X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c26785337f92df70c1ac31f5c35ded59a1b2a2fa..b956ede575a798da612bf65b4936f5be605add55:/target/linux/generic/files/drivers/net/phy/rtl8366rb.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index ceae5409e..f71f4f2b5 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -15,7 +15,6 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <linux/switch.h>
 #include <linux/rtl8366rb.h>
 
 #include "rtl8366_smi.h"
@@ -107,7 +106,7 @@
 #define RTL8366RB_TABLE_VLAN_READ_CTRL		0x0E01
 #define RTL8366RB_TABLE_VLAN_WRITE_CTRL		0x0F01
 
-#define RTL8366RB_VLAN_MEMCONF_BASE		0x0020
+#define RTL8366RB_VLAN_MC_BASE(_x)		(0x0020 + (_x) * 3)
 
 
 #define RTL8366RB_PORT_LINK_STATUS_BASE		0x0014
@@ -156,32 +155,13 @@
 
 #define RTL8366RB_PORT_ALL_INTERNAL	 RTL8366RB_PORT_CPU
 
-struct rtl8366rb {
-	struct device		*parent;
-	struct rtl8366_smi	smi;
-	struct switch_dev	dev;
-};
-
-struct rtl8366rb_vlan_mc {
-	u16	reserved2:1;
-	u16	priority:3;
-	u16	vid:12;
-	u16	untag:8;
-	u16	member:8;
-	u16	stag_mbr:8;
-	u16	stag_idx:3;
-	u16	reserved1:2;
-	u16	fid:3;
-};
-
-struct rtl8366rb_vlan_4k {
-	u16	reserved1:4;
-	u16	vid:12;
-	u16	untag:8;
-	u16	member:8;
-	u16	reserved2:13;
-	u16	fid:3;
-};
+#define RTL8366RB_VLAN_VID_MASK		0xfff
+#define RTL8366RB_VLAN_PRIORITY_SHIFT	12
+#define RTL8366RB_VLAN_PRIORITY_MASK	0x7
+#define RTL8366RB_VLAN_UNTAG_SHIFT	8
+#define RTL8366RB_VLAN_UNTAG_MASK	0xff
+#define RTL8366RB_VLAN_MEMBER_MASK	0xff
+#define RTL8366RB_VLAN_FID_MASK		0x7
 
 static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
 	{ 0,  0, 4, "IfInOctets"				},
@@ -233,22 +213,6 @@ static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
 			return err;					\
 	} while (0)
 
-static inline struct rtl8366rb *smi_to_rtl8366rb(struct rtl8366_smi *smi)
-{
-	return container_of(smi, struct rtl8366rb, smi);
-}
-
-static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw)
-{
-	return container_of(sw, struct rtl8366rb, dev);
-}
-
-static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
-{
-	struct rtl8366rb *rtl = sw_to_rtl8366rb(sw);
-	return &rtl->smi;
-}
-
 static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
 {
 	int timeout = 10;
@@ -419,22 +383,18 @@ static int rtl8366rb_get_mib_counter(struct rtl8366_smi *smi, int counter,
 static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
 				 struct rtl8366_vlan_4k *vlan4k)
 {
-	struct rtl8366rb_vlan_4k vlan4k_priv;
+	u32 data[3];
 	int err;
-	u32 data;
-	u16 *tableaddr;
+	int i;
 
 	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
-	vlan4k_priv.vid = vid;
 
 	if (vid >= RTL8366RB_NUM_VIDS)
 		return -EINVAL;
 
-	tableaddr = (u16 *)&vlan4k_priv;
-
 	/* write VID */
-	data = *tableaddr;
-	err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE, data);
+	err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE,
+				    vid & RTL8366RB_VLAN_VID_MASK);
 	if (err)
 		return err;
 
@@ -444,31 +404,19 @@ static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
 	if (err)
 		return err;
 
