From: Vladimir Oltean <olteanv@gmail.com>
To: "Arınç ÜNAL" <arinc.unal@arinc9.com>
Cc: Daniel Golle <daniel@makrotopia.org>,
Landen Chao <Landen.Chao@mediatek.com>,
DENG Qingfang <dqfext@gmail.com>,
Sean Wang <sean.wang@mediatek.com>, Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Russell King <linux@armlinux.org.uk>,
Frank Wunderlich <frank-w@public-files.de>,
Bartel Eerdekens <bartel.eerdekens@constell8.be>,
mithat.guner@xeront.com, erkin.bozoglu@xeront.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Subject: Re: [PATCH net-next v2 1/7] net: dsa: mt7530: always trap frames to active CPU port on MT7530
Date: Thu, 4 Jan 2024 17:22:32 +0200 [thread overview]
Message-ID: <20240104152232.jkoqiuwk3rd24rpm@skbuf> (raw)
In-Reply-To: <20231227044347.107291-2-arinc.unal@arinc9.com> <20231227044347.107291-2-arinc.unal@arinc9.com>
On Wed, Dec 27, 2023 at 07:43:41AM +0300, Arınç ÜNAL wrote:
> On the MT7530 switch, the CPU_PORT field indicates which CPU port to trap
> frames to, regardless of the affinity of the inbound user port.
>
> When multiple CPU ports are in use, if the DSA conduit interface is down,
> trapped frames won't be passed to the conduit interface.
>
> To make trapping frames work including this case, implement
> ds->ops->master_state_change() on this subdriver and set the CPU_PORT field
conduit_state_change()
> to the numerically smallest CPU port which the DSA conduit interface its
> affine to is up. Introduce the active_cpu_ports field to store the
> information of the active CPU ports. Correct the macros, CPU_PORT is bits 4
> through 6 of the register.
>
> Add a comment to explain frame trapping for this switch.
>
> Currently, the driver doesn't support the use of multiple CPU ports so this
> is not necessarily a bug fix.
>
> Suggested-by: Vladimir Oltean <olteanv@gmail.com>
> Suggested-by: Russell King (Oracle) <linux@armlinux.org.uk>
> Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
> ---
> drivers/net/dsa/mt7530.c | 37 +++++++++++++++++++++++++++++++++----
> drivers/net/dsa/mt7530.h | 6 ++++--
> 2 files changed, 37 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
> index 391c4dbdff42..436d5c311be0 100644
> --- a/drivers/net/dsa/mt7530.c
> +++ b/drivers/net/dsa/mt7530.c
> @@ -1035,10 +1035,6 @@ mt753x_cpu_port_enable(struct dsa_switch *ds, int port)
> mt7530_set(priv, MT7530_MFC, BC_FFP(BIT(port)) | UNM_FFP(BIT(port)) |
> UNU_FFP(BIT(port)));
>
> - /* Set CPU port number */
> - if (priv->id == ID_MT7530 || priv->id == ID_MT7621)
> - mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));
> -
> /* Add the CPU port to the CPU port bitmap for MT7531 and the switch on
> * the MT7988 SoC. Trapped frames will be forwarded to the CPU port that
> * is affine to the inbound user port.
> @@ -3075,6 +3071,38 @@ static int mt753x_set_mac_eee(struct dsa_switch *ds, int port,
> return 0;
> }
>
> +static void
> +mt753x_conduit_state_change(struct dsa_switch *ds,
> + const struct net_device *conduit,
> + bool operational)
> +{
> + struct dsa_port *cpu_dp = conduit->dsa_ptr;
> + struct mt7530_priv *priv = ds->priv;
> + u8 mask;
> + int val = 0;
Longest line first.
> +
> + /* Set the CPU port to trap frames to for MT7530. Trapped frames will be
> + * forwarded to the numerically smallest CPU port which the DSA conduit
> + * interface its affine to is up.
"first CPU port whose conduit interface is up"
> + */
> + if (priv->id != ID_MT7530 && priv->id != ID_MT7621)
> + return;
> +
> + mask = BIT(cpu_dp->index);
> +
> + if (operational)
> + priv->active_cpu_ports |= mask;
> + else
> + priv->active_cpu_ports &= ~mask;
> +
> + if (priv->active_cpu_ports)
> + val =
> + CPU_EN |
> + CPU_PORT(__ffs((unsigned long)priv->active_cpu_ports));
I don't think the type cast is necessary (implicit type promotion takes place).
Also, it is customary to put {} for multi-line "if" blocks, even if they are
made up of a single expression.
But without the type cast, it could look like this.
if (priv->active_cpu_ports)
val = CPU_EN | CPU_PORT(__ffs(priv->active_cpu_ports));
> +
> + mt7530_rmw(priv, MT7530_MFC, CPU_EN | CPU_PORT_MASK, val);
> +}
next prev parent reply other threads:[~2024-01-04 15:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-27 4:43 [PATCH net-next v2 0/7] MT7530 DSA Subdriver Improvements Act I Arınç ÜNAL
2023-12-27 4:43 ` [PATCH net-next v2 1/7] net: dsa: mt7530: always trap frames to active CPU port on MT7530 Arınç ÜNAL
2024-01-04 15:22 ` Vladimir Oltean [this message]
2024-01-06 14:33 ` Arınç ÜNAL
2023-12-27 4:43 ` [PATCH net-next v2 2/7] net: dsa: mt7530: use p5_interface_select as data type for p5_intf_sel Arınç ÜNAL
2023-12-27 4:43 ` [PATCH net-next v2 3/7] net: dsa: mt7530: store port 5 SGMII capability of MT7531 Arınç ÜNAL
2023-12-27 4:43 ` [PATCH net-next v2 4/7] net: dsa: mt7530: improve comments regarding port 5 and 6 Arınç ÜNAL
2024-01-04 15:25 ` Vladimir Oltean
2023-12-27 4:43 ` [PATCH net-next v2 5/7] net: dsa: mt7530: improve code path for setting up port 5 Arınç ÜNAL
2024-01-04 15:29 ` Vladimir Oltean
2023-12-27 4:43 ` [PATCH net-next v2 6/7] net: dsa: mt7530: do not set priv->p5_interface on mt7530_setup_port5() Arınç ÜNAL
2024-01-04 15:42 ` Vladimir Oltean
2024-01-06 15:00 ` Arınç ÜNAL
2024-01-09 11:42 ` Arınç ÜNAL
2024-01-09 11:51 ` Vladimir Oltean
2024-01-10 11:29 ` Arınç ÜNAL
2023-12-27 4:43 ` [PATCH net-next v2 7/7] net: dsa: mt7530: do not run mt7530_setup_port5() if port 5 is disabled Arınç ÜNAL
2024-01-02 22:34 ` [PATCH net-next v2 0/7] MT7530 DSA Subdriver Improvements Act I Jakub Kicinski
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=20240104152232.jkoqiuwk3rd24rpm@skbuf \
--to=olteanv@gmail.com \
--cc=Landen.Chao@mediatek.com \
--cc=andrew@lunn.ch \
--cc=angelogioacchino.delregno@collabora.com \
--cc=arinc.unal@arinc9.com \
--cc=bartel.eerdekens@constell8.be \
--cc=daniel@makrotopia.org \
--cc=davem@davemloft.net \
--cc=dqfext@gmail.com \
--cc=edumazet@google.com \
--cc=erkin.bozoglu@xeront.com \
--cc=f.fainelli@gmail.com \
--cc=frank-w@public-files.de \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=matthias.bgg@gmail.com \
--cc=mithat.guner@xeront.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sean.wang@mediatek.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).