From: Vladimir Oltean <olteanv@gmail.com>
To: Ansuel Smith <ansuelsmth@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH net-next v3 10/20] net: dsa: qca8k: add priority tweak to qca8337 switch
Date: Thu, 6 May 2021 14:16:20 +0300 [thread overview]
Message-ID: <20210506111620.vqvlvvd57c6yliua@skbuf> (raw)
In-Reply-To: <20210504222915.17206-10-ansuelsmth@gmail.com>
On Wed, May 05, 2021 at 12:29:04AM +0200, Ansuel Smith wrote:
> The port 5 of the ar8337 have some problem in flood condition. The
> original legacy driver had some specific buffer and priority settings
> for the different port suggested by the QCA switch team. Add this
> missing settings to improve switch stability under load condition.
> The packet priority tweak and the rx delay is specific to qca8337.
> Limit this changes to qca8337 as now we also support 8327 switch.
>
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> ---
> drivers/net/dsa/qca8k.c | 54 +++++++++++++++++++++++++++++++++++++++--
> drivers/net/dsa/qca8k.h | 24 ++++++++++++++++++
> 2 files changed, 76 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
> index 17c6fd4afa7d..9e034c445085 100644
> --- a/drivers/net/dsa/qca8k.c
> +++ b/drivers/net/dsa/qca8k.c
> @@ -783,7 +783,12 @@ static int
> qca8k_setup(struct dsa_switch *ds)
> {
> struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
> + const struct qca8k_match_data *data;
> int ret, i;
> + u32 mask;
> +
> + /* get the switches ID from the compatible */
> + data = of_device_get_match_data(priv->dev);
>
> /* Make sure that port 0 is the cpu port */
> if (!dsa_is_cpu_port(ds, 0)) {
> @@ -889,6 +894,45 @@ qca8k_setup(struct dsa_switch *ds)
> }
> }
>
> + if (data->id == QCA8K_ID_QCA8337) {
> + for (i = 0; i < QCA8K_NUM_PORTS; i++) {
> + switch (i) {
> + /* The 2 CPU port and port 5 requires some different
> + * priority than any other ports.
> + */
> + case 0:
> + case 5:
> + case 6:
> + mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x4) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x4) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI4(0x6) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI5(0x8) |
> + QCA8K_PORT_HOL_CTRL0_EG_PORT(0x1e);
> + break;
> + default:
> + mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x6) |
> + QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x8) |
> + QCA8K_PORT_HOL_CTRL0_EG_PORT(0x19);
> + }
> + qca8k_write(priv, QCA8K_REG_PORT_HOL_CTRL0(i), mask);
> +
> + mask = QCA8K_PORT_HOL_CTRL1_ING(0x6) |
> + QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |
> + QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |
> + QCA8K_PORT_HOL_CTRL1_WRED_EN;
> + qca8k_rmw(priv, QCA8K_REG_PORT_HOL_CTRL1(i),
> + QCA8K_PORT_HOL_CTRL1_ING_BUF |
> + QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |
> + QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |
> + QCA8K_PORT_HOL_CTRL1_WRED_EN,
> + mask);
> + }
What is this actually doing and why is it needed?
> + }
> +
> /* Setup our port MTUs to match power on defaults */
> for (i = 0; i < QCA8K_NUM_PORTS; i++)
> priv->port_mtu[i] = ETH_FRAME_LEN + ETH_FCS_LEN;
> @@ -909,9 +953,13 @@ static void
> qca8k_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
> const struct phylink_link_state *state)
> {
> + const struct qca8k_match_data *data;
> struct qca8k_priv *priv = ds->priv;
> u32 reg, val;
>
> + /* get the switches ID from the compatible */
> + data = of_device_get_match_data(priv->dev);
> +
> switch (port) {
> case 0: /* 1st CPU port */
> if (state->interface != PHY_INTERFACE_MODE_RGMII &&
> @@ -962,8 +1010,10 @@ qca8k_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
> QCA8K_PORT_PAD_RGMII_EN |
> QCA8K_PORT_PAD_RGMII_TX_DELAY(QCA8K_MAX_DELAY) |
> QCA8K_PORT_PAD_RGMII_RX_DELAY(QCA8K_MAX_DELAY));
> - qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL,
> - QCA8K_PORT_PAD_RGMII_RX_DELAY_EN);
> + /* QCA8337 requires to set rgmii rx delay */
> + if (data->id == QCA8K_ID_QCA8337)
> + qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL,
> + QCA8K_PORT_PAD_RGMII_RX_DELAY_EN);
Why are we looking at an RGMII delay change in a patch about "priority
tweaks"? This patch is very confusing.
> break;
> case PHY_INTERFACE_MODE_SGMII:
> case PHY_INTERFACE_MODE_1000BASEX:
> diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
> index 86e8d479c9f9..34c5522e7202 100644
> --- a/drivers/net/dsa/qca8k.h
> +++ b/drivers/net/dsa/qca8k.h
> @@ -166,6 +166,30 @@
> #define QCA8K_PORT_LOOKUP_STATE GENMASK(18, 16)
> #define QCA8K_PORT_LOOKUP_LEARN BIT(20)
>
> +#define QCA8K_REG_PORT_HOL_CTRL0(_i) (0x970 + (_i) * 0x8)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI0_BUF GENMASK(3, 0)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI0(x) ((x) << 0)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI1_BUF GENMASK(7, 4)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI1(x) ((x) << 4)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI2_BUF GENMASK(11, 8)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI2(x) ((x) << 8)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI3_BUF GENMASK(15, 12)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI3(x) ((x) << 12)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI4_BUF GENMASK(19, 16)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI4(x) ((x) << 16)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI5_BUF GENMASK(23, 20)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PRI5(x) ((x) << 20)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PORT_BUF GENMASK(29, 24)
> +#define QCA8K_PORT_HOL_CTRL0_EG_PORT(x) ((x) << 24)
> +
> +#define QCA8K_REG_PORT_HOL_CTRL1(_i) (0x974 + (_i) * 0x8)
> +#define QCA8K_PORT_HOL_CTRL1_ING_BUF GENMASK(3, 0)
> +#define QCA8K_PORT_HOL_CTRL1_ING(x) ((x) << 0)
> +#define QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN BIT(6)
> +#define QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN BIT(7)
> +#define QCA8K_PORT_HOL_CTRL1_WRED_EN BIT(8)
> +#define QCA8K_PORT_HOL_CTRL1_EG_MIRROR_EN BIT(16)
> +
> /* Pkt edit registers */
> #define QCA8K_EGRESS_VLAN(x) (0x0c70 + (4 * (x / 2)))
>
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-05-06 11:16 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 22:28 [RFC PATCH net-next v3 01/20] net: mdio: ipq8064: clean whitespaces in define Ansuel Smith
2021-05-04 22:28 ` [RFC PATCH net-next v3 02/20] net: mdio: ipq8064: add regmap config to disable REGCACHE Ansuel Smith
2021-05-04 22:28 ` [RFC PATCH net-next v3 03/20] net: mdio: ipq8064: enlarge sleep after read/write operation Ansuel Smith
2021-05-04 22:28 ` [RFC PATCH net-next v3 04/20] net: dsa: qca8k: handle qca8k_set_page errors Ansuel Smith
2021-05-05 0:25 ` Andrew Lunn
2021-05-05 0:26 ` Andrew Lunn
2021-05-04 22:28 ` [RFC PATCH net-next v3 05/20] net: dsa: qca8k: handle error with qca8k_read operation Ansuel Smith
2021-05-05 0:36 ` Andrew Lunn
2021-05-05 0:44 ` Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 06/20] net: dsa: qca8k: handle error with qca8k_write operation Ansuel Smith
2021-05-05 0:41 ` Andrew Lunn
2021-05-05 0:47 ` Ansuel Smith
2021-05-06 11:19 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 07/20] net: dsa: qca8k: handle error with qca8k_rmw operation Ansuel Smith
2021-05-05 0:46 ` Andrew Lunn
2021-05-05 0:51 ` Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 08/20] net: dsa: qca8k: add support for qca8327 switch Ansuel Smith
2021-05-05 0:48 ` Andrew Lunn
2021-05-06 11:20 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 09/20] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-05-05 0:48 ` Andrew Lunn
2021-05-06 21:07 ` Rob Herring
2021-05-04 22:29 ` [RFC PATCH net-next v3 10/20] net: dsa: qca8k: add priority tweak to qca8337 switch Ansuel Smith
2021-05-05 0:53 ` Andrew Lunn
2021-05-06 11:16 ` Vladimir Oltean [this message]
2021-05-04 22:29 ` [RFC PATCH net-next v3 11/20] net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-05-05 0:54 ` Andrew Lunn
2021-05-04 22:29 ` [RFC PATCH net-next v3 12/20] net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 13/20] net: dsa: qca8k: make rgmii delay configurable Ansuel Smith
2021-05-05 1:00 ` Andrew Lunn
2021-05-05 1:07 ` Ansuel Smith
2021-05-06 11:10 ` Vladimir Oltean
2021-05-06 21:53 ` Ansuel Smith
2021-05-07 8:51 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 14/20] net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 15/20] net: dsa: qca8k: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-05-05 1:04 ` Andrew Lunn
2021-05-04 22:29 ` [RFC PATCH net-next v3 16/20] net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-05-06 11:27 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 17/20] net: phy: phylink: permit to pass dev_flags to phylink_connect_phy Ansuel Smith
2021-05-04 22:33 ` Florian Fainelli
2021-05-05 0:35 ` Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 18/20] net: dsa: slave: pass dev_flags also to internal PHY Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 19/20] net: dsa: qca8k: pass switch_revision info to phy dev_flags Ansuel Smith
2021-05-06 11:24 ` Vladimir Oltean
2021-05-07 23:26 ` Ansuel Smith
2021-05-07 23:33 ` Russell King - ARM Linux admin
2021-05-07 23:51 ` Ansuel Smith
2021-05-08 17:31 ` Andrew Lunn
2021-05-08 18:26 ` Vladimir Oltean
2021-05-08 19:39 ` Russell King - ARM Linux admin
2021-05-08 20:55 ` Andrew Lunn
2021-05-07 9:44 ` Russell King - ARM Linux admin
2021-05-04 22:29 ` [RFC PATCH net-next v3 20/20] net: phy: add qca8k driver for qca8k switch internal PHY Ansuel Smith
2021-05-05 1:11 ` Andrew Lunn
2021-05-05 1:17 ` Ansuel Smith
2021-05-05 12:06 ` Andrew Lunn
2021-05-04 22:29 ` [RFC PATCH next-next v3 00/20] Multiple improvement to qca8k stability Ansuel Smith
2021-05-05 0:17 ` [RFC PATCH net-next v3 01/20] net: mdio: ipq8064: clean whitespaces in define Andrew Lunn
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=20210506111620.vqvlvvd57c6yliua@skbuf \
--to=olteanv@gmail.com \
--cc=andrew@lunn.ch \
--cc=ansuelsmth@gmail.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).