hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switch: the BCM5365 is a special switch and the BCM5350 or BCM5325 is the normal case.

Browse Source 
This makes it easier to compare this code with the code from the Broadcom SDK.

SVN-Revision: 35580
master
Hauke Mehrtens 12 years ago
parent 827e315017
commit 9d3b0f5661
2 changed files with 40 additions and 47 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      package/switch/src/etc53xx.h
  2. 73
      package/switch/src/switch-robo.c

14
package/switch/src/etc53xx.h
Unescape View File

@ -542,9 +542,9 @@ typedef struct _ROBO_VLAN_CTRL0_STRUC
#define VLAN_TABLE_WRITE 1 /* for read/write state in table access reg */ #define VLAN_TABLE_WRITE 1 /* for read/write state in table access reg */
#define VLAN_TABLE_READ 0 /* for read/write state in table access reg */ #define VLAN_TABLE_READ 0 /* for read/write state in table access reg */
#define VLAN_ID_HIGH_BITS 0 /* static high bits in table access reg */ #define VLAN_ID_HIGH_BITS 0 /* static high bits in table access reg */
#define VLAN_ID_MAX 255 /* max VLAN id */ #define VLAN_ID_MAX 15 /* max VLAN id (5350) */
#define VLAN_ID_MAX5350 15 /* max VLAN id (5350) */ #define VLAN_ID_MAX_5365 255 /* max VLAN id */
#define VLAN_ID_MAX5395 4094 /* max VLAN id (5395) */ #define VLAN_ID_MAX_5395 4094 /* max VLAN id (5395) */
#define VLAN_ID_MASK VLAN_ID_MAX /* VLAN id mask */ #define VLAN_ID_MASK VLAN_ID_MAX /* VLAN id mask */
#ifdef BCM5380 #ifdef BCM5380
#define VLAN_UNTAG_SHIFT 13 /* for postioning untag bits in write reg */ #define VLAN_UNTAG_SHIFT 13 /* for postioning untag bits in write reg */
@ -595,10 +595,10 @@ typedef struct _ROBO_VLAN_READ_WRITE_STRUC_5350
#define ROBO_VLAN_CTRL3 0x03 /* 8b: VLAN Control 3 Register */ #define ROBO_VLAN_CTRL3 0x03 /* 8b: VLAN Control 3 Register */
#define ROBO_VLAN_CTRL4 0x04 /* 8b: VLAN Control 4 Register */ #define ROBO_VLAN_CTRL4 0x04 /* 8b: VLAN Control 4 Register */
#define ROBO_VLAN_CTRL5 0x05 /* 8b: VLAN Control 5 Register */ #define ROBO_VLAN_CTRL5 0x05 /* 8b: VLAN Control 5 Register */
#define ROBO_VLAN_TABLE_ACCESS 0x08 /* 14b: VLAN Table Access Register */ #define ROBO_VLAN_TABLE_ACCESS_5365 0x08 /* 14b: VLAN Table Access Register */
#define ROBO_VLAN_TABLE_ACCESS_5350 0x06 /* 14b: VLAN Table Access Register (5350) */ #define ROBO_VLAN_TABLE_ACCESS 0x06 /* 14b: VLAN Table Access Register (5350) */
#define ROBO_VLAN_WRITE 0x0a /* 15b: VLAN Write Register */ #define ROBO_VLAN_WRITE_5365 0x0a /* 15b: VLAN Write Register */
#define ROBO_VLAN_WRITE_5350 0x08 /* 15b: VLAN Write Register (5350) */ #define ROBO_VLAN_WRITE 0x08 /* 15b: VLAN Write Register (5350) */
#define ROBO_VLAN_READ 0x0c /* 15b: VLAN Read Register */ #define ROBO_VLAN_READ 0x0c /* 15b: VLAN Read Register */
#define ROBO_VLAN_PORT0_DEF_TAG 0x10 /* 16b: VLAN Port 0 Default Tag Register */ #define ROBO_VLAN_PORT0_DEF_TAG 0x10 /* 16b: VLAN Port 0 Default Tag Register */
#define ROBO_VLAN_PORT1_DEF_TAG 0x12 /* 16b: VLAN Port 1 Default Tag Register */ #define ROBO_VLAN_PORT1_DEF_TAG 0x12 /* 16b: VLAN Port 1 Default Tag Register */

73
package/switch/src/switch-robo.c
Unescape View File

