Commit 13807ded authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rtl8366-cleanups' 



Linus Walleij says:

====================
RTL8366(RB) cleanups part 1

This is a first set of patches making the RTL8366RB work out of
the box with a default OpenWrt userspace.

We achieve bridge port isolation with the first patch, and the
next 5 patches removes the very weird VLAN set-up with one
VLAN with PVID per port that has been in this driver in all
vendor trees and in OpenWrt for years.

The switch is now managed the way a modern bridge/DSA switch
shall be managed.

After these patches are merged, I will send the next set which
adds new features, some which have circulated before.

ChangeLog v4->v5:
- Drop the patch disabling 4K VLAN.
- Drop the patch forcing VLAN0 untagged.
- Fix a semantic bug in the filer enablement code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d06d54a3 d310b14a

drivers/net/dsa/realtek-smi-core.h

+0 −3
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port, 
int rtl8366_enable_vlan4k(struct realtek_smi *smi, bool enable);

int rtl8366_enable_vlan(struct realtek_smi *smi, bool enable);

int rtl8366_reset_vlan(struct realtek_smi *smi);

int rtl8366_init_vlan(struct realtek_smi *smi);

int rtl8366_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,

			   struct netlink_ext_ack *extack);

int rtl8366_vlan_add(struct dsa_switch *ds, int port,

		     const struct switchdev_obj_port_vlan *vlan,

		     struct netlink_ext_ack *extack);

drivers/net/dsa/rtl8366.c

+5 −91
Original line number Diff line number Diff line
@@ -292,89 +292,6 @@ int rtl8366_reset_vlan(struct realtek_smi *smi) 
}

EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);



int rtl8366_init_vlan(struct realtek_smi *smi)

{

	int port;

	int ret;



	ret = rtl8366_reset_vlan(smi);

	if (ret)

		return ret;



	/* Loop over the available ports, for each port, associate

	 * it with the VLAN (port+1)

	 */

	for (port = 0; port < smi->num_ports; port++) {

		u32 mask;



		if (port == smi->cpu_port)

			/* For the CPU port, make all ports members of this

			 * VLAN.

			 */

			mask = GENMASK((int)smi->num_ports - 1, 0);

		else

			/* For all other ports, enable itself plus the

			 * CPU port.

			 */

			mask = BIT(port) | BIT(smi->cpu_port);



		/* For each port, set the port as member of VLAN (port+1)

		 * and untagged, except for the CPU port: the CPU port (5) is

		 * member of VLAN 6 and so are ALL the other ports as well.

		 * Use filter 0 (no filter).

		 */

		dev_info(smi->dev, "VLAN%d port mask for port %d, %08x\n",

			 (port + 1), port, mask);

		ret = rtl8366_set_vlan(smi, (port + 1), mask, mask, 0);

		if (ret)

			return ret;



		dev_info(smi->dev, "VLAN%d port %d, PVID set to %d\n",

			 (port + 1), port, (port + 1));

		ret = rtl8366_set_pvid(smi, port, (port + 1));

		if (ret)

			return ret;

	}



	return rtl8366_enable_vlan(smi, true);

}

EXPORT_SYMBOL_GPL(rtl8366_init_vlan);



int rtl8366_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,

			   struct netlink_ext_ack *extack)

{

	struct realtek_smi *smi = ds->priv;

	struct rtl8366_vlan_4k vlan4k;

	int ret;



	/* Use VLAN nr port + 1 since VLAN0 is not valid */

	if (!smi->ops->is_vlan_valid(smi, port + 1))

		return -EINVAL;



	dev_info(smi->dev, "%s filtering on port %d\n",

		 vlan_filtering ? "enable" : "disable",

		 port);



	/* TODO:

	 * The hardware support filter ID (FID) 0..7, I have no clue how to

	 * support this in the driver when the callback only says on/off.

	 */

	ret = smi->ops->get_vlan_4k(smi, port + 1, &vlan4k);

	if (ret)

		return ret;



	/* Just set the filter to FID 1 for now then */

	ret = rtl8366_set_vlan(smi, port + 1,

			       vlan4k.member,

			       vlan4k.untag,

			       1);

	if (ret)

		return ret;



	return 0;

}

EXPORT_SYMBOL_GPL(rtl8366_vlan_filtering);



int rtl8366_vlan_add(struct dsa_switch *ds, int port,

		     const struct switchdev_obj_port_vlan *vlan,

		     struct netlink_ext_ack *extack)
