The series got born as a result of the discussions around the recent
Yanteng' series adding the Loongson LS7A1000, LS2K1000, LS7A2000, LS2K2000
MACs support:
Link: https://lore.kernel.org/netdev/fu3f6uoakylnb6eijllakeu5i4okcyqq7sfafhp5efaocbsrwe@w74xe7gb6x7p
In particular the Yanteng' patchset needed to implement the Loongson
MAC-specific constraints applied to the link speed and link duplex mode.
As a result of the discussion with Russel the next preliminary patch was
born:
Link: https://lore.kernel.org/netdev/df31e8bcf74b3b4ddb7ddf5a1c371390f16a2ad5.1712917541.git.siyanteng@loongson.cn
The patch above was a temporal solution utilized by Yanteng for further
developments and to move on with the on-going review. This patchset is a
refactored version of that single patch with formatting required for the
fixes patches.
The main part of the series has already been merged in on v1 stage. The
leftover is the cleanup patches which rename
stmmac_ops::phylink_get_caps() callback to stmmac_ops::update_caps() and
move the MAC-capabilities init/re-init to the phylink MAC-capabilities
getter.
Link: https://lore.kernel.org/netdev/[email protected]/
Changelog v2:
- Add a new patch (Romain):
[PATCH net-next v2 1/2] net: stmmac: Rename phylink_get_caps() callback to update_caps()
- Resubmit the leftover patches to net-next tree (Paolo).
Signed-off-by: Serge Semin <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: Simon Horman <[email protected]>
Cc: Huacai Chen <[email protected]>
Cc: Chen-Yu Tsai <[email protected]>
Cc: Jernej Skrabec <[email protected]>
Cc: Samuel Holland <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Serge Semin (2):
net: stmmac: Rename phylink_get_caps() callback to update_caps()
net: stmmac: Move MAC caps init to phylink MAC caps getter
.../net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 ++---
drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 ++---
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 36 +++++++++----------
3 files changed, 25 insertions(+), 27 deletions(-)
--
2.43.0
After a set of recent fixes the stmmac_phy_setup() and
stmmac_reinit_queues() methods have turned to having some duplicated code.
Let's get rid from the duplication by moving the MAC-capabilities
initialization to the PHYLINK MAC-capabilities getter. The getter is
called during each network device interface open/close cycle. So the
MAC-capabilities will be initialized in generic device open procedure and
in case of the Tx/Rx queues re-initialization as the original code
semantics implies.
Signed-off-by: Serge Semin <[email protected]>
---
Link: https://lore.kernel.org/netdev/[email protected]/
Changelog v2:
- Resubmit the patch to net-next separately from the main patchset (Paolo)
---
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 36 +++++++++----------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index b810f6b69bf5..0d6cd1704e6a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -936,6 +936,22 @@ static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex)
priv->pause, tx_cnt);
}
+static unsigned long stmmac_mac_get_caps(struct phylink_config *config,
+ phy_interface_t interface)
+{
+ struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
+
+ /* Refresh the MAC-specific capabilities */
+ stmmac_mac_update_caps(priv);
+
+ config->mac_capabilities = priv->hw->link.caps;
+
+ if (priv->plat->max_speed)
+ phylink_limit_mac_speed(config, priv->plat->max_speed);
+
+ return config->mac_capabilities;
+}
+
static struct phylink_pcs *stmmac_mac_select_pcs(struct phylink_config *config,
phy_interface_t interface)
{
@@ -1105,6 +1121,7 @@ static void stmmac_mac_link_up(struct phylink_config *config,
}
static const struct phylink_mac_ops stmmac_phylink_mac_ops = {
+ .mac_get_caps = stmmac_mac_get_caps,
.mac_select_pcs = stmmac_mac_select_pcs,
.mac_config = stmmac_mac_config,
.mac_link_down = stmmac_mac_link_down,
@@ -1204,7 +1221,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
int mode = priv->plat->phy_interface;
struct fwnode_handle *fwnode;
struct phylink *phylink;
- int max_speed;
priv->phylink_config.dev = &priv->dev->dev;
priv->phylink_config.type = PHYLINK_NETDEV;
@@ -1225,15 +1241,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
xpcs_get_interfaces(priv->hw->xpcs,
priv->phylink_config.supported_interfaces);
- /* Refresh the MAC-specific capabilities */
- stmmac_mac_update_caps(priv);
-
- priv->phylink_config.mac_capabilities = priv->hw->link.caps;
-
- max_speed = priv->plat->max_speed;
- if (max_speed)
- phylink_limit_mac_speed(&priv->phylink_config, max_speed);
-
fwnode = priv->plat->port_node;
if (!fwnode)
fwnode = dev_fwnode(priv->device);
@@ -7327,7 +7334,6 @@ int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt)
{
struct stmmac_priv *priv = netdev_priv(dev);
int ret = 0, i;
- int max_speed;
if (netif_running(dev))
stmmac_release(dev);
@@ -7341,14 +7347,6 @@ 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_update_caps(priv);
-
- priv->phylink_config.mac_capabilities = priv->hw->link.caps;
-
- max_speed = priv->plat->max_speed;
- if (max_speed)
- phylink_limit_mac_speed(&priv->phylink_config, max_speed);
-
stmmac_napi_add(dev);
if (netif_running(dev))
--
2.43.0
On Wed, 17 Apr 2024, Serge Semin wrote:
> After a set of recent fixes the stmmac_phy_setup() and
> stmmac_reinit_queues() methods have turned to having some duplicated code.
> Let's get rid from the duplication by moving the MAC-capabilities
> initialization to the PHYLINK MAC-capabilities getter. The getter is
> called during each network device interface open/close cycle. So the
> MAC-capabilities will be initialized in generic device open procedure and
> in case of the Tx/Rx queues re-initialization as the original code
> semantics implies.
>
> Signed-off-by: Serge Semin <[email protected]>
>
> ---
>
> Link: https://lore.kernel.org/netdev/[email protected]/
> Changelog v2:
> - Resubmit the patch to net-next separately from the main patchset (Paolo)
> ---
> .../net/ethernet/stmicro/stmmac/stmmac_main.c | 36 +++++++++----------
> 1 file changed, 17 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index b810f6b69bf5..0d6cd1704e6a 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -936,6 +936,22 @@ static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex)
> priv->pause, tx_cnt);
> }
>
> +static unsigned long stmmac_mac_get_caps(struct phylink_config *config,
> + phy_interface_t interface)
> +{
> + struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
> +
> + /* Refresh the MAC-specific capabilities */
> + stmmac_mac_update_caps(priv);
> +
> + config->mac_capabilities = priv->hw->link.caps;
> +
> + if (priv->plat->max_speed)
> + phylink_limit_mac_speed(config, priv->plat->max_speed);
> +
> + return config->mac_capabilities;
> +}
> +
> static struct phylink_pcs *stmmac_mac_select_pcs(struct phylink_config *config,
> phy_interface_t interface)
> {
> @@ -1105,6 +1121,7 @@ static void stmmac_mac_link_up(struct phylink_config *config,
> }
>
> static const struct phylink_mac_ops stmmac_phylink_mac_ops = {
> + .mac_get_caps = stmmac_mac_get_caps,
> .mac_select_pcs = stmmac_mac_select_pcs,
> .mac_config = stmmac_mac_config,
> .mac_link_down = stmmac_mac_link_down,
> @@ -1204,7 +1221,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
> int mode = priv->plat->phy_interface;
> struct fwnode_handle *fwnode;
> struct phylink *phylink;
> - int max_speed;
>
> priv->phylink_config.dev = &priv->dev->dev;
> priv->phylink_config.type = PHYLINK_NETDEV;
> @@ -1225,15 +1241,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
> xpcs_get_interfaces(priv->hw->xpcs,
> priv->phylink_config.supported_interfaces);
>
> - /* Refresh the MAC-specific capabilities */
> - stmmac_mac_update_caps(priv);
> -
> - priv->phylink_config.mac_capabilities = priv->hw->link.caps;
> -
> - max_speed = priv->plat->max_speed;
> - if (max_speed)
> - phylink_limit_mac_speed(&priv->phylink_config, max_speed);
> -
> fwnode = priv->plat->port_node;
> if (!fwnode)
> fwnode = dev_fwnode(priv->device);
> @@ -7327,7 +7334,6 @@ int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt)
> {
> struct stmmac_priv *priv = netdev_priv(dev);
> int ret = 0, i;
> - int max_speed;
>
> if (netif_running(dev))
> stmmac_release(dev);
> @@ -7341,14 +7347,6 @@ 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_update_caps(priv);
> -
> - priv->phylink_config.mac_capabilities = priv->hw->link.caps;
> -
> - max_speed = priv->plat->max_speed;
> - if (max_speed)
> - phylink_limit_mac_speed(&priv->phylink_config, max_speed);
> -
> stmmac_napi_add(dev);
>
> if (netif_running(dev))
> --
> 2.43.0
>
>
Reviewed-by: Romain Gantois <[email protected]>
Thanks,
--
Romain Gantois, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
On Wed, 17 Apr 2024 17:00:06 +0300 Serge Semin wrote:
> The series got born as a result of the discussions around the recent
> Yanteng' series adding the Loongson LS7A1000, LS2K1000, LS7A2000, LS2K2000
> MACs support:
> Link: https://lore.kernel.org/netdev/fu3f6uoakylnb6eijllakeu5i4okcyqq7sfafhp5efaocbsrwe@w74xe7gb6x7p
>
> In particular the Yanteng' patchset needed to implement the Loongson
> MAC-specific constraints applied to the link speed and link duplex mode.
> As a result of the discussion with Russel the next preliminary patch was
> born:
> Link: https://lore.kernel.org/netdev/df31e8bcf74b3b4ddb7ddf5a1c371390f16a2ad5.1712917541.git.siyanteng@loongson.cn
>
> The patch above was a temporal solution utilized by Yanteng for further
> developments and to move on with the on-going review. This patchset is a
> refactored version of that single patch with formatting required for the
> fixes patches.
>
> The main part of the series has already been merged in on v1 stage. The
> leftover is the cleanup patches which rename
> stmmac_ops::phylink_get_caps() callback to stmmac_ops::update_caps() and
> move the MAC-capabilities init/re-init to the phylink MAC-capabilities
> getter.
According to the build bot it didn't apply at the time of posting :S
It does apply now but the bot doesn't have a "retry now" button.
Could you repost?
--
pw-bot: cr
On Thu, Apr 18, 2024 at 06:53:28PM -0700, Jakub Kicinski wrote:
> On Wed, 17 Apr 2024 17:00:06 +0300 Serge Semin wrote:
> > The series got born as a result of the discussions around the recent
> > Yanteng' series adding the Loongson LS7A1000, LS2K1000, LS7A2000, LS2K2000
> > MACs support:
> > Link: https://lore.kernel.org/netdev/fu3f6uoakylnb6eijllakeu5i4okcyqq7sfafhp5efaocbsrwe@w74xe7gb6x7p
> >
> > In particular the Yanteng' patchset needed to implement the Loongson
> > MAC-specific constraints applied to the link speed and link duplex mode.
> > As a result of the discussion with Russel the next preliminary patch was
> > born:
> > Link: https://lore.kernel.org/netdev/df31e8bcf74b3b4ddb7ddf5a1c371390f16a2ad5.1712917541.git.siyanteng@loongson.cn
> >
> > The patch above was a temporal solution utilized by Yanteng for further
> > developments and to move on with the on-going review. This patchset is a
> > refactored version of that single patch with formatting required for the
> > fixes patches.
> >
> > The main part of the series has already been merged in on v1 stage. The
> > leftover is the cleanup patches which rename
> > stmmac_ops::phylink_get_caps() callback to stmmac_ops::update_caps() and
> > move the MAC-capabilities init/re-init to the phylink MAC-capabilities
> > getter.
>
> According to the build bot it didn't apply at the time of posting :S
Most likely it happened because the first three patches
https://lore.kernel.org/netdev/[email protected]/
hadn't been merged in yet back then. They are now.
> It does apply now but the bot doesn't have a "retry now" button.
> Could you repost?
Sure. I'll do that in an instant.
-Serge(y)
> --
> pw-bot: cr