From: Hauke Mehrtens <hauke@hauke-m.de>
To: davem@davemloft.net
Cc: andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com,
netdev@vger.kernel.org, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH v3 1/5] net: dsa: lantiq: Allow special tags only on CPU port
Date: Mon, 6 May 2019 00:25:06 +0200 [thread overview]
Message-ID: <20190505222510.14619-2-hauke@hauke-m.de> (raw)
In-Reply-To: <20190505222510.14619-1-hauke@hauke-m.de>
Allow the special tag in ingress only on the CPU port and not on all
ports. A packet with a special tag could circumvent the hardware
forwarding and should only be allowed on the CPU port where Linux
controls the port.
Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200)"
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/dsa/lantiq_gswip.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index d8328866908c..0a2259cb09df 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -461,8 +461,6 @@ static int gswip_port_enable(struct dsa_switch *ds, int port,
GSWIP_FDMA_PCTRLp(port));
gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,
GSWIP_SDMA_PCTRLp(port));
- gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_INGRESS,
- GSWIP_PCE_PCTRL_0p(port));
if (!dsa_is_cpu_port(ds, port)) {
u32 macconf = GSWIP_MDIO_PHY_LINK_AUTO |
@@ -578,6 +576,10 @@ static int gswip_setup(struct dsa_switch *ds)
gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_STEN,
GSWIP_FDMA_PCTRLp(cpu_port));
+ /* accept special tag in ingress direction */
+ gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_INGRESS,
+ GSWIP_PCE_PCTRL_0p(cpu_port));
+
gswip_switch_mask(priv, 0, GSWIP_MAC_CTRL_2_MLEN,
GSWIP_MAC_CTRL_2p(cpu_port));
gswip_switch_w(priv, VLAN_ETH_FRAME_LEN + 8, GSWIP_MAC_FLEN);
--
2.20.1
next prev parent reply other threads:[~2019-05-05 22:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-05 22:25 [PATCH v3 0/5] net: dsa: lantiq: Add bridge offloading Hauke Mehrtens
2019-05-05 22:25 ` Hauke Mehrtens [this message]
2019-05-05 22:25 ` [PATCH v3 2/5] net: dsa: lantiq: Add VLAN unaware " Hauke Mehrtens
2019-05-05 22:25 ` [PATCH v3 3/5] net: dsa: lantiq: Add VLAN aware " Hauke Mehrtens
2019-05-05 22:25 ` [PATCH v3 4/5] net: dsa: lantiq: Add fast age function Hauke Mehrtens
2019-05-05 22:25 ` [PATCH v3 5/5] net: dsa: lantiq: Add Forwarding Database access Hauke Mehrtens
2019-05-07 17:37 ` [PATCH v3 0/5] net: dsa: lantiq: Add bridge offloading David Miller
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=20190505222510.14619-2-hauke@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--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).