-	err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE + 1,
-				   &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366RB_VLAN_TABLE_READ_BASE + 2,
-				   &data);
-	if (err)
-		return err;
-	*tableaddr = data;
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_read_reg(smi,
+					   RTL8366RB_VLAN_TABLE_READ_BASE + i,
+					   &data[i]);
+		if (err)
+			return err;
+	}
 
 	vlan4k->vid = vid;
-	vlan4k->untag = vlan4k_priv.untag;
-	vlan4k->member = vlan4k_priv.member;
-	vlan4k->fid = vlan4k_priv.fid;
+	vlan4k->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) &
+			RTL8366RB_VLAN_UNTAG_MASK;
+	vlan4k->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK;
+	vlan4k->fid = data[2] & RTL8366RB_VLAN_FID_MASK;
 
 	return 0;
 }
@@ -476,10 +424,9 @@ static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
 static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
 				 const struct rtl8366_vlan_4k *vlan4k)
 {
-	struct rtl8366rb_vlan_4k vlan4k_priv;
+	u32 data[3];
 	int err;
-	u32 data;
-	u16 *tableaddr;
+	int i;
 
 	if (vlan4k->vid >= RTL8366RB_NUM_VIDS ||
 	    vlan4k->member > RTL8366RB_PORT_ALL ||
@@ -487,36 +434,19 @@ static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
 	    vlan4k->fid > RTL8366RB_FIDMAX)
 		return -EINVAL;
 
-	vlan4k_priv.vid = vlan4k->vid;
-	vlan4k_priv.untag = vlan4k->untag;
-	vlan4k_priv.member = vlan4k->member;
-	vlan4k_priv.fid = vlan4k->fid;
-
-	tableaddr = (u16 *)&vlan4k_priv;
-
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE, data);
-	if (err)
-		return err;
-
-	tableaddr++;
-
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE + 1,
-				    data);
-	if (err)
-		return err;
-
-	tableaddr++;
-
-	data = *tableaddr;
+	data[0] = vlan4k->vid & RTL8366RB_VLAN_VID_MASK;
+	data[1] = (vlan4k->member & RTL8366RB_VLAN_MEMBER_MASK) |
+		  ((vlan4k->untag & RTL8366RB_VLAN_UNTAG_MASK) <<
+			RTL8366RB_VLAN_UNTAG_SHIFT);
+	data[2] = vlan4k->fid & RTL8366RB_VLAN_FID_MASK;
 
-	err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE + 2,
-				    data);
-	if (err)
-		return err;
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_write_reg(smi,
+					    RTL8366RB_VLAN_TABLE_WRITE_BASE + i,
+					    data[i]);
+		if (err)
+			return err;
+	}
 
 	/* write table access control word */
 	err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG,
@@ -528,47 +458,30 @@ static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
 static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
 				 struct rtl8366_vlan_mc *vlanmc)
 {
-	struct rtl8366rb_vlan_mc vlanmc_priv;
+	u32 data[3];
 	int err;
-	u32 addr;
-	u32 data;
-	u16 *tableaddr;
+	int i;
 
 	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
 
 	if (index >= RTL8366RB_NUM_VLANS)
 		return -EINVAL;
 
-	tableaddr = (u16 *)&vlanmc_priv;
-
-	addr = RTL8366RB_VLAN_MEMCONF_BASE + (index * 3);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	addr = RTL8366RB_VLAN_MEMCONF_BASE + 1 + (index * 3);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	addr = RTL8366RB_VLAN_MEMCONF_BASE + 2 + (index * 3);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_read_reg(smi,
+					   RTL8366RB_VLAN_MC_BASE(index) + i,
+					   &data[i]);
+		if (err)
+			return err;
+	}
 
