X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/82212c6f65be34b9f6fbe1983249fdf492ec2c93..403aac591d6096e5a8974a0a283bfa7417b5027e:/package/switch/src/switch-robo.c

diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index 43e8098b5..ec9e33733 100644
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -34,6 +34,10 @@
 #include "switch-core.h"
 #include "etc53xx.h"
 
+#ifdef CONFIG_BCM47XX
+#include <nvram.h>
+#endif
+
 #define DRIVER_NAME		"bcm53xx"
 #define DRIVER_VERSION		"0.02"
 #define PFX			"roboswitch: "
@@ -63,19 +67,6 @@
 #define SIOCGETCPHYRD           (SIOCDEVPRIVATE + 9)
 #define SIOCSETCPHYWR           (SIOCDEVPRIVATE + 10)
 
-/* linux 2.4 does not have 'bool' */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define bool int
-#endif
-
-/* Only available on brcm-2.4/brcm47xx */
-#ifdef BROADCOM
-extern char *nvram_get(const char *name);
-#define getvar(str) (nvram_get(str)?:"")
-#else
-#define getvar(str) ""
-#endif
-
 /* Data structure for a Roboswitch device. */
 struct robo_switch {
 	char *device;			/* The device name string (ethX) */
@@ -130,7 +121,7 @@ static u16 mdio_read(__u16 phy_id, __u8 reg)
 			       "[%s:%d] SIOCGETCPHYRD failed!\n", __FILE__, __LINE__);
 			return 0xffff;
 		}
-	
+
 		return args[1];
 	} else {
 		struct mii_ioctl_data *mii = (struct mii_ioctl_data *) &robo.ifr.ifr_data;
@@ -160,7 +151,7 @@ static void mdio_write(__u16 phy_id, __u8 reg, __u16 val)
 
 			return;
 		}
-		
+
 		if (do_ioctl(SIOCSETCPHYWR, args) < 0) {
 			printk(KERN_ERR PFX
 			       "[%s:%d] SIOCGETCPHYWR failed!\n", __FILE__, __LINE__);
@@ -184,13 +175,13 @@ static void mdio_write(__u16 phy_id, __u8 reg, __u16 val)
 static int robo_reg(__u8 page, __u8 reg, __u8 op)
 {
 	int i = 3;
-	
+
 	/* set page number */
-	mdio_write(robo.phy_addr, REG_MII_PAGE, 
+	mdio_write(robo.phy_addr, REG_MII_PAGE,
 		(page << 8) | REG_MII_PAGE_ENABLE);
-	
+
 	/* set register address */
-	mdio_write(robo.phy_addr, REG_MII_ADDR, 
+	mdio_write(robo.phy_addr, REG_MII_ADDR,
 		(reg << 8) | op);
 
 	/* check if operation completed */
@@ -200,7 +191,7 @@ static int robo_reg(__u8 page, __u8 reg, __u8 op)
 	}
 
 	printk(KERN_ERR PFX "[%s:%d] timeout in robo_reg!\n", __FILE__, __LINE__);
-	
+
 	return 0;
 }
 
@@ -208,9 +199,9 @@ static int robo_reg(__u8 page, __u8 reg, __u8 op)
 static void robo_read(__u8 page, __u8 reg, __u16 *val, int count)
 {
 	int i;
-	
+
 	robo_reg(page, reg, REG_MII_ADDR_READ);
-	
+
 	for (i = 0; i < count; i++)
 		val[i] = mdio_read(robo.phy_addr, REG_MII_DATA0 + i);
 }
@@ -219,14 +210,14 @@ static void robo_read(__u8 page, __u8 reg, __u16 *val, int count)
 static __u16 robo_read16(__u8 page, __u8 reg)
 {
 	robo_reg(page, reg, REG_MII_ADDR_READ);
-	
+
 	return mdio_read(robo.phy_addr, REG_MII_DATA0);
 }
 
 static __u32 robo_read32(__u8 page, __u8 reg)
 {
 	robo_reg(page, reg, REG_MII_ADDR_READ);
-	
+
 	return mdio_read(robo.phy_addr, REG_MII_DATA0) +
 		(mdio_read(robo.phy_addr, REG_MII_DATA0 + 1) << 16);
 }
@@ -244,7 +235,7 @@ static void robo_write32(__u8 page, __u8 reg, __u32 val32)
 	/* write data */
 	mdio_write(robo.phy_addr, REG_MII_DATA0, val32 & 65535);
 	mdio_write(robo.phy_addr, REG_MII_DATA0 + 1, val32 >> 16);
-	
+
 	robo_reg(page, reg, REG_MII_ADDR_WRITE);
 }
 
@@ -254,7 +245,7 @@ static int robo_vlan5350(void)
 	/* set vlan access id to 15 and read it back */
 	__u16 val16 = 15;
 	robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
-	
+
 	/* 5365 will refuse this as it does not have this reg */
 	return (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350) == val16);
 }
