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

pc, pc64: handle 64-bit pci membars

Browse source 
this avoids listing the upper half of 64-bit membars
in Pcidev.mem[] array avoiding potential confusion
in drivers.

we also check if the upper half is programmed to zero
by bios and otherwise zap the entry in Pcidev.mem[]
and print a warning.
This commit is contained in:
cinap_lenrek 2015-04-08 03:34:08 +02:00
parent fba26da490
commit b7ceab84d3
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sys/src/9/pc/pci.c
View file

@ -249,6 +249,7 @@ pcibusmap(Pcidev *root, ulong *pmema, ulong *pioa, int wrreg)
if(size == 0)
continue;
p->mem[i].size = size;
if(v & 1) {
itb->dev = p;
itb->bar = i;
@ -260,9 +261,10 @@ pcibusmap(Pcidev *root, ulong *pmema, ulong *pioa, int wrreg)
mtb->bar = i;
mtb->siz = size;
mtb++;
}
p->mem[i].size = size;
if((v & 7) == 4)
i++;
}
}
}
@ -438,11 +440,24 @@ pcilscan(int bno, Pcidev** list, Pcidev *parent)
case 0x0C: /* serial bus controllers */
if((hdt & 0x7F) != 0)
break;
rno = PciBAR0 - 4;
rno = PciBAR0;
for(i = 0; i < nelem(p->mem); i++) {
rno += 4;
p->mem[i].bar = pcicfgr32(p, rno);
p->mem[i].size = pcibarsize(p, rno);
if((p->mem[i].bar & 7) == 4){
ulong hi;
rno += 4;
hi = pcicfgr32(p, rno);
if(hi != 0){
print("ignoring 64-bit bar %d: %llux %d from %T\n",
i, (uvlong)hi<<32 | p->mem[i].bar, p->mem[i].size, p->tbdf);
p->mem[i].bar = 0;
p->mem[i].size = 0;
}
i++;
}
rno += 4;
}
break;