Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stopgap fix for PR 9984: sprinkle some (small) delays at appropriate

Browse Source 
places into the CIS reading code.

The card in question has IO8 only enabled in its CIS info and is apparently
not able to keep up with quick reads. It words fine in a pcmcia slot but
panics(!) the kernel in a TI 1250 cardbus slot. This may be a failure of
the pci cardbus code when initializing this bridge. When finding (and
fixing) that, we should back this change out.

The card I am testing with is not broken, I have multiple versions of it
(AVM Fritz! pcmcia ISDN card), all work fine on windows and all cause
us to panic because of bogus CIS info read.

XXX - panicing because of bogus CIS data is probably another error.
This commit is contained in:
martin 2001-02-10 23:22:10 +00:00
parent 504487fbd6
commit abd28c6cc2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/pcmcia/pcmcia_cis.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcmcia_cis.c,v 1.20 2000/10/17 10:13:46 haya Exp $ */
/* $NetBSD: pcmcia_cis.c,v 1.21 2001/02/10 23:22:10 martin Exp $ */
#define PCMCIACISDEBUG
@ -158,6 +158,7 @@ pcmcia_scan_cis(dev, fct, arg)
while (1) {
/* get the tuple code */
DELAY(1000);
tuple.code = pcmcia_cis_read_1(&tuple, tuple.ptr);
/* two special-case tuples */
@ -181,6 +182,7 @@ pcmcia_scan_cis(dev, fct, arg)
}
/* now all the normal tuples */
DELAY(1250);
tuple.length = pcmcia_cis_read_1(&tuple, tuple.ptr + 1);
switch (tuple.code) {
case PCMCIA_CISTPL_LONGLINK_A:
@ -217,7 +219,9 @@ pcmcia_scan_cis(dev, fct, arg)
*((u_int16_t *) & offset) =
pcmcia_tuple_read_2(&tuple, 0);
DELAY(500);
length = pcmcia_tuple_read_2(&tuple, 2);
DELAY(500);
cksum = pcmcia_tuple_read_1(&tuple, 4);
addr = tuple.ptr + offset;