oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak oxpcie in kernel

Browse Source
This commit is contained in:
Ben Gras 2011-07-13 20:14:19 +02:00
parent 1abfde0e03
commit c484bc1dc8
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/arch/i386/memory.c
View File

@ -889,7 +889,10 @@ void i386_freepde(const int pde)
freepdes[nfreepdes++] = pde; freepdes[nfreepdes++] = pde;
} }
PRIVATE int oxpcie_mapping_index = -1; PRIVATE int oxpcie_mapping_index = -1,
lapic_mapping_index = -1,
ioapic_first_index = -1,
ioapic_last_index = -1;
PUBLIC int arch_phys_map(const int index, PUBLIC int arch_phys_map(const int index,
phys_bytes *addr, phys_bytes *addr,
@ -903,9 +906,14 @@ PUBLIC int arch_phys_map(const int index,
if(first) { if(first) {
#ifdef USE_APIC #ifdef USE_APIC
if(lapic_addr) if(lapic_addr)
freeidx++; lapic_mapping_index = freeidx++;
if (ioapic_enabled) if (ioapic_enabled) {
int i;
ioapic_first_index = freeidx;
assert(nioapics > 0);
freeidx += nioapics; freeidx += nioapics;
ioapic_last_index = freeidx-1;
}
#endif #endif
#ifdef CONFIG_OXPCIE #ifdef CONFIG_OXPCIE
@ -913,6 +921,7 @@ PUBLIC int arch_phys_map(const int index,
if(ser_var[0] != '0' || ser_var[1] != 'x') { if(ser_var[0] != '0' || ser_var[1] != 'x') {
printf("oxpcie address in hex please\n"); printf("oxpcie address in hex please\n");
} else { } else {
printf("oxpcie address is %s\n", ser_var);
oxpcie_mapping_index = freeidx++; oxpcie_mapping_index = freeidx++;
} }
} }
@ -922,7 +931,7 @@ PUBLIC int arch_phys_map(const int index,
#ifdef USE_APIC #ifdef USE_APIC
/* map the local APIC if enabled */ /* map the local APIC if enabled */
if (index == 0) { if (index == lapic_mapping_index) {
if (!lapic_addr) if (!lapic_addr)
return EINVAL; return EINVAL;
*addr = vir2phys(lapic_addr); *addr = vir2phys(lapic_addr);
@ -954,12 +963,13 @@ PUBLIC int arch_phys_map_reply(const int index, const vir_bytes addr)
{ {
#ifdef USE_APIC #ifdef USE_APIC
/* if local APIC is enabled */ /* if local APIC is enabled */
if (index == 0 && lapic_addr) { if (index == lapic_mapping_index && lapic_addr) {
lapic_addr_vaddr = addr; lapic_addr_vaddr = addr;
return OK; return OK;
} }
else if (ioapic_enabled && index <= nioapics) { else if (ioapic_enabled && index >= ioapic_first_index &&
io_apic[index - 1].vaddr = addr; index <= ioapic_last_index) {
io_apic[index - ioapic_first_index].vaddr = addr;
return OK; return OK;
} }
#endif #endif