generic: rtl8366: add common vlan_mc structure

[openwrt.git] / target / linux / generic-2.6 / files / drivers / net / phy / rtl8366s.c

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
index 9f37865..ec2c0d4 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
@@ -155,7 +155,7 @@ struct rtl8366s {
 #endif
 };
 
-struct rtl8366s_vlanconfig {
+struct rtl8366s_vlan_mc {
        u16     reserved2:1;
        u16     priority:3;
        u16     vid:12;
@@ -166,7 +166,7 @@ struct rtl8366s_vlanconfig {
        u16     member:6;
 };
 
-struct rtl8366s_vlan4kentry {
+struct rtl8366s_vlan_4k {
        u16     reserved1:4;
        u16     vid:12;
 
@@ -257,10 +257,9 @@ static int rtl8366s_reset_chip(struct rtl8366s *rtl)
        return 0;
 }
 
-static int rtl8366s_read_phy_reg(struct rtl8366s *rtl,
+static int rtl8366s_read_phy_reg(struct rtl8366_smi *smi,
                                 u32 phy_no, u32 page, u32 addr, u32 *data)
 {
-       struct rtl8366_smi *smi = &rtl->smi;
        u32 reg;
        int ret;
 
@@ -293,10 +292,9 @@ static int rtl8366s_read_phy_reg(struct rtl8366s *rtl,
        return 0;
 }
 
-static int rtl8366s_write_phy_reg(struct rtl8366s *rtl,
+static int rtl8366s_write_phy_reg(struct rtl8366_smi *smi,
                                  u32 phy_no, u32 page, u32 addr, u32 data)
 {
-       struct rtl8366_smi *smi = &rtl->smi;
        u32 reg;
        int ret;
 
@@ -374,15 +372,15 @@ static int rtl8366_get_mib_counter(struct rtl8366s *rtl, int counter,
        return 0;
 }
 
-static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid,
-                                     struct rtl8366s_vlan4kentry *vlan4k)
+static int rtl8366s_get_vlan_4k(struct rtl8366s *rtl, u32 vid,
+                               struct rtl8366s_vlan_4k *vlan4k)
 {
        struct rtl8366_smi *smi = &rtl->smi;
        int err;
        u32 data;
        u16 *tableaddr;
 
-       memset(vlan4k, '\0', sizeof(struct rtl8366s_vlan4kentry));
+       memset(vlan4k, '\0', sizeof(struct rtl8366s_vlan_4k));
        vlan4k->vid = vid;
 
        if (vid >= RTL8366_NUM_VIDS)
@@ -420,8 +418,8 @@ static int rtl8366s_get_vlan_4k_entry(struct rtl8366s *rtl, u32 vid,
        return 0;
 }
 
-static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl,
-                                     const struct rtl8366s_vlan4kentry *vlan4k)
+static int rtl8366s_set_vlan_4k(struct rtl8366s *rtl,
+                               const struct rtl8366s_vlan_4k *vlan4k)
 {
        struct rtl8366_smi *smi = &rtl->smi;
        int err;
@@ -458,21 +456,22 @@ static int rtl8366s_set_vlan_4k_entry(struct rtl8366s *rtl,
        return err;
 }
 
-static int rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index,
-                                          struct rtl8366s_vlanconfig *vlanmc)
+static int rtl8366s_get_vlan_mc(struct rtl8366s *rtl, u32 index,
+                               struct rtl8366_vlan_mc *vlanmc)
 {
        struct rtl8366_smi *smi = &rtl->smi;
+       struct rtl8366s_vlan_mc vlanmc_priv;
        int err;
        u32 addr;
        u32 data;
        u16 *tableaddr;
 
-       memset(vlanmc, '\0', sizeof(struct rtl8366s_vlanconfig));
+       memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
 
        if (index >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       tableaddr = (u16 *)vlanmc;
+       tableaddr = (u16 *)&vlanmc_priv;
 
        addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
        err = rtl8366_smi_read_reg(smi, addr, &data);
@@ -489,14 +488,20 @@ static int rtl8366s_get_vlan_member_config(struct rtl8366s *rtl, u32 index,
 
        *tableaddr = data;
 
+       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;
+
        return 0;
 }
 
-static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index,
-                                          const struct rtl8366s_vlanconfig
-                                          *vlanmc)
+static int rtl8366s_set_vlan_mc(struct rtl8366s *rtl, u32 index,
+                               const struct rtl8366_vlan_mc *vlanmc)
 {
        struct rtl8366_smi *smi = &rtl->smi;
+       struct rtl8366s_vlan_mc vlanmc_priv;
        int err;
        u32 addr;
        u32 data;
@@ -510,9 +515,15 @@ static int rtl8366s_set_vlan_member_config(struct rtl8366s *rtl, u32 index,
            vlanmc->fid > RTL8366S_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.fid = vlanmc->fid;
+
        addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
 
-       tableaddr = (u16 *)vlanmc;
+       tableaddr = (u16 *)&vlanmc_priv;
        data = *tableaddr;
 
        err = rtl8366_smi_write_reg(smi, addr, data);
@@ -556,7 +567,7 @@ static int rtl8366s_get_port_vlan_index(struct rtl8366s *rtl, int port,
 static int rtl8366s_get_vlan_port_pvid(struct rtl8366s *rtl, int port,
                                       int *val)
 {
-       struct rtl8366s_vlanconfig vlanmc;
+       struct rtl8366_vlan_mc vlanmc;
        int err;
        int index;
 
@@ -564,7 +575,7 @@ static int rtl8366s_get_vlan_port_pvid(struct rtl8366s *rtl, int port,
        if (err)
                return err;
 
-       err = rtl8366s_get_vlan_member_config(rtl, index, &vlanmc);
+       err = rtl8366s_get_vlan_mc(rtl, index, &vlanmc);
        if (err)
                return err;
 
@@ -600,29 +611,29 @@ static int rtl8366s_set_port_vlan_index(struct rtl8366s *rtl, int port,
 static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val)
 {
        int i;
-       struct rtl8366s_vlanconfig vlanmc;
-       struct rtl8366s_vlan4kentry vlan4k;
+       struct rtl8366_vlan_mc vlanmc;
+       struct rtl8366s_vlan_4k vlan4k;
 
        if (port >= RTL8366_NUM_PORTS || val >= RTL8366_NUM_VIDS)
                return -EINVAL;
 
        /* Updating the 4K entry; lookup it and change the port member set */
-       rtl8366s_get_vlan_4k_entry(rtl, val, &vlan4k);
+       rtl8366s_get_vlan_4k(rtl, val, &vlan4k);
        vlan4k.member |= ((1 << port) | RTL8366_PORT_CPU);
        vlan4k.untag = RTL8366_PORT_ALL_BUT_CPU;
-       rtl8366s_set_vlan_4k_entry(rtl, &vlan4k);
+       rtl8366s_set_vlan_4k(rtl, &vlan4k);
 
        /*
         * For the 16 entries more work needs to be done. First see if such
         * VID is already there and change it
         */
        for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               rtl8366s_get_vlan_member_config(rtl, i, &vlanmc);
+               rtl8366s_get_vlan_mc(rtl, i, &vlanmc);
 
                /* Try to find an existing vid and update port member set */
                if (val == vlanmc.vid) {
                        vlanmc.member |= ((1 << port) | RTL8366_PORT_CPU);
-                       rtl8366s_set_vlan_member_config(rtl, i, &vlanmc);
+                       rtl8366s_set_vlan_mc(rtl, i, &vlanmc);
 
                        /* Now update PVID register settings */
                        rtl8366s_set_port_vlan_index(rtl, port, i);
@@ -636,7 +647,7 @@ static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val)
         * has no member ports) with new one
         */
        for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               rtl8366s_get_vlan_member_config(rtl, i, &vlanmc);
+               rtl8366s_get_vlan_mc(rtl, i, &vlanmc);
 
                /*
                 * See if this vlan member configuration is unused. It is
@@ -649,7 +660,7 @@ static int rtl8366s_set_vlan_port_pvid(struct rtl8366s *rtl, int port, int val)
                        vlanmc.member = ((1 << port) | RTL8366_PORT_CPU);
                        vlanmc.fid = 0;
 
-                       rtl8366s_set_vlan_member_config(rtl, i, &vlanmc);
+                       rtl8366s_set_vlan_mc(rtl, i, &vlanmc);
 
                        /* Now update PVID register settings */
                        rtl8366s_set_port_vlan_index(rtl, port, i);
@@ -697,8 +708,8 @@ static int rtl8366s_vlan_set_4ktable(struct rtl8366s *rtl, int enable)
 
 static int rtl8366s_reset_vlan(struct rtl8366s *rtl)
 {
-       struct rtl8366s_vlan4kentry vlan4k;
-       struct rtl8366s_vlanconfig vlanmc;
+       struct rtl8366s_vlan_4k vlan4k;
+       struct rtl8366_vlan_mc vlanmc;
        int err;
        int i;
 
@@ -709,7 +720,7 @@ static int rtl8366s_reset_vlan(struct rtl8366s *rtl)
        vlanmc.untag = 0;
        vlanmc.fid = 0;
        for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               err = rtl8366s_set_vlan_member_config(rtl, i, &vlanmc);
+               err = rtl8366s_set_vlan_mc(rtl, i, &vlanmc);
                if (err)
                        return err;
        }
@@ -719,7 +730,7 @@ static int rtl8366s_reset_vlan(struct rtl8366s *rtl)
        vlan4k.member = RTL8366_PORT_ALL;
        vlan4k.untag = RTL8366_PORT_ALL;
        vlan4k.fid = 0;
-       err = rtl8366s_set_vlan_4k_entry(rtl, &vlan4k);
+       err = rtl8366s_set_vlan_4k(rtl, &vlan4k);
        if (err)
                return err;
 
@@ -803,9 +814,9 @@ static ssize_t rtl8366s_read_debugfs_vlan(struct file *file,
                        "\tports\n");
 
        for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               struct rtl8366s_vlanconfig vlanmc;
+               struct rtl8366_vlan_mc vlanmc;
 
-               rtl8366s_get_vlan_member_config(rtl, i, &vlanmc);
+               rtl8366s_get_vlan_mc(rtl, i, &vlanmc);
 
                len += snprintf(buf + len, sizeof(rtl->buf) - len,
                                "\t[%d] \t %d \t %d \t 0x%04x \t 0x%04x \t %d "
@@ -1122,8 +1133,8 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
 {
        int i;
        u32 len = 0;
-       struct rtl8366s_vlanconfig vlanmc;
-       struct rtl8366s_vlan4kentry vlan4k;
+       struct rtl8366_vlan_mc vlanmc;
+       struct rtl8366s_vlan_4k vlan4k;
        struct rtl8366s *rtl = sw_to_rtl8366s(dev);
        char *buf = rtl->buf;
 
@@ -1132,8 +1143,8 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
 
        memset(buf, '\0', sizeof(rtl->buf));
 
-       rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
-       rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k);
+       rtl8366s_get_vlan_mc(rtl, val->port_vlan, &vlanmc);
+       rtl8366s_get_vlan_4k(rtl, vlanmc.vid, &vlan4k);
 
        len += snprintf(buf + len, sizeof(rtl->buf) - len, "VLAN %d: Ports: ",
                        val->port_vlan);
@@ -1261,7 +1272,7 @@ static int rtl8366s_sw_get_port_mib(struct switch_dev *dev,
 static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
                                      struct switch_val *val)
 {
-       struct rtl8366s_vlanconfig vlanmc;
+       struct rtl8366_vlan_mc vlanmc;
        struct rtl8366s *rtl = sw_to_rtl8366s(dev);
        struct switch_port *port;
        int i;
@@ -1269,7 +1280,7 @@ static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
        if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
+       rtl8366s_get_vlan_mc(rtl, val->port_vlan, &vlanmc);
 
        port = &val->value.ports[0];
        val->len = 0;
@@ -1289,8 +1300,8 @@ static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
 static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
                                      struct switch_val *val)
 {
-       struct rtl8366s_vlanconfig vlanmc;
-       struct rtl8366s_vlan4kentry vlan4k;
+       struct rtl8366_vlan_mc vlanmc;
+       struct rtl8366s_vlan_4k vlan4k;
        struct rtl8366s *rtl = sw_to_rtl8366s(dev);
        struct switch_port *port;
        int i;
@@ -1298,8 +1309,8 @@ static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
        if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
                return -EINVAL;
 
-       rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
-       rtl8366s_get_vlan_4k_entry(rtl, vlanmc.vid, &vlan4k);
+       rtl8366s_get_vlan_mc(rtl, val->port_vlan, &vlanmc);
+       rtl8366s_get_vlan_4k(rtl, vlanmc.vid, &vlan4k);
 
        vlanmc.untag = 0;
        vlanmc.member = 0;
@@ -1315,8 +1326,8 @@ static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
        vlan4k.member = vlanmc.member;
        vlan4k.untag = vlanmc.untag;
 
-       rtl8366s_set_vlan_member_config(rtl, val->port_vlan, &vlanmc);
-       rtl8366s_set_vlan_4k_entry(rtl, &vlan4k);
+       rtl8366s_set_vlan_mc(rtl, val->port_vlan, &vlanmc);
+       rtl8366s_set_vlan_4k(rtl, &vlan4k);
        return 0;
 }
 
@@ -1471,11 +1482,11 @@ static void rtl8366s_switch_cleanup(struct rtl8366s *rtl)
 
 static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
 {
-       struct rtl8366s *rtl = smi_to_rtl8366s(bus->priv);
+       struct rtl8366_smi *smi = bus->priv;
        u32 val = 0;
        int err;
 
-       err = rtl8366s_read_phy_reg(rtl, addr, 0, reg, &val);
+       err = rtl8366s_read_phy_reg(smi, addr, 0, reg, &val);
        if (err)
                return 0xffff;
 
@@ -1484,13 +1495,13 @@ static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
 
 static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
 {
-       struct rtl8366s *rtl = smi_to_rtl8366s(bus->priv);
+       struct rtl8366_smi *smi = bus->priv;
        u32 t;
        int err;
 
-       err = rtl8366s_write_phy_reg(rtl, addr, 0, reg, val);
+       err = rtl8366s_write_phy_reg(smi, addr, 0, reg, val);
        /* flush write */
-       (void) rtl8366s_read_phy_reg(rtl, addr, 0, reg, &t);
+       (void) rtl8366s_read_phy_reg(smi, addr, 0, reg, &t);
 
        return err;
 }