net: dsa: qca8k: reduce mgmt ethernet timeout
Subsystems (3)
PATCH RESEND 1/3 net: dsa: qca8k: reduce mgmt ethernet timeout
The current mgmt ethernet timeout is set to 100ms. This value is too big and would slow down any mdio command in case the mgmt ethernet packet have some problems on the receiving part.
Reduce it to just 5ms to handle case when some operation are done on the master port that would cause the mgmt ethernet to not work temporarily.
--- drivers/net/dsa/qca8k.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/qca8k.h +1 -1
@@ -15,7 +15,7 @@#define QCA8K_ETHERNET_MDIO_PRIORITY 7#define QCA8K_ETHERNET_PHY_PRIORITY 6 -#define QCA8K_ETHERNET_TIMEOUT 100 +#define QCA8K_ETHERNET_TIMEOUT 5#define QCA8K_NUM_PORTS 7#define QCA8K_NUM_CPU_PORTS 2
Signature · 1 line
2.36.1
PATCH RESEND 2/3 net: dsa: qca8k: change only max_frame_size of mac_frame_size_reg
Currently we overwrite the entire MAX_FRAME_SIZE reg instead of tweaking just the MAX_FRAME_SIZE value. Change this and update only the relevant bits.
--- drivers/net/dsa/qca8k.c | 8 ++++++-- drivers/net/dsa/qca8k.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/dsa/qca8k.c +6 -2
@@ -2345,7 +2345,9 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)return 0 ;/* Include L2 header / FCS length */ -return qca8k_write (priv,QCA8K_MAX_FRAME_SIZE , new_mtu +ETH_HLEN +ETH_FCS_LEN ); +return regmap_update_bits (priv->regmap,QCA8K_MAX_FRAME_SIZE_REG , +QCA8K_MAX_FRAME_SIZE_MASK , + new_mtu +ETH_HLEN +ETH_FCS_LEN ); } static int
@@ -3015,7 +3017,9 @@ qca8k_setup(struct dsa_switch *ds) }/* Setup our port MTUs to match power on defaults */ - ret =qca8k_write (priv,QCA8K_MAX_FRAME_SIZE ,ETH_FRAME_LEN +ETH_FCS_LEN ); + ret =regmap_update_bits (priv->regmap,QCA8K_MAX_FRAME_SIZE_REG , +QCA8K_MAX_FRAME_SIZE_MASK , +ETH_FRAME_LEN +ETH_FCS_LEN );if (ret)dev_warn (priv->dev,"failed setting MTU settings" );
drivers/net/dsa/qca8k.h +2 -1
@@ -87,7 +87,8 @@#define QCA8K_MDIO_MASTER_MAX_REG 32#define QCA8K_GOL_MAC_ADDR0 0x60#define QCA8K_GOL_MAC_ADDR1 0x64 -#define QCA8K_MAX_FRAME_SIZE 0x78 +#define QCA8K_MAX_FRAME_SIZE_REG 0x78 +#define QCA8K_MAX_FRAME_SIZE_MASK GENMASK(13, 0)#define QCA8K_REG_PORT_STATUS (_i) (0x07c + (_i) * 4)#define QCA8K_PORT_STATUS_SPEED GENMASK(1, 0)#define QCA8K_PORT_STATUS_SPEED_10 0
Signature · 1 line
2.36.1
PATCH RESEND 3/3 net: dsa: qca8k: reset cpu port on MTU change
In reply to Christian MarangiIt was discovered that the Documentation lacks of a fundamental detail on how to correctly change the MAX_FRAME_SIZE of the switch.
In fact if the MAX_FRAME_SIZE is changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required.
To correctly handle this, turn off the cpu ports before changing the MAX_FRAME_SIZE and turn on again after the value is applied.
--- drivers/net/dsa/qca8k.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
drivers/net/dsa/qca8k.c +23 -3
@@ -2334,6 +2334,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; +int ret;/* We have only have a general MTU setting. * DSA always set the CPU port's MTU to the largest MTU of the slave
@@ -2344,10 +2345,29 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)if (!dsa_is_cpu_port (ds, port))return 0 ; +/* To change the MAX_FRAME_SIZE the cpu ports must be off or +* the switch panics. +* Turn off both cpu ports before applying the new value to prevent +* this. +*/ +if (priv->port_enabled_map &BIT (0 )) +qca8k_port_set_status (priv,0 ,0 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,0 ); +/* Include L2 header / FCS length */ -return regmap_update_bits (priv->regmap,QCA8K_MAX_FRAME_SIZE_REG , -QCA8K_MAX_FRAME_SIZE_MASK , - new_mtu +ETH_HLEN +ETH_FCS_LEN ); + ret =regmap_update_bits (priv->regmap,QCA8K_MAX_FRAME_SIZE_REG , +QCA8K_MAX_FRAME_SIZE_MASK , + new_mtu +ETH_HLEN +ETH_FCS_LEN ); + +if (priv->port_enabled_map &BIT (0 )) +qca8k_port_set_status (priv,0 ,1 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,1 ); + +return ret; } static int
Signature · 1 line
2.36.1
Jakub Kicinski
maintainerRe: [RESEND net-next PATCH 3/3] net: dsa: qca8k: reset cpu port on MTU change
Quoted 9 lines · On Sat, 18 Jun 2022 09:26:50 +0200 Christian Marangi wrote:
It was discovered that the Documentation lacks of a fundamental detail on how to correctly change the
MAX_FRAME_SIZEof the switch.In fact if the
MAX_FRAME_SIZEis changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required.
Quoted 5 lines
To correctly handle this, turn off the cpu ports before changing the
MAX_FRAME_SIZEand turn on again after the value is applied.Fixes f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks")Signed-off-by Christian Marangi <[email protected]>
It reads like this patch should be backported to 5.10 and 5.15 stable branches. While patches 1 and 2 are cleanups. In which case you should reports just patch 3 against net/master first, we'll send it to Linus at the end of the week and then you can send the cleanups on top for -next.
One extra question below.
Quoted 22 lines
drivers/net/dsa/qca8k.c +7
-0@@ -2334,6 +2334,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; +int ret;/* We have only have a general MTU setting. * DSA always set the CPU port's MTU to the largest MTU of the slave @@ -2344,10 +2345,29 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)if (!dsa_is_cpu_port (ds, port))return 0 ; +/* To change the MAX_FRAME_SIZE the cpu ports must be off or +* the switch panics. +* Turn off both cpu ports before applying the new value to prevent +* this. +*/ +if (priv->port_enabled_map &BIT (0 ))
drivers/net/dsa/qca8k.c qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) · line 2360
Quoted 10 lines
drivers/net/dsa/qca8k.c +6
-3+qca8k_port_set_status (priv,0 ,0 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,0 ); +/* Include L2 header / FCS length */ -return regmap_update_bits (priv->regmap,QCA8K_MAX_FRAME_SIZE_REG , -QCA8K_MAX_FRAME_SIZE_MASK , - new_mtu +ETH_HLEN +ETH_FCS_LEN ); + ret = regmap_update_bits(priv->regmap, QCA8K_MAX_FRAME_SIZE_REG,
Why care about the return code of this regmap access but not the ones inside the *port_set_status() calls?
Quoted 13 lines
drivers/net/dsa/qca8k.c +10
-0+QCA8K_MAX_FRAME_SIZE_MASK , + new_mtu + ETH_HLEN + ETH_FCS_LEN); + +if (priv->port_enabled_map &BIT (0 )) +qca8k_port_set_status (priv,0 ,1 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,1 ); + +return ret; } static int
Re: [RESEND net-next PATCH 3/3] net: dsa: qca8k: reset cpu port on MTU change
Quoted 13 lines · Jakub Kicinski
Quoted 12 lines · On Sat, 18 Jun 2022 09:26:50 +0200 Christian Marangi wrote:
It was discovered that the Documentation lacks of a fundamental detail on how to correctly change the
MAX_FRAME_SIZEof the switch.In fact if the
MAX_FRAME_SIZEis changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required.To correctly handle this, turn off the cpu ports before changing the
MAX_FRAME_SIZEand turn on again after the value is applied.
Quoted 8 lines
Quoted 2 lines
Fixes f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks")Signed-off-by Christian Marangi <[email protected]>It reads like this patch should be backported to 5.10 and 5.15 stable branches. While patches 1 and 2 are cleanups. In which case you should reports just patch 3 against net/master first, we'll send it to Linus at the end of the week and then you can send the cleanups on top for -next.
Ok will split this series.
Quoted 29 lines
One extra question below.
Quoted 27 lines
drivers/net/dsa/qca8k.c +12
-0@@ -2334,6 +2334,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; +int ret;/* We have only have a general MTU setting. * DSA always set the CPU port's MTU to the largest MTU of the slave @@ -2344,10 +2345,29 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)if (!dsa_is_cpu_port (ds, port))return 0 ; +/* To change the MAX_FRAME_SIZE the cpu ports must be off or +* the switch panics. +* Turn off both cpu ports before applying the new value to prevent +* this. +*/ +if (priv->port_enabled_map &BIT (0 )) +qca8k_port_set_status (priv,0 ,0 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,0 ); +
Quoted 9 lines
drivers/net/dsa/qca8k.c qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) · line 2360
Quoted 5 lines
drivers/net/dsa/qca8k.c +1
-3/* Include L2 header / FCS length */ -return regmap_update_bits (priv->regmap,QCA8K_MAX_FRAME_SIZE_REG , -QCA8K_MAX_FRAME_SIZE_MASK , - new_mtu +ETH_HLEN +ETH_FCS_LEN ); + ret = regmap_update_bits(priv->regmap, QCA8K_MAX_FRAME_SIZE_REG,Why care about the return code of this regmap access but not the ones inside the
*port_set_status()calls?
No reason just following old bad behaviour done in other function where qca8k_port_set_status is used. Will send v2 with the error handled.
Quoted 13 lines
Quoted 13 lines
drivers/net/dsa/qca8k.c +10
-0+QCA8K_MAX_FRAME_SIZE_MASK , + new_mtu + ETH_HLEN + ETH_FCS_LEN); + +if (priv->port_enabled_map &BIT (0 )) +qca8k_port_set_status (priv,0 ,1 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,1 ); + +return ret; } static int
Signature · 1 line
Ansuel
Re: [RESEND net-next PATCH 3/3] net: dsa: qca8k: reset cpu port on MTU change
Quoted 64 lines · Christian Marangi
Quoted 13 lines · Jakub Kicinski
Quoted 12 lines · On Sat, 18 Jun 2022 09:26:50 +0200 Christian Marangi wrote:
It was discovered that the Documentation lacks of a fundamental detail on how to correctly change the
MAX_FRAME_SIZEof the switch.In fact if the
MAX_FRAME_SIZEis changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required.To correctly handle this, turn off the cpu ports before changing the
MAX_FRAME_SIZEand turn on again after the value is applied.Quoted 8 lines
Quoted 2 lines
Fixes f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks")Signed-off-by Christian Marangi <[email protected]>It reads like this patch should be backported to 5.10 and 5.15 stable branches. While patches 1 and 2 are cleanups. In which case you should reports just patch 3 against net/master first, we'll send it to Linus at the end of the week and then you can send the cleanups on top for -next.
Ok will split this series.
Quoted 29 lines
One extra question below.
Quoted 27 lines
drivers/net/dsa/qca8k.c +12
-0@@ -2334,6 +2334,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; +int ret;/* We have only have a general MTU setting. * DSA always set the CPU port's MTU to the largest MTU of the slave @@ -2344,10 +2345,29 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)if (!dsa_is_cpu_port (ds, port))return 0 ; +/* To change the MAX_FRAME_SIZE the cpu ports must be off or +* the switch panics. +* Turn off both cpu ports before applying the new value to prevent +* this. +*/ +if (priv->port_enabled_map &BIT (0 )) +qca8k_port_set_status (priv,0 ,0 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,0 ); +Quoted 9 lines
drivers/net/dsa/qca8k.c qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) · line 2360
Quoted 5 lines
drivers/net/dsa/qca8k.c +1
-3/* Include L2 header / FCS length */ -return regmap_update_bits (priv->regmap,QCA8K_MAX_FRAME_SIZE_REG , -QCA8K_MAX_FRAME_SIZE_MASK , - new_mtu +ETH_HLEN +ETH_FCS_LEN ); + ret = regmap_update_bits(priv->regmap, QCA8K_MAX_FRAME_SIZE_REG,Why care about the return code of this regmap access but not the ones inside the
*port_set_status()calls?
Quoted 3 lines
No reason just following old bad behaviour done in other function where
qca8k_port_set_statusis used. Will send v2 with the error handled.
Actually now that i checked, the qca8k_port_set_status is void... So it would require an additional change to that function. Will make it part of the net-next series...
Quoted 16 lines
Quoted 13 lines
Quoted 13 lines
drivers/net/dsa/qca8k.c +10
-0+QCA8K_MAX_FRAME_SIZE_MASK , + new_mtu + ETH_HLEN + ETH_FCS_LEN); + +if (priv->port_enabled_map &BIT (0 )) +qca8k_port_set_status (priv,0 ,1 ); + +if (priv->port_enabled_map &BIT (6 )) +qca8k_port_set_status (priv,6 ,1 ); + +return ret; } static intSignature · 1 line
Ansuel
Signature · 1 line
Ansuel