kernel/swconfig: remove obsolete portmapping feature from swconfig
[openwrt/staging/yousong.git] / target / linux / generic / files / drivers / net / phy / swconfig.c
index 07efda05ebc772590b008942a2f7eee59972b598..8dfcb1aa3b0e170044186e2ce1a67f14109f3887 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * swconfig.c: Switch configuration API
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 #include <linux/switch.h>
 #include <linux/of.h>
 #include <linux/version.h>
+#include <uapi/linux/mii.h>
 
 #define SWCONFIG_DEVNAME       "switch%d"
 
 #include "swconfig_leds.c"
 
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 MODULE_LICENSE("GPL");
 
 static int swdev_id;
@@ -127,6 +128,16 @@ swconfig_get_pvid(struct switch_dev *dev, const struct switch_attr *attr,
        return dev->ops->get_port_pvid(dev, val->port_vlan, &val->value.i);
 }
 
+static int
+swconfig_set_link(struct switch_dev *dev, const struct switch_attr *attr,
+                       struct switch_val *val)
+{
+       if (!dev->ops->set_port_link)
+               return -EOPNOTSUPP;
+
+       return dev->ops->set_port_link(dev, val->port_vlan, val->value.link);
+}
+
 static int
 swconfig_get_link(struct switch_dev *dev, const struct switch_attr *attr,
                        struct switch_val *val)
@@ -206,7 +217,7 @@ static struct switch_attr default_port[] = {
                .type = SWITCH_TYPE_LINK,
                .name = "link",
                .description = "Get port link information",
-               .set = NULL,
+               .set = swconfig_set_link,
                .get = swconfig_get_link,
        }
 };
@@ -282,6 +293,12 @@ static const struct nla_policy port_policy[SWITCH_PORT_ATTR_MAX+1] = {
        [SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
 };
 
+static struct nla_policy link_policy[SWITCH_LINK_ATTR_MAX] = {
+       [SWITCH_LINK_FLAG_DUPLEX] = { .type = NLA_FLAG },
+       [SWITCH_LINK_FLAG_ANEG] = { .type = NLA_FLAG },
+       [SWITCH_LINK_SPEED] = { .type = NLA_U32 },
+};
+
 static inline void
 swconfig_lock(void)
 {
@@ -594,6 +611,22 @@ swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
        return 0;
 }
 
+static int
+swconfig_parse_link(struct sk_buff *msg, struct nlattr *nla,
+                   struct switch_port_link *link)
+{
+       struct nlattr *tb[SWITCH_LINK_ATTR_MAX + 1];
+
+       if (nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy))
+               return -EINVAL;
+
+       link->duplex = !!tb[SWITCH_LINK_FLAG_DUPLEX];
+       link->aneg = !!tb[SWITCH_LINK_FLAG_ANEG];
+       link->speed = nla_get_u32(tb[SWITCH_LINK_SPEED]);
+
+       return 0;
+}
+
 static int
 swconfig_set_attr(struct sk_buff *skb, struct genl_info *info)
 {
@@ -602,6 +635,9 @@ swconfig_set_attr(struct sk_buff *skb, struct genl_info *info)
        struct switch_val val;
        int err = -EINVAL;
 
+       if (!capable(CAP_NET_ADMIN))
+               return -EPERM;
+
        dev = swconfig_get_dev(info);
        if (!dev)
                return -EINVAL;
@@ -644,6 +680,21 @@ swconfig_set_attr(struct sk_buff *skb, struct genl_info *info)
                        err = 0;
                }
                break;
+       case SWITCH_TYPE_LINK:
+               val.value.link = &dev->linkbuf;
+               memset(&dev->linkbuf, 0, sizeof(struct switch_port_link));
+
+               if (info->attrs[SWITCH_ATTR_OP_VALUE_LINK]) {
+                       err = swconfig_parse_link(skb,
+                                                 info->attrs[SWITCH_ATTR_OP_VALUE_LINK],
+                                                 val.value.link);
+                       if (err < 0)
+                               goto error;
+               } else {
+                       val.len = 0;
+                       err = 0;
+               }
+               break;
        default:
                goto error;
        }
@@ -864,9 +915,7 @@ static int
 swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                const struct switch_dev *dev)
 {
-       struct nlattr *p = NULL, *m = NULL;
        void *hdr;
-       int i;
 
        hdr = genlmsg_put(msg, pid, seq, &switch_fam, flags,
                        SWITCH_CMD_NEW_ATTR);
@@ -888,24 +937,6 @@ swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
        if (nla_put_u32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port))
                goto nla_put_failure;
 
-       m = nla_nest_start(msg, SWITCH_ATTR_PORTMAP);
-       if (!m)
-               goto nla_put_failure;
-       for (i = 0; i < dev->ports; i++) {
-               p = nla_nest_start(msg, SWITCH_ATTR_PORTS);
-               if (!p)
-                       continue;
-               if (dev->portmap[i].s) {
-                       if (nla_put_string(msg, SWITCH_PORTMAP_SEGMENT,
-                                               dev->portmap[i].s))
-                               goto nla_put_failure;
-                       if (nla_put_u32(msg, SWITCH_PORTMAP_VIRT,
-                                               dev->portmap[i].virt))
-                               goto nla_put_failure;
-               }
-               nla_nest_end(msg, p);
-       }
-       nla_nest_end(msg, m);
        genlmsg_end(msg, hdr);
        return msg->len;
 nla_put_failure:
