net: stmmac: remove pcs_get_adv_lp() support
Subsystems (4)
PATCH 1/1 net: stmmac: remove pcs_get_adv_lp() support
It appears that the GMAC_ANE_ADV and GMAC_ANE_LPA registers are only available for TBI and RTBI PHY interfaces. In commit 482b3c3ba757 ("net: stmmac: Drop TBI/RTBI PCS flags") support for these was dropped, and thus it no longer makes sense to access these registers.
Remove the *_get_adv_lp() functions, and the now redundant struct rgmii_adv and STMMAC_PCS_* definitions.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 11 ----- .../ethernet/stmicro/stmmac/dwmac1000_core.c | 6 --- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 ---- drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 -- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 47 +------------------ .../net/ethernet/stmicro/stmmac/stmmac_pcs.h | 32 +------------ 6 files changed, 4 insertions(+), 104 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +0 -11
@@ -396,17 +396,6 @@ enum request_irq_err {#define CORE_IRQ_MTL_RX_OVERFLOW BIT(8) -/* Physical Coding Sublayer */ -struct rgmii_adv { -unsigned int pause; -unsigned int duplex; -unsigned int lp_pause; -unsigned int lp_duplex; -}; - -#define STMMAC_PCS_PAUSE 1 -#define STMMAC_PCS_ASYM_PAUSE 2 -/* DMA HW capabilities */ struct dma_features {unsigned int mbps_10_100;
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +0 -6
@@ -399,11 +399,6 @@ static void dwmac1000_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral,dwmac_ctrl_ane (ioaddr,GMAC_PCS_BASE , ane, srgmi_ral, loopback); } -static void dwmac1000_get_adv_lp (void __iomem *ioaddr,struct rgmii_adv *adv) -{ -dwmac_get_adv_lp (ioaddr,GMAC_PCS_BASE , adv); -} -static void dwmac1000_debug (struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_extra_stats *x,u32 rx_queues,u32 tx_queues)
@@ -508,7 +503,6 @@ const struct stmmac_ops dwmac1000_ops = { .set_eee_pls = dwmac1000_set_eee_pls, .debug = dwmac1000_debug, .pcs_ctrl_ane = dwmac1000_ctrl_ane, - .pcs_get_adv_lp = dwmac1000_get_adv_lp, .set_mac_loopback = dwmac1000_set_mac_loopback, };
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +0 -8
@@ -589,11 +589,6 @@ static void dwmac4_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral,dwmac_ctrl_ane (ioaddr,GMAC_PCS_BASE , ane, srgmi_ral, loopback); } -static void dwmac4_get_adv_lp (void __iomem *ioaddr,struct rgmii_adv *adv) -{ -dwmac_get_adv_lp (ioaddr,GMAC_PCS_BASE , adv); -} -/* RGMII or SMII interface */ static void dwmac4_phystatus (void __iomem *ioaddr,struct stmmac_extra_stats *x) {
@@ -958,7 +953,6 @@ const struct stmmac_ops dwmac4_ops = { .set_eee_timer = dwmac4_set_eee_timer, .set_eee_pls = dwmac4_set_eee_pls, .pcs_ctrl_ane = dwmac4_ctrl_ane, - .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, .set_mac_loopback = dwmac4_set_mac_loopback,
@@ -993,7 +987,6 @@ const struct stmmac_ops dwmac410_ops = { .set_eee_timer = dwmac4_set_eee_timer, .set_eee_pls = dwmac4_set_eee_pls, .pcs_ctrl_ane = dwmac4_ctrl_ane, - .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, .flex_pps_config = dwmac5_flex_pps_config,
@@ -1030,7 +1023,6 @@ const struct stmmac_ops dwmac510_ops = { .set_eee_timer = dwmac4_set_eee_timer, .set_eee_pls = dwmac4_set_eee_pls, .pcs_ctrl_ane = dwmac4_ctrl_ane, - .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, .safety_feat_config = dwmac5_safety_feat_config,
drivers/net/ethernet/stmicro/stmmac/hwif.h +0 -4
@@ -300,7 +300,6 @@ struct stmmac_dma_ops {struct mac_device_info ;struct net_device ; -struct rgmii_adv ;struct stmmac_tc_entry ;struct stmmac_pps_cfg ;struct stmmac_rss ;
@@ -377,7 +376,6 @@ struct stmmac_ops {/* PCS calls */ void (*pcs_ctrl_ane)(void __iomem *ioaddr,bool ane,bool srgmi_ral,bool loopback); -void (*pcs_get_adv_lp)(void __iomem *ioaddr,struct rgmii_adv *adv);/* Safety Features */ int (*safety_feat_config)(void __iomem *ioaddr,unsigned int asp,struct stmmac_safety_feature_cfg *safety_cfg);
@@ -467,8 +465,6 @@ struct stmmac_ops { stmmac_do_void_callback(__priv, mac, debug, __priv, __args) #define stmmac_pcs_ctrl_ane(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __args) -#define stmmac_pcs_get_adv_lp(__priv, __args...) \ - stmmac_do_void_callback(__priv, mac, pcs_get_adv_lp, __args) #define stmmac_safety_feat_config(__priv, __args...) \ stmmac_do_callback(__priv, mac, safety_feat_config, __args) #define stmmac_safety_feat_irq_status(__priv, __args...) \
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +2 -45
87 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h +2 -30
@@ -16,6 +16,8 @@/* PCS registers (AN/TBI/SGMII/RGMII) offsets */ #define GMAC_AN_CTRL (x) (x)/* AN control */ #define GMAC_AN_STATUS (x) (x + 0x4)/* AN status */ + +/* ADV, LPA and EXP are only available for the TBI and RTBI interfaces */ #define GMAC_ANE_ADV (x) (x + 0x8)/* ANE Advertisement */ #define GMAC_ANE_LPA (x) (x + 0xc)/* ANE link partener ability */ #define GMAC_ANE_EXP (x) (x + 0x10)/* ANE expansion */
@@ -107,34 +109,4 @@ static inline void dwmac_ctrl_ane(void __iomem *ioaddr, u32 reg, bool ane, writel(value, ioaddr + GMAC_AN_CTRL(reg)); } - -/** -* dwmac_get_adv_lp - Get ADV and LP cap -* @ioaddr: IO registers pointer -* @reg: Base address of the AN Control Register. -* @adv_lp: structure to store the adv,lp status -* Description: this is to expose the ANE advertisement and Link partner ability -* status to ethtool support. -*/ -static inline void dwmac_get_adv_lp (void __iomem *ioaddr,u32 reg, -struct rgmii_adv *adv_lp) -{ -u32 value =readl (ioaddr +GMAC_ANE_ADV (reg)); - -if (value &GMAC_ANE_FD ) - adv_lp->duplex =DUPLEX_FULL ; -if (value &GMAC_ANE_HD ) - adv_lp->duplex |=DUPLEX_HALF ; - - adv_lp->pause = (value &GMAC_ANE_PSE ) >>GMAC_ANE_PSE_SHIFT ; - - value =readl (ioaddr +GMAC_ANE_LPA (reg)); - -if (value &GMAC_ANE_FD ) - adv_lp->lp_duplex =DUPLEX_FULL ; -if (value &GMAC_ANE_HD ) - adv_lp->lp_duplex =DUPLEX_HALF ; - - adv_lp->lp_pause = (value &GMAC_ANE_PSE ) >>GMAC_ANE_PSE_SHIFT ; -}#endif /* __STMMAC_PCS_H__ */
Signature · 1 line
2.30.2
Quoted 10 lines · Russell King (Oracle)
It appears that the
GMAC_ANE_ADVandGMAC_ANE_LPAregisters are only available for TBI and RTBI PHY interfaces. In commit482b3c3ba757("net: stmmac: Drop TBI/RTBI PCS flags") support for these was dropped, and thus it no longer makes sense to access these registers.Remove the
*_get_adv_lp()functions, and the now redundant structrgmii_advand STMMAC_PCS_* definitions.Signed-off-by Russell King (Oracle) <[email protected]>---
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 12 Jun 2025 17:16:35 +0100 you wrote:
It appears that the
GMAC_ANE_ADVandGMAC_ANE_LPAregisters are only available for TBI and RTBI PHY interfaces. In commit482b3c3ba757("net: stmmac: Drop TBI/RTBI PCS flags") support for these was dropped, and thus it no longer makes sense to access these registers.Remove the
*_get_adv_lp()functions, and the now redundant structrgmii_advand STMMAC_PCS_* definitions.[...]
Here is the summary with links:
- [net-next] net: stmmac: remove pcs_get_adv_lp() support
https://git.kernel.org/netdev/net-next/c/883af78926c1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html