| Message ID | E1sZpov-000eI5-KP@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | net: stmmac: convert stmmac "pcs" to phylink | expand |
On Fri, Aug 02, 2024 at 11:47:37AM GMT, Russell King wrote: > From: Serge Semin <fancer.lancer@gmail.com> > > The HWFEATURE.PCSSEL flag is set if the PCS block has been synthesized > into the DW GMAC controller. It's always done if the controller supports > at least one of the SGMII, TBI, RTBI PHY interfaces. If none of these > interfaces support was activated during the IP-core synthesize the PCS > block won't be activated either and the HWFEATURE.PCSSEL flag won't be > set. Based on that the RGMII in-band status detection procedure > implemented in the driver hasn't been working for the devices with the > RGMII interface support and with none of the SGMII, TBI, RTBI PHY > interfaces available in the device. > > Fix that just by dropping the dma_cap.pcs flag check from the conditional > statement responsible for the In-band/PCS functionality activation. If the > RGMII interface is supported by the device then the in-band link status > detection will be also supported automatically (it's always embedded into > the RGMII RTL code). If the SGMII interface is supported by the device > then the PCS block will be supported too (it's unconditionally synthesized > into the controller). The later is also correct for the TBI/RTBI PHY > interfaces. > > Note while at it drop the netdev_dbg() calls since at the moment of the > stmmac_check_pcs_mode() invocation the network device isn't registered. So > the debug prints will be for the unknown/NULL device. > > Signed-off-by: Serge Semin <fancer.lancer@gmail.com> > [rmk: fix build errors, only use PCS for SGMII if priv->dma_cap.pcs is set] > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Russell, did you add in the priv->dma_cap.pcs check with SGMII just because it *is* expected to be set unconditionally when SGMII support is there? Always fan of less conditionals, so just curious as to your motivation since Serge's message makes it seem like SGMII && dma_cap.pcs is a redundant check. Otherwise, looks good to me. Thanks, Andrew
On Fri, Aug 02, 2024 at 02:12:08PM -0500, Andrew Halaney wrote: > On Fri, Aug 02, 2024 at 11:47:37AM GMT, Russell King wrote: > > From: Serge Semin <fancer.lancer@gmail.com> > > > > The HWFEATURE.PCSSEL flag is set if the PCS block has been synthesized > > into the DW GMAC controller. It's always done if the controller supports > > at least one of the SGMII, TBI, RTBI PHY interfaces. If none of these > > interfaces support was activated during the IP-core synthesize the PCS > > block won't be activated either and the HWFEATURE.PCSSEL flag won't be > > set. Based on that the RGMII in-band status detection procedure > > implemented in the driver hasn't been working for the devices with the > > RGMII interface support and with none of the SGMII, TBI, RTBI PHY > > interfaces available in the device. > > > > Fix that just by dropping the dma_cap.pcs flag check from the conditional > > statement responsible for the In-band/PCS functionality activation. If the > > RGMII interface is supported by the device then the in-band link status > > detection will be also supported automatically (it's always embedded into > > the RGMII RTL code). If the SGMII interface is supported by the device > > then the PCS block will be supported too (it's unconditionally synthesized > > into the controller). The later is also correct for the TBI/RTBI PHY > > interfaces. > > > > Note while at it drop the netdev_dbg() calls since at the moment of the > > stmmac_check_pcs_mode() invocation the network device isn't registered. So > > the debug prints will be for the unknown/NULL device. > > > > Signed-off-by: Serge Semin <fancer.lancer@gmail.com> > > [rmk: fix build errors, only use PCS for SGMII if priv->dma_cap.pcs is set] > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > > Russell, did you add in the priv->dma_cap.pcs check with SGMII just > because it *is* expected to be set unconditionally when SGMII support is > there? > > Always fan of less conditionals, so just curious as to your motivation > since Serge's message makes it seem like SGMII && dma_cap.pcs is a > redundant check. I don't think that is correct. As I understand it from several exchanges with Serge, priv->dma_cap.pcs indicates whether or not the PCS hardware is present in the instantiated hardware. The PCS hardware is specific to SGMII, TBI, RTBI but *not* RGMII, so testing priv->dma_cap.pcs in conjunction with RGMII has been wrong for quite some time. We have dropped TBI and RTBI support, so those aren't relevant anymore. For SGMII, however, stmmac also supports XPCS, and XPCS supports SGMII. So, one can have the situation where XPCS support is present, the stmmac PCS is not present, and SGMII mode has been set. In that case, we must not set priv->hw->pcs to STMMAC_PCS_SGMII even if we are in SGMII mode, but priv->dma_cap.pcs indicates that the PCS hardware is not present.
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 3e43f2d6d49f..a9b5e2a34b10 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1133,18 +1133,10 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv) { int interface = priv->plat->mac_interface; - if (priv->dma_cap.pcs) { - if ((interface == PHY_INTERFACE_MODE_RGMII) || - (interface == PHY_INTERFACE_MODE_RGMII_ID) || - (interface == PHY_INTERFACE_MODE_RGMII_RXID) || - (interface == PHY_INTERFACE_MODE_RGMII_TXID)) { - netdev_dbg(priv->dev, "PCS RGMII support enabled\n"); - priv->hw->pcs = STMMAC_PCS_RGMII; - } else if (interface == PHY_INTERFACE_MODE_SGMII) { - netdev_dbg(priv->dev, "PCS SGMII support enabled\n"); - priv->hw->pcs = STMMAC_PCS_SGMII; - } - } + if (phy_interface_mode_is_rgmii(interface)) + priv->hw->pcs = STMMAC_PCS_RGMII; + else if (priv->dma_cap.pcs && interface == PHY_INTERFACE_MODE_SGMII) + priv->hw->pcs = STMMAC_PCS_SGMII; } /**