From patchwork Fri Mar 31 20:57:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenwei Wang X-Patchwork-Id: 13196565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56604C76196 for ; Fri, 31 Mar 2023 20:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0LFp5YyhQSxvo2s2HQv44Nx93/HBTHGRj4NLuRXHiCs=; b=sg187O/Mc3Opa7 N1PB3S5mtK/1X0AjgxJgBTNngEXxoUww7tslR5/kctp96kI0T3Pb9RfGT7Owe+1Huf/USyB8pBIZ3 A+1uCIX40lUBFeX3GcSDG03xT5z+5Rhsb2BZoRwRplXw+OxDlQeMNOuD/YJ71LqI+P2gniWv/ceQE UV59DA6hDEuuX5G3mjzJ4OMEce8UsV+n0bM+mYhz2YJps0xMLCd+v3xWUeVEr4TW4wisFPn45KOs3 DjhKLubUYNXyvb4DRtqukgxCjFcd0n3ITKyuQTNoxoE2PcD0/MPkQWuHWZExOYJl3TRotOwfS4BcP UMHvNL15THf98u3HZT7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1piLpO-008qaL-2A; Fri, 31 Mar 2023 20:58:30 +0000 Received: from mail-dbaeur03on2062c.outbound.protection.outlook.com ([2a01:111:f400:fe1a::62c] helo=EUR03-DBA-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1piLpG-008qYs-2C for linux-arm-kernel@lists.infradead.org; Fri, 31 Mar 2023 20:58:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BNfgOClrHtGH0t9JV799dvDv8OkgtWZw3hlMInnbFTOeIa2+xmgQML+iqPQLQ0eytg6U4WNPRJUJK7hbPFqnD07lFrwCGjF77di6AYuHGKX1MFNBhOeSqizaD2W7/jpA65N3cGbz+guUS8263CJkYWbaqy8KgAgzJ/X1WqoCX3jslFeItPc9uC7oykPry1FG/AT9JuG7ZCnuMV59l3hUn0jjGP/czXKHky5elqYxeavz3xC8K78TlU6wNCYhjtcdmZk2FklsENyFE4xZbiJznDxTpSMyGl5hwsq7xZSdC1u0b6lKGoOi+lE1N6OAz2s5tmqnD26b7lV/7Iw7swv2Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uyE2AZb903607mUK4FwgjrGfuWZxuVGFt4Iogqlv+/E=; b=BU+SrvbOYAyt9p2JFI8D9Xlw7T7+2wB/6MFFq78mEsMM9olfNKWTiNeCoIBc8Q0RiJB8ZX/GUQrplKzHrPoGeVjrQNqM8SJAbAEgGBeoaV+YRyHoIvbkKCWc1ch5dZ9gtpBruuFbGAycR1rKU+hQvRX8FRcMDrjuSx8tiMLyUR3UPPCkf2951qofZ7A00lHWrQsfgE4KkDgiWe3qqk8hIAdORSeVd3HBxJi2nwmF05c7F2cWK7i57JdsQdELdFqaQerUBZDXEHnQNmR1eoAut/Tej4yCyh8jK2kJGa5MEiZ960W9AHYMy80ELd+KpjfEEm1MtEJwyCwYOHGJTpG48A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uyE2AZb903607mUK4FwgjrGfuWZxuVGFt4Iogqlv+/E=; b=d4Pp4WyazKJPLa+s92wv80/p329+/OX4omoKjFBGPG5fKCScolavsXZc9/L9lXR62dazmiY4bpyiqkXoGu1R4/sP38MQlWePM6hw9CNDFcz/AfBPGvafinVlv+nnlaG6CQ3/dT6ZJPGpoEEvFdeQrAgUbRb/wACVKLixbtO2rT0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) by PAXPR04MB8205.eurprd04.prod.outlook.com (2603:10a6:102:1c2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.21; Fri, 31 Mar 2023 20:58:19 +0000 Received: from PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3]) by PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3%3]) with mapi id 15.20.6254.023; Fri, 31 Mar 2023 20:58:19 +0000 From: Shenwei Wang To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Shawn Guo , Sascha Hauer Cc: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Wong Vee Khee , Tan Tee Min , Revanth Kumar Uppala , Jon Hunter , Shenwei Wang , Andrey Konovalov , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev Subject: [PATCH v3 2/2] net: stmmac: dwmac-imx: use platform specific reset for imx93 SoCs Date: Fri, 31 Mar 2023 15:57:59 -0500 Message-Id: <20230331205759.92309-2-shenwei.wang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230331205759.92309-1-shenwei.wang@nxp.com> References: <20230331205759.92309-1-shenwei.wang@nxp.com> X-ClientProxiedBy: BYAPR07CA0008.namprd07.prod.outlook.com (2603:10b6:a02:bc::21) To PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9185:EE_|PAXPR04MB8205:EE_ X-MS-Office365-Filtering-Correlation-Id: bbc046c4-5c38-455b-6eea-08db322aa81a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uGndzs+DvrghLn95gqlTRbSLmZ6tI3b9F7DkNzG/yMO8WULk2e3kso6wgAsef7JXmcwG5PFM/I+6kS4lLYKzAQPL548pJ7Lfous/1Re3W+ibFfXVLjXtfm8ctul3GdjG20/5ep+N5EJulsrmQ5AI7KseAv5tHRI/+EgMX4wnp6vsqYYCjty0xzariMp9kGLZJTW173C7JLJiSo4ocZsW8CkL8yV2kIbJZsniLCXoCaGvDn56RmAnIHUY/lkpCY4arNyPEomMJvo6MxgCuO+eAA8Dm6gDp5e0AxMpnHyNyL0ZzG65MifGfD+T1wMR65LIb3kuJKPY9WYfwzEu/No9ACRI8cOpjvI2NupjYLX8OdQ7X1ajNUgWp/45RmWsrH3HV017W5jEB6ItlWcfOBMTzsxIEtHGWtUfx6+wo9jr+9IdnLV3ej6P3i95fowmSGDK5DfvB4DpfuE6ytrGD+igtJTKM5FF0eLSjWOACr31zEQWjB0dulMWQpDoE5LclgLsgwsPAUVKnzYVDBIJBloWHHVQ2AEqXuXM3bLWnDqLjX355/BMH0xVc0HIGQjuzg1ZZQWTPiCpeGvMFxy4P4Z6RkH/4dxGdq0+52oQ6mRE/S/XhStzlhwvwJVKZF8xsHhy X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9185.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(6029001)(4636009)(346002)(136003)(396003)(39860400002)(376002)(366004)(451199021)(2616005)(478600001)(83380400001)(6486002)(52116002)(186003)(110136005)(55236004)(6666004)(26005)(54906003)(1076003)(6512007)(6506007)(316002)(8936002)(41300700001)(38350700002)(4326008)(66946007)(44832011)(66476007)(5660300002)(66556008)(38100700002)(7416002)(8676002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +/3naZUJ3hnXfoKlED2fgJy8rmK06yNAkc8rzzGBKEiIKoPZQLpIjfpW0TCyCTiHKH5N2I+wh+J+tlhynBFbai3NgXBrU6HuprnXwNnbeUWEGlSgXPwkEr+gTlexqD+hVhTfwL+IPawY7Z+JsjiEl7Hk5nhv32GXdtDDe88Txn7vfxU8BH14jTYifS+UKMmvCwBBNQnKF++u0lV90LmhDn6Q4uiMW9w9yM1uSJRDq4tvVQWd1E9Caf4XsGw2g3+ORDmna9MIuOUPvUWkArtcs1sDO+pUqCLrvVEN0+z5byMNjcgMszCr7wJEhtvULKsxtXUfrXpfjpPgym3MMgN1r08YfdrgOZpx+8qASlI0cWFkPtnwrt2QoDxro3Nz9FSPTng49GVkUm7SB6vq4pucElRLhYiDGoVwhgTTxVVYqX4Nj6o2xW+/fWntPeaxFiF3ukosBf3EAZX3AKt6hK9eNAhVs0aWBCXvtkss5k0d+vl6jwmOyEe6uxCdgj3HEwAVWlHcD6myHUJafV76gZ1GUo6XDAKN1XYQuB2O273D0RGxC+EmrET/SMtyehRJZroMHydzVZote2D3NouBHdoHW/fYZlbk74WkF+qyMvwHQ8Z+OaL7P314My469UwmBJsa3uMbEqOJ3gd2zKR5IYd+/8ojsZ1PiVZ6TJhP2XaCjKKyB7bJ6vwGIyyg9tB257X94Xu2cEFyDPydhLKbFsa3pNyZlZOUJ28kXRzw3fTNdiR9HmN3vAxhJHDyaUdDTYeKY9GT58qMqVyimsAyJuOQuMnPYlUDCwzwFXv2B2gl8e9kOHlIIA9jfpcYPEGzxh1SjVbgWG/jRll66pecQeTAvAdJBVCRLed1nItLZhMGlMoVl6n1x2C5LbFTm5Trubu9AZAeFgTRdxIFxbZvOrGZy2OneeFGQW4ix23PoyUBYqpBhye05gD0lfLAW9ZoS8N2r+z/g06NsJgF4M7/tyjVZYC//SomSSjJI5D9NZX/9dRJ0XTWhAKXSOzgTDIaRKsnpBBMJ/LBNFFBSLbkADcQR+f6xLk9AFA7ZrE0FTt045Cms3NW3SsFteCulocRX3XnxkC5uayNGRED0luA5Jk5RoAsKiLjWSmM673MRxZLs+zxrc0mqHdEYG5SwXK2r3NllpseVt9atnHnyLGk3UIldJdNPbxyIvP6qmcwjQZzNOwqlbv56ruFut8A/Ah9E1DQx9bkSc9PB/3J2Jap7kgR72qaoIpbSSwdEQDc+ECYjrt6kK35jEXv4KNLKvTyFlhmGjO/A5bJV0y3wEX4xYm5mLVpdDpfPsWqqcDJI3FmH2nhr/WXeq2Wq4nt14VReIiV2uhd5aDx2kAQAhObyBAUcBhLWlMqxVpWdmTSAOAHkKVnFsT6Yp9vVi3I/q+W15FeOZo3utuSplmYhc7BM2lcEpgtiTaIvBXlGpetg7TvJ9VqDJFCIvZkoHXcvizoLOO4OtOKSGX2vJTBatIxnaNIAcplL53QMfn7yWG952XaLHI0H56XIp32e78ReFsfDlQTovm7MA4+py7AEa7KZGxA5AqZvS6DJjFz22Bbeo6Mp2swDYkTuICdy662jv9ytSo7 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbc046c4-5c38-455b-6eea-08db322aa81a X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 20:58:19.6812 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mk0025b8QZ2t+KEnMZ5onnein/G9QAhE9HEToFZENf/nRZ/iAR9Zid8fsswURVjzs4AwA15Kwgiabw7qIccegQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8205 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230331_135822_743293_E4E0C380 X-CRM114-Status: GOOD ( 18.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The patch addresses an issue with the reset logic on the i.MX93 SoC, which requires configuration of the correct interface speed under RMII mode to complete the reset. The patch implements a fix_soc_reset function and uses it specifically for the i.MX93 SoCs. Signed-off-by: Shenwei Wang Reviewed-by: Fabio Estevam --- .../net/ethernet/stmicro/stmmac/dwmac-imx.c | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c index ac8580f501e2..3dfd13840535 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c @@ -19,9 +19,9 @@ #include #include #include -#include #include "stmmac_platform.h" +#include "common.h" #define GPR_ENET_QOS_INTF_MODE_MASK GENMASK(21, 16) #define GPR_ENET_QOS_INTF_SEL_MII (0x0 << 16) @@ -37,10 +37,15 @@ #define MX93_GPR_ENET_QOS_INTF_SEL_RGMII (0x1 << 1) #define MX93_GPR_ENET_QOS_CLK_GEN_EN (0x1 << 0) +#define DMA_BUS_MODE 0x00001000 +#define DMA_BUS_MODE_SFT_RESET (0x1 << 0) +#define RMII_RESET_SPEED (0x3 << 14) + struct imx_dwmac_ops { u32 addr_width; bool mac_rgmii_txclk_auto_adj; + int (*fix_soc_reset)(void *priv, void __iomem *ioaddr); int (*set_intf_mode)(struct plat_stmmacenet_data *plat_dat); }; @@ -207,6 +212,25 @@ static void imx_dwmac_fix_speed(void *priv, unsigned int speed) dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate); } +static int imx_dwmac_mx93_reset(void *priv, void __iomem *ioaddr) +{ + u32 value = readl(ioaddr + DMA_BUS_MODE); + struct plat_stmmacenet_data *plat_dat = priv; + + /* DMA SW reset */ + value |= DMA_BUS_MODE_SFT_RESET; + writel(value, ioaddr + DMA_BUS_MODE); + + if (plat_dat->interface == PHY_INTERFACE_MODE_RMII) { + usleep_range(100, 200); + writel(RMII_RESET_SPEED, ioaddr + MAC_CTRL_REG); + } + + return readl_poll_timeout(ioaddr + DMA_BUS_MODE, value, + !(value & DMA_BUS_MODE_SFT_RESET), + 10000, 1000000); +} + static int imx_dwmac_parse_dt(struct imx_priv_data *dwmac, struct device *dev) { @@ -305,6 +329,8 @@ static int imx_dwmac_probe(struct platform_device *pdev) if (ret) goto err_dwmac_init; + dwmac->plat_dat->fix_soc_reset = dwmac->ops->fix_soc_reset; + ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) goto err_drv_probe; @@ -338,6 +364,7 @@ static struct imx_dwmac_ops imx93_dwmac_data = { .addr_width = 32, .mac_rgmii_txclk_auto_adj = true, .set_intf_mode = imx93_set_intf_mode, + .fix_soc_reset = imx_dwmac_mx93_reset, }; static const struct of_device_id imx_dwmac_match[] = {