| Message ID | 20230403222302.328262-1-shenwei.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 10739ea3132861b1344264b110ea48d951a0e3b0 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v6,1/2] net: stmmac: add support for platform specific reset | expand |
On Mon, Apr 03, 2023 at 05:23:01PM -0500, Shenwei Wang wrote: > 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 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. > > Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
Hello: This series was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 3 Apr 2023 17:23:01 -0500 you wrote: > 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 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. > > [...] Here is the summary with links: - [v6,1/2] net: stmmac: add support for platform specific reset https://git.kernel.org/netdev/net-next/c/10739ea31328 - [v6,2/2] net: stmmac: dwmac-imx: use platform specific reset for imx93 SoCs https://git.kernel.org/netdev/net-next/c/b536f32b5b03 You are awesome, thank you!
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c index bb7114f970f8..b8ba8f2d8041 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -87,6 +87,19 @@ 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 (!priv) + return -EINVAL; + + 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..1cc286b000b6 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 __iomem *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 a2414c187483..dafa001e9e7a 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);
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 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. Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> --- v6: - add an extra condition check for priv per simon's review. - reorder the local variable declarations in imx_dwmac_mx93_reset v5: - add the missing __iomem tag in the stmmac_reset definition. drivers/net/ethernet/stmicro/stmmac/hwif.c | 13 +++++++++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +-- include/linux/stmmac.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) -- 2.34.1