X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fgeneric%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Frtl8366s.c;h=6e55ccde6e0c9d7ba49bb5b4430b7d0c4d4ec777;hb=d59f0a0930a70de5c9f25102ae7ea9419e1e3566;hp=fa3f3cd652a24e1c99eb28cae71eb035d27cf21f;hpb=7a3a11aca6c39977f3022366a3c10f21f19876a7;p=openwrt.git

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index fa3f3cd652..6e55ccde6e 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -170,7 +170,6 @@ struct rtl8366s {
 	struct device		*parent;
 	struct rtl8366_smi	smi;
 	struct switch_dev	dev;
-	char			buf[4096];
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
 	struct dentry           *debugfs_root;
 #endif
@@ -661,170 +660,6 @@ static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
 					RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
 }
 
-static int rtl8366s_set_vlan(struct rtl8366_smi *smi, int vid, u32 member,
-			     u32 untag, u32 fid)
-{
-	struct rtl8366_vlan_4k vlan4k;
-	int err;
-	int i;
-
-	/* Update the 4K table */
-	err = smi->ops->get_vlan_4k(smi, vid, &vlan4k);
-	if (err)
-		return err;
-
-	vlan4k.member = member;
-	vlan4k.untag = untag;
-	vlan4k.fid = fid;
-	err = smi->ops->set_vlan_4k(smi, &vlan4k);
-	if (err)
-		return err;
-
-	/* Try to find an existing MC entry for this VID */
-	for (i = 0; i < smi->num_vlan_mc; i++) {
-		struct rtl8366_vlan_mc vlanmc;
-
-		err = smi->ops->get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vid == vlanmc.vid) {
-			/* update the MC entry */
-			vlanmc.member = member;
-			vlanmc.untag = untag;
-			vlanmc.fid = fid;
-
-			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-			break;
-		}
-	}
-
-	return err;
-}
-
-static int rtl8366s_get_pvid(struct rtl8366_smi *smi, int port, int *val)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	int err;
-	int index;
-
-	err = smi->ops->get_mc_index(smi, port, &index);
-	if (err)
-		return err;
-
-	err = smi->ops->get_vlan_mc(smi, index, &vlanmc);
-	if (err)
-		return err;
-
-	*val = vlanmc.vid;
-	return 0;
-}
-
-static int rtl8366s_mc_is_used(struct rtl8366_smi *smi, int mc_index,
-			       int *used)
-{
-	int err;
-	int i;
-
-	*used = 0;
-	for (i = 0; i < smi->num_ports; i++) {
-		int index = 0;
-
-		err = smi->ops->get_mc_index(smi, i, &index);
-		if (err)
-			return err;
-
-		if (mc_index == index) {
-			*used = 1;
-			break;
-		}
-	}
-
-	return 0;
-}
-
-static int rtl8366s_set_pvid(struct rtl8366_smi *smi, unsigned port,
-			     unsigned vid)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	struct rtl8366_vlan_4k vlan4k;
-	int err;
-	int i;
-
-	/* Try to find an existing MC entry for this VID */
-	for (i = 0; i < smi->num_vlan_mc; i++) {
-		err = smi->ops->get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vid == vlanmc.vid) {
-			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = smi->ops->set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	/* We have no MC entry for this VID, try to find an empty one */
-	for (i = 0; i < smi->num_vlan_mc; i++) {
-		err = smi->ops->get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vlanmc.vid == 0 && vlanmc.member == 0) {
-			/* Update the entry from the 4K table */
-			err = smi->ops->get_vlan_4k(smi, vid, &vlan4k);
-			if (err)
-				return err;
-
-			vlanmc.vid = vid;
-			vlanmc.member = vlan4k.member;
-			vlanmc.untag = vlan4k.untag;
-			vlanmc.fid = vlan4k.fid;
-			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = smi->ops->set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	/* MC table is full, try to find an unused entry and replace it */
-	for (i = 0; i < smi->num_vlan_mc; i++) {
-		int used;
-
-		err = rtl8366s_mc_is_used(smi, i, &used);
-		if (err)
-			return err;
-
-		if (!used) {
-			/* Update the entry from the 4K table */
-			err = smi->ops->get_vlan_4k(smi, vid, &vlan4k);
-			if (err)
-				return err;
-
-			vlanmc.vid = vid;
-			vlanmc.member = vlan4k.member;
-			vlanmc.untag = vlan4k.untag;
-			vlanmc.fid = vlan4k.fid;
-			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = smi->ops->set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	dev_err(smi->parent,
-		"all VLAN member configurations are in use\n");
-
-	return -ENOSPC;
-}
-
 static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
 {
 	return rtl8366_smi_rmwr(smi, RTL8366S_CHIP_GLOBAL_CTRL_REG,
@@ -838,43 +673,6 @@ static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
 				1, (enable) ? 1 : 0);
 }
 
-static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	int err;
-	int i;
-
-	/* clear VLAN member configurations */
-	vlanmc.vid = 0;
-	vlanmc.priority = 0;
-	vlanmc.member = 0;
-	vlanmc.untag = 0;
-	vlanmc.fid = 0;
-	for (i = 0; i < smi->num_vlan_mc; i++) {
-		err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-	}
-
-	for (i = 0; i < smi->num_ports; i++) {
-		if (i == smi->cpu_port)
-			continue;
-
-		err = rtl8366s_set_vlan(smi, (i + 1),
-					 (1 << i) | (1 << smi->cpu_port),
-					 (1 << i) | (1 << smi->cpu_port),
-					 0);
-		if (err)
-			return err;
-
-		err = rtl8366s_set_pvid(smi, i, (i + 1));
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
 static int rtl8366s_debugfs_open(struct inode *inode, struct file *file)
 {
@@ -889,30 +687,30 @@ static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
 	struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
 	struct rtl8366_smi *smi = &rtl->smi;
 	int i, j, len = 0;
-	char *buf = rtl->buf;
+	char *buf = smi->buf;
 
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
 			"%-36s %12s %12s %12s %12s %12s %12s\n",
 			"Counter",
 			"Port 0", "Port 1", "Port 2",
 			"Port 3", "Port 4", "Port 5");
 
 	for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "%-36s ",
+		len += snprintf(buf + len, sizeof(smi->buf) - len, "%-36s ",
 				rtl8366s_mib_counters[i].name);
 		for (j = 0; j < RTL8366S_NUM_PORTS; ++j) {
 			unsigned long long counter = 0;
 
 			if (!rtl8366_get_mib_counter(smi, i, j, &counter))
 				len += snprintf(buf + len,
-						sizeof(rtl->buf) - len,
+						sizeof(smi->buf) - len,
 						"%12llu ", counter);
 			else
 				len += snprintf(buf + len,
-						sizeof(rtl->buf) - len,
+						sizeof(smi->buf) - len,
 						"%12s ", "error");
 		}
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
+		len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
 	}
 
 	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
@@ -925,9 +723,9 @@ static ssize_t rtl8366s_read_debugfs_vlan_mc(struct file *file,
 	struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
 	struct rtl8366_smi *smi = &rtl->smi;
 	int i, len = 0;
-	char *buf = rtl->buf;
+	char *buf = smi->buf;
 
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
 			"%2s %6s %4s %6s %6s %3s\n",
 			"id", "vid","prio", "member", "untag", "fid");
 
@@ -936,7 +734,7 @@ static ssize_t rtl8366s_read_debugfs_vlan_mc(struct file *file,
 
 		rtl8366s_get_vlan_mc(smi, i, &vlanmc);
 
-		len += snprintf(buf + len, sizeof(rtl->buf) - len,
+		len += snprintf(buf + len, sizeof(smi->buf) - len,
 				"%2d %6d %4d 0x%04x 0x%04x %3d\n",
 				i, vlanmc.vid, vlanmc.priority,
 				vlanmc.member, vlanmc.untag, vlanmc.fid);
@@ -953,18 +751,18 @@ static ssize_t rtl8366s_read_debugfs_reg(struct file *file,
 	struct rtl8366_smi *smi = &rtl->smi;
 	u32 t, reg = g_dbg_reg;
 	int err, len = 0;
-	char *buf = rtl->buf;
+	char *buf = smi->buf;
 
-	memset(buf, '\0', sizeof(rtl->buf));
+	memset(buf, '\0', sizeof(smi->buf));
 
 	err = rtl8366_smi_read_reg(smi, reg, &t);
 	if (err) {
-		len += snprintf(buf, sizeof(rtl->buf),
+		len += snprintf(buf, sizeof(smi->buf),
 				"Read failed (reg: 0x%04x)\n", reg);
 		return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 	}
 
-	len += snprintf(buf, sizeof(rtl->buf), "reg = 0x%04x, val = 0x%04x\n",
+	len += snprintf(buf, sizeof(smi->buf), "reg = 0x%04x, val = 0x%04x\n",
 			reg, t);
 
 	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
@@ -980,9 +778,9 @@ static ssize_t rtl8366s_write_debugfs_reg(struct file *file,
 	u32 reg = g_dbg_reg;
 	int err;
 	size_t len;
-	char *buf = rtl->buf;
+	char *buf = smi->buf;
 
-	len = min(count, sizeof(rtl->buf) - 1);
+	len = min(count, sizeof(smi->buf) - 1);
 	if (copy_from_user(buf, user_buf, len)) {
 		dev_err(rtl->parent, "copy from user failed\n");
 		return -EFAULT;
@@ -1182,14 +980,13 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
 				     const struct switch_attr *attr,
 				     struct switch_val *val)
 {
-	struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 	u32 len = 0, data = 0;
 
 	if (val->port_vlan >= RTL8366S_NUM_PORTS)
 		return -EINVAL;
 
-	memset(rtl->buf, '\0', sizeof(rtl->buf));
+	memset(smi->buf, '\0', sizeof(smi->buf));
 	rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
 			     (val->port_vlan / 2), &data);
 
@@ -1197,7 +994,7 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
 		data = data >> 8;
 
 	if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
-		len = snprintf(rtl->buf, sizeof(rtl->buf),
+		len = snprintf(smi->buf, sizeof(smi->buf),
 				"port:%d link:up speed:%s %s-duplex %s%s%s",
 				val->port_vlan,
 				rtl8366s_speed_str(data &
@@ -1211,11 +1008,11 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
 				(data & RTL8366S_PORT_STATUS_AN_MASK) ?
 					"nway ": "");
 	} else {
-		len = snprintf(rtl->buf, sizeof(rtl->buf), "port:%d link: down",
+		len = snprintf(smi->buf, sizeof(smi->buf), "port:%d link: down",
 				val->port_vlan);
 	}
 
-	val->value.s = rtl->buf;
+	val->value.s = smi->buf;
 	val->len = len;
 
 	return 0;
@@ -1228,32 +1025,31 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
 	int i;
 	u32 len = 0;
 	struct rtl8366_vlan_4k vlan4k;
-	struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
-	char *buf = rtl->buf;
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	char *buf = smi->buf;
 	int err;
 
 	if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
 		return -EINVAL;
 
-	memset(buf, '\0', sizeof(rtl->buf));
+	memset(buf, '\0', sizeof(smi->buf));
 
 	err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
 	if (err)
 		return err;
 
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
 			"VLAN %d: Ports: '", vlan4k.vid);
 
 	for (i = 0; i < RTL8366S_NUM_PORTS; i++) {
 		if (!(vlan4k.member & (1 << i)))
 			continue;
 
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d%s", i,
+		len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i,
 				(vlan4k.untag & (1 << i)) ? "" : "t");
 	}
 
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
 			"', members=%04x, untag=%04x, fid=%u",
 			vlan4k.member, vlan4k.untag, vlan4k.fid);
 
@@ -1323,27 +1119,26 @@ static int rtl8366s_sw_get_port_mib(struct switch_dev *dev,
 				    const struct switch_attr *attr,
 				    struct switch_val *val)
 {
-	struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 	int i, len = 0;
 	unsigned long long counter = 0;
-	char *buf = rtl->buf;
+	char *buf = smi->buf;
 
 	if (val->port_vlan >= RTL8366S_NUM_PORTS)
 		return -EINVAL;
 
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
 			"Port %d MIB counters\n",
 			val->port_vlan);
 
 	for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
-		len += snprintf(buf + len, sizeof(rtl->buf) - len,
+		len += snprintf(buf + len, sizeof(smi->buf) - len,
 				"%-36s: ", rtl8366s_mib_counters[i].name);
 		if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-			len += snprintf(buf + len, sizeof(rtl->buf) - len,
+			len += snprintf(buf + len, sizeof(smi->buf) - len,
 					"%llu\n", counter);
 		else
-			len += snprintf(buf + len, sizeof(rtl->buf) - len,
+			len += snprintf(buf + len, sizeof(smi->buf) - len,
 					"%s\n", "error");
 	}
 
@@ -1400,19 +1195,19 @@ static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
 			untag |= BIT(port->id);
 	}
 
-	return rtl8366s_set_vlan(smi, val->port_vlan, member, untag, 0);
+	return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 
 static int rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
 {
 	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366s_get_pvid(smi, port, val);
+	return rtl8366_get_pvid(smi, port, val);
 }
 
 static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
 {
 	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366s_set_pvid(smi, port, val);
+	return rtl8366_set_pvid(smi, port, val);
 }
 
 static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
@@ -1428,7 +1223,7 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
 	if (err)
 		return err;
 
-	return rtl8366s_reset_vlan(smi);
+	return rtl8366_reset_vlan(smi);
 }
 
 static struct switch_attr rtl8366s_globals[] = {