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

net: mscc: ocelot: split writes to pause frame enable bit and to thresholds 



We don't want ocelot_port_set_maxlen to enable pause frame TX, just to
adjust the pause thresholds.

Move the unconditional enabling of pause TX to ocelot_init_port. There
is no good place to put such setting because it shouldn't be
unconditional. But at the moment it is, we're not changing that.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67c24049

drivers/net/ethernet/mscc/ocelot.c

+12 −7
Original line number Diff line number Diff line
@@ -1259,6 +1259,7 @@ void ocelot_port_set_maxlen(struct ocelot *ocelot, int port, size_t sdu) 
{

	struct ocelot_port *ocelot_port = ocelot->ports[port];

	int maxlen = sdu + ETH_HLEN + ETH_FCS_LEN;

	int pause_start, pause_stop;

	int atop_wm;



	if (port == ocelot->npi) {
@@ -1272,13 +1273,13 @@ void ocelot_port_set_maxlen(struct ocelot *ocelot, int port, size_t sdu) 


	ocelot_port_writel(ocelot_port, maxlen, DEV_MAC_MAXLEN_CFG);



	/* Set Pause WM hysteresis

	 * 152 = 6 * maxlen / OCELOT_BUFFER_CELL_SZ

	 * 101 = 4 * maxlen / OCELOT_BUFFER_CELL_SZ

	 */

	ocelot_write_rix(ocelot, SYS_PAUSE_CFG_PAUSE_ENA |

			 SYS_PAUSE_CFG_PAUSE_STOP(101) |

			 SYS_PAUSE_CFG_PAUSE_START(152), SYS_PAUSE_CFG, port);

	/* Set Pause watermark hysteresis */

	pause_start = 6 * maxlen / OCELOT_BUFFER_CELL_SZ;

	pause_stop = 4 * maxlen / OCELOT_BUFFER_CELL_SZ;

	ocelot_rmw_rix(ocelot, SYS_PAUSE_CFG_PAUSE_START(pause_start),

		       SYS_PAUSE_CFG_PAUSE_START_M, SYS_PAUSE_CFG, port);

	ocelot_rmw_rix(ocelot, SYS_PAUSE_CFG_PAUSE_STOP(pause_stop),

		       SYS_PAUSE_CFG_PAUSE_STOP_M, SYS_PAUSE_CFG, port);



	/* Tail dropping watermark */

	atop_wm = (ocelot->shared_queue_sz - 9 * maxlen) /
@@ -1341,6 +1342,10 @@ void ocelot_init_port(struct ocelot *ocelot, int port) 
	ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_HIGH_CFG);

	ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_LOW_CFG);



	/* Enable transmission of pause frames */

	ocelot_rmw_rix(ocelot, SYS_PAUSE_CFG_PAUSE_ENA, SYS_PAUSE_CFG_PAUSE_ENA,

		       SYS_PAUSE_CFG, port);



	/* Drop frames with multicast source address */

	ocelot_rmw_gix(ocelot, ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,

		       ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,