Commit a6baf3af authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik

r8169: prevent bit sign expansion error in mdio_write

Oops.

The current code does not like being given an u16 with the highest
bit set as an argument to mdio_write. Let's enforce a correct range of
values for both the register address and value (resp. 5 and 16 bits).

The callers are currently left as-is.
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent 50d84c2d
...@@ -470,7 +470,7 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) ...@@ -470,7 +470,7 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
{ {
int i; int i;
RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0xFF) << 16 | value); RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0x1f) << 16 | (value & 0xffff));
for (i = 20; i > 0; i--) { for (i = 20; i > 0; i--) {
/* /*
...@@ -487,7 +487,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) ...@@ -487,7 +487,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
{ {
int i, value = -1; int i, value = -1;
RTL_W32(PHYAR, 0x0 | (reg_addr & 0xFF) << 16); RTL_W32(PHYAR, 0x0 | (reg_addr & 0x1f) << 16);
for (i = 20; i > 0; i--) { for (i = 20; i > 0; i--) {
/* /*
...@@ -495,7 +495,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) ...@@ -495,7 +495,7 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
* the specified MII register. * the specified MII register.
*/ */
if (RTL_R32(PHYAR) & 0x80000000) { if (RTL_R32(PHYAR) & 0x80000000) {
value = (int) (RTL_R32(PHYAR) & 0xFFFF); value = RTL_R32(PHYAR) & 0xffff;
break; break;
} }
udelay(25); udelay(25);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment