| From d7691ec043d0d59ccac605702eb4659d5387be0e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 13 Jul 2020 19:57:05 +0300 |
| Subject: net: mscc: ocelot: split writes to pause frame enable bit and to |
| thresholds |
| |
| From: Vladimir Oltean <vladimir.oltean@nxp.com> |
| |
| [ Upstream commit e8e6e73db14273464b374d49ca7242c0994945f3 ] |
| |
| 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: Vladimir Oltean <vladimir.oltean@nxp.com> |
| Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mscc/ocelot.c | 19 ++++++++++++------- |
| 1 file changed, 12 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c |
| index d0b79cca51840..6e68713c0ac6b 100644 |
| --- a/drivers/net/ethernet/mscc/ocelot.c |
| +++ b/drivers/net/ethernet/mscc/ocelot.c |
| @@ -2012,6 +2012,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) { |
| @@ -2025,13 +2026,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) / |
| @@ -2094,6 +2095,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, |
| -- |
| 2.25.1 |
| |
