EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added APIC ID remapping

aiju 2011-05-16 02:18:29 +00:00
parent d80cf1a4ba
commit 8e1fbbeda5
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/src/9/pc/mp.c
View File

@ -17,6 +17,7 @@ static int mpeisabus = -1;
extern int i8259elcr; /* mask of level-triggered interrupts */ extern int i8259elcr; /* mask of level-triggered interrupts */
static Apic mpapic[MaxAPICNO+1]; static Apic mpapic[MaxAPICNO+1];
static int machno2apicno[MaxAPICNO+1]; /* inverse map: machno -> APIC ID */ static int machno2apicno[MaxAPICNO+1]; /* inverse map: machno -> APIC ID */
static int mpapicremap[MaxAPICNO+1];
static int mpmachno = 1; static int mpmachno = 1;
static Lock mpphysidlock; static Lock mpphysidlock;
static int mpphysid; static int mpphysid;
@ -135,11 +136,22 @@ mpgetbus(int busno)
return 0; return 0;
} }
static int
freeapicid(void)
{
int i;
for(i = 0; i < MaxAPICNO+1; i++)
if(mpapic[i].flags == 0)
return i;
return -1;
}
static Apic* static Apic*
mkioapic(PCMPioapic* p) mkioapic(PCMPioapic* p)
{ {
void *va; void *va;
int apicno; int apicno, new;
Apic *apic; Apic *apic;
apicno = p->apicno; apicno = p->apicno;
@ -153,8 +165,18 @@ mkioapic(PCMPioapic* p)
return 0; return 0;
apic = &mpapic[apicno]; apic = &mpapic[apicno];
if(apic->flags != 0) if(apic->flags != 0) {
print("mkioapic: APIC ID conflict at %d\n", p->apicno); new = freeapicid();
if(new < 0)
print("mkioapic: out of APIC IDs\n");
else {
mpapicremap[p->apicno] = new;
print("mkioapic: APIC ID conflict at %d, remapping to %d\n", p->apicno, new);
p->apicno = apicno = new;
apic = &mpapic[apicno];
}
} else
mpapicremap[p->apicno] = p->apicno;
apic->type = PcmpIOAPIC; apic->type = PcmpIOAPIC;
apic->apicno = apicno; apic->apicno = apicno;
apic->addr = va; apic->addr = va;
@ -177,8 +199,14 @@ mkiointr(PCMPintr* p)
* It's unclear how that can possibly be correct so treat it as * It's unclear how that can possibly be correct so treat it as
* an error for now. * an error for now.
*/ */
if(p->apicno == 0xFF) if(p->apicno > MaxAPICNO)
return 0; return 0;
if(mpapicremap[p->apicno] < 0) {
print("iointr: non-existing IOAPIC %d\n", p->apicno);
return 0;
}
p->apicno = mpapicremap[p->apicno];
if((bus = mpgetbus(p->busno)) == 0) if((bus = mpgetbus(p->busno)) == 0)
return 0; return 0;
@ -528,7 +556,7 @@ mpoverride(uchar** newp, uchar** e)
void void
mpinit(void) mpinit(void)
{ {
int ncpu; int ncpu, i;
char *cp; char *cp;
PCMP *pcmp; PCMP *pcmp;
uchar *e, *p; uchar *e, *p;
@ -552,6 +580,9 @@ mpinit(void)
bpapic = nil; bpapic = nil;
for(i = 0; i <= MaxAPICNO; i++)
mpapicremap[i] = -1;
/* /*
* Run through the table saving information needed for starting * Run through the table saving information needed for starting
* application processors and initialising any I/O APICs. The table * application processors and initialising any I/O APICs. The table