X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/43ac860de14dfd38fbfdf043366cc231fc991937..86b5f9e15f37d932d9bba3b7ef81ade0085c40dd:/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 16afea0af..1baccb1ba 100644
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -31,6 +31,10 @@
 #define DPRINTF(...) do {} while(0)
 #endif
 
+#define SWCONFIG_DEVNAME	"switch%d"
+
+#include "swconfig_leds.c"
+
 MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
 MODULE_LICENSE("GPL");
 
@@ -125,6 +129,62 @@ swconfig_get_pvid(struct switch_dev *dev, const struct switch_attr *attr, struct
 	return dev->ops->get_port_pvid(dev, val->port_vlan, &val->value.i);
 }
 
+static const char *
+swconfig_speed_str(enum switch_port_speed speed)
+{
+	switch (speed) {
+	case SWITCH_PORT_SPEED_10:
+		return "10baseT";
+	case SWITCH_PORT_SPEED_100:
+		return "100baseT";
+	case SWITCH_PORT_SPEED_1000:
+		return "1000baseT";
+	default:
+		break;
+	}
+
+	return "unknown";
+}
+
+static int
+swconfig_get_link(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct switch_port_link link;
+	int len;
+	int ret;
+
+	if (val->port_vlan >= dev->ports)
+		return -EINVAL;
+
+	if (!dev->ops->get_port_link)
+		return -EOPNOTSUPP;
+
+	memset(&link, 0, sizeof(link));
+	ret = dev->ops->get_port_link(dev, val->port_vlan, &link);
+	if (ret)
+		return ret;
+
+	memset(dev->buf, 0, sizeof(dev->buf));
+
+	if (link.link)
+		len = snprintf(dev->buf, sizeof(dev->buf),
+			       "port:%d link:up speed:%s %s-duplex %s%s%s",
+			       val->port_vlan,
+			       swconfig_speed_str(link.speed),
+			       link.duplex ? "full" : "half",
+			       link.tx_flow ? "txflow ": "",
+			       link.rx_flow ?	"rxflow " : "",
+			       link.aneg ? "auto" : "");
+	else
+		len = snprintf(dev->buf, sizeof(dev->buf), "port:%d link:down",
+			       val->port_vlan);
+
+	val->value.s = dev->buf;
+	val->len = len;
+
+	return 0;
+}
+
 static int
 swconfig_apply_config(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
 {
@@ -156,6 +216,7 @@ enum vlan_defaults {
 
 enum port_defaults {
 	PORT_PVID,
+	PORT_LINK,
 };
 
 static struct switch_attr default_global[] = {
@@ -180,6 +241,13 @@ static struct switch_attr default_port[] = {
 		.description = "Primary VLAN ID",
 		.set = swconfig_set_pvid,
 		.get = swconfig_get_pvid,
+	},
+	[PORT_LINK] = {
+		.type = SWITCH_TYPE_STRING,
+		.name = "link",
+		.description = "Get port link information",
+		.set = NULL,
+		.get = swconfig_get_link,
 	}
 };
 
@@ -193,6 +261,17 @@ static struct switch_attr default_vlan[] = {
 	},
 };
 
+static const struct switch_attr *
+swconfig_find_attr_by_name(const struct switch_attrlist *alist, const char *name)
+{
+	int i;
+
+	for (i = 0; i < alist->n_attr; i++)
+		if (strcmp(name, alist->attr[i].name) == 0)
+			return &alist->attr[i];
+
+	return NULL;
+}
 
 static void swconfig_defaults_init(struct switch_dev *dev)
 {
@@ -208,6 +287,10 @@ static void swconfig_defaults_init(struct switch_dev *dev)
 	if (ops->get_port_pvid || ops->set_port_pvid)
 		set_bit(PORT_PVID, &dev->def_port);
 
+	if (ops->get_port_link &&
+	    !swconfig_find_attr_by_name(&ops->attr_port, "link"))
+		set_bit(PORT_LINK, &dev->def_port);
+
 	/* always present, can be no-op */
 	set_bit(GLOBAL_APPLY, &dev->def_global);
 	set_bit(GLOBAL_RESET, &dev->def_global);
@@ -760,8 +843,9 @@ swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
 		return -1;
 
 	NLA_PUT_U32(msg, SWITCH_ATTR_ID, dev->id);
-	NLA_PUT_STRING(msg, SWITCH_ATTR_NAME, dev->name);
 	NLA_PUT_STRING(msg, SWITCH_ATTR_DEV_NAME, dev->devname);
+	NLA_PUT_STRING(msg, SWITCH_ATTR_ALIAS, dev->alias);
+	NLA_PUT_STRING(msg, SWITCH_ATTR_NAME, dev->name);
 	NLA_PUT_U32(msg, SWITCH_ATTR_VLANS, dev->vlans);
 	NLA_PUT_U32(msg, SWITCH_ATTR_PORTS, dev->ports);
 	NLA_PUT_U32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port);
@@ -857,13 +941,19 @@ static struct genl_ops swconfig_ops[] = {
 int
 register_switch(struct switch_dev *dev, struct net_device *netdev)
 {
+	struct switch_dev *sdev;
+	const int max_switches = 8 * sizeof(unsigned long);
+	unsigned long in_use = 0;
+	int err;
+	int i;
+
 	INIT_LIST_HEAD(&dev->dev_list);
 	if (netdev) {
 		dev->netdev = netdev;
-		if (!dev->devname)
-			dev->devname = netdev->name;
+		if (!dev->alias)
+			dev->alias = netdev->name;
 	}
-	BUG_ON(!dev->devname);
+	BUG_ON(!dev->alias);
 
 	if (dev->ports > 0) {
 		dev->portbuf = kzalloc(sizeof(struct switch_port) * dev->ports,
@@ -871,13 +961,36 @@ register_switch(struct switch_dev *dev, struct net_device *netdev)
 		if (!dev->portbuf)
 			return -ENOMEM;
 	}
-	dev->id = ++swdev_id;
 	swconfig_defaults_init(dev);
 	spin_lock_init(&dev->lock);
 	swconfig_lock();
+	dev->id = ++swdev_id;
+
+	list_for_each_entry(sdev, &swdevs, dev_list) {
+		if (!sscanf(sdev->devname, SWCONFIG_DEVNAME, &i))
+			continue;
+		if (i < 0 || i > max_switches)
+			continue;
+
+		set_bit(i, &in_use);
+	}
+	i = find_first_zero_bit(&in_use, max_switches);
+
+	if (i == max_switches) {
+		swconfig_unlock();
+		return -ENFILE;
+	}
+
+	/* fill device name */
+	snprintf(dev->devname, IFNAMSIZ, SWCONFIG_DEVNAME, i);
+
 	list_add(&dev->dev_list, &swdevs);
 	swconfig_unlock();
 
+	err = swconfig_create_led_trigger(dev);
+	if (err)
+		return err;
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(register_switch);
@@ -885,6 +998,7 @@ EXPORT_SYMBOL_GPL(register_switch);
 void
 unregister_switch(struct switch_dev *dev)
 {
+	swconfig_destroy_led_trigger(dev);
 	kfree(dev->portbuf);
 	spin_lock(&dev->lock);
 	swconfig_lock();