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

process acpi interrupt source override entries in a 2nd pass over the madt (APIC) table (thanks erik)

Browse source 
according to erik, virtualbox puts the source overrides
before the ioapic entries so the addirq() call fails
as no ioapics have been declared yet. use a second pass
over the table after we processed the apic entries.
This commit is contained in:
cinap_lenrek 2014-04-08 19:35:29 +02:00
parent ae3afb12a0
commit aec3d8022a
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/src/9/pc/archacpi.c
View file

@ -461,7 +461,7 @@ acpiinit(void)
Tbl *t;
Apic *a;
void *va;
uchar *p, *e;
uchar *s, *p, *e;
ulong lapicbase;
int machno, i, c;
@ -497,16 +497,16 @@ acpiinit(void)
return;
Foundapic:
p = t->data;
e = p + tbldlen(t);
lapicbase = get32(p); p += 8;
s = t->data;
e = s + tbldlen(t);
lapicbase = get32(s); s += 8;
va = vmap(lapicbase, 1024);
print("LAPIC: %.8lux %#p\n", lapicbase, va);
if(va == nil)
panic("acpiinit: cannot map lapic %.8lux", lapicbase);
machno = 0;
for(; p < e; p += c){
for(p = s; p < e; p += c){
c = p[1];
if(c < 2 || (p+c) > e)
break;
@ -555,6 +555,18 @@ Foundapic:
mpioapic[a->apicno] = a;
ioapicinit(a, a->apicno);
break;
}
}
/*
* need 2nd pass as vbox puts interrupt overrides
* *before* the ioapic entries (!)
*/
for(p = s; p < e; p += c){
c = p[1];
if(c < 2 || (p+c) > e)
break;
switch(*p){
case 0x02: /* Interrupt Source Override */
addirq(get32(p+4), BusISA, 0, p[3], get16(p+8));
break;