net: dsa: vsc73xx: Add vlan filtering (6b783ded) · Commits · git / linux-nf

drivers/net/dsa/vitesse-vsc73xx-core.c

+529 −3

Original line number	Diff line number	Diff line
		@@ -22,9 +22,11 @@
		#include <linux/of_mdio.h>
		#include <linux/bitops.h>
		#include <linux/if_bridge.h>
		#include <linux/if_vlan.h>
		#include <linux/etherdevice.h>
		#include <linux/gpio/consumer.h>
		#include <linux/gpio/driver.h>
		#include <linux/dsa/8021q.h>
		#include <linux/random.h>
		#include <net/dsa.h>

		@@ -62,6 +64,8 @@
		#define VSC73XX_CAT_DROP 0x6e
		#define VSC73XX_CAT_PR_MISC_L2 0x6f
		#define VSC73XX_CAT_PR_USR_PRIO 0x75
		#define VSC73XX_CAT_VLAN_MISC 0x79
		#define VSC73XX_CAT_PORT_VLAN 0x7a
		#define VSC73XX_Q_MISC_CONF 0xdf

		/* MAC_CFG register bits */
		@@ -122,6 +126,17 @@
		#define VSC73XX_ADVPORTM_IO_LOOPBACK BIT(1)
		#define VSC73XX_ADVPORTM_HOST_LOOPBACK BIT(0)

		/* TXUPDCFG transmit modify setup bits */
		#define VSC73XX_TXUPDCFG_DSCP_REWR_MODE GENMASK(20, 19)
		#define VSC73XX_TXUPDCFG_DSCP_REWR_ENA BIT(18)
		#define VSC73XX_TXUPDCFG_TX_INT_TO_USRPRIO_ENA BIT(17)
		#define VSC73XX_TXUPDCFG_TX_UNTAGGED_VID GENMASK(15, 4)
		#define VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_ENA BIT(3)
		#define VSC73XX_TXUPDCFG_TX_UPDATE_CRC_CPU_ENA BIT(1)
		#define VSC73XX_TXUPDCFG_TX_INSERT_TAG BIT(0)

		#define VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_SHIFT 4

		/* CAT_DROP categorizer frame dropping register bits */
		#define VSC73XX_CAT_DROP_DROP_MC_SMAC_ENA BIT(6)
		#define VSC73XX_CAT_DROP_FWD_CTRL_ENA BIT(4)
		@@ -135,6 +150,15 @@
		#define VSC73XX_Q_MISC_CONF_EARLY_TX_512 (1 << 1)
		#define VSC73XX_Q_MISC_CONF_MAC_PAUSE_MODE BIT(0)

		/* CAT_VLAN_MISC categorizer VLAN miscellaneous bits */
		#define VSC73XX_CAT_VLAN_MISC_VLAN_TCI_IGNORE_ENA BIT(8)
		#define VSC73XX_CAT_VLAN_MISC_VLAN_KEEP_TAG_ENA BIT(7)

		/* CAT_PORT_VLAN categorizer port VLAN */
		#define VSC73XX_CAT_PORT_VLAN_VLAN_CFI BIT(15)
		#define VSC73XX_CAT_PORT_VLAN_VLAN_USR_PRIO GENMASK(14, 12)
		#define VSC73XX_CAT_PORT_VLAN_VLAN_VID GENMASK(11, 0)

		/* Frame analyzer block 2 registers */
		#define VSC73XX_STORMLIMIT 0x02
		#define VSC73XX_ADVLEARN 0x03
		@@ -189,7 +213,8 @@
		#define VSC73XX_VLANACCESS_VLAN_MIRROR BIT(29)
		#define VSC73XX_VLANACCESS_VLAN_SRC_CHECK BIT(28)
		#define VSC73XX_VLANACCESS_VLAN_PORT_MASK GENMASK(9, 2)
		#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK GENMASK(2, 0)
		#define VSC73XX_VLANACCESS_VLAN_PORT_MASK_SHIFT 2
		#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK GENMASK(1, 0)
		#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_IDLE 0
		#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_READ_ENTRY 1
		#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_WRITE_ENTRY 2
		@@ -347,6 +372,17 @@ static const struct vsc73xx_counter vsc73xx_tx_counters[] = {
		{ 29, "TxQoSClass3" }, /* non-standard counter */
		};

		struct vsc73xx_vlan_summary {
		size_t num_tagged;
		size_t num_untagged;
		};

		enum vsc73xx_port_vlan_conf {
		VSC73XX_VLAN_FILTER,
		VSC73XX_VLAN_FILTER_UNTAG_ALL,
		VSC73XX_VLAN_IGNORE,
		};

		int vsc73xx_is_addr_valid(u8 block, u8 subblock)
		{
		switch (block) {
		@@ -564,6 +600,90 @@ static enum dsa_tag_protocol vsc73xx_get_tag_protocol(struct dsa_switch *ds,
		return DSA_TAG_PROTO_NONE;
		}

		static int vsc73xx_wait_for_vlan_table_cmd(struct vsc73xx *vsc)
		{
		int ret, err;
		u32 val;

		ret = read_poll_timeout(vsc73xx_read, err,
		err < 0 \|\|
		((val & VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK) ==
		VSC73XX_VLANACCESS_VLAN_TBL_CMD_IDLE),
		VSC73XX_POLL_SLEEP_US, VSC73XX_POLL_TIMEOUT_US,
		false, vsc, VSC73XX_BLOCK_ANALYZER,
		0, VSC73XX_VLANACCESS, &val);
		if (ret)
		return ret;
		return err;
		}

		static int
		vsc73xx_read_vlan_table_entry(struct vsc73xx vsc, u16 vid, u8 portmap)
		{
		u32 val;
		int ret;

		vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANTIDX, vid);

		ret = vsc73xx_wait_for_vlan_table_cmd(vsc);
		if (ret)
		return ret;

		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANACCESS,
		VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK,
		VSC73XX_VLANACCESS_VLAN_TBL_CMD_READ_ENTRY);

		ret = vsc73xx_wait_for_vlan_table_cmd(vsc);
		if (ret)
		return ret;

		vsc73xx_read(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANACCESS, &val);
		*portmap = (val & VSC73XX_VLANACCESS_VLAN_PORT_MASK) >>
		VSC73XX_VLANACCESS_VLAN_PORT_MASK_SHIFT;

		return 0;
		}

		static int
		vsc73xx_write_vlan_table_entry(struct vsc73xx *vsc, u16 vid, u8 portmap)
		{
		int ret;

		vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANTIDX, vid);

		ret = vsc73xx_wait_for_vlan_table_cmd(vsc);
		if (ret)
		return ret;

		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANACCESS,
		VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK \|
		VSC73XX_VLANACCESS_VLAN_SRC_CHECK \|
		VSC73XX_VLANACCESS_VLAN_PORT_MASK,
		VSC73XX_VLANACCESS_VLAN_TBL_CMD_WRITE_ENTRY \|
		VSC73XX_VLANACCESS_VLAN_SRC_CHECK \|
		(portmap << VSC73XX_VLANACCESS_VLAN_PORT_MASK_SHIFT));

		return vsc73xx_wait_for_vlan_table_cmd(vsc);
		}

		static int
		vsc73xx_update_vlan_table(struct vsc73xx *vsc, int port, u16 vid, bool set)
		{
		u8 portmap;
		int ret;

		ret = vsc73xx_read_vlan_table_entry(vsc, vid, &portmap);
		if (ret)
		return ret;

		if (set)
		portmap \|= BIT(port);
		else
		portmap &= ~BIT(port);

		return vsc73xx_write_vlan_table_entry(vsc, vid, portmap);
		}

		static int vsc73xx_setup(struct dsa_switch *ds)
		{
		struct vsc73xx *vsc = ds->priv;
		@@ -598,7 +718,7 @@ static int vsc73xx_setup(struct dsa_switch *ds)
		VSC73XX_MACACCESS,
		VSC73XX_MACACCESS_CMD_CLEAR_TABLE);

		/* Clear VLAN table */
		/* Set VLAN table to default values */
		vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0,
		VSC73XX_VLANACCESS,
		VSC73XX_VLANACCESS_VLAN_TBL_CMD_CLEAR_TABLE);
		@@ -627,6 +747,9 @@ static int vsc73xx_setup(struct dsa_switch *ds)
		vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GMIIDELAY,
		VSC73XX_GMIIDELAY_GMII0_GTXDELAY_2_0_NS \|
		VSC73XX_GMIIDELAY_GMII0_RXDELAY_2_0_NS);
		/* Ingess VLAN reception mask (table 145) */
		vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANMASK,
		0xff);
		/* IP multicast flood mask (table 144) */
		vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_IFLODMSK,
		0xff);
		@@ -639,6 +762,12 @@ static int vsc73xx_setup(struct dsa_switch *ds)

		udelay(4);

		/* Clear VLAN table */
		for (i = 0; i < VLAN_N_VID; i++)
		vsc73xx_write_vlan_table_entry(vsc, i, 0);

		INIT_LIST_HEAD(&vsc->vlans);

		return 0;
		}

		@@ -825,6 +954,12 @@ static void vsc73xx_mac_link_up(struct phylink_config *config,
		val \|= seed << VSC73XX_MAC_CFG_SEED_OFFSET;
		val \|= VSC73XX_MAC_CFG_SEED_LOAD;
		val \|= VSC73XX_MAC_CFG_WEXC_DIS;

		/* Those bits are responsible for MTU only. Kernel takes care about MTU,
		* let's enable +8 bytes frame length unconditionally.
		*/
		val \|= VSC73XX_MAC_CFG_VLAN_AWR \| VSC73XX_MAC_CFG_VLAN_DBLAWR;

		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_MAC_CFG, val);

		/* Flow control for the PHY facing ports:
		@@ -853,6 +988,257 @@ static void vsc73xx_mac_link_up(struct phylink_config *config,
		VSC73XX_MAC_CFG_TX_EN \| VSC73XX_MAC_CFG_RX_EN);
		}

		static bool vsc73xx_tag_8021q_active(struct dsa_port *dp)
		{
		return !dsa_port_is_vlan_filtering(dp);
		}

		static struct vsc73xx_bridge_vlan *
		vsc73xx_bridge_vlan_find(struct vsc73xx *vsc, u16 vid)
		{
		struct vsc73xx_bridge_vlan *vlan;

		list_for_each_entry(vlan, &vsc->vlans, list)
		if (vlan->vid == vid)
		return vlan;

		return NULL;
		}

		static void
		vsc73xx_bridge_vlan_remove_port(struct vsc73xx_bridge_vlan *vsc73xx_vlan,
		int port)
		{
		vsc73xx_vlan->portmask &= ~BIT(port);

		if (vsc73xx_vlan->portmask)
		return;

		list_del(&vsc73xx_vlan->list);
		kfree(vsc73xx_vlan);
		}

		static void vsc73xx_bridge_vlan_summary(struct vsc73xx *vsc, int port,
		struct vsc73xx_vlan_summary *summary,
		u16 ignored_vid)
		{
		size_t num_tagged = 0, num_untagged = 0;
		struct vsc73xx_bridge_vlan *vlan;

		list_for_each_entry(vlan, &vsc->vlans, list) {
		if (!(vlan->portmask & BIT(port)) \|\| vlan->vid == ignored_vid)
		continue;

		if (vlan->untagged & BIT(port))
		num_untagged++;
		else
		num_tagged++;
		}

		summary->num_untagged = num_untagged;
		summary->num_tagged = num_tagged;
		}

		static u16 vsc73xx_find_first_vlan_untagged(struct vsc73xx *vsc, int port)
		{
		struct vsc73xx_bridge_vlan *vlan;

		list_for_each_entry(vlan, &vsc->vlans, list)
		if ((vlan->portmask & BIT(port)) &&
		(vlan->untagged & BIT(port)))
		return vlan->vid;

		return VLAN_N_VID;
		}

		static int vsc73xx_set_vlan_conf(struct vsc73xx *vsc, int port,
		enum vsc73xx_port_vlan_conf port_vlan_conf)
		{
		u32 val = 0;
		int ret;

		if (port_vlan_conf == VSC73XX_VLAN_IGNORE)
		val = VSC73XX_CAT_VLAN_MISC_VLAN_TCI_IGNORE_ENA \|
		VSC73XX_CAT_VLAN_MISC_VLAN_KEEP_TAG_ENA;

		ret = vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,
		VSC73XX_CAT_VLAN_MISC,
		VSC73XX_CAT_VLAN_MISC_VLAN_TCI_IGNORE_ENA \|
		VSC73XX_CAT_VLAN_MISC_VLAN_KEEP_TAG_ENA, val);
		if (ret)
		return ret;

		val = (port_vlan_conf == VSC73XX_VLAN_FILTER) ?
		VSC73XX_TXUPDCFG_TX_INSERT_TAG : 0;

		return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,
		VSC73XX_TXUPDCFG,
		VSC73XX_TXUPDCFG_TX_INSERT_TAG, val);
		}

		/**
		* vsc73xx_vlan_commit_conf - Update VLAN configuration of a port
		* @vsc: Switch private data structure
		* @port: Port index on which to operate
		*
		* Update the VLAN behavior of a port to make sure that when it is under
		* a VLAN filtering bridge, the port is either filtering with tag
		* preservation, or filtering with all VLANs egress-untagged. Otherwise,
		* the port ignores VLAN tags from packets and applies the port-based
		* VID.
		*
		* Must be called when changes are made to:
		* - the bridge VLAN filtering state of the port
		* - the number or attributes of VLANs from the bridge VLAN table,
		* while the port is currently VLAN-aware
		*
		* Return: 0 on success, or negative errno on error.
		*/
		static int vsc73xx_vlan_commit_conf(struct vsc73xx *vsc, int port)
		{
		enum vsc73xx_port_vlan_conf port_vlan_conf = VSC73XX_VLAN_IGNORE;
		struct dsa_port *dp = dsa_to_port(vsc->ds, port);

		if (port == CPU_PORT) {
		port_vlan_conf = VSC73XX_VLAN_FILTER;
		} else if (dsa_port_is_vlan_filtering(dp)) {
		struct vsc73xx_vlan_summary summary;

		port_vlan_conf = VSC73XX_VLAN_FILTER;

		vsc73xx_bridge_vlan_summary(vsc, port, &summary, VLAN_N_VID);
		if (summary.num_tagged == 0)
		port_vlan_conf = VSC73XX_VLAN_FILTER_UNTAG_ALL;
		}

		return vsc73xx_set_vlan_conf(vsc, port, port_vlan_conf);
		}

		static int
		vsc73xx_vlan_change_untagged(struct vsc73xx *vsc, int port, u16 vid, bool set)
		{
		u32 val = 0;

		if (set)
		val = VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_ENA \|
		((vid << VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_SHIFT) &
		VSC73XX_TXUPDCFG_TX_UNTAGGED_VID);

		return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,
		VSC73XX_TXUPDCFG,
		VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_ENA \|
		VSC73XX_TXUPDCFG_TX_UNTAGGED_VID, val);
		}

		/**
		* vsc73xx_vlan_commit_untagged - Update native VLAN of a port
		* @vsc: Switch private data structure
		* @port: Port index on which to operate
		*
		* Update the native VLAN of a port (the one VLAN which is transmitted
		* as egress-tagged on a trunk port) when port is in VLAN filtering mode and
		* only one untagged vid is configured.
		* In other cases no need to configure it because switch can untag all vlans on
		* the port.
		*
		* Return: 0 on success, or negative errno on error.
		*/
		static int vsc73xx_vlan_commit_untagged(struct vsc73xx *vsc, int port)
		{
		struct dsa_port *dp = dsa_to_port(vsc->ds, port);
		struct vsc73xx_vlan_summary summary;
		u16 vid = 0;
		bool valid;

		if (!dsa_port_is_vlan_filtering(dp))
		/* Port is configured to untag all vlans in that case.
		* No need to commit untagged config change.
		*/
		return 0;

		vsc73xx_bridge_vlan_summary(vsc, port, &summary, VLAN_N_VID);

		if (summary.num_untagged > 1)
		/* Port must untag all vlans in that case.
		* No need to commit untagged config change.
		*/
		return 0;

		valid = (summary.num_untagged == 1);
		if (valid)
		vid = vsc73xx_find_first_vlan_untagged(vsc, port);

		return vsc73xx_vlan_change_untagged(vsc, port, vid, valid);
		}

		static int
		vsc73xx_vlan_change_pvid(struct vsc73xx *vsc, int port, u16 vid, bool set)
		{
		u32 val = 0;
		int ret;

		val = set ? 0 : VSC73XX_CAT_DROP_UNTAGGED_ENA;

		ret = vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,
		VSC73XX_CAT_DROP,
		VSC73XX_CAT_DROP_UNTAGGED_ENA, val);
		if (!set \|\| ret)
		return ret;

		return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,
		VSC73XX_CAT_PORT_VLAN,
		VSC73XX_CAT_PORT_VLAN_VLAN_VID,
		vid & VSC73XX_CAT_PORT_VLAN_VLAN_VID);
		}

		/**
		* vsc73xx_vlan_commit_pvid - Update port-based default VLAN of a port
		* @vsc: Switch private data structure
		* @port: Port index on which to operate
		*
		* Update the PVID of a port so that it follows either the bridge PVID
		* configuration, when the bridge is currently VLAN-aware, or the PVID
		* from tag_8021q, when the port is standalone or under a VLAN-unaware
		* bridge. A port with no PVID drops all untagged and VID 0 tagged
		* traffic.
		*
		* Must be called when changes are made to:
		* - the bridge VLAN filtering state of the port
		* - the number or attributes of VLANs from the bridge VLAN table,
		* while the port is currently VLAN-aware
		*
		* Return: 0 on success, or negative errno on error.
		*/
		static int vsc73xx_vlan_commit_pvid(struct vsc73xx *vsc, int port)
		{
		struct vsc73xx_portinfo *portinfo = &vsc->portinfo[port];
		bool valid = portinfo->pvid_tag_8021q_configured;
		struct dsa_port *dp = dsa_to_port(vsc->ds, port);
		u16 vid = portinfo->pvid_tag_8021q;

		if (dsa_port_is_vlan_filtering(dp)) {
		vid = portinfo->pvid_vlan_filtering;
		valid = portinfo->pvid_vlan_filtering_configured;
		}

		return vsc73xx_vlan_change_pvid(vsc, port, vid, valid);
		}

		static int vsc73xx_vlan_commit_settings(struct vsc73xx *vsc, int port)
		{
		int ret;

		ret = vsc73xx_vlan_commit_untagged(vsc, port);
		if (ret)
		return ret;

		ret = vsc73xx_vlan_commit_pvid(vsc, port);
		if (ret)
		return ret;

		return vsc73xx_vlan_commit_conf(vsc, port);
		}

		static int vsc73xx_port_enable(struct dsa_switch *ds, int port,
		struct phy_device *phy)
		{
		@@ -861,7 +1247,7 @@ static int vsc73xx_port_enable(struct dsa_switch *ds, int port,
		dev_info(vsc->dev, "enable port %d\n", port);
		vsc73xx_init_port(vsc, port);

		return 0;
		return vsc73xx_vlan_commit_settings(vsc, port);
		}

		static void vsc73xx_port_disable(struct dsa_switch *ds, int port)
		@@ -1032,6 +1418,143 @@ static void vsc73xx_phylink_get_caps(struct dsa_switch *dsa, int port,
		config->mac_capabilities = MAC_SYM_PAUSE \| MAC_10 \| MAC_100 \| MAC_1000;
		}

		static int
		vsc73xx_port_vlan_filtering(struct dsa_switch *ds, int port,
		bool vlan_filtering, struct netlink_ext_ack *extack)
		{
		struct vsc73xx *vsc = ds->priv;

		/* The commit to hardware processed below is required because vsc73xx
		* is using tag_8021q. When vlan_filtering is disabled, tag_8021q uses
		* pvid/untagged vlans for port recognition. The values configured for
		* vlans and pvid/untagged states are stored in portinfo structure.
		* When vlan_filtering is enabled, we need to restore pvid/untagged from
		* portinfo structure. Analogous routine is processed when
		* vlan_filtering is disabled, but values used for tag_8021q are
		* restored.
		*/

		return vsc73xx_vlan_commit_settings(vsc, port);
		}

		static int vsc73xx_port_vlan_add(struct dsa_switch *ds, int port,
		const struct switchdev_obj_port_vlan *vlan,
		struct netlink_ext_ack *extack)
		{
		bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
		bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;
		struct dsa_port *dp = dsa_to_port(ds, port);
		struct vsc73xx_bridge_vlan *vsc73xx_vlan;
		struct vsc73xx_vlan_summary summary;
		struct vsc73xx_portinfo *portinfo;
		struct vsc73xx *vsc = ds->priv;
		bool commit_to_hardware;
		int ret = 0;

		/* Be sure to deny alterations to the configuration done by tag_8021q.
		*/
		if (vid_is_dsa_8021q(vlan->vid)) {
		NL_SET_ERR_MSG_MOD(extack,
		"Range 3072-4095 reserved for dsa_8021q operation");
		return -EBUSY;
		}

		/* The processed vlan->vid is excluded from the search because the VLAN
		* can be re-added with a different set of flags, so it's easiest to
		* ignore its old flags from the VLAN database software copy.
		*/
		vsc73xx_bridge_vlan_summary(vsc, port, &summary, vlan->vid);

		/* VSC73XX allows only three untagged states: none, one or all */
		if ((untagged && summary.num_tagged > 0 && summary.num_untagged > 0) \|\|
		(!untagged && summary.num_untagged > 1)) {
		NL_SET_ERR_MSG_MOD(extack,
		"Port can have only none, one or all untagged vlan");
		return -EBUSY;
		}

		vsc73xx_vlan = vsc73xx_bridge_vlan_find(vsc, vlan->vid);

		if (!vsc73xx_vlan) {
		vsc73xx_vlan = kzalloc(sizeof(*vsc73xx_vlan), GFP_KERNEL);
		if (!vsc73xx_vlan)
		return -ENOMEM;

		vsc73xx_vlan->vid = vlan->vid;

		list_add_tail(&vsc73xx_vlan->list, &vsc->vlans);
		}

		vsc73xx_vlan->portmask \|= BIT(port);

		/* CPU port must be always tagged because source port identification is
		* based on tag_8021q.
		*/
		if (port == CPU_PORT)
		goto update_vlan_table;

		if (untagged)
		vsc73xx_vlan->untagged \|= BIT(port);
		else
		vsc73xx_vlan->untagged &= ~BIT(port);

		portinfo = &vsc->portinfo[port];

		if (pvid) {
		portinfo->pvid_vlan_filtering_configured = true;
		portinfo->pvid_vlan_filtering = vlan->vid;
		} else if (portinfo->pvid_vlan_filtering_configured &&
		portinfo->pvid_vlan_filtering == vlan->vid) {
		portinfo->pvid_vlan_filtering_configured = false;
		}

		commit_to_hardware = !vsc73xx_tag_8021q_active(dp);
		if (commit_to_hardware) {
		ret = vsc73xx_vlan_commit_settings(vsc, port);
		if (ret)
		goto err;
		}

		update_vlan_table:
		ret = vsc73xx_update_vlan_table(vsc, port, vlan->vid, true);
		if (!ret)
		return 0;
		err:
		vsc73xx_bridge_vlan_remove_port(vsc73xx_vlan, port);
		return ret;
		}

		static int vsc73xx_port_vlan_del(struct dsa_switch *ds, int port,
		const struct switchdev_obj_port_vlan *vlan)
		{
		struct vsc73xx_bridge_vlan *vsc73xx_vlan;
		struct vsc73xx_portinfo *portinfo;
		struct vsc73xx *vsc = ds->priv;
		bool commit_to_hardware;
		int ret;

		ret = vsc73xx_update_vlan_table(vsc, port, vlan->vid, false);
		if (ret)
		return ret;

		portinfo = &vsc->portinfo[port];

		if (portinfo->pvid_vlan_filtering_configured &&
		portinfo->pvid_vlan_filtering == vlan->vid)
		portinfo->pvid_vlan_filtering_configured = false;

		vsc73xx_vlan = vsc73xx_bridge_vlan_find(vsc, vlan->vid);

		if (vsc73xx_vlan)
		vsc73xx_bridge_vlan_remove_port(vsc73xx_vlan, port);

		commit_to_hardware = !vsc73xx_tag_8021q_active(dsa_to_port(ds, port));
		if (commit_to_hardware)
		return vsc73xx_vlan_commit_settings(vsc, port);

		return 0;
		}

		static void vsc73xx_refresh_fwd_map(struct dsa_switch *ds, int port, u8 state)
		{
		struct dsa_port other_dp, dp = dsa_to_port(ds, port);
		@@ -1131,6 +1654,9 @@ static const struct dsa_switch_ops vsc73xx_ds_ops = {
		.port_change_mtu = vsc73xx_change_mtu,
		.port_max_mtu = vsc73xx_get_max_mtu,
		.port_stp_state_set = vsc73xx_port_stp_state_set,
		.port_vlan_filtering = vsc73xx_port_vlan_filtering,
		.port_vlan_add = vsc73xx_port_vlan_add,
		.port_vlan_del = vsc73xx_port_vlan_del,
		.phylink_get_caps = vsc73xx_phylink_get_caps,
		};

drivers/net/dsa/vitesse-vsc73xx.h

+37 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,22 @@
		*/
		#define VSC73XX_MAX_NUM_PORTS 8

		/**
		* struct vsc73xx_portinfo - port data structure: contains storage data
		* @pvid_vlan_filtering: pvid vlan number used in vlan filtering mode
		* @pvid_tag_8021q: pvid vlan number used in tag_8021q mode
		* @pvid_vlan_filtering_configured: informs if port has configured pvid in vlan
		* filtering mode
		* @pvid_tag_8021q_configured: imforms if port have configured pvid in tag_8021q
		* mode
		*/
		struct vsc73xx_portinfo {
		u16 pvid_vlan_filtering;
		u16 pvid_tag_8021q;
		bool pvid_vlan_filtering_configured;
		bool pvid_tag_8021q_configured;
		};

		/**
		* struct vsc73xx - VSC73xx state container: main data structure
		* @dev: The device pointer
		@@ -25,6 +41,10 @@
		* @addr: MAC address used in flow control frames
		* @ops: Structure with hardware-dependent operations
		* @priv: Pointer to the configuration interface structure
		* @portinfo: Storage table portinfo structructures
		* @vlans: List of configured vlans. Contains port mask and untagged status of
		* every vlan configured in port vlan operation. It doesn't cover tag_8021q
		* vlans.
		*/
		struct vsc73xx {
		struct device *dev;
		@@ -35,6 +55,8 @@ struct vsc73xx {
		u8 addr[ETH_ALEN];
		const struct vsc73xx_ops *ops;
		void *priv;
		struct vsc73xx_portinfo portinfo[VSC73XX_MAX_NUM_PORTS];
		struct list_head vlans;
		};

		/**
		@@ -49,6 +71,21 @@ struct vsc73xx_ops {
		u32 val);
		};

		/**
		* struct vsc73xx_bridge_vlan - VSC73xx driver structure which keeps vlan
		* database copy
		* @vid: VLAN number
		* @portmask: each bit represents one port
		* @untagged: each bit represents one port configured with @vid untagged
		* @list: list structure
		*/
		struct vsc73xx_bridge_vlan {
		u16 vid;
		u8 portmask;
		u8 untagged;
		struct list_head list;
		};

		int vsc73xx_is_addr_valid(u8 block, u8 subblock);
		int vsc73xx_probe(struct vsc73xx *vsc);
		void vsc73xx_remove(struct vsc73xx *vsc);