-	vlanmc->vid = vlanmc_priv.vid;
-	vlanmc->priority = vlanmc_priv.priority;
-	vlanmc->untag = vlanmc_priv.untag;
-	vlanmc->member = vlanmc_priv.member;
-	vlanmc->fid = vlanmc_priv.fid;
+	vlanmc->vid = data[0] & RTL8366RB_VLAN_VID_MASK;
+	vlanmc->priority = (data[0] >> RTL8366RB_VLAN_PRIORITY_SHIFT) &
+			   RTL8366RB_VLAN_PRIORITY_MASK;
+	vlanmc->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) &
+			RTL8366RB_VLAN_UNTAG_MASK;
+	vlanmc->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK;
+	vlanmc->fid = data[2] & RTL8366RB_VLAN_FID_MASK;
 
 	return 0;
 }
@@ -576,11 +489,9 @@ static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
 static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
 				 const struct rtl8366_vlan_mc *vlanmc)
 {
-	struct rtl8366rb_vlan_mc vlanmc_priv;
+	u32 data[3];
 	int err;
-	u32 addr;
-	u32 data;
-	u16 *tableaddr;
+	int i;
 
 	if (index >= RTL8366RB_NUM_VLANS ||
 	    vlanmc->vid >= RTL8366RB_NUM_VIDS ||
@@ -590,40 +501,22 @@ static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
 	    vlanmc->fid > RTL8366RB_FIDMAX)
 		return -EINVAL;
 
-	vlanmc_priv.vid = vlanmc->vid;
-	vlanmc_priv.priority = vlanmc->priority;
-	vlanmc_priv.untag = vlanmc->untag;
-	vlanmc_priv.member = vlanmc->member;
-	vlanmc_priv.stag_mbr = 0;
-	vlanmc_priv.stag_idx = 0;
-	vlanmc_priv.fid = vlanmc->fid;
-
-	addr = RTL8366RB_VLAN_MEMCONF_BASE + (index * 3);
-
-	tableaddr = (u16 *)&vlanmc_priv;
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	addr = RTL8366RB_VLAN_MEMCONF_BASE + 1 + (index * 3);
-
-	tableaddr++;
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	addr = RTL8366RB_VLAN_MEMCONF_BASE + 2 + (index * 3);
-
-	tableaddr++;
-	data = *tableaddr;
+	data[0] = (vlanmc->vid & RTL8366RB_VLAN_VID_MASK) |
+		  ((vlanmc->priority & RTL8366RB_VLAN_PRIORITY_MASK) <<
+			RTL8366RB_VLAN_PRIORITY_SHIFT);
+	data[1] = (vlanmc->member & RTL8366RB_VLAN_MEMBER_MASK) |
+		  ((vlanmc->untag & RTL8366RB_VLAN_UNTAG_MASK) <<
+			RTL8366RB_VLAN_UNTAG_SHIFT);
+	data[2] = vlanmc->fid & RTL8366RB_VLAN_FID_MASK;
+
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_write_reg(smi,
+					    RTL8366RB_VLAN_MC_BASE(index) + i,
+					    data[i]);
+		if (err)
+			return err;
+	}
 
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
 	return 0;
 }
 
@@ -982,18 +875,6 @@ static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
 	return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 
-static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366_get_pvid(smi, port, val);
-}
-
-static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366_set_pvid(smi, port, val);
-}
-
 static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
 {
 	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
@@ -1105,30 +986,30 @@ static struct switch_dev rtl8366_switch_dev = {
 
 	.get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
 	.set_vlan_ports = rtl8366rb_sw_set_vlan_ports,
-	.get_port_pvid = rtl8366rb_sw_get_port_pvid,
-	.set_port_pvid = rtl8366rb_sw_set_port_pvid,
+	.get_port_pvid = rtl8366_sw_get_port_pvid,
+	.set_port_pvid = rtl8366_sw_set_port_pvid,
 	.reset_switch = rtl8366rb_sw_reset_switch,
 };
 
-static int rtl8366rb_switch_init(struct rtl8366rb *rtl)
+static int rtl8366rb_switch_init(struct rtl8366_smi *smi)
 {
-	struct switch_dev *dev = &rtl->dev;
+	struct switch_dev *dev = &smi->sw_dev;
 	int err;
 
 	memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-	dev->priv = rtl;
-	dev->devname = dev_name(rtl->parent);
+	dev->priv = smi;
+	dev->devname = dev_name(smi->parent);
 
 	err = register_switch(dev, NULL);
 	if (err)
-		dev_err(rtl->parent, "switch registration failed\n");
+		dev_err(smi->parent, "switch registration failed\n");
 
 	return err;
 }
 
-static void rtl8366rb_switch_cleanup(struct rtl8366rb *rtl)
+static void rtl8366rb_switch_cleanup(struct rtl8366_smi *smi)
 {
-	unregister_switch(&rtl->dev);
+	unregister_switch(&smi->sw_dev);
 }
 
 static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
@@ -1163,9 +1044,8 @@ static int rtl8366rb_mii_bus_match(struct mii_bus *bus)
 		bus->write == rtl8366rb_mii_write);
 }
 
