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

ether82563: work arround phyprobe() failing on 82579LM without cable plugged in (thanks mischief)

Browse source 
on 82579LM, the phy status is inaccessible without
a cable plugged, so we wait and retry phyprobe() once
the link status changes.
This commit is contained in:
cinap_lenrek 2017-02-20 22:01:54 +01:00
parent 55373a6498
commit a32d11dff3
1 changed files with 23 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1179,6 +1179,15 @@ phyprobe(Ctlr *c, uint mask)
return ~0; return ~0;
} }
static void
lsleep(Ctlr *c, uint m)
{
c->lim = 0;
i82563im(c, m);
c->lsleep++;
sleep(&c->lrendez, i82563lim, c);
}
static void static void
phyl79proc(void *v) phyl79proc(void *v)
{ {
@ -1188,15 +1197,12 @@ phyl79proc(void *v)
e = v; e = v;
c = e->ctlr; c = e->ctlr;
phyno = phyprobe(c, 3<<1);
if(phyno == ~0){
print("%s: no phy, exiting\n", up->text);
pexit("no phy", 1);
}
while(waserror()) while(waserror())
; ;
while((phyno = phyprobe(c, 3<<1)) == ~0)
lsleep(c, Lsc);
for(;;){ for(;;){
phy = phyread(c, phyno, Phystat); phy = phyread(c, phyno, Phystat);
if(phy == ~0){ if(phy == ~0){
@ -1216,10 +1222,7 @@ next:
i = 3; i = 3;
c->speeds[i]++; c->speeds[i]++;
e->mbps = speedtab[i]; e->mbps = speedtab[i];
c->lim = 0; lsleep(c, Lsc);
i82563im(c, Lsc);
c->lsleep++;
sleep(&c->lrendez, i82563lim, c);
} }
} }
@ -1232,18 +1235,15 @@ phylproc(void *v)
e = v; e = v;
c = e->ctlr; c = e->ctlr;
while(waserror())
;
phyno = phyprobe(c, 3<<1); while((phyno = phyprobe(c, 3<<1)) == ~0)
if(phyno == ~0){ lsleep(c, Lsc);
print("%s: no phy, exiting\n", up->text);
pexit("no phy", 1);
}
if(c->type == i82573 && (phy = phyread(c, phyno, Phyier)) != ~0) if(c->type == i82573 && (phy = phyread(c, phyno, Phyier)) != ~0)
phywrite(c, phyno, Phyier, phy | Lscie | Ancie | Spdie | Panie); phywrite(c, phyno, Phyier, phy | Lscie | Ancie | Spdie | Panie);
while(waserror())
;
for(;;){ for(;;){
phy = phyread(c, phyno, Physsr); phy = phyread(c, phyno, Physsr);
if(phy == ~0){ if(phy == ~0){
@ -1280,10 +1280,7 @@ next:
e->mbps = speedtab[i]; e->mbps = speedtab[i];
if(c->type == i82563) if(c->type == i82563)
phyerrata(e, c, phyno); phyerrata(e, c, phyno);
c->lim = 0; lsleep(c, Lsc);
i82563im(c, Lsc);
c->lsleep++;
sleep(&c->lrendez, i82563lim, c);
} }
} }
@ -1296,11 +1293,11 @@ pcslproc(void *v)
e = v; e = v;
c = e->ctlr; c = e->ctlr;
while(waserror())
;
if(c->type == i82575 || c->type == i82576) if(c->type == i82575 || c->type == i82576)
csr32w(c, Connsw, Enrgirq); csr32w(c, Connsw, Enrgirq);
while(waserror())
;
for(;;){ for(;;){
phy = csr32r(c, Pcsstat); phy = csr32r(c, Pcsstat);
e->link = phy & Linkok; e->link = phy & Linkok;
@ -1311,10 +1308,7 @@ pcslproc(void *v)
csr32w(c, Pcsctl, csr32r(c, Pcsctl) | Pan | Prestart); csr32w(c, Pcsctl, csr32r(c, Pcsctl) | Pan | Prestart);
c->speeds[i]++; c->speeds[i]++;
e->mbps = speedtab[i]; e->mbps = speedtab[i];
c->lim = 0; lsleep(c, Lsc | Omed);
i82563im(c, Lsc | Omed);
c->lsleep++;
sleep(&c->lrendez, i82563lim, c);
} }
} }
@ -1327,7 +1321,6 @@ serdeslproc(void *v)
e = v; e = v;
c = e->ctlr; c = e->ctlr;
while(waserror()) while(waserror())
; ;
for(;;){ for(;;){
@ -1341,10 +1334,7 @@ serdeslproc(void *v)
i = 2; i = 2;
c->speeds[i]++; c->speeds[i]++;
e->mbps = speedtab[i]; e->mbps = speedtab[i];
c->lim = 0; lsleep(c, Lsc);
i82563im(c, Lsc);
c->lsleep++;
sleep(&c->lrendez, i82563lim, c);
} }
} }