@ -72,8 +72,8 @@
struct robo_switch { struct robo_switch {
char *device; /* The device name string (ethX) */ char *device; /* The device name string (ethX) */
u16 devid; /* ROBO_DEVICE_ID_53xx */ u16 devid; /* ROBO_DEVICE_ID_53xx */
bool is_5350; bool is_5365;
u8 gmii; /* gigabit mii */ bool gmii; /* gigabit mii */
int gpio_robo_reset; int gpio_robo_reset;
int gpio_lanports_enable; int gpio_lanports_enable;
struct ifreq ifr; struct ifreq ifr;
@ -198,34 +198,22 @@ static void robo_write32(__u8 page, __u8 reg, __u32 val32)
robo_reg(page, reg, REG_MII_ADDR_WRITE); robo_reg(page, reg, REG_MII_ADDR_WRITE);
} }
/* checks that attached switch is 5325/5352/5354/5356/5357/53115 */ /* checks that attached switch is 5365 */
static int robo_vlan5350(__u32 phyid) static bool robo_bcm5365(void)
{ {
/* set vlan access id to 15 and read it back */ /* set vlan access id to 15 and read it back */
__u16 val16 = 15; __u16 val16 = 15;
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16); robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
/* 5365 will refuse this as it does not have this reg */ /* 5365 will refuse this as it does not have this reg */
if (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350) != val16) return robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS) != val16;
return 0; }
/* gigabit ? */
static bool robo_gmii(void)
{
if (mdio_read(0, ROBO_MII_STAT) & 0x0100) if (mdio_read(0, ROBO_MII_STAT) & 0x0100)
robo.gmii = ((mdio_read(0, 0x0f) & 0xf000) != 0); return ((mdio_read(0, 0x0f) & 0xf000) != 0);
/* 53115 ? */ return false;
if (robo.gmii && robo_read32(ROBO_STAT_PAGE, ROBO_LSA_IM_PORT) != 0) {
robo_write16(ROBO_ARLIO_PAGE, ROBO_VTBL_INDX_5395, val16);
robo_write16(ROBO_ARLIO_PAGE, ROBO_VTBL_ACCESS_5395,
(1 << 7) /* start */ | 1 /* read */);
if (robo_read16(ROBO_ARLIO_PAGE, ROBO_VTBL_ACCESS_5395) == 1 &&
robo_read16(ROBO_ARLIO_PAGE, ROBO_VTBL_INDX_5395) == val16)
return 4;
}
/* dirty trick for 5356/5357 */
if ((phyid & 0xfff0ffff ) == 0x5da00362 ||
(phyid & 0xfff0ffff ) == 0x5e000362)
return 3;
/* 5325/5352/5354*/
return 1;
} }
static int robo_switch_enable(void) static int robo_switch_enable(void)
@ -392,7 +380,12 @@ static int robo_probe(char *devname)
} }
if (!robo.devid) if (!robo.devid)
robo.devid = ROBO_DEVICE_ID_5325; /* Fake it */ robo.devid = ROBO_DEVICE_ID_5325; /* Fake it */
robo.is_5350 = robo_vlan5350(phyid); if (robo.devid == ROBO_DEVICE_ID_5325)
robo.is_5365 = robo_bcm5365();
else
robo.is_5365 = false;
robo.gmii = robo_gmii();
robo_switch_reset(); robo_switch_reset();
err = robo_switch_enable(); err = robo_switch_enable();
@ -400,7 +393,7 @@ static int robo_probe(char *devname)
goto err_gpio_lanports; goto err_gpio_lanports;
printk(KERN_INFO PFX "found a 5%s%x!%s at %s\n", robo.devid & 0xff00 ? "" : "3", robo.devid, printk(KERN_INFO PFX "found a 5%s%x!%s at %s\n", robo.devid & 0xff00 ? "" : "3", robo.devid,
robo.is_5350 ? " It's a 5350." : "", devname); robo.is_5365 ? " It's a BCM5365." : "", devname);
return 0; return 0;
@ -426,9 +419,9 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
val16 = (nr) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */; val16 = (nr) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */;
if (robo.is_5350) { if (!robo.is_5365) {
u32 val32; u32 val32;
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16); robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
/* actual read */ /* actual read */
val32 = robo_read32(ROBO_VLAN_PAGE, ROBO_VLAN_READ); val32 = robo_read32(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
if ((val32 & (1 << 20)) /* valid */) { if ((val32 & (1 << 20)) /* valid */) {
@ -448,7 +441,7 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
len += sprintf(buf + len, "\n"); len += sprintf(buf + len, "\n");
} }
} else { } else {
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16); robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5365, val16);
/* actual read */ /* actual read */
val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ); val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
if ((val16 & (1 << 14)) /* valid */) { if ((val16 & (1 << 14)) /* valid */) {
@ -504,13 +497,13 @@ static int handle_vlan_port_write(void *driver, char *buf, int nr)
} }
val16 = (nr) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */; val16 = (nr) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */;
if (robo.is_5350) { if (robo.is_5365) {
robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5350, robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5365,
(1 << 20) /* valid */ | (c->untag << 6) | c->port);
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
} else {
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE,
(1 << 14) /* valid */ | (c->untag << 7) | c->port); (1 << 14) /* valid */ | (c->untag << 7) | c->port);
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5365, val16);
} else {
robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE,
(1 << 20) /* valid */ | (c->untag << 6) | c->port);
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16); robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
} }
@ -643,14 +636,14 @@ static int handle_reset(void *driver, char *buf, int nr)
set_switch(0); set_switch(0);
/* reset vlans */ /* reset vlans */
for (j = 0; j <= ((robo.is_5350) ? VLAN_ID_MAX5350 : VLAN_ID_MAX); j++) { for (j = 0; j <= ((robo.is_5365) ? VLAN_ID_MAX_5365 : VLAN_ID_MAX); j++) {
/* write config now */ /* write config now */
val16 = (j) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */; val16 = (j) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */;
if (robo.is_5350) if (robo.is_5365)
robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5350, 0); robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5365, 0);
else else
robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE, 0); robo_write32(ROBO_VLAN_PAGE, ROBO_VLAN_WRITE, 0);
robo_write16(ROBO_VLAN_PAGE, robo.is_5350 ? ROBO_VLAN_TABLE_ACCESS_5350 : robo_write16(ROBO_VLAN_PAGE, robo.is_5365 ? ROBO_VLAN_TABLE_ACCESS_5365 :
ROBO_VLAN_TABLE_ACCESS, ROBO_VLAN_TABLE_ACCESS,
val16); val16);
} }

Write Preview
Loading…
Cancel
Save