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

Merge branch 'RTL8366-stabilization' 



Linus Walleij says:

====================
RTL8366 stabilization

This stabilizes the RTL8366 driver by checking validity
of the passed VLANs and refactoring the member config
(MC) code so we do not require strict call order and
de-duplicate some code.

Changes from v1: incorporate review comments on patch
2.

Changes from v2: a oneline bug fix in patch 2.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c6f4c2b0 7e1301ed

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

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ struct rtl8366_mib_counter { 
	const char	*name;

};



/**

 * struct rtl8366_vlan_mc - Virtual LAN member configuration

 */

struct rtl8366_vlan_mc {

	u16	vid;

	u16	untag;
@@ -119,7 +122,6 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi); 
int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used);

int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,

		     u32 untag, u32 fid);

int rtl8366_get_pvid(struct realtek_smi *smi, int port, int *val);

int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port,

		     unsigned int vid);

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

drivers/net/dsa/rtl8366.c

+148 −129
Original line number Diff line number Diff line
@@ -36,160 +36,186 @@ int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used) 
}

EXPORT_SYMBOL_GPL(rtl8366_mc_is_used);



int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,

		     u32 untag, u32 fid)

/**

 * rtl8366_obtain_mc() - retrieve or allocate a VLAN member configuration

 * @smi: the Realtek SMI device instance

 * @vid: the VLAN ID to look up or allocate

 * @vlanmc: the pointer will be assigned to a pointer to a valid member config

 * if successful

 * @return: index of a new member config or negative error number

 */

static int rtl8366_obtain_mc(struct realtek_smi *smi, int vid,

			     struct rtl8366_vlan_mc *vlanmc)

{

	struct rtl8366_vlan_4k vlan4k;

	int ret;

	int i;



	dev_dbg(smi->dev,

		"setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",

		vid, member, untag);



	/* Update the 4K table */

	ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k);

	if (ret)

		return ret;



	vlan4k.member |= member;

	vlan4k.untag |= untag;

	vlan4k.fid = fid;

	ret = smi->ops->set_vlan_4k(smi, &vlan4k);

	if (ret)

	/* Try to find an existing member config entry for this VID */

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

		ret = smi->ops->get_vlan_mc(smi, i, vlanmc);

		if (ret) {

			dev_err(smi->dev, "error searching for VLAN MC %d for VID %d\n",

				i, vid);

			return ret;

		}



	dev_dbg(smi->dev,

		"resulting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",

		vid, vlan4k.member, vlan4k.untag);

		if (vid == vlanmc->vid)

			return i;

	}



	/* Try to find an existing MC entry for this VID */

	/* We have no MC entry for this VID, try to find an empty one */

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

		struct rtl8366_vlan_mc vlanmc;



		ret = smi->ops->get_vlan_mc(smi, i, &vlanmc);

		if (ret)

		ret = smi->ops->get_vlan_mc(smi, i, vlanmc);

		if (ret) {

			dev_err(smi->dev, "error searching for VLAN MC %d for VID %d\n",

				i, vid);

			return ret;



		if (vid == vlanmc.vid) {

			/* update the MC entry */

			vlanmc.member |= member;

			vlanmc.untag |= untag;

			vlanmc.fid = fid;



			ret = smi->ops->set_vlan_mc(smi, i, &vlanmc);



			dev_dbg(smi->dev,

				"resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n",

				vid, vlanmc.member, vlanmc.untag);



			break;

		}



		if (vlanmc->vid == 0 && vlanmc->member == 0) {

			/* Update the entry from the 4K table */

			ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k);

			if (ret) {

				dev_err(smi->dev, "error looking for 4K VLAN MC %d for VID %d\n",

					i, vid);

				return ret;

			}



			vlanmc->vid = vid;

			vlanmc->member = vlan4k.member;

			vlanmc->untag = vlan4k.untag;

			vlanmc->fid = vlan4k.fid;

			ret = smi->ops->set_vlan_mc(smi, i, vlanmc);

			if (ret) {

				dev_err(smi->dev, "unable to set/update VLAN MC %d for VID %d\n",

					i, vid);

				return ret;

			}

EXPORT_SYMBOL_GPL(rtl8366_set_vlan);



int rtl8366_get_pvid(struct realtek_smi *smi, int port, int *val)

{

	struct rtl8366_vlan_mc vlanmc;

	int ret;

	int index;

			dev_dbg(smi->dev, "created new MC at index %d for VID %d\n",

				i, vid);

			return i;

		}

	}



	/* MC table is full, try to find an unused entry and replace it */

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

		int used;



	ret = smi->ops->get_mc_index(smi, port, &index);

		ret = rtl8366_mc_is_used(smi, i, &used);

		if (ret)

			return ret;



	ret = smi->ops->get_vlan_mc(smi, index, &vlanmc);

		if (!used) {

			/* Update the entry from the 4K table */

			ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k);

			if (ret)

				return ret;



	*val = vlanmc.vid;

	return 0;

			vlanmc->vid = vid;

			vlanmc->member = vlan4k.member;

			vlanmc->untag = vlan4k.untag;

			vlanmc->fid = vlan4k.fid;

			ret = smi->ops->set_vlan_mc(smi, i, vlanmc);

			if (ret) {

				dev_err(smi->dev, "unable to set/update VLAN MC %d for VID %d\n",

					i, vid);

				return ret;

			}

			dev_dbg(smi->dev, "recycled MC at index %i for VID %d\n",

				i, vid);

			return i;

		}

	}