@@ -263,6 +254,9 @@ static int robo_switch_enable(void)
 {
 	unsigned int i, last_port;
 	u16 val;
+#ifdef CONFIG_BCM47XX
+	char buf[20];
+#endif
 
 	val = robo_read16(ROBO_CTRL_PAGE, ROBO_SWITCH_MODE);
 	if (!(val & (1 << 1))) {
@@ -283,10 +277,13 @@ static int robo_switch_enable(void)
 			robo_write16(ROBO_CTRL_PAGE, i, 0);
 	}
 
+#ifdef CONFIG_BCM47XX
 	/* WAN port LED, except for Netgear WGT634U */
-	if (strcmp(getvar("nvram_type"), "cfe") != 0)
-		robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
-
+	if (nvram_getenv("nvram_type", buf, sizeof(buf)) >= 0) {
+		if (strcmp(buf, "cfe") != 0)
+			robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F);
+	}
+#endif
 	return 0;
 }
 
@@ -306,7 +303,7 @@ static int robo_probe(char *devname)
 {
 	__u32 phyid;
 	unsigned int i;
-	int err;
+	int err = 1;
 
 	printk(KERN_INFO PFX "Probing device %s: ", devname);
 	strcpy(robo.ifr.ifr_name, devname);
@@ -336,7 +333,7 @@ static int robo_probe(char *devname)
 		    (mii->phy_id != ROBO_PHY_ADDR_BCM63XX) &&
 		    (mii->phy_id != ROBO_PHY_ADDR_TG3)) {
 			printk("Invalid phy address (%d)\n", mii->phy_id);
-			return 1;
+			goto done;
 		}
 		robo.use_et = 0;
 		/* The robo has a fixed PHY address that is different from the
@@ -349,7 +346,7 @@ static int robo_probe(char *devname)
 
 	if (phyid == 0xffffffff || phyid == 0x55210022) {
 		printk("No Robo switch in managed mode found, phy_id = 0x%08x\n", phyid);
-		return 1;
+		goto done;
 	}
 
 	/* Get the device ID */
@@ -366,11 +363,18 @@ static int robo_probe(char *devname)
 	robo_switch_reset();
 	err = robo_switch_enable();
 	if (err)
-		return err;
+		goto done;
+	err = 0;
 
 	printk("found a 5%s%x!%s\n", robo.devid & 0xff00 ? "" : "3", robo.devid,
 		robo.is_5350 ? " It's a 5350." : "");
-	return 0;
+
+done:
+	if (err) {
+		dev_put(robo.dev);
+		robo.dev = NULL;
+	}
+	return err;
 }
 
 
@@ -381,7 +385,7 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
 	int j;
 
 	val16 = (nr) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */;
-	
+
 	if (robo.is_5350) {
 		u32 val32;
 		robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
@@ -403,7 +407,7 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
 			}
 			len += sprintf(buf + len, "\n");
 		}
-	} else { 
+	} else {
 		robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
 		/* actual read */
 		val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
@@ -436,7 +440,7 @@ static int handle_vlan_port_write(void *driver, char *buf, int nr)
 	switch_vlan_config *c = switch_parse_vlan(d, buf);
 	int j;
 	__u16 val16;
-	
+
 	if (c == NULL)
 		return -EINVAL;
 
@@ -495,7 +499,7 @@ static int handle_enable_vlan_read(void *driver, char *buf, int nr)
 static int handle_enable_vlan_write(void *driver, char *buf, int nr)
 {
 	int disable = ((buf[0] != '1') ? 1 : 0);
-	
+
 	robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL0, disable ? 0 :
 		(1 << 7) /* 802.1Q VLAN */ | (3 << 5) /* mac check and hash */);
 	robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL1, disable ? 0 :
@@ -519,7 +523,7 @@ static int handle_reset(void *driver, char *buf, int nr)
 	switch_vlan_config *c = switch_parse_vlan(d, buf);
 	int j;
 	__u16 val16;
-	
+
 	if (c == NULL)
 		return -EINVAL;
 
@@ -565,7 +569,7 @@ static int __init robo_init(void)
 			notfound = robo_probe(device);
 	}
 	device[3]--;
-	
+
 	if (notfound) {
 		kfree(device);
 		return -ENODEV;
@@ -615,6 +619,8 @@ static int __init robo_init(void)
 static void __exit robo_exit(void)
 {
 	switch_unregister_driver(DRIVER_NAME);
+	if (robo.dev)
+		dev_put(robo.dev);
 	kfree(robo.device);
 }