| Message ID | 20240417140013.12575-2-fancer.lancer@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: stmmac: Fix MAC-capabilities procedure | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/apply | fail | Patch does not apply to net-next-0 |
On Wed, 17 Apr 2024, Serge Semin wrote: > Since recent commits the stmmac_ops::phylink_get_caps() callback has no > longer been responsible for the phylink MAC capabilities getting, but > merely updates the MAC capabilities in the mac_device_info::link::caps > field. Rename the callback to comply with the what the method does now. > > Signed-off-by: Serge Semin <fancer.lancer@gmail.com> > > --- > > Link: https://lore.kernel.org/netdev/20240412180340.7965-5-fancer.lancer@gmail.com/ > Changelog v2: > - This is a new patch created based on the discussion around patch #4 in > the series above. > --- > drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 ++++---- > drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 ++++---- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c > index a38226d7cc6a..b25774d69195 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c > @@ -68,7 +68,7 @@ static void dwmac4_core_init(struct mac_device_info *hw, > init_waitqueue_head(&priv->tstamp_busy_wait); > } > > -static void dwmac4_phylink_get_caps(struct stmmac_priv *priv) > +static void dwmac4_update_caps(struct stmmac_priv *priv) > { > if (priv->plat->tx_queues_to_use > 1) > priv->hw->link.caps &= ~(MAC_10HD | MAC_100HD | MAC_1000HD); > @@ -1190,7 +1190,7 @@ static void dwmac4_set_hw_vlan_mode(struct mac_device_info *hw) > > const struct stmmac_ops dwmac4_ops = { > .core_init = dwmac4_core_init, > - .phylink_get_caps = dwmac4_phylink_get_caps, > + .update_caps = dwmac4_update_caps, > .set_mac = stmmac_set_mac, > .rx_ipc = dwmac4_rx_ipc_enable, > .rx_queue_enable = dwmac4_rx_queue_enable, > @@ -1235,7 +1235,7 @@ const struct stmmac_ops dwmac4_ops = { > > const struct stmmac_ops dwmac410_ops = { > .core_init = dwmac4_core_init, > - .phylink_get_caps = dwmac4_phylink_get_caps, > + .update_caps = dwmac4_update_caps, > .set_mac = stmmac_dwmac4_set_mac, > .rx_ipc = dwmac4_rx_ipc_enable, > .rx_queue_enable = dwmac4_rx_queue_enable, > @@ -1284,7 +1284,7 @@ const struct stmmac_ops dwmac410_ops = { > > const struct stmmac_ops dwmac510_ops = { > .core_init = dwmac4_core_init, > - .phylink_get_caps = dwmac4_phylink_get_caps, > + .update_caps = dwmac4_update_caps, > .set_mac = stmmac_dwmac4_set_mac, > .rx_ipc = dwmac4_rx_ipc_enable, > .rx_queue_enable = dwmac4_rx_queue_enable, > diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h > index 7be04b54738b..90384db228b5 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h > +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h > @@ -308,8 +308,8 @@ struct stmmac_est; > struct stmmac_ops { > /* MAC core initialization */ > void (*core_init)(struct mac_device_info *hw, struct net_device *dev); > - /* Get phylink capabilities */ > - void (*phylink_get_caps)(struct stmmac_priv *priv); > + /* Update MAC capabilities */ > + void (*update_caps)(struct stmmac_priv *priv); > /* Enable the MAC RX/TX */ > void (*set_mac)(void __iomem *ioaddr, bool enable); > /* Enable and verify that the IPC module is supported */ > @@ -430,8 +430,8 @@ struct stmmac_ops { > > #define stmmac_core_init(__priv, __args...) \ > stmmac_do_void_callback(__priv, mac, core_init, __args) > -#define stmmac_mac_phylink_get_caps(__priv) \ > - stmmac_do_void_callback(__priv, mac, phylink_get_caps, __priv) > +#define stmmac_mac_update_caps(__priv) \ > + stmmac_do_void_callback(__priv, mac, update_caps, __priv) > #define stmmac_mac_set(__priv, __args...) \ > stmmac_do_void_callback(__priv, mac, set_mac, __args) > #define stmmac_rx_ipc(__priv, __args...) \ > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 7c6fb14b5555..b810f6b69bf5 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -1225,8 +1225,8 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) > xpcs_get_interfaces(priv->hw->xpcs, > priv->phylink_config.supported_interfaces); > > - /* Get the MAC specific capabilities */ > - stmmac_mac_phylink_get_caps(priv); > + /* Refresh the MAC-specific capabilities */ > + stmmac_mac_update_caps(priv); > > priv->phylink_config.mac_capabilities = priv->hw->link.caps; > > @@ -7341,7 +7341,7 @@ int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt) > priv->rss.table[i] = ethtool_rxfh_indir_default(i, > rx_cnt); > > - stmmac_mac_phylink_get_caps(priv); > + stmmac_mac_update_caps(priv); > > priv->phylink_config.mac_capabilities = priv->hw->link.caps; > > -- > 2.43.0 > > Reviewed-by: Romain Gantois <romain.gantois@bootlin.com> Thanks,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index a38226d7cc6a..b25774d69195 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -68,7 +68,7 @@ static void dwmac4_core_init(struct mac_device_info *hw, init_waitqueue_head(&priv->tstamp_busy_wait); } -static void dwmac4_phylink_get_caps(struct stmmac_priv *priv) +static void dwmac4_update_caps(struct stmmac_priv *priv) { if (priv->plat->tx_queues_to_use > 1) priv->hw->link.caps &= ~(MAC_10HD | MAC_100HD | MAC_1000HD); @@ -1190,7 +1190,7 @@ static void dwmac4_set_hw_vlan_mode(struct mac_device_info *hw) const struct stmmac_ops dwmac4_ops = { .core_init = dwmac4_core_init, - .phylink_get_caps = dwmac4_phylink_get_caps, + .update_caps = dwmac4_update_caps, .set_mac = stmmac_set_mac, .rx_ipc = dwmac4_rx_ipc_enable, .rx_queue_enable = dwmac4_rx_queue_enable, @@ -1235,7 +1235,7 @@ const struct stmmac_ops dwmac4_ops = { const struct stmmac_ops dwmac410_ops = { .core_init = dwmac4_core_init, - .phylink_get_caps = dwmac4_phylink_get_caps, + .update_caps = dwmac4_update_caps, .set_mac = stmmac_dwmac4_set_mac, .rx_ipc = dwmac4_rx_ipc_enable, .rx_queue_enable = dwmac4_rx_queue_enable, @@ -1284,7 +1284,7 @@ const struct stmmac_ops dwmac410_ops = { const struct stmmac_ops dwmac510_ops = { .core_init = dwmac4_core_init, - .phylink_get_caps = dwmac4_phylink_get_caps, + .update_caps = dwmac4_update_caps, .set_mac = stmmac_dwmac4_set_mac, .rx_ipc = dwmac4_rx_ipc_enable, .rx_queue_enable = dwmac4_rx_queue_enable, diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index 7be04b54738b..90384db228b5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -308,8 +308,8 @@ struct stmmac_est; struct stmmac_ops { /* MAC core initialization */ void (*core_init)(struct mac_device_info *hw, struct net_device *dev); - /* Get phylink capabilities */ - void (*phylink_get_caps)(struct stmmac_priv *priv); + /* Update MAC capabilities */ + void (*update_caps)(struct stmmac_priv *priv); /* Enable the MAC RX/TX */ void (*set_mac)(void __iomem *ioaddr, bool enable); /* Enable and verify that the IPC module is supported */ @@ -430,8 +430,8 @@ struct stmmac_ops { #define stmmac_core_init(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, core_init, __args) -#define stmmac_mac_phylink_get_caps(__priv) \ - stmmac_do_void_callback(__priv, mac, phylink_get_caps, __priv) +#define stmmac_mac_update_caps(__priv) \ + stmmac_do_void_callback(__priv, mac, update_caps, __priv) #define stmmac_mac_set(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, set_mac, __args) #define stmmac_rx_ipc(__priv, __args...) \ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 7c6fb14b5555..b810f6b69bf5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1225,8 +1225,8 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) xpcs_get_interfaces(priv->hw->xpcs, priv->phylink_config.supported_interfaces); - /* Get the MAC specific capabilities */ - stmmac_mac_phylink_get_caps(priv); + /* Refresh the MAC-specific capabilities */ + stmmac_mac_update_caps(priv); priv->phylink_config.mac_capabilities = priv->hw->link.caps; @@ -7341,7 +7341,7 @@ int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt) priv->rss.table[i] = ethtool_rxfh_indir_default(i, rx_cnt); - stmmac_mac_phylink_get_caps(priv); + stmmac_mac_update_caps(priv); priv->phylink_config.mac_capabilities = priv->hw->link.caps;
Since recent commits the stmmac_ops::phylink_get_caps() callback has no longer been responsible for the phylink MAC capabilities getting, but merely updates the MAC capabilities in the mac_device_info::link::caps field. Rename the callback to comply with the what the method does now. Signed-off-by: Serge Semin <fancer.lancer@gmail.com> --- Link: https://lore.kernel.org/netdev/20240412180340.7965-5-fancer.lancer@gmail.com/ Changelog v2: - This is a new patch created based on the discussion around patch #4 in the series above. --- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 ++++---- drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 ++++---- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-)