From: Hauke Mehrtens <hauke@hauke-m.de>
To: Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
netdev@vger.kernel.org
Cc: andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com,
olteanv@gmail.com, davem@davemloft.net, kuba@kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 2/2] net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access
Date: Sun, 3 Jan 2021 02:36:30 +0100 [thread overview]
Message-ID: <a671e783-da5c-378b-56f3-97e1c782570d@hauke-m.de> (raw)
In-Reply-To: <20210103012544.3259029-3-martin.blumenstingl@googlemail.com>
On 1/3/21 2:25 AM, Martin Blumenstingl wrote:
> There is one GSWIP_MII_CFG register for each switch-port except the CPU
> port. The register offset for the first port is 0x0, 0x02 for the
> second, 0x04 for the third and so on.
>
> Update the driver to not only restrict the GSWIP_MII_CFG registers to
> ports 0, 1 and 5. Handle ports 0..5 instead but skip the CPU port. This
> means we are not overwriting the configuration for the third port (port
> two since we start counting from zero) with the settings for the sixth
> port (with number five) anymore.
>
> The GSWIP_MII_PCDU(p) registers are not updated because there's really
> only three (one for each of the following ports: 0, 1, 5).
>
> Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
> Cc: stable@vger.kernel.org
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> drivers/net/dsa/lantiq_gswip.c | 23 ++++++-----------------
> 1 file changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
> index 5d378c8026f0..4b36d89bec06 100644
> --- a/drivers/net/dsa/lantiq_gswip.c
> +++ b/drivers/net/dsa/lantiq_gswip.c
> @@ -92,9 +92,7 @@
> GSWIP_MDIO_PHY_FDUP_MASK)
>
> /* GSWIP MII Registers */
> -#define GSWIP_MII_CFG0 0x00
> -#define GSWIP_MII_CFG1 0x02
> -#define GSWIP_MII_CFG5 0x04
> +#define GSWIP_MII_CFGp(p) (0x2 * (p))
> #define GSWIP_MII_CFG_EN BIT(14)
> #define GSWIP_MII_CFG_LDCLKDIS BIT(12)
> #define GSWIP_MII_CFG_MODE_MIIP 0x0
> @@ -392,17 +390,9 @@ static void gswip_mii_mask(struct gswip_priv *priv, u32 clear, u32 set,
> static void gswip_mii_mask_cfg(struct gswip_priv *priv, u32 clear, u32 set,
> int port)
> {
> - switch (port) {
> - case 0:
> - gswip_mii_mask(priv, clear, set, GSWIP_MII_CFG0);
> - break;
> - case 1:
> - gswip_mii_mask(priv, clear, set, GSWIP_MII_CFG1);
> - break;
> - case 5:
> - gswip_mii_mask(priv, clear, set, GSWIP_MII_CFG5);
> - break;
> - }
> + /* There's no MII_CFG register for the CPU port */
> + if (!dsa_is_cpu_port(priv->ds, port))
> + gswip_mii_mask(priv, clear, set, GSWIP_MII_CFGp(port));
> }
>
> static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 set,
> @@ -822,9 +812,8 @@ static int gswip_setup(struct dsa_switch *ds)
> gswip_mdio_mask(priv, 0xff, 0x09, GSWIP_MDIO_MDC_CFG1);
>
> /* Disable the xMII link */
> - gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, 0);
> - gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, 1);
> - gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, 5);
> + for (i = 0; i < priv->hw_info->max_ports; i++)
> + gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, i);
>
> /* enable special tag insertion on cpu port */
> gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_STEN,
>
next prev parent reply other threads:[~2021-01-03 1:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-03 1:25 [PATCH 0/2] net: dsa: lantiq_gswip: two fixes for -net/-stable Martin Blumenstingl
2021-01-03 1:25 ` [PATCH 1/2] net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs Martin Blumenstingl
2021-01-03 1:35 ` Hauke Mehrtens
2021-01-03 2:09 ` Andrew Lunn
2021-01-03 2:12 ` Martin Blumenstingl
2021-01-04 21:52 ` Jakub Kicinski
2021-01-04 23:54 ` Martin Blumenstingl
2021-01-04 19:53 ` Florian Fainelli
2021-01-03 1:25 ` [PATCH 2/2] net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access Martin Blumenstingl
2021-01-03 1:36 ` Hauke Mehrtens [this message]
2021-01-04 19:58 ` Florian Fainelli
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=a671e783-da5c-378b-56f3-97e1c782570d@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=stable@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 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.