| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <8f893436-018e-73d8-15b1-8037af5b4f04@bootlin.com>
Date: Thu, 18 Apr 2024 13:29:25 +0200 (CEST)
From: Romain Gantois <romain.gantois@...tlin.com>
To: Serge Semin <fancer.lancer@...il.com>
cc: Alexandre Torgue <alexandre.torgue@...s.st.com>,
Jose Abreu <joabreu@...opsys.com>, "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Russell King <linux@...linux.org.uk>,
Yanteng Si <siyanteng@...ngson.cn>,
Romain Gantois <romain.gantois@...tlin.com>,
Maxime Coquelin <mcoquelin.stm32@...il.com>,
Simon Horman <horms@...nel.org>, Huacai Chen <chenhuacai@...nel.org>,
Chen-Yu Tsai <wens@...e.org>, Jernej Skrabec <jernej.skrabec@...il.com>,
Samuel Holland <samuel@...lland.org>, netdev@...r.kernel.org,
linux-stm32@...md-mailman.stormreply.com,
linux-arm-kernel@...ts.infradead.org, linux-sunxi@...ts.linux.dev,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next v2 1/2] net: stmmac: Rename phylink_get_caps()
callback to update_caps()
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@...il.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@...tlin.com>
Thanks,
--
Romain Gantois, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Powered by blists - more mailing lists