From: Florian Fainelli <f.fainelli@gmail.com>
To: stable@vger.kernel.org
Cc: Doug Berger <opendmb@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org, olteanv@gmail.com, andrew@lunn.ch
Subject: [PATCH stable 5.4] net: dsa: bcm_sf2: force pause link settings
Date: Mon, 4 Jul 2022 08:35:10 -0700 [thread overview]
Message-ID: <20220704153510.3859649-4-f.fainelli@gmail.com> (raw)
In-Reply-To: <20220704153510.3859649-1-f.fainelli@gmail.com>
From: Doug Berger <opendmb@gmail.com>
commit 7c97bc0128b2eecc703106112679a69d446d1a12 upstream
The pause settings reported by the PHY should also be applied to the GMII port
status override otherwise the switch will not generate pause frames towards the
link partner despite the advertisement saying otherwise.
Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver")
Signed-off-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/dsa/bcm_sf2.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 0ee1c0a7b165..282e9e2a50d9 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -602,6 +602,11 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
reg |= LINK_STS;
if (state->duplex == DUPLEX_FULL)
reg |= DUPLX_MODE;
+ if (state->pause & MLO_PAUSE_TXRX_MASK) {
+ if (state->pause & MLO_PAUSE_TX)
+ reg |= TXFLOW_CNTL;
+ reg |= RXFLOW_CNTL;
+ }
core_writel(priv, reg, offset);
}
--
2.25.1
next prev parent reply other threads:[~2022-07-04 15:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-04 15:35 [PATCH stable 4.9] net: dsa: bcm_sf2: force pause link settings Florian Fainelli
2022-07-04 15:35 ` [PATCH stable 4.14] " Florian Fainelli
2022-07-04 15:35 ` [PATCH stable 4.19] " Florian Fainelli
2022-07-04 15:35 ` Florian Fainelli [this message]
2022-07-04 23:34 ` [PATCH stable 4.9] " Vladimir Oltean
2022-07-05 6:56 ` Andrew Lunn
2022-07-05 7:18 ` Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220704153510.3859649-4-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew@lunn.ch \
--cc=gregkh@linuxfoundation.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=opendmb@gmail.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.