kernel: swconfig: make compatible with kernel 5.2

[openwrt/staging/mkresin.git] / target / linux / generic / files / drivers / net / phy / swconfig.c

diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c
index c70ca74cadde948bd330543cdf9811ce130899b1..4b039991dba99b3ffe414c55fb919918d8c86e27 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
 
 static int swdev_id;
 static struct list_head swdevs;
-static DEFINE_SPINLOCK(swdevs_lock);
+static DEFINE_MUTEX(swdevs_lock);
 struct swconfig_callback;
 
 struct swconfig_callback {
@@ -269,13 +269,7 @@ static void swconfig_defaults_init(struct switch_dev *dev)
 }
 
 
-static struct genl_family switch_fam = {
-       .id = GENL_ID_GENERATE,
-       .name = "switch",
-       .hdrsize = 0,
-       .version = 1,
-       .maxattr = SWITCH_ATTR_MAX,
-};
+static struct genl_family switch_fam;
 
 static const struct nla_policy switch_policy[SWITCH_ATTR_MAX+1] = {
        [SWITCH_ATTR_ID] = { .type = NLA_U32 },
@@ -302,13 +296,13 @@ static struct nla_policy link_policy[SWITCH_LINK_ATTR_MAX] = {
 static inline void
 swconfig_lock(void)
 {
-       spin_lock(&swdevs_lock);
+       mutex_lock(&swdevs_lock);
 }
 
 static inline void
 swconfig_unlock(void)
 {
-       spin_unlock(&swdevs_lock);
+       mutex_unlock(&swdevs_lock);
 }
 
 static struct switch_dev *
@@ -506,7 +500,7 @@ swconfig_lookup_attr(struct switch_dev *dev, struct genl_info *info,
        struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
        const struct switch_attrlist *alist;
        const struct switch_attr *attr = NULL;
-       int attr_id;
+       unsigned int attr_id;
 
        /* defaults */
        struct switch_attr *def_list;
@@ -590,13 +584,23 @@ swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
        val->len = 0;
        nla_for_each_nested(nla, head, rem) {
                struct nlattr *tb[SWITCH_PORT_ATTR_MAX+1];
-               struct switch_port *port = &val->value.ports[val->len];
+               struct switch_port *port;
 
                if (val->len >= max)
                        return -EINVAL;
 
+               port = &val->value.ports[val->len];
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               if (nla_parse_nested_deprecated(tb, SWITCH_PORT_ATTR_MAX, nla,
+                               port_policy, NULL))
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
+               if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
+                               port_policy, NULL))
+#else
                if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
                                port_policy))
+#endif
                        return -EINVAL;
 
                if (!tb[SWITCH_PORT_ID])
@@ -617,7 +621,13 @@ swconfig_parse_link(struct sk_buff *msg, struct nlattr *nla,
 {
        struct nlattr *tb[SWITCH_LINK_ATTR_MAX + 1];
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+       if (nla_parse_nested_deprecated(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL))
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
+       if (nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL))
+#else
        if (nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy))
+#endif
                return -EINVAL;
 
        link->duplex = !!tb[SWITCH_LINK_FLAG_DUPLEX];
@@ -891,7 +901,7 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
        default:
                pr_debug("invalid type in attribute\n");
                err = -EINVAL;
-               goto error;
+               goto nla_put_failure;
        }
        genlmsg_end(msg, hdr);
        err = msg->len;
@@ -995,60 +1005,126 @@ swconfig_done(struct netlink_callback *cb)
 static struct genl_ops swconfig_ops[] = {
        {
                .cmd = SWITCH_CMD_LIST_GLOBAL,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .doit = swconfig_list_attrs,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_LIST_VLAN,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .doit = swconfig_list_attrs,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_LIST_PORT,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .doit = swconfig_list_attrs,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_GET_GLOBAL,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .doit = swconfig_get_attr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_GET_VLAN,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .doit = swconfig_get_attr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_GET_PORT,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .doit = swconfig_get_attr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_SET_GLOBAL,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .flags = GENL_ADMIN_PERM,
                .doit = swconfig_set_attr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_SET_VLAN,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .flags = GENL_ADMIN_PERM,
                .doit = swconfig_set_attr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_SET_PORT,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .flags = GENL_ADMIN_PERM,
                .doit = swconfig_set_attr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
        },
        {
                .cmd = SWITCH_CMD_GET_SWITCH,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
+#endif
                .dumpit = swconfig_dump_switches,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
                .policy = switch_policy,
+#endif
                .done = swconfig_done,
        }
 };
 
+static struct genl_family switch_fam = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
+       .id = GENL_ID_GENERATE,
+#endif
+       .name = "switch",
+       .hdrsize = 0,
+       .version = 1,
+       .maxattr = SWITCH_ATTR_MAX,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+       .policy = switch_policy,
+#endif
+       .module = THIS_MODULE,
+       .ops = swconfig_ops,
+       .n_ops = ARRAY_SIZE(swconfig_ops),
+};
+
 #ifdef CONFIG_OF
 void
 of_switch_load_portmap(struct switch_dev *dev)
@@ -1111,6 +1187,11 @@ register_switch(struct switch_dev *dev, struct net_device *netdev)
        }
        BUG_ON(!dev->alias);
 
+       /* Make sure swdev_id doesn't overflow */
+       if (swdev_id == INT_MAX) {
+               return -ENOMEM;
+       }
+
        if (dev->ports > 0) {
                dev->portbuf = kzalloc(sizeof(struct switch_port) *
                                dev->ports, GFP_KERNEL);
@@ -1215,8 +1296,12 @@ static int __init
 swconfig_init(void)
 {
        INIT_LIST_HEAD(&swdevs);
-       
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
        return genl_register_family_with_ops(&switch_fam, swconfig_ops);
+#else
+       return genl_register_family(&switch_fam);
+#endif
 }
 
 static void __exit
@@ -1227,4 +1312,3 @@ swconfig_exit(void)
 
 module_init(swconfig_init);
 module_exit(swconfig_exit);
-