* [PATCH AUTOSEL 6.1 35/48] net: enetc: remove ERR050089 workaround for i.MX95 [not found] <20241124134950.3348099-1-sashal@kernel.org> @ 2024-11-24 13:48 ` Sasha Levin 2024-11-25 1:55 ` Wei Fang 2024-11-24 13:48 ` [PATCH AUTOSEL 6.1 36/48] net: enetc: add i.MX95 EMDIO support Sasha Levin 1 sibling, 1 reply; 3+ messages in thread From: Sasha Levin @ 2024-11-24 13:48 UTC (permalink / raw) To: linux-kernel, stable Cc: Vladimir Oltean, Wei Fang, David S . Miller, Sasha Levin, claudiu.manoil, xiaoning.wang, andrew+netdev, edumazet, kuba, pabeni, imx, netdev From: Vladimir Oltean <vladimir.oltean@nxp.com> [ Upstream commit 86831a3f4cd4c924dd78cf0d6e4d73acacfe1b11 ] The ERR050089 workaround causes performance degradation and potential functional issues (e.g., RCU stalls) under certain workloads. Since new SoCs like i.MX95 do not require this workaround, use a static key to compile out enetc_lock_mdio() and enetc_unlock_mdio() at runtime, improving performance and avoiding unnecessary logic. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: Wei Fang <wei.fang@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org> --- .../net/ethernet/freescale/enetc/enetc_hw.h | 34 +++++++++++++------ .../ethernet/freescale/enetc/enetc_pci_mdio.c | 28 +++++++++++++++ 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h index 18ca1f42b1f75..a5e38804e2811 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h @@ -372,18 +372,22 @@ struct enetc_hw { */ extern rwlock_t enetc_mdio_lock; +DECLARE_STATIC_KEY_FALSE(enetc_has_err050089); + /* use this locking primitive only on the fast datapath to * group together multiple non-MDIO register accesses to * minimize the overhead of the lock */ static inline void enetc_lock_mdio(void) { - read_lock(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + read_lock(&enetc_mdio_lock); } static inline void enetc_unlock_mdio(void) { - read_unlock(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + read_unlock(&enetc_mdio_lock); } /* use these accessors only on the fast datapath under @@ -392,14 +396,16 @@ static inline void enetc_unlock_mdio(void) */ static inline u32 enetc_rd_reg_hot(void __iomem *reg) { - lockdep_assert_held(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + lockdep_assert_held(&enetc_mdio_lock); return ioread32(reg); } static inline void enetc_wr_reg_hot(void __iomem *reg, u32 val) { - lockdep_assert_held(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + lockdep_assert_held(&enetc_mdio_lock); iowrite32(val, reg); } @@ -428,9 +434,13 @@ static inline u32 _enetc_rd_mdio_reg_wa(void __iomem *reg) unsigned long flags; u32 val; - write_lock_irqsave(&enetc_mdio_lock, flags); - val = ioread32(reg); - write_unlock_irqrestore(&enetc_mdio_lock, flags); + if (static_branch_unlikely(&enetc_has_err050089)) { + write_lock_irqsave(&enetc_mdio_lock, flags); + val = ioread32(reg); + write_unlock_irqrestore(&enetc_mdio_lock, flags); + } else { + val = ioread32(reg); + } return val; } @@ -439,9 +449,13 @@ static inline void _enetc_wr_mdio_reg_wa(void __iomem *reg, u32 val) { unsigned long flags; - write_lock_irqsave(&enetc_mdio_lock, flags); - iowrite32(val, reg); - write_unlock_irqrestore(&enetc_mdio_lock, flags); + if (static_branch_unlikely(&enetc_has_err050089)) { + write_lock_irqsave(&enetc_mdio_lock, flags); + iowrite32(val, reg); + write_unlock_irqrestore(&enetc_mdio_lock, flags); + } else { + iowrite32(val, reg); + } } #ifdef ioread64 diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c index dafb26f81f95f..d3248881a9b7e 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c @@ -9,6 +9,28 @@ #define ENETC_MDIO_BUS_NAME ENETC_MDIO_DEV_NAME " Bus" #define ENETC_MDIO_DRV_NAME ENETC_MDIO_DEV_NAME " driver" +DEFINE_STATIC_KEY_FALSE(enetc_has_err050089); +EXPORT_SYMBOL_GPL(enetc_has_err050089); + +static void enetc_emdio_enable_err050089(struct pci_dev *pdev) +{ + if (pdev->vendor == PCI_VENDOR_ID_FREESCALE && + pdev->device == ENETC_MDIO_DEV_ID) { + static_branch_inc(&enetc_has_err050089); + dev_info(&pdev->dev, "Enabled ERR050089 workaround\n"); + } +} + +static void enetc_emdio_disable_err050089(struct pci_dev *pdev) +{ + if (pdev->vendor == PCI_VENDOR_ID_FREESCALE && + pdev->device == ENETC_MDIO_DEV_ID) { + static_branch_dec(&enetc_has_err050089); + if (!static_key_enabled(&enetc_has_err050089.key)) + dev_info(&pdev->dev, "Disabled ERR050089 workaround\n"); + } +} + static int enetc_pci_mdio_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -60,6 +82,8 @@ static int enetc_pci_mdio_probe(struct pci_dev *pdev, goto err_pci_mem_reg; } + enetc_emdio_enable_err050089(pdev); + err = of_mdiobus_register(bus, dev->of_node); if (err) goto err_mdiobus_reg; @@ -69,6 +93,7 @@ static int enetc_pci_mdio_probe(struct pci_dev *pdev, return 0; err_mdiobus_reg: + enetc_emdio_disable_err050089(pdev); pci_release_region(pdev, 0); err_pci_mem_reg: pci_disable_device(pdev); @@ -86,6 +111,9 @@ static void enetc_pci_mdio_remove(struct pci_dev *pdev) struct enetc_mdio_priv *mdio_priv; mdiobus_unregister(bus); + + enetc_emdio_disable_err050089(pdev); + mdio_priv = bus->priv; iounmap(mdio_priv->hw->port); pci_release_region(pdev, 0); -- 2.43.0 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH AUTOSEL 6.1 35/48] net: enetc: remove ERR050089 workaround for i.MX95 2024-11-24 13:48 ` [PATCH AUTOSEL 6.1 35/48] net: enetc: remove ERR050089 workaround for i.MX95 Sasha Levin @ 2024-11-25 1:55 ` Wei Fang 0 siblings, 0 replies; 3+ messages in thread From: Wei Fang @ 2024-11-25 1:55 UTC (permalink / raw) To: Sasha Levin, linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Oltean, David S . Miller, Claudiu Manoil, Clark Wang, andrew+netdev@lunn.ch, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, imx@lists.linux.dev, netdev@vger.kernel.org > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > [ Upstream commit 86831a3f4cd4c924dd78cf0d6e4d73acacfe1b11 ] > > The ERR050089 workaround causes performance degradation and potential > functional issues (e.g., RCU stalls) under certain workloads. Since new SoCs like > i.MX95 do not require this workaround, use a static key to compile out > enetc_lock_mdio() and enetc_unlock_mdio() at runtime, improving > performance and avoiding unnecessary logic. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > Signed-off-by: Wei Fang <wei.fang@nxp.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > .../net/ethernet/freescale/enetc/enetc_hw.h | 34 +++++++++++++------ > .../ethernet/freescale/enetc/enetc_pci_mdio.c | 28 +++++++++++++++ > 2 files changed, 52 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h > b/drivers/net/ethernet/freescale/enetc/enetc_hw.h > index 18ca1f42b1f75..a5e38804e2811 100644 > --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h > +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h > @@ -372,18 +372,22 @@ struct enetc_hw { > */ > extern rwlock_t enetc_mdio_lock; > > +DECLARE_STATIC_KEY_FALSE(enetc_has_err050089); > + > /* use this locking primitive only on the fast datapath to > * group together multiple non-MDIO register accesses to > * minimize the overhead of the lock > */ > static inline void enetc_lock_mdio(void) { > - read_lock(&enetc_mdio_lock); > + if (static_branch_unlikely(&enetc_has_err050089)) > + read_lock(&enetc_mdio_lock); > } > > static inline void enetc_unlock_mdio(void) { > - read_unlock(&enetc_mdio_lock); > + if (static_branch_unlikely(&enetc_has_err050089)) > + read_unlock(&enetc_mdio_lock); > } > > /* use these accessors only on the fast datapath under @@ -392,14 +396,16 > @@ static inline void enetc_unlock_mdio(void) > */ > static inline u32 enetc_rd_reg_hot(void __iomem *reg) { > - lockdep_assert_held(&enetc_mdio_lock); > + if (static_branch_unlikely(&enetc_has_err050089)) > + lockdep_assert_held(&enetc_mdio_lock); > > return ioread32(reg); > } > > static inline void enetc_wr_reg_hot(void __iomem *reg, u32 val) { > - lockdep_assert_held(&enetc_mdio_lock); > + if (static_branch_unlikely(&enetc_has_err050089)) > + lockdep_assert_held(&enetc_mdio_lock); > > iowrite32(val, reg); > } > @@ -428,9 +434,13 @@ static inline u32 _enetc_rd_mdio_reg_wa(void > __iomem *reg) > unsigned long flags; > u32 val; > > - write_lock_irqsave(&enetc_mdio_lock, flags); > - val = ioread32(reg); > - write_unlock_irqrestore(&enetc_mdio_lock, flags); > + if (static_branch_unlikely(&enetc_has_err050089)) { > + write_lock_irqsave(&enetc_mdio_lock, flags); > + val = ioread32(reg); > + write_unlock_irqrestore(&enetc_mdio_lock, flags); > + } else { > + val = ioread32(reg); > + } > > return val; > } > @@ -439,9 +449,13 @@ static inline void _enetc_wr_mdio_reg_wa(void > __iomem *reg, u32 val) { > unsigned long flags; > > - write_lock_irqsave(&enetc_mdio_lock, flags); > - iowrite32(val, reg); > - write_unlock_irqrestore(&enetc_mdio_lock, flags); > + if (static_branch_unlikely(&enetc_has_err050089)) { > + write_lock_irqsave(&enetc_mdio_lock, flags); > + iowrite32(val, reg); > + write_unlock_irqrestore(&enetc_mdio_lock, flags); > + } else { > + iowrite32(val, reg); > + } > } > > #ifdef ioread64 > diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c > b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c > index dafb26f81f95f..d3248881a9b7e 100644 > --- a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c > +++ b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c > @@ -9,6 +9,28 @@ > #define ENETC_MDIO_BUS_NAME ENETC_MDIO_DEV_NAME " Bus" > #define ENETC_MDIO_DRV_NAME ENETC_MDIO_DEV_NAME " driver" > > +DEFINE_STATIC_KEY_FALSE(enetc_has_err050089); > +EXPORT_SYMBOL_GPL(enetc_has_err050089); > + > +static void enetc_emdio_enable_err050089(struct pci_dev *pdev) { > + if (pdev->vendor == PCI_VENDOR_ID_FREESCALE && > + pdev->device == ENETC_MDIO_DEV_ID) { > + static_branch_inc(&enetc_has_err050089); > + dev_info(&pdev->dev, "Enabled ERR050089 workaround\n"); > + } > +} > + > +static void enetc_emdio_disable_err050089(struct pci_dev *pdev) { > + if (pdev->vendor == PCI_VENDOR_ID_FREESCALE && > + pdev->device == ENETC_MDIO_DEV_ID) { > + static_branch_dec(&enetc_has_err050089); > + if (!static_key_enabled(&enetc_has_err050089.key)) > + dev_info(&pdev->dev, "Disabled ERR050089 workaround\n"); > + } > +} > + > static int enetc_pci_mdio_probe(struct pci_dev *pdev, > const struct pci_device_id *ent) > { > @@ -60,6 +82,8 @@ static int enetc_pci_mdio_probe(struct pci_dev *pdev, > goto err_pci_mem_reg; > } > > + enetc_emdio_enable_err050089(pdev); > + > err = of_mdiobus_register(bus, dev->of_node); > if (err) > goto err_mdiobus_reg; > @@ -69,6 +93,7 @@ static int enetc_pci_mdio_probe(struct pci_dev *pdev, > return 0; > > err_mdiobus_reg: > + enetc_emdio_disable_err050089(pdev); > pci_release_region(pdev, 0); > err_pci_mem_reg: > pci_disable_device(pdev); > @@ -86,6 +111,9 @@ static void enetc_pci_mdio_remove(struct pci_dev > *pdev) > struct enetc_mdio_priv *mdio_priv; > > mdiobus_unregister(bus); > + > + enetc_emdio_disable_err050089(pdev); > + > mdio_priv = bus->priv; > iounmap(mdio_priv->hw->port); > pci_release_region(pdev, 0); > -- > 2.43.0 Hi Sasha, This patch does not need to be backported, because i.MX95 NETC is only supported in the latest kernel (should be 6.13, Linus tree). For the old kernel, only LS1028A NETC is supported, so this problem does not exist. ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH AUTOSEL 6.1 36/48] net: enetc: add i.MX95 EMDIO support [not found] <20241124134950.3348099-1-sashal@kernel.org> 2024-11-24 13:48 ` [PATCH AUTOSEL 6.1 35/48] net: enetc: remove ERR050089 workaround for i.MX95 Sasha Levin @ 2024-11-24 13:48 ` Sasha Levin 1 sibling, 0 replies; 3+ messages in thread From: Sasha Levin @ 2024-11-24 13:48 UTC (permalink / raw) To: linux-kernel, stable Cc: Wei Fang, David S . Miller, Sasha Levin, claudiu.manoil, vladimir.oltean, xiaoning.wang, andrew+netdev, edumazet, kuba, pabeni, imx, netdev From: Wei Fang <wei.fang@nxp.com> [ Upstream commit a52201fb9caa9b33b4d881725d1ec733438b07f2 ] The verdor ID and device ID of i.MX95 EMDIO are different from LS1028A EMDIO, so add new vendor ID and device ID to pci_device_id table to support i.MX95 EMDIO. Signed-off-by: Wei Fang <wei.fang@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c index d3248881a9b7e..626faae064a95 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c @@ -4,6 +4,8 @@ #include <linux/of_mdio.h> #include "enetc_pf.h" +#define NETC_EMDIO_VEN_ID 0x1131 +#define NETC_EMDIO_DEV_ID 0xee00 #define ENETC_MDIO_DEV_ID 0xee01 #define ENETC_MDIO_DEV_NAME "FSL PCIe IE Central MDIO" #define ENETC_MDIO_BUS_NAME ENETC_MDIO_DEV_NAME " Bus" @@ -122,6 +124,7 @@ static void enetc_pci_mdio_remove(struct pci_dev *pdev) static const struct pci_device_id enetc_pci_mdio_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_FREESCALE, ENETC_MDIO_DEV_ID) }, + { PCI_DEVICE(NETC_EMDIO_VEN_ID, NETC_EMDIO_DEV_ID) }, { 0, } /* End of table. */ }; MODULE_DEVICE_TABLE(pci, enetc_pci_mdio_id_table); -- 2.43.0 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-25 1:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20241124134950.3348099-1-sashal@kernel.org>
2024-11-24 13:48 ` [PATCH AUTOSEL 6.1 35/48] net: enetc: remove ERR050089 workaround for i.MX95 Sasha Levin
2024-11-25 1:55 ` Wei Fang
2024-11-24 13:48 ` [PATCH AUTOSEL 6.1 36/48] net: enetc: add i.MX95 EMDIO support Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox