Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ben Hutchings <ben.hutchings@mind.be>
To: Woojung Huh <woojung.huh@microchip.com>, UNGLinuxDriver@microchip.com
Cc: netdev@vger.kernel.org
Subject: [PATCH net 6/7] net: dsa: microchip: ksz8795: Fix VLAN filtering
Date: Tue, 10 Aug 2021 01:00:06 +0200	[thread overview]
Message-ID: <20210809230005.GG17207@cephalopod> (raw)
In-Reply-To: <20210809225753.GA17207@cephalopod>

Currently ksz8_port_vlan_filtering() sets or clears the VLAN Enable
hardware flag.  That controls discarding of packets with a VID that
has not been enabled for any port on the switch.

Since it is a global flag, set the dsa_switch::vlan_filtering_is_global
flag so that the DSA core understands this can't be controlled per
port.

When VLAN filtering is enabled, the switch should also discard packets
with a VID that's not enabled on the ingress port.  Set or clear each
external port's VLAN Ingress Filter flag in ksz8_port_vlan_filtering()
to make that happen.

Fixes: e66f840c08a2 ("net: dsa: ksz: Add Microchip KSZ8795 DSA driver")
Signed-off-by: Ben Hutchings <ben.hutchings@mind.be>
---
 drivers/net/dsa/microchip/ksz8795.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index ddfe9cd6b7bd..891eaeb62ad0 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1119,8 +1119,14 @@ static int ksz8_port_vlan_filtering(struct dsa_switch *ds, int port, bool flag,
 	if (ksz_is_ksz88x3(dev))
 		return -ENOTSUPP;
 
+	/* Discard packets with VID not enabled on the switch */
 	ksz_cfg(dev, S_MIRROR_CTRL, SW_VLAN_ENABLE, flag);
 
+	/* Discard packets with VID not enabled on the ingress port */
+	for (port = 0; port < dev->phy_port_cnt; ++port)
+		ksz_port_cfg(dev, port, REG_PORT_CTRL_2, PORT_INGRESS_FILTER,
+			     flag);
+
 	return 0;
 }
 
@@ -1774,6 +1780,11 @@ static int ksz8_switch_init(struct ksz_device *dev)
 	 */
 	dev->ds->untag_bridge_pvid = true;
 
+	/* VLAN filtering is partly controlled by the global VLAN
+	 * Enable flag
+	 */
+	dev->ds->vlan_filtering_is_global = true;
+
 	return 0;
 }
 
-- 
2.20.1


  parent reply	other threads:[~2021-08-09 23:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-09 22:57 [PATCH net 0/7] ksz8795 VLAN fixes Ben Hutchings
2021-08-09 22:59 ` [PATCH net 1/7] net: dsa: microchip: Fix ksz_read64() Ben Hutchings
2021-08-09 22:59 ` [PATCH net 2/7] net: dsa: microchip: ksz8795: Fix PVID tag insertion Ben Hutchings
2021-08-09 22:59 ` [PATCH net 3/7] net: dsa: microchip: ksz8795: Reject unsupported VLAN configuration Ben Hutchings
2021-08-09 22:59 ` [PATCH net 4/7] net: dsa: microchip: ksz8795: Fix VLAN untagged flag change on deletion Ben Hutchings
2021-08-09 22:59 ` [PATCH net 5/7] net: dsa: microchip: ksz8795: Use software untagging on CPU port Ben Hutchings
2021-08-09 23:00 ` Ben Hutchings [this message]
2021-08-09 23:00 ` [PATCH net 7/7] net: dsa: microchip: ksz8795: Don't use phy_port_cnt in VLAN table lookup Ben Hutchings
2021-08-10  0:03 ` [PATCH net 0/7] ksz8795 VLAN fixes Jakub Kicinski
2021-08-10  9:00 ` patchwork-bot+netdevbpf

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=20210809230005.GG17207@cephalopod \
    --to=ben.hutchings@mind.be \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=netdev@vger.kernel.org \
    --cc=woojung.huh@microchip.com \
    --subject='Re: [PATCH net 6/7] net: dsa: microchip: ksz8795: Fix VLAN filtering' \
    /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

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).