#endif
};
-struct rtl8366s_vlanconfig {
+struct rtl8366s_vlan_mc {
u16 reserved2:1;
u16 priority:3;
u16 vid:12;
u16 member:6;
};
-struct rtl8366s_vlan4kentry {
+struct rtl8366s_vlan_4k {
u16 reserved1:4;
u16 vid:12;
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)
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;
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);
*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;
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);
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;
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;
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);
* 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
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);
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;
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;
}
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;
"\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 "
{
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;
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);
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;
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;
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;
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;
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;
}