net: dsa: felix: re-enable TX flow control in ocelot_port_flush()
Subsystems (3)
PATCH 1/1 net: dsa: felix: re-enable TX flow control in ocelot_port_flush()
From: Vladimir Oltean <[email protected]>
Because flow control is set up statically in ocelot_init_port(), and not in phylink_mac_link_up(), what happens is that after the blamed commit, the flow control remains disabled after the port flushing procedure.
--- drivers/net/ethernet/mscc/ocelot.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/mscc/ocelot.c +5 -0
@@ -379,6 +379,7 @@ static u32 ocelot_read_eq_avail(struct ocelot *ocelot, int port)int ocelot_port_flush (struct ocelot *ocelot,int port) { +unsigned int pause_ena;int err, val;/* Disable dequeuing from the egress queues */
@@ -387,6 +388,7 @@ int ocelot_port_flush(struct ocelot *ocelot, int port) QSYS_PORT_MODE, port);/* Disable flow control */ +ocelot_fields_read (ocelot, port,SYS_PAUSE_CFG_PAUSE_ENA , &pause_ena);ocelot_fields_write (ocelot, port,SYS_PAUSE_CFG_PAUSE_ENA ,0 );/* Disable priority flow control */
@@ -422,6 +424,9 @@ int ocelot_port_flush(struct ocelot *ocelot, int port)/* Clear flushing again. */ ocelot_rmw_gix (ocelot,0 ,REW_PORT_CFG_FLUSH_ENA ,REW_PORT_CFG , port); +/* Re-enable flow control */ +ocelot_fields_write (ocelot, port,SYS_PAUSE_CFG_PAUSE_ENA , pause_ena); +return err; }EXPORT_SYMBOL (ocelot_port_flush);
Signature · 1 line
2.25.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 10 lines · On Tue, 8 Jun 2021 14:15:35 +0300 you wrote:
From: Vladimir Oltean <[email protected]>
Because flow control is set up statically in
ocelot_init_port(), and not inphylink_mac_link_up(), what happens is that after the blamed commit, the flow control remains disabled after the port flushing procedure.Fixes eb4733d7cffc ("net: dsa: felix: implement port flushing on .phylink_mac_link_down")Signed-off-by Vladimir Oltean <[email protected]>[...]
Here is the summary with links:
- [net] net: dsa: felix: re-enable TX flow control in ocelot_port_flush()
https://git.kernel.org/netdev/net/c/1650bdb1c516
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html