sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

net: phy: bugfixes: mv88E61xx multichip addressing support 

With these fixes, this driver works properly for multi chip
addressging mode

Bugfixes:
1. Build error fixed for function mv88e61xx_busychk_multic-fixed
2. PHY dev address error detection- fixed
3. wrong busy bit was refered in function mv88e61xx_busychk -fixed
4. invalid data read ptr was refered for RD_PHY in case of
	multichip addressing mode -fixed

The Multichip Address mode is tested with RD6281A board having
MV88E6165 switch on it

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Prafulla Wadaskar 2009-07-16 20:58:02 +05:30 committed by Ben Warren
parent 16025ea455
commit 443ce4ac9d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/phy/mv88e61xx.c
View File

@ -36,7 +36,7 @@
* By default single chip mode is configured * By default single chip mode is configured
* multichip mode operation can be configured in board header * multichip mode operation can be configured in board header
*/ */
static int mv88e61xx_busychk_multic(u32 devaddr) static int mv88e61xx_busychk_multic(char *name, u32 devaddr)
{ {
u32 reg = 0; u32 reg = 0;
u32 timeout = MV88E61XX_PHY_TIMEOUT; u32 timeout = MV88E61XX_PHY_TIMEOUT;
@ -58,11 +58,11 @@ static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data)
u32 mii_dev_addr; u32 mii_dev_addr;
/* command to read PHY dev address */ /* command to read PHY dev address */
if (!miiphy_read(name, 0xEE, 0xEE, &mii_dev_addr)) { if (miiphy_read(name, 0xEE, 0xEE, &mii_dev_addr)) {
printf("Error..could not read PHY dev address\n"); printf("Error..could not read PHY dev address\n");
return; return;
} }
mv88e61xx_busychk_multic(mii_dev_addr); mv88e61xx_busychk_multic(name, mii_dev_addr);
/* Write data to Switch indirect data register */ /* Write data to Switch indirect data register */
miiphy_write(name, mii_dev_addr, 0x1, data); miiphy_write(name, mii_dev_addr, 0x1, data);
/* Write command to Switch indirect command register (write) */ /* Write command to Switch indirect command register (write) */
@ -77,18 +77,18 @@ static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data)
u32 mii_dev_addr; u32 mii_dev_addr;
/* command to read PHY dev address */ /* command to read PHY dev address */
if (!miiphy_read(name, 0xEE, 0xEE, &mii_dev_addr)) { if (miiphy_read(name, 0xEE, 0xEE, &mii_dev_addr)) {
printf("Error..could not read PHY dev address\n"); printf("Error..could not read PHY dev address\n");
return; return;
} }
mv88e61xx_busychk_multic(mii_dev_addr); mv88e61xx_busychk_multic(name, mii_dev_addr);
/* Write command to Switch indirect command register (read) */ /* Write command to Switch indirect command register (read) */
miiphy_write(name, mii_dev_addr, 0x0, miiphy_write(name, mii_dev_addr, 0x0,
reg_ofs | (phy_adr << 5) | (1 << 10) | (1 << 12) | (1 << reg_ofs | (phy_adr << 5) | (1 << 11) | (1 << 12) | (1 <<
15)); 15));
mv88e61xx_busychk_multic(mii_dev_addr); mv88e61xx_busychk_multic(name, mii_dev_addr);
/* Read data from Switch indirect data register */ /* Read data from Switch indirect data register */
miiphy_read(name, mii_dev_addr, 0x1, (u16 *) & data); miiphy_read(name, mii_dev_addr, 0x1, data);
} }
#endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */ #endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */
@ -212,7 +212,7 @@ static int mv88e61xx_busychk(char *name)
printf("SMI busy timeout\n"); printf("SMI busy timeout\n");
return -1; return -1;
} }
} while (reg & 1 << 28); /* busy mask */ } while (reg & 1 << 15); /* busy mask */
return 0; return 0;
} }

2
drivers/net/phy/mv88e61xx.h
View File

@ -49,7 +49,7 @@
#define MV88E61XX_ADDR_OFST 5 #define MV88E61XX_ADDR_OFST 5
#ifdef CONFIG_MV88E61XX_MULTICHIP_ADRMODE #ifdef CONFIG_MV88E61XX_MULTICHIP_ADRMODE
static int mv88e61xx_busychk_multic(u32 devaddr); static int mv88e61xx_busychk_multic(char *name, u32 devaddr);
static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data); static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data);
static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data); static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data);
#define WR_PHY mv88e61xx_wr_phy #define WR_PHY mv88e61xx_wr_phy