Commit a4bb481a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: felix: access QSYS_TAG_CONFIG under tas_lock in vsc9959_sched_speed_set 



The read-modify-write of QSYS_TAG_CONFIG from vsc9959_sched_speed_set()
runs unlocked with respect to the other functions that access it, which
are vsc9959_tas_guard_bands_update(), vsc9959_qos_port_tas_set() and
vsc9959_tas_clock_adjust(). All the others are under ocelot->tas_lock,
so move the vsc9959_sched_speed_set() access under that lock as well, to
resolve the concurrency.

Fixes: 55a515b1 ("net: dsa: felix: drop oversized frames with tc-taprio instead of hanging the port")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 843794bb

drivers/net/dsa/ocelot/felix_vsc9959.c

+2 −2
Original line number Diff line number Diff line
@@ -1759,13 +1759,13 @@ static void vsc9959_sched_speed_set(struct ocelot *ocelot, int port, 
		break;

	}



	mutex_lock(&ocelot->tas_lock);



	ocelot_rmw_rix(ocelot,

		       QSYS_TAG_CONFIG_LINK_SPEED(tas_speed),

		       QSYS_TAG_CONFIG_LINK_SPEED_M,

		       QSYS_TAG_CONFIG, port);



	mutex_lock(&ocelot->tas_lock);



	if (ocelot_port->taprio)

		vsc9959_tas_guard_bands_update(ocelot, port);