-static int rtl8366rb_setup(struct rtl8366rb *rtl)
+static int rtl8366rb_setup(struct rtl8366_smi *smi)
 {
-	struct rtl8366_smi *smi = &rtl->smi;
 	int ret;
 
 	ret = rtl8366rb_reset_chip(smi);
@@ -1211,6 +1091,8 @@ static int rtl8366rb_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
 	.detect		= rtl8366rb_detect,
+	.setup		= rtl8366rb_setup,
+
 	.mii_read	= rtl8366rb_mii_read,
 	.mii_write	= rtl8366rb_mii_write,
 
@@ -1227,7 +1109,6 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
 {
 	static int rtl8366_smi_version_printed;
 	struct rtl8366rb_platform_data *pdata;
-	struct rtl8366rb *rtl;
 	struct rtl8366_smi *smi;
 	int err;
 
@@ -1242,17 +1123,12 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
 		goto err_out;
 	}
 
-	rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
-	if (!rtl) {
-		dev_err(&pdev->dev, "no memory for private data\n");
+	smi = rtl8366_smi_alloc(&pdev->dev);
+	if (!smi) {
 		err = -ENOMEM;
 		goto err_out;
 	}
 
-	rtl->parent = &pdev->dev;
-
-	smi = &rtl->smi;
-	smi->parent = &pdev->dev;
 	smi->gpio_sda = pdata->gpio_sda;
 	smi->gpio_sck = pdata->gpio_sck;
 	smi->ops = &rtl8366rb_smi_ops;
@@ -1264,15 +1140,11 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
 
 	err = rtl8366_smi_init(smi);
 	if (err)
-		goto err_free_rtl;
+		goto err_free_smi;
 
-	platform_set_drvdata(pdev, rtl);
-
-	err = rtl8366rb_setup(rtl);
-	if (err)
-		goto err_clear_drvdata;
+	platform_set_drvdata(pdev, smi);
 
-	err = rtl8366rb_switch_init(rtl);
+	err = rtl8366rb_switch_init(smi);
 	if (err)
 		goto err_clear_drvdata;
 
@@ -1281,8 +1153,8 @@ static int __init rtl8366rb_probe(struct platform_device *pdev)
  err_clear_drvdata:
 	platform_set_drvdata(pdev, NULL);
 	rtl8366_smi_cleanup(smi);
- err_free_rtl:
-	kfree(rtl);
+ err_free_smi:
+	kfree(smi);
  err_out:
 	return err;
 }
@@ -1315,13 +1187,13 @@ static struct phy_driver rtl8366rb_phy_driver = {
 
 static int __devexit rtl8366rb_remove(struct platform_device *pdev)
 {
-	struct rtl8366rb *rtl = platform_get_drvdata(pdev);
+	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
-	if (rtl) {
-		rtl8366rb_switch_cleanup(rtl);
+	if (smi) {
+		rtl8366rb_switch_cleanup(smi);
 		platform_set_drvdata(pdev, NULL);
-		rtl8366_smi_cleanup(&rtl->smi);
-		kfree(rtl);
+		rtl8366_smi_cleanup(smi);
+		kfree(smi);
 	}
 
 	return 0;