@@ -401,13 +318,10 @@ int rtl8366_vlan_add(struct dsa_switch *ds, int port, 
		return ret;

	}



	dev_info(smi->dev, "add VLAN %d on port %d, %s, %s\n",

	dev_dbg(smi->dev, "add VLAN %d on port %d, %s, %s\n",

		vlan->vid, port, untagged ? "untagged" : "tagged",

		pvid ? "PVID" : "no PVID");



	if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))

		dev_err(smi->dev, "port is DSA or CPU port\n");



	member |= BIT(port);



	if (untagged)
@@ -439,7 +353,7 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port, 
	struct realtek_smi *smi = ds->priv;

	int ret, i;



	dev_info(smi->dev, "del VLAN %04x on port %d\n", vlan->vid, port);

	dev_dbg(smi->dev, "del VLAN %d on port %d\n", vlan->vid, port);



	for (i = 0; i < smi->num_vlan_mc; i++) {

		struct rtl8366_vlan_mc vlanmc;
@@ -457,7 +371,7 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port, 
			 * anymore then clear the whole member

			 * config so it can be reused.

			 */

			if (!vlanmc.member && vlanmc.untag) {

			if (!vlanmc.member) {

				vlanmc.vid = 0;

				vlanmc.priority = 0;

				vlanmc.fid = 0;

drivers/net/dsa/rtl8366rb.c

+183 −11
Original line number Diff line number Diff line
@@ -143,6 +143,21 @@ 
#define RTL8366RB_PHY_NO_OFFSET			9

#define RTL8366RB_PHY_NO_MASK			(0x1f << 9)



/* VLAN Ingress Control Register 1, one bit per port.

 * bit 0 .. 5 will make the switch drop ingress frames without

 * VID such as untagged or priority-tagged frames for respective

 * port.

 * bit 6 .. 11 will make the switch drop ingress frames carrying

 * a C-tag with VID != 0 for respective port.

 */

#define RTL8366RB_VLAN_INGRESS_CTRL1_REG	0x037E

#define RTL8366RB_VLAN_INGRESS_CTRL1_DROP(port)	(BIT((port)) | BIT((port) + 6))



/* VLAN Ingress Control Register 2, one bit per port.

 * bit0 .. bit5 will make the switch drop all ingress frames with

 * a VLAN classification that does not include the port is in its

 * member set.

 */

#define RTL8366RB_VLAN_INGRESS_CTRL2_REG	0x037f



/* LED control registers */
@@ -300,6 +315,13 @@ 
#define RTL8366RB_INTERRUPT_STATUS_REG	0x0442

#define RTL8366RB_NUM_INTERRUPT		14 /* 0..13 */



/* Port isolation registers */

#define RTL8366RB_PORT_ISO_BASE		0x0F08

#define RTL8366RB_PORT_ISO(pnum)	(RTL8366RB_PORT_ISO_BASE + (pnum))

#define RTL8366RB_PORT_ISO_EN		BIT(0)

#define RTL8366RB_PORT_ISO_PORTS_MASK	GENMASK(7, 1)

#define RTL8366RB_PORT_ISO_PORTS(pmask)	((pmask) << 1)



/* bits 0..5 enable force when cleared */

#define RTL8366RB_MAC_FORCE_CTRL_REG	0x0F11
@@ -314,9 +336,13 @@ 
/**

 * struct rtl8366rb - RTL8366RB-specific data

 * @max_mtu: per-port max MTU setting

 * @pvid_enabled: if PVID is set for respective port

 * @vlan_filtering: if VLAN filtering is enabled for respective port

 */

struct rtl8366rb {

	unsigned int max_mtu[RTL8366RB_NUM_PORTS];

	bool pvid_enabled[RTL8366RB_NUM_PORTS];

	bool vlan_filtering[RTL8366RB_NUM_PORTS];

};



static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
@@ -835,6 +861,21 @@ static int rtl8366rb_setup(struct dsa_switch *ds) 
	if (ret)

		return ret;



	/* Isolate all user ports so they can only send packets to itself and the CPU port */

	for (i = 0; i < RTL8366RB_PORT_NUM_CPU; i++) {

		ret = regmap_write(smi->map, RTL8366RB_PORT_ISO(i),

				   RTL8366RB_PORT_ISO_PORTS(BIT(RTL8366RB_PORT_NUM_CPU)) |

				   RTL8366RB_PORT_ISO_EN);

		if (ret)

			return ret;

	}

	/* CPU port can send packets to all ports */

	ret = regmap_write(smi->map, RTL8366RB_PORT_ISO(RTL8366RB_PORT_NUM_CPU),

			   RTL8366RB_PORT_ISO_PORTS(dsa_user_ports(ds)) |

			   RTL8366RB_PORT_ISO_EN);

	if (ret)

		return ret;



	/* Set up the "green ethernet" feature */

	ret = rtl8366rb_jam_table(rtl8366rb_green_jam,

				  ARRAY_SIZE(rtl8366rb_green_jam), smi, false);
@@ -911,11 +952,13 @@ static int rtl8366rb_setup(struct dsa_switch *ds) 
	if (ret)

		return ret;



	/* Discard VLAN tagged packets if the port is not a member of

	 * the VLAN with which the packets is associated.

	 */

	/* Accept all packets by default, we enable filtering on-demand */

	ret = regmap_write(smi->map, RTL8366RB_VLAN_INGRESS_CTRL1_REG,

			   0);

	if (ret)

		return ret;

	ret = regmap_write(smi->map, RTL8366RB_VLAN_INGRESS_CTRL2_REG,

			   RTL8366RB_PORT_ALL);

			   0);

	if (ret)

		return ret;
@@ -963,7 +1006,7 @@ static int rtl8366rb_setup(struct dsa_switch *ds) 
			return ret;

	}



	ret = rtl8366_init_vlan(smi);

	ret = rtl8366_reset_vlan(smi);

	if (ret)

		return ret;
@@ -977,8 +1020,6 @@ static int rtl8366rb_setup(struct dsa_switch *ds) 
		return -ENODEV;

	}



	ds->configure_vlan_while_not_filtering = false;



	return 0;

}
@@ -1127,6 +1168,115 @@ rtl8366rb_port_disable(struct dsa_switch *ds, int port) 
	rb8366rb_set_port_led(smi, port, false);

}