EXPORT_SYMBOL_GPL(rtl8366_get_pvid);



int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port,

		     unsigned int vid)

	dev_err(smi->dev, "all VLAN member configurations are in use\n");

	return -ENOSPC;

}



int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,

		     u32 untag, u32 fid)

{

	struct rtl8366_vlan_mc vlanmc;

	struct rtl8366_vlan_4k vlan4k;

	int mc;

	int ret;

	int i;



	/* Try to find an existing MC entry for this VID */

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

		ret = smi->ops->get_vlan_mc(smi, i, &vlanmc);

	if (!smi->ops->is_vlan_valid(smi, vid))

		return -EINVAL;



	dev_dbg(smi->dev,

		"setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",

		vid, member, untag);



	/* Update the 4K table */

	ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k);

	if (ret)

		return ret;



		if (vid == vlanmc.vid) {

			ret = smi->ops->set_vlan_mc(smi, i, &vlanmc);

	vlan4k.member |= member;

	vlan4k.untag |= untag;

	vlan4k.fid = fid;

	ret = smi->ops->set_vlan_4k(smi, &vlan4k);

	if (ret)

		return ret;



			ret = smi->ops->set_mc_index(smi, port, i);

			return ret;

		}

	}

	dev_dbg(smi->dev,

		"resulting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",

		vid, vlan4k.member, vlan4k.untag);



	/* We have no MC entry for this VID, try to find an empty one */

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

		ret = smi->ops->get_vlan_mc(smi, i, &vlanmc);

		if (ret)

	/* Find or allocate a member config for this VID */

	ret = rtl8366_obtain_mc(smi, vid, &vlanmc);

	if (ret < 0)

		return ret;

	mc = ret;



		if (vlanmc.vid == 0 && vlanmc.member == 0) {

			/* Update the entry from the 4K table */

			ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k);

			if (ret)

				return ret;

	/* Update the MC entry */

	vlanmc.member |= member;

	vlanmc.untag |= untag;

	vlanmc.fid = fid;



			vlanmc.vid = vid;

			vlanmc.member = vlan4k.member;

			vlanmc.untag = vlan4k.untag;

			vlanmc.fid = vlan4k.fid;

			ret = smi->ops->set_vlan_mc(smi, i, &vlanmc);

	/* Commit updates to the MC entry */

	ret = smi->ops->set_vlan_mc(smi, mc, &vlanmc);

	if (ret)

				return ret;

		dev_err(smi->dev, "failed to commit changes to VLAN MC index %d for VID %d\n",

			mc, vid);

	else

		dev_dbg(smi->dev,

			"resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n",

			vid, vlanmc.member, vlanmc.untag);



			ret = smi->ops->set_mc_index(smi, port, i);

	return ret;

}

	}



	/* MC table is full, try to find an unused entry and replace it */

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

		int used;

EXPORT_SYMBOL_GPL(rtl8366_set_vlan);



		ret = rtl8366_mc_is_used(smi, i, &used);

		if (ret)

			return ret;

int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port,

		     unsigned int vid)

{

	struct rtl8366_vlan_mc vlanmc;

	int mc;

	int ret;



		if (!used) {

			/* Update the entry from the 4K table */

			ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k);

			if (ret)

				return ret;

	if (!smi->ops->is_vlan_valid(smi, vid))

		return -EINVAL;



			vlanmc.vid = vid;

			vlanmc.member = vlan4k.member;

			vlanmc.untag = vlan4k.untag;

			vlanmc.fid = vlan4k.fid;

			ret = smi->ops->set_vlan_mc(smi, i, &vlanmc);

			if (ret)

	/* Find or allocate a member config for this VID */

	ret = rtl8366_obtain_mc(smi, vid, &vlanmc);

	if (ret < 0)

		return ret;

	mc = ret;



			ret = smi->ops->set_mc_index(smi, port, i);

	ret = smi->ops->set_mc_index(smi, port, mc);

	if (ret) {

		dev_err(smi->dev, "set PVID: failed to set MC index %d for port %d\n",

			mc, port);

		return ret;

	}

	}



	dev_err(smi->dev,

		"all VLAN member configurations are in use\n");

	dev_dbg(smi->dev, "set PVID: the PVID for port %d set to %d using existing MC index %d\n",

		port, vid, mc);



	return -ENOSPC;

	return 0;

}

EXPORT_SYMBOL_GPL(rtl8366_set_pvid);
@@ -389,7 +415,8 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, 
		if (!smi->ops->is_vlan_valid(smi, vid))

			return;



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

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

		 vlan->vid_begin,

		 port,

		 untagged ? "untagged" : "tagged",

		 pvid ? " PVID" : "no PVID");
@@ -398,34 +425,26 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, 
		dev_err(smi->dev, "port is DSA or CPU port\n");



	for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) {

		int pvid_val = 0;



		dev_info(smi->dev, "add VLAN %04x\n", vid);

		member |= BIT(port);



		if (untagged)

			untag |= BIT(port);



		/* To ensure that we have a valid MC entry for this VLAN,

		 * initialize the port VLAN ID here.

		 */

		ret = rtl8366_get_pvid(smi, port, &pvid_val);

		if (ret < 0) {

			dev_err(smi->dev, "could not lookup PVID for port %d\n",

				port);

			return;

		}

		if (pvid_val == 0) {

			ret = rtl8366_set_pvid(smi, port, vid);

			if (ret < 0)

				return;

		}



		ret = rtl8366_set_vlan(smi, vid, member, untag, 0);

		if (ret)

			dev_err(smi->dev,

				"failed to set up VLAN %04x",

				vid);



		ret = rtl8366_set_pvid(smi, port, vid);

		if (ret)

			dev_err(smi->dev,

				"failed to set PVID on port %d to VLAN %04x",

				port, vid);



		if (!ret)

			dev_dbg(smi->dev, "VLAN add: added VLAN %d with PVID on port %d\n",

				vid, port);

	}

}

EXPORT_SYMBOL_GPL(rtl8366_vlan_add);

CRA Git | Maintained and supported by SUSTech CRA and CCSE