* [PATCH v4 1/2] net: stmmac: add support for platform specific reset
@ 2023-03-31 21:22 Shenwei Wang
2023-03-31 21:22 ` [PATCH v4 2/2] net: stmmac: dwmac-imx: use platform specific reset for imx93 SoCs Shenwei Wang
2023-04-01 4:58 ` [PATCH v4 1/2] net: stmmac: add support for platform specific reset Jakub Kicinski
0 siblings, 2 replies; 4+ messages in thread
From: Shenwei Wang @ 2023-03-31 21:22 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Shawn Guo, Sascha Hauer, Maxime Coquelin
Cc: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Wong Vee Khee, Kurt Kanzenbach, Revanth Kumar Uppala,
Andrey Konovalov, Shenwei Wang, Tan Tee Min, netdev,
linux-arm-kernel, linux-stm32, imx
This patch adds support for platform-specific reset logic in the
stmmac driver. Some SoCs require a different reset mechanism than
the standard dwmac IP reset. To support these platforms, a new function
pointer 'fix_soc_reset' is added to the plat_stmmacenet_data structure.
The stmmac_reset macro in hwif.h is modified to call the 'fix_soc_reset'
function if it exists. This enables the driver to use the platform-specific
reset logic when necessary.
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
---
drivers/net/ethernet/stmicro/stmmac/hwif.c | 10 ++++++++++
drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +--
include/linux/stmmac.h | 1 +
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
index bb7114f970f8..0eefa697ffe8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -87,6 +87,16 @@ static int stmmac_dwxlgmac_quirks(struct stmmac_priv *priv)
return 0;
}
+int stmmac_reset(struct stmmac_priv *priv, void __iomem *ioaddr)
+{
+ struct plat_stmmacenet_data *plat = priv ? priv->plat : NULL;
+
+ if (plat && plat->fix_soc_reset)
+ return plat->fix_soc_reset(plat, ioaddr);
+
+ return stmmac_do_callback(priv, dma, reset, ioaddr);
+}
+
static const struct stmmac_hwif_entry {
bool gmac;
bool gmac4;
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index 16a7421715cb..47a68f506c10 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -214,8 +214,6 @@ struct stmmac_dma_ops {
int (*enable_tbs)(void __iomem *ioaddr, bool en, u32 chan);
};
-#define stmmac_reset(__priv, __args...) \
- stmmac_do_callback(__priv, dma, reset, __args)
#define stmmac_dma_init(__priv, __args...) \
stmmac_do_void_callback(__priv, dma, init, __args)
#define stmmac_init_chan(__priv, __args...) \
@@ -640,6 +638,7 @@ extern const struct stmmac_mmc_ops dwxgmac_mmc_ops;
#define GMAC_VERSION 0x00000020 /* GMAC CORE Version */
#define GMAC4_VERSION 0x00000110 /* GMAC4+ CORE Version */
+int stmmac_reset(struct stmmac_priv *priv, void *ioaddr);
int stmmac_hwif_init(struct stmmac_priv *priv);
#endif /* __STMMAC_HWIF_H__ */
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index a152678b82b7..9044477fad61 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -223,6 +223,7 @@ struct plat_stmmacenet_data {
struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];
struct stmmac_txq_cfg tx_queues_cfg[MTL_MAX_TX_QUEUES];
void (*fix_mac_speed)(void *priv, unsigned int speed);
+ int (*fix_soc_reset)(void *priv, void __iomem *ioaddr);
int (*serdes_powerup)(struct net_device *ndev, void *priv);
void (*serdes_powerdown)(struct net_device *ndev, void *priv);
void (*speed_mode_2500)(struct net_device *ndev, void *priv);
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v4 2/2] net: stmmac: dwmac-imx: use platform specific reset for imx93 SoCs
2023-03-31 21:22 [PATCH v4 1/2] net: stmmac: add support for platform specific reset Shenwei Wang
@ 2023-03-31 21:22 ` Shenwei Wang
2023-04-01 4:58 ` [PATCH v4 1/2] net: stmmac: add support for platform specific reset Jakub Kicinski
1 sibling, 0 replies; 4+ messages in thread
From: Shenwei Wang @ 2023-03-31 21:22 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Shawn Guo, Sascha Hauer, Maxime Coquelin
Cc: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Wong Vee Khee, Kurt Kanzenbach, Revanth Kumar Uppala,
Andrey Konovalov, Shenwei Wang, Tan Tee Min, netdev,
linux-arm-kernel, linux-stm32, imx
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.
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
---
.../net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
index ac8580f501e2..ebab2ced5422 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
@@ -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[] = {
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v4 1/2] net: stmmac: add support for platform specific reset
2023-03-31 21:22 [PATCH v4 1/2] net: stmmac: add support for platform specific reset Shenwei Wang
2023-03-31 21:22 ` [PATCH v4 2/2] net: stmmac: dwmac-imx: use platform specific reset for imx93 SoCs Shenwei Wang
@ 2023-04-01 4:58 ` Jakub Kicinski
2023-04-03 13:53 ` [EXT] " Shenwei Wang
1 sibling, 1 reply; 4+ messages in thread
From: Jakub Kicinski @ 2023-04-01 4:58 UTC (permalink / raw)
To: Shenwei Wang
Cc: David S. Miller, Eric Dumazet, Paolo Abeni, Shawn Guo,
Sascha Hauer, Maxime Coquelin, Giuseppe Cavallaro,
Alexandre Torgue, Jose Abreu, Pengutronix Kernel Team,
Fabio Estevam, NXP Linux Team, Wong Vee Khee, Kurt Kanzenbach,
Revanth Kumar Uppala, Andrey Konovalov, Tan Tee Min, netdev,
linux-arm-kernel, linux-stm32, imx
On Fri, 31 Mar 2023 16:22:49 -0500 Shenwei Wang wrote:
> diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
> index 16a7421715cb..47a68f506c10 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
> +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
> @@ -214,8 +214,6 @@ struct stmmac_dma_ops {
> int (*enable_tbs)(void __iomem *ioaddr, bool en, u32 chan);
> };
>
> -#define stmmac_reset(__priv, __args...) \
> - stmmac_do_callback(__priv, dma, reset, __args)
> #define stmmac_dma_init(__priv, __args...) \
> stmmac_do_void_callback(__priv, dma, init, __args)
> #define stmmac_init_chan(__priv, __args...) \
> @@ -640,6 +638,7 @@ extern const struct stmmac_mmc_ops dwxgmac_mmc_ops;
> #define GMAC_VERSION 0x00000020 /* GMAC CORE Version */
> #define GMAC4_VERSION 0x00000110 /* GMAC4+ CORE Version */
>
> +int stmmac_reset(struct stmmac_priv *priv, void *ioaddr);
sparse reports missing annotation, I think it's this line.
It should have a __iomem tag. Try building with C=1
Also please take a look at:
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html
> int stmmac_hwif_init(struct stmmac_priv *priv);
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [EXT] Re: [PATCH v4 1/2] net: stmmac: add support for platform specific reset
2023-04-01 4:58 ` [PATCH v4 1/2] net: stmmac: add support for platform specific reset Jakub Kicinski
@ 2023-04-03 13:53 ` Shenwei Wang
0 siblings, 0 replies; 4+ messages in thread
From: Shenwei Wang @ 2023-04-03 13:53 UTC (permalink / raw)
To: Jakub Kicinski
Cc: David S. Miller, Eric Dumazet, Paolo Abeni, Shawn Guo,
Sascha Hauer, Maxime Coquelin, Giuseppe Cavallaro,
Alexandre Torgue, Jose Abreu, Pengutronix Kernel Team,
Fabio Estevam, dl-linux-imx, Wong Vee Khee, Kurt Kanzenbach,
Revanth Kumar Uppala, Andrey Konovalov, Tan Tee Min,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com, imx@lists.linux.dev
> -----Original Message-----
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Friday, March 31, 2023 11:58 PM
> To: Shenwei Wang <shenwei.wang@nxp.com>
> Cc: David S. Miller <davem@davemloft.net>; Eric Dumazet
> <edumazet@google.com>; Paolo Abeni <pabeni@redhat.com>; Shawn Guo
> <shawnguo@kernel.org>; Sascha Hauer <s.hauer@pengutronix.de>; Maxime
> Coquelin <mcoquelin.stm32@gmail.com>; Giuseppe Cavallaro
> <peppe.cavallaro@st.com>; Alexandre Torgue <alexandre.torgue@foss.st.com>;
> Jose Abreu <joabreu@synopsys.com>; Pengutronix Kernel Team
> <kernel@pengutronix.de>; Fabio Estevam <festevam@gmail.com>; dl-linux-imx
> <linux-imx@nxp.com>; Wong Vee Khee <veekhee@apple.com>; Kurt
> Kanzenbach <kurt@linutronix.de>; Revanth Kumar Uppala
> <ruppala@nvidia.com>; Andrey Konovalov <andrey.konovalov@linaro.org>; Tan
> Tee Min <tee.min.tan@linux.intel.com>; netdev@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; linux-stm32@st-md-mailman.stormreply.com;
> imx@lists.linux.dev
> Subject: [EXT] Re: [PATCH v4 1/2] net: stmmac: add support for platform specific
> reset
>
> Caution: EXT Email
>
> On Fri, 31 Mar 2023 16:22:49 -0500 Shenwei Wang wrote:
> > diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h
> > b/drivers/net/ethernet/stmicro/stmmac/hwif.h
> > index 16a7421715cb..47a68f506c10 100644
> > --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
> > +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
> > @@ -214,8 +214,6 @@ struct stmmac_dma_ops {
> > int (*enable_tbs)(void __iomem *ioaddr, bool en, u32 chan); };
> >
> > -#define stmmac_reset(__priv, __args...) \
> > - stmmac_do_callback(__priv, dma, reset, __args)
> > #define stmmac_dma_init(__priv, __args...) \
> > stmmac_do_void_callback(__priv, dma, init, __args) #define
> > stmmac_init_chan(__priv, __args...) \ @@ -640,6 +638,7 @@ extern const
> > struct stmmac_mmc_ops dwxgmac_mmc_ops;
> > #define GMAC_VERSION 0x00000020 /* GMAC CORE Version */
> > #define GMAC4_VERSION 0x00000110 /* GMAC4+ CORE Version
> */
> >
> > +int stmmac_reset(struct stmmac_priv *priv, void *ioaddr);
>
> sparse reports missing annotation, I think it's this line.
> It should have a __iomem tag. Try building with C=1 Also please take a look at:
Tried to rebuild with C=1 but didn't reproduce the missing annotation issue. However, the __iomem
should be added here.
Thanks,
Shenwei
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.ker
> nel.org%2Fdoc%2Fhtml%2Fnext%2Fprocess%2Fmaintainer-
> netdev.html&data=05%7C01%7Cshenwei.wang%40nxp.com%7Cb0c66303819f4
> c5c2eec08db326db89d%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7
> C638159219052564995%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwM
> DAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C
> &sdata=0j58wSNzzTirX%2FqaJKPxYEDZn6ezs7qC39trHa72YRA%3D&reserved=0
>
> > int stmmac_hwif_init(struct stmmac_priv *priv);
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-03 13:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-31 21:22 [PATCH v4 1/2] net: stmmac: add support for platform specific reset Shenwei Wang
2023-03-31 21:22 ` [PATCH v4 2/2] net: stmmac: dwmac-imx: use platform specific reset for imx93 SoCs Shenwei Wang
2023-04-01 4:58 ` [PATCH v4 1/2] net: stmmac: add support for platform specific reset Jakub Kicinski
2023-04-03 13:53 ` [EXT] " Shenwei Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).