d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error checking of phy access and retry when error occurs.

Browse Source
This commit is contained in:
Hidetoshi Shimokawa 2002-12-31 10:00:36 +00:00
parent 32130e9fb0
commit e4b13179f6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=108500
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/dev/firewire/fwohci.c
View File

@ -304,32 +304,38 @@ fwohci_set_bus_manager(struct firewire_comm *fc, u_int node)
static u_int32_t
fwphy_rddata(struct fwohci_softc *sc, u_int addr)
{
u_int32_t fun;
u_int i;
u_int32_t fun, stat;
u_int i, retry = 0;
addr &= 0xf;
#define MAX_RETRY 100
again:
OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_REG_FAIL);
fun = PHYDEV_RDCMD | (addr << PHYDEV_REGADDR);
OWRITE(sc, OHCI_PHYACCESS, fun);
#if 1
/* Make sure that SCLK is started */
for(i = 0; i < 1000; i++) {
if ((OREAD(sc, FWOHCI_INTSTAT) & OHCI_INT_REG_FAIL) == 0)
break;
DELAY(100);
OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_REG_FAIL);
OWRITE(sc, OHCI_PHYACCESS, fun);
}
if (bootverbose)
device_printf(sc->fc.dev, "fwphy_rddata: write loop=%d\n", i);
#endif
for ( i = 0 ; i < 1000 ; i ++ ){
for ( i = 0 ; i < MAX_RETRY ; i ++ ){
fun = OREAD(sc, OHCI_PHYACCESS);
if ((fun & PHYDEV_RDCMD) == 0 && (fun & PHYDEV_RDDONE) != 0)
break;
DELAY(1000);
}
if( i >= 1000)
if(i >= MAX_RETRY) {
device_printf(sc->fc.dev, "cannot read phy\n");
return 0; /* XXX */
}
/* Make sure that SCLK is started */
stat = OREAD(sc, FWOHCI_INTSTAT);
if ((stat & OHCI_INT_REG_FAIL) != 0 ||
((fun >> PHYDEV_REGADDR) & 0xf) != addr) {
if (++retry < MAX_RETRY) {
DELAY(1000);
goto again;
}
}
if (bootverbose || retry >= MAX_RETRY)
device_printf(sc->fc.dev,
"fwphy_rddata: loop=%d, retry=%d\n", i, retry);
#undef MAX_RETRY
return((fun >> PHYDEV_RDDATA )& 0xff);
}
/* Device specific ioctl. */