@@ -974,16 +1005,19 @@ static struct genl_ops swconfig_ops[] = {
        },
        {
                .cmd = SWITCH_CMD_SET_GLOBAL,
+               .flags = GENL_ADMIN_PERM,
                .doit = swconfig_set_attr,
                .policy = switch_policy,
        },
        {
                .cmd = SWITCH_CMD_SET_VLAN,
+               .flags = GENL_ADMIN_PERM,
                .doit = swconfig_set_attr,
                .policy = switch_policy,
        },
        {
                .cmd = SWITCH_CMD_SET_PORT,
+               .flags = GENL_ADMIN_PERM,
                .doit = swconfig_set_attr,
                .policy = switch_policy,
        },
@@ -995,51 +1029,6 @@ static struct genl_ops swconfig_ops[] = {
        }
 };
 
-#ifdef CONFIG_OF
-void
-of_switch_load_portmap(struct switch_dev *dev)
-{
-       struct device_node *port;
-
-       if (!dev->of_node)
-               return;
-
-       for_each_child_of_node(dev->of_node, port) {
-               const __be32 *prop;
-               const char *segment;
-               int size, phys;
-
-               if (!of_device_is_compatible(port, "swconfig,port"))
-                       continue;
-
-               if (of_property_read_string(port, "swconfig,segment", &segment))
-                       continue;
-
-               prop = of_get_property(port, "swconfig,portmap", &size);
-               if (!prop)
-                       continue;
-
-               if (size != (2 * sizeof(*prop))) {
-                       pr_err("%s: failed to parse port mapping\n",
-                                       port->name);
-                       continue;
-               }
-
-               phys = be32_to_cpup(prop++);
-               if ((phys < 0) | (phys >= dev->ports)) {
-                       pr_err("%s: physical port index out of range\n",
-                                       port->name);
-                       continue;
-               }
-
-               dev->portmap[phys].s = kstrdup(segment, GFP_KERNEL);
-               dev->portmap[phys].virt = be32_to_cpup(prop);
-               pr_debug("Found port: %s, physical: %d, virtual: %d\n",
-                       segment, phys, dev->portmap[phys].virt);
-       }
-}
-#endif
-
 int
 register_switch(struct switch_dev *dev, struct net_device *netdev)
 {
@@ -1062,12 +1051,6 @@ register_switch(struct switch_dev *dev, struct net_device *netdev)
                                dev->ports, GFP_KERNEL);
                if (!dev->portbuf)
                        return -ENOMEM;
-               dev->portmap = kzalloc(sizeof(struct switch_portmap) *
-                               dev->ports, GFP_KERNEL);
-               if (!dev->portmap) {
-                       kfree(dev->portbuf);
-                       return -ENOMEM;
-               }
        }
        swconfig_defaults_init(dev);
        mutex_init(&dev->sw_mutex);
@@ -1089,11 +1072,6 @@ register_switch(struct switch_dev *dev, struct net_device *netdev)
                return -ENFILE;
        }
 
-#ifdef CONFIG_OF
-       if (dev->ports)
-               of_switch_load_portmap(dev);
-#endif
-
        /* fill device name */
        snprintf(dev->devname, IFNAMSIZ, SWCONFIG_DEVNAME, i);
 
@@ -1121,38 +1099,48 @@ unregister_switch(struct switch_dev *dev)
 }
 EXPORT_SYMBOL_GPL(unregister_switch);
 
-
-static int __init
-swconfig_init(void)
+int
+switch_generic_set_link(struct switch_dev *dev, int port,
+                       struct switch_port_link *link)
 {
-       int err;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0))
-       int i;
-#endif
+       if (WARN_ON(!dev->ops->phy_write16))
+               return -ENOTSUPP;
 
-       INIT_LIST_HEAD(&swdevs);
-       
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0))
-       err = genl_register_family(&switch_fam);
-       if (err)
-               return err;
+       /* Generic implementation */
+       if (link->aneg) {
+               dev->ops->phy_write16(dev, port, MII_BMCR, 0x0000);
+               dev->ops->phy_write16(dev, port, MII_BMCR, BMCR_ANENABLE | BMCR_ANRESTART);
+       } else {
+               u16 bmcr = 0;
 
-       for (i = 0; i < ARRAY_SIZE(swconfig_ops); i++) {
-               err = genl_register_ops(&switch_fam, &swconfig_ops[i]);
-               if (err)
-                       goto unregister;
+               if (link->duplex)
+                       bmcr |= BMCR_FULLDPLX;
+
+               switch (link->speed) {
+               case SWITCH_PORT_SPEED_10:
+                       break;
+               case SWITCH_PORT_SPEED_100:
+                       bmcr |= BMCR_SPEED100;
+                       break;
+               case SWITCH_PORT_SPEED_1000:
+                       bmcr |= BMCR_SPEED1000;
+                       break;
+               default:
+                       return -ENOTSUPP;
+               }
+
+               dev->ops->phy_write16(dev, port, MII_BMCR, bmcr);
        }
-       return 0;
 
-unregister:
-       genl_unregister_family(&switch_fam);
-       return err;
-#else
-       err = genl_register_family_with_ops(&switch_fam, swconfig_ops);
-       if (err)
-               return err;
        return 0;
-#endif
+}
+
+static int __init
+swconfig_init(void)
+{
+       INIT_LIST_HEAD(&swdevs);
+       
+       return genl_register_family_with_ops(&switch_fam, swconfig_ops);
 }
 
 static void __exit