mpc85xx: fix up kernel config and make the target boot on the MPC8568E-MDS-PB board

[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366_smi.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index 341f2e9..e60b708 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -307,8 +307,8 @@ static int rtl8366_mc_is_used(struct rtl8366_smi *smi, int mc_index, int *used)
        return 0;
 }
 
-int rtl8366_set_vlan(struct rtl8366_smi *smi, int vid, u32 member, u32 untag,
-                    u32 fid)
+static int rtl8366_set_vlan(struct rtl8366_smi *smi, int vid, u32 member,
+                           u32 untag, u32 fid)
 {
        struct rtl8366_vlan_4k vlan4k;
        int err;
@@ -347,7 +347,6 @@ int rtl8366_set_vlan(struct rtl8366_smi *smi, int vid, u32 member, u32 untag,
 
        return err;
 }
-EXPORT_SYMBOL_GPL(rtl8366_set_vlan);
 
 static int rtl8366_get_pvid(struct rtl8366_smi *smi, int port, int *val)
 {
@@ -449,12 +448,53 @@ static int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port,
        return -ENOSPC;
 }
 
+static int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
+{
+       int err;
+
+       err = smi->ops->enable_vlan(smi, enable);
+       if (err)
+               return err;
+
+       smi->vlan_enabled = enable;
+
+       if (!enable) {
+               smi->vlan4k_enabled = 0;
+               err = smi->ops->enable_vlan4k(smi, enable);
+       }
+
+       return err;
+}
+
+static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+{
+       int err;
+
+       if (enable) {
+               err = smi->ops->enable_vlan(smi, enable);
+               if (err)
+                       return err;
+
+               smi->vlan_enabled = enable;
+       }
+
+       err = smi->ops->enable_vlan4k(smi, enable);
+       if (err)
+               return err;
+
+       smi->vlan4k_enabled = enable;
+       return 0;
+}
+
 int rtl8366_reset_vlan(struct rtl8366_smi *smi)
 {
        struct rtl8366_vlan_mc vlanmc;
        int err;
        int i;
 
+       rtl8366_enable_vlan(smi, 0);
+       rtl8366_enable_vlan4k(smi, 0);
+
        /* clear VLAN member configurations */
        vlanmc.vid = 0;
        vlanmc.priority = 0;
@@ -521,6 +561,34 @@ static ssize_t rtl8366_read_debugfs_vlan_mc(struct file *file,
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
+static ssize_t rtl8366_read_debugfs_pvid(struct file *file,
+                                        char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+       struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+       char *buf = smi->buf;
+       int len = 0;
+       int i;
+
+       len += snprintf(buf + len, sizeof(smi->buf) - len, "%4s %4s\n",
+                       "port", "pvid");
+
+       for (i = 0; i < smi->num_ports; i++) {
+               int pvid;
+               int err;
+
+               err = rtl8366_get_pvid(smi, i, &pvid);
+               if (err)
+                       len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "%4d error\n", i);
+               else
+                       len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "%4d %4d\n", i, pvid);
+       }
+
+       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
 static ssize_t rtl8366_read_debugfs_reg(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos)
@@ -635,6 +703,12 @@ static const struct file_operations fops_rtl8366_vlan_mc = {
        .owner  = THIS_MODULE
 };
 
+static const struct file_operations fops_rtl8366_pvid = {
+       .read   = rtl8366_read_debugfs_pvid,
+       .open   = rtl8366_debugfs_open,
+       .owner  = THIS_MODULE
+};
+
 static const struct file_operations fops_rtl8366_mibs = {
        .read = rtl8366_read_debugfs_mibs,
        .open = rtl8366_debugfs_open,
@@ -680,6 +754,14 @@ static void rtl8366_debugfs_init(struct rtl8366_smi *smi)
                return;
        }
 
+       node = debugfs_create_file("pvid", S_IRUSR, root, smi,
+                                  &fops_rtl8366_pvid);
+       if (!node) {
+               dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+                       "pvid");
+               return;
+       }
+
        node = debugfs_create_file("mibs", S_IRUSR, smi->debugfs_root, smi,
                                   &fops_rtl8366_mibs);
        if (!node)
@@ -864,6 +946,7 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
        struct switch_port *port;
        u32 member = 0;
        u32 untag = 0;
+       int err;
        int i;
 
        if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
@@ -875,12 +958,103 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
 
                if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
                        untag |= BIT(port->id);
+
+               /*
+                * To ensure that we have a valid MC entry for this VLAN,
+                * initialize the port VLAN ID here.
+                */
+               err = rtl8366_set_pvid(smi, port->id, val->port_vlan);
+               if (err < 0)
+                       return err;
        }
 
        return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_ports);
 
+int rtl8366_sw_get_vlan_fid(struct switch_dev *dev,
+                           const struct switch_attr *attr,
+                           struct switch_val *val)
+{
+       struct rtl8366_vlan_4k vlan4k;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       int err;
+
+       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+               return -EINVAL;
+
+       err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       if (err)
+               return err;
+
+       val->value.i = vlan4k.fid;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_fid);
+
+int rtl8366_sw_set_vlan_fid(struct switch_dev *dev,
+                           const struct switch_attr *attr,
+                           struct switch_val *val)
+{
+       struct rtl8366_vlan_4k vlan4k;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       int err;
+
+       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+               return -EINVAL;
+
+       if (val->value.i < 0 || val->value.i > attr->max)
+               return -EINVAL;
+
+       err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       if (err)
+               return err;
+
+       return rtl8366_set_vlan(smi, val->port_vlan,
+                               vlan4k.member,
+                               vlan4k.untag,
+                               val->value.i);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_fid);
+
+int rtl8366_sw_get_vlan_enable(struct switch_dev *dev,
+                              const struct switch_attr *attr,
+                              struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+       if (attr->ofs > 2)
+               return -EINVAL;
+
+       if (attr->ofs == 1)
+               val->value.i = smi->vlan_enabled;
+       else
+               val->value.i = smi->vlan4k_enabled;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_enable);
+
+int rtl8366_sw_set_vlan_enable(struct switch_dev *dev,
+                              const struct switch_attr *attr,
+                              struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       int err;
+
+       if (attr->ofs > 2)
+               return -EINVAL;
+
+       if (attr->ofs == 1)
+               err = rtl8366_enable_vlan(smi, val->value.i);
+       else
+               err = rtl8366_enable_vlan4k(smi, val->value.i);
+
+       return err;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_enable);
+
 struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent)
 {
        struct rtl8366_smi *smi;