xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add timeout to eeprom and flash init in ether82563 driver.

Browse source 
Prevents hang on misidentified or broken cards.
This commit is contained in:
google 2012-09-03 19:23:28 +12:00
parent 25a5ae8a44
commit 3914d039b1
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sys/src/9/pc/ether82563.c
View file

@ -1650,10 +1650,17 @@ i82563shutdown(Ether *edev)
static int static int
eeread(Ctlr *ctlr, int adr) eeread(Ctlr *ctlr, int adr)
{ {
int timeout;
csr32w(ctlr, Eerd, EEstart | adr << 2); csr32w(ctlr, Eerd, EEstart | adr << 2);
while ((csr32r(ctlr, Eerd) & EEdone) == 0) timeout = 1000;
; while ((csr32r(ctlr, Eerd) & EEdone) == 0 && timeout--)
return csr32r(ctlr, Eerd) >> 16; microdelay(5);
if (timeout < 0) {
print("%s: eeread timeout.\n", cname(ctlr));
return -1;
}
return (csr32r(ctlr, Eerd) >> 16) & 0xffff;
} }
static int static int
@ -1665,6 +1672,7 @@ eeload(Ctlr *ctlr)
sum = 0; sum = 0;
for (adr = 0; adr < 0x40; adr++) { for (adr = 0; adr < 0x40; adr++) {
data = eeread(ctlr, adr); data = eeread(ctlr, adr);
if(data == -1) return -1;
ctlr->eeprom[adr] = data; ctlr->eeprom[adr] = data;
sum += data; sum += data;
} }
@ -1694,6 +1702,7 @@ static int
fread(Ctlr *c, Flash *f, int ladr) fread(Ctlr *c, Flash *f, int ladr)
{ {
u16int s; u16int s;
int timeout;
delay(1); delay(1);
if(fcycle(c, f) == -1) if(fcycle(c, f) == -1)
@ -1704,9 +1713,13 @@ fread(Ctlr *c, Flash *f, int ladr)
/* setup flash control register */ /* setup flash control register */
s = f->reg[Fctl] & ~0x3ff; s = f->reg[Fctl] & ~0x3ff;
f->reg[Fctl] = s | 1<<8 | Fgo; /* 2 byte read */ f->reg[Fctl] = s | 1<<8 | Fgo; /* 2 byte read */
timeout = 1000;
while((f->reg[Fsts] & Fdone) == 0) while((f->reg[Fsts] & Fdone) == 0 && timeout--)
; microdelay(5);
if(timeout < 0){
print("%s: fread timeout.\n");
return -1;
}
if(f->reg[Fsts] & (Fcerr|Ael)) if(f->reg[Fsts] & (Fcerr|Ael))
return -1; return -1;
return f->reg32[Fdata] & 0xffff; return f->reg32[Fdata] & 0xffff;