static int

rtl8366rb_port_bridge_join(struct dsa_switch *ds, int port,

			   struct net_device *bridge)

{

	struct realtek_smi *smi = ds->priv;

	unsigned int port_bitmap = 0;

	int ret, i;



	/* Loop over all other ports than the current one */

	for (i = 0; i < RTL8366RB_PORT_NUM_CPU; i++) {

		/* Current port handled last */

		if (i == port)

			continue;

		/* Not on this bridge */

		if (dsa_to_port(ds, i)->bridge_dev != bridge)

			continue;

		/* Join this port to each other port on the bridge */

		ret = regmap_update_bits(smi->map, RTL8366RB_PORT_ISO(i),

					 RTL8366RB_PORT_ISO_PORTS(BIT(port)),

					 RTL8366RB_PORT_ISO_PORTS(BIT(port)));

		if (ret)

			dev_err(smi->dev, "failed to join port %d\n", port);



		port_bitmap |= BIT(i);

	}



	/* Set the bits for the ports we can access */

	return regmap_update_bits(smi->map, RTL8366RB_PORT_ISO(port),

				  RTL8366RB_PORT_ISO_PORTS(port_bitmap),

				  RTL8366RB_PORT_ISO_PORTS(port_bitmap));

}



static void

rtl8366rb_port_bridge_leave(struct dsa_switch *ds, int port,

			    struct net_device *bridge)

{

	struct realtek_smi *smi = ds->priv;

	unsigned int port_bitmap = 0;

	int ret, i;



	/* Loop over all other ports than this one */

	for (i = 0; i < RTL8366RB_PORT_NUM_CPU; i++) {

		/* Current port handled last */

		if (i == port)

			continue;

		/* Not on this bridge */

		if (dsa_to_port(ds, i)->bridge_dev != bridge)

			continue;

		/* Remove this port from any other port on the bridge */

		ret = regmap_update_bits(smi->map, RTL8366RB_PORT_ISO(i),

					 RTL8366RB_PORT_ISO_PORTS(BIT(port)), 0);

		if (ret)

			dev_err(smi->dev, "failed to leave port %d\n", port);



		port_bitmap |= BIT(i);

	}



	/* Clear the bits for the ports we can not access, leave ourselves */

	regmap_update_bits(smi->map, RTL8366RB_PORT_ISO(port),

			   RTL8366RB_PORT_ISO_PORTS(port_bitmap), 0);

}



/**

 * rtl8366rb_drop_untagged() - make the switch drop untagged and C-tagged frames

 * @smi: SMI state container

 * @port: the port to drop untagged and C-tagged frames on

 * @drop: whether to drop or pass untagged and C-tagged frames

 */

static int rtl8366rb_drop_untagged(struct realtek_smi *smi, int port, bool drop)

{

	return regmap_update_bits(smi->map, RTL8366RB_VLAN_INGRESS_CTRL1_REG,

				  RTL8366RB_VLAN_INGRESS_CTRL1_DROP(port),

				  drop ? RTL8366RB_VLAN_INGRESS_CTRL1_DROP(port) : 0);

}



static int rtl8366rb_vlan_filtering(struct dsa_switch *ds, int port,

				    bool vlan_filtering,

				    struct netlink_ext_ack *extack)

{

	struct realtek_smi *smi = ds->priv;

	struct rtl8366rb *rb;

	int ret;



	rb = smi->chip_data;



	dev_dbg(smi->dev, "port %d: %s VLAN filtering\n", port,

		vlan_filtering ? "enable" : "disable");



	/* If the port is not in the member set, the frame will be dropped */

	ret = regmap_update_bits(smi->map, RTL8366RB_VLAN_INGRESS_CTRL2_REG,

				 BIT(port), vlan_filtering ? BIT(port) : 0);

	if (ret)

		return ret;



	/* Keep track if filtering is enabled on each port */

	rb->vlan_filtering[port] = vlan_filtering;



	/* If VLAN filtering is enabled and PVID is also enabled, we must

	 * not drop any untagged or C-tagged frames. If we turn off VLAN

	 * filtering on a port, we need ti accept any frames.

	 */

	if (vlan_filtering)

		ret = rtl8366rb_drop_untagged(smi, port, !rb->pvid_enabled[port]);

	else

		ret = rtl8366rb_drop_untagged(smi, port, false);



	return ret;

}



static int rtl8366rb_change_mtu(struct dsa_switch *ds, int port, int new_mtu)

{

	struct realtek_smi *smi = ds->priv;
@@ -1338,24 +1488,44 @@ static int rtl8366rb_get_mc_index(struct realtek_smi *smi, int port, int *val) 


static int rtl8366rb_set_mc_index(struct realtek_smi *smi, int port, int index)

{

	struct rtl8366rb *rb;

	bool pvid_enabled;

	int ret;



	rb = smi->chip_data;

	pvid_enabled = !!index;



	if (port >= smi->num_ports || index >= RTL8366RB_NUM_VLANS)

		return -EINVAL;



	return regmap_update_bits(smi->map, RTL8366RB_PORT_VLAN_CTRL_REG(port),

	ret = regmap_update_bits(smi->map, RTL8366RB_PORT_VLAN_CTRL_REG(port),

				RTL8366RB_PORT_VLAN_CTRL_MASK <<

					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port),

				(index & RTL8366RB_PORT_VLAN_CTRL_MASK) <<

					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port));

	if (ret)

		return ret;



	rb->pvid_enabled[port] = pvid_enabled;



	/* If VLAN filtering is enabled and PVID is also enabled, we must

	 * not drop any untagged or C-tagged frames. Make sure to update the

	 * filtering setting.

	 */

	if (rb->vlan_filtering[port])

		ret = rtl8366rb_drop_untagged(smi, port, !pvid_enabled);



	return ret;

}



static bool rtl8366rb_is_vlan_valid(struct realtek_smi *smi, unsigned int vlan)

{

	unsigned int max = RTL8366RB_NUM_VLANS;

	unsigned int max = RTL8366RB_NUM_VLANS - 1;



	if (smi->vlan4k_enabled)

		max = RTL8366RB_NUM_VIDS - 1;



	if (vlan == 0 || vlan > max)

	if (vlan > max)

		return false;



	return true;
@@ -1510,7 +1680,9 @@ static const struct dsa_switch_ops rtl8366rb_switch_ops = { 
	.get_strings = rtl8366_get_strings,

	.get_ethtool_stats = rtl8366_get_ethtool_stats,

	.get_sset_count = rtl8366_get_sset_count,

	.port_vlan_filtering = rtl8366_vlan_filtering,

	.port_bridge_join = rtl8366rb_port_bridge_join,

	.port_bridge_leave = rtl8366rb_port_bridge_leave,

	.port_vlan_filtering = rtl8366rb_vlan_filtering,

	.port_vlan_add = rtl8366_vlan_add,

	.port_vlan_del = rtl8366_vlan_del,

	.port_enable = rtl8366rb_port_enable,