x86,io-apic: Do not map IO-APIC direct registers twice
RFC 1/1 x86,io-apic: Do not map IO-APIC direct registers twice
Please review, I didn't manage to test (emulate actually since I don't have such a hardware) it yet (going to do so this weekend).
Meanwhile I would like to heard comments, complains and etc... Perhaps I miss something obvious so don't hesitate to poke me.
-- Cyrill
---
x86,io-apic: Do not map IO-APIC direct registers twice
In case if IO-APIC address is not 4K aligned (which is pretty established by MPS-1.4) we may not fixmap they twice and should eliminate resourse overlap in this case.
An example of a such configureation is
http://marc.info/?l=linux-kernel&m=118114792006520
| Quoting the message | | IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23 | IOAPIC[1]: apic_id 3, version 32, address 0xfec80000, GSI 24-47 | IOAPIC[2]: apic_id 4, version 32, address 0xfec80400, GSI 48-71 | IOAPIC[3]: apic_id 5, version 32, address 0xfec84000, GSI 72-95 | IOAPIC[4]: apic_id 8, version 32, address 0xfec84400, GSI 96-119
Some io-apics are 4K aligned while others are -- 1K. We may have the situation when next IO-APIC address (1K aligned) is following previous 4K one. So instead of allocating new fixmap we may use already done one.
To implement it ioapic_fixmap_shared is introduced which check if new IO-APIC base address lays inside already mapped page.
Also insert_resourse will not fail anymore on 1K aligned io-apics.
--- arch/x86/include/asm/apicdef.h | 23 +++++++++++++++-- arch/x86/include/asm/mpspec_def.h | 9 +++--- arch/x86/kernel/apic/io_apic.c | 50 +++++++++++++++++++++++++++++++------- arch/x86/kernel/mpparse.c | 2 - 4 files changed, 67 insertions(+), 17 deletions(-)
arch/x86/include/asm/apicdef.h +20 -3
@@ -1,6 +1,3 @@ -#ifndef _ASM_X86_APICDEF_H -#define _ASM_X86_APICDEF_H -/* * Constants for various Intel APICs. (local APIC, IOAPIC, etc.) *
@@ -8,9 +5,29 @@* Ingo Molnar <[email protected]>, 1999, 2000 */ +#ifndef _ASM_X86_APICDEF_H +#define _ASM_X86_APICDEF_H +#define IO_APIC_DEFAULT_PHYS_BASE 0xfec00000#define APIC_DEFAULT_PHYS_BASE 0xfee00000 +/* +* MP 1.4 specify that LAPIC must be aligned +* on 4K bound and IO-APIC on 1K +* (4K boud on IO-APIC is widely used too) +*/ +#define APIC_PHYS_BASE_SHIFT (12) +#define IO_APIC_PHYS_BASE_SHIFT (10) +#define APIC_PHYS_BASE_MASK (~((1U << APIC_PHYS_BASE_SHIFT) - 1)) +#define IO_APIC_PHYS_BASE_MASK (~((1U << IO_APIC_PHYS_BASE_SHIFT) - 1)) + +/* +* We assume that 1024 bytes will be more +* then enough in feasible feauture to cover +* all direct accessible IO-APIC registers +*/ +#define IO_APIC_SLOT_SIZE (1 << IO_APIC_PHYS_BASE_SHIFT) +#define APIC_ID 0x20#define APIC_LVR 0x30
arch/x86/include/asm/mpspec_def.h +5 -4
@@ -1,11 +1,11 @@ -#ifndef _ASM_X86_MPSPEC_DEF_H -#define _ASM_X86_MPSPEC_DEF_H -/* * Structure definitions for SMP machines following the * Intel Multiprocessing Specification 1.1 and 1.4. */ +#ifndef _ASM_X86_MPSPEC_DEF_H +#define _ASM_X86_MPSPEC_DEF_H +/* * This tag identifies where the SMP configuration * information is.
@@ -107,7 +107,8 @@ struct mpc_bus {#define BUSTYPE_VME "VME"#define BUSTYPE_XPRESS "XPRESS" -#define MPC_APIC_USABLE 0x01 +#define MPC_IO_APIC_USABLE (1 << 0) +#define MPC_IO_APIC_MAPPED (1 << 1)struct mpc_ioapic {unsigned char type;
arch/x86/kernel/apic/io_apic.c +41 -9
73 lines not on this page · raw message
arch/x86/kernel/mpparse.c +1 -1
@@ -132,7 +132,7 @@ static int bad_ioapic(unsigned long addrstatic void __init MP_ioapic_info (struct mpc_ioapic *m) { -if (!(m->flags &MPC_APIC_USABLE )) +if (!(m->flags &MPC_IO_APIC_USABLE ))return ; printk(KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n",
Quoted 10 lines · Cyrill Gorcunov
Please review, I didn't manage to test (emulate actually since I don't have such a hardware) it yet (going to do so this weekend).
Meanwhile I would like to heard comments, complains and etc... Perhaps I miss something obvious so don't hesitate to poke me.
-- Cyrill
---
x86,io-apic: Do not map IO-APIC direct registers twice
...
I know that I've occasionally removed
apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n",
already fixed in v2, just do not post updated version here.
-- Cyrill
Quoted 14 lines · Cyrill Gorcunov
Quoted 10 lines · Cyrill Gorcunov
Please review, I didn't manage to test (emulate actually since I don't have such a hardware) it yet (going to do so this weekend).
Meanwhile I would like to heard comments, complains and etc... Perhaps I miss something obvious so don't hesitate to poke me.
-- Cyrill
---
x86,io-apic: Do not map IO-APIC direct registers twice...
I know that I've occasionally removed
Quoted 6 lines
apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n",already fixed in v2, just do not post updated version here.
-- Cyrill
Forgot to mention that I know this double for() over nr_ioapics is slowlest approach but firstly I need to be sure that this idea works in general/simple way before speedup it.
-- Cyrill
Quoted 31 lines · Cyrill Gorcunov
Please review, I didn't manage to test (emulate actually since I don't have such a hardware) it yet (going to do so this weekend).
Meanwhile I would like to heard comments, complains and etc... Perhaps I miss something obvious so don't hesitate to poke me.
-- Cyrill
---
x86,io-apic: Do not map IO-APIC direct registers twiceIn case if IO-APIC address is not 4K aligned (which is pretty established by MPS-1.4) we may not fixmap they twice and should eliminate resourse overlap in this case.
An example of a such configureation is
http://marc.info/?l=linux-kernel&m=118114792006520| Quoting the message | | IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23 | IOAPIC[1]: apic_id 3, version 32, address 0xfec80000, GSI 24-47 | IOAPIC[2]: apic_id 4, version 32, address 0xfec80400, GSI 48-71 | IOAPIC[3]: apic_id 5, version 32, address 0xfec84000, GSI 72-95 | IOAPIC[4]: apic_id 8, version 32, address 0xfec84400, GSI 96-119Some io-apics are 4K aligned while others are -- 1K. We may have the situation when next IO-APIC address (1K aligned) is following previous 4K one. So instead of allocating new fixmap we may use already done one.
Quoted 4 lines
To implement it
ioapic_fixmap_sharedis introduced which check if new IO-APIC base address lays inside already mapped page.Also
insert_resoursewill not fail anymore on 1K aligned io-apics.
looks that we don't need that ...
not io_apic_base already have that + &. left problems are
1. display.
2. insert resource problem.
YH
arch/x86/kernel/apic/io_apic.c +4 -2
@@ -4140,11 +4140,13 @@ fake_ioapic_page:set_fixmap_nocache (idx, ioapic_phys);apic_printk (APIC_VERBOSE ,"mapped IOAPIC to %08lx (%08lx)\n" , -__fix_to_virt (idx), ioapic_phys); +__fix_to_virt (idx) + (ioapic_phys & ~PAGE_MASK ), + ioapic_phys); idx++; +/* spec says size is 1024 */ ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys +PAGE_SIZE -1 ; + ioapic_res->end = ioapic_phys + (1 <<10 ) -1 ; ioapic_res++; } }
Quoted 3 lines · Yinghai Lu
Quoted 2 lines · Cyrill Gorcunov
Please review, I didn't manage to test (emulate actually since I don't
...
First of all -- thanks a lot for review Yinghai!
Quoted 14 lines
Quoted 1 line
Also
insert_resoursewill not fail anymore on 1K aligned io-apics.looks that we don't need that ...
notio_apic_basealready have that + &. left problems are
1. display.
2. insert resource problem.YH
arch/x86/kernel/apic/io_apic.c +0
-0
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4143
Quoted 5 lines
arch/x86/kernel/apic/io_apic.c +1
-1@@ -4140,11 +4140,13 @@ fake_ioapic_page:set_fixmap_nocache (idx, ioapic_phys); apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", -__fix_to_virt (idx), ioapic_phys); + __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK),
Don't understand, why? What is wrong with physical address, could you elaborate please?
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4147
Quoted 4 lines
arch/x86/kernel/apic/io_apic.c +2
-0+ ioapic_phys); idx++; +/* spec says size is 1024 */
Hmm, MP says nothing about size of IO-APIC direct registers cound and as a result -- the size of MMIO. It will (and
is) differ between IO-APIC versions. An example -- IO-APIC EOI register which 82489DX just dont have at all. At moment (ICH-10) the lenght is 68 bytes so you may note the comment in the former patch that we "hope" such a size will be enough for quite a long time to cover all direct register space an IO-APIC provides (though to be precise from this 68 bytes only index,data,eoi registers specified).
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4152
Quoted 7 lines
arch/x86/kernel/apic/io_apic.c +1
-1ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys +PAGE_SIZE -1 ; + ioapic_res->end = ioapic_phys + (1 <<10 ) -1 ; ioapic_res++; } }
I think I've compicated the patch/idea too much indeed :) Since we have fixmap for all io_apics build time reserved even if some io-apic is 1K aligned we still may use new fixmap index. So only issue remains -- resource allocation. Here is an updated patch. Please review.
-- Cyrill
---
x86,io-apic: IO-APIC MMIO should not fail on resourse insertion
If IO-APIC base address is 1K aligned we should not fail on resourse insertion procedure. For this sake we define IO_APIC_SLOT_SIZE constant which should cover all IO-APIC direct accessible registers.
An example of a such configuration is there
http://marc.info/?l=linux-kernel&m=118114792006520
| Quoting the message | | IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23 | IOAPIC[1]: apic_id 3, version 32, address 0xfec80000, GSI 24-47 | IOAPIC[2]: apic_id 4, version 32, address 0xfec80400, GSI 48-71 | IOAPIC[3]: apic_id 5, version 32, address 0xfec84000, GSI 72-95 | IOAPIC[4]: apic_id 8, version 32, address 0xfec84400, GSI 96-119
--- arch/x86/include/asm/apicdef.h | 7 +++++++ arch/x86/kernel/apic/io_apic.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-)
arch/x86/include/asm/apicdef.h +7 -0
@@ -11,6 +11,13 @@#define IO_APIC_DEFAULT_PHYS_BASE 0xfec00000#define APIC_DEFAULT_PHYS_BASE 0xfee00000 +/* +* We assume that it will be more then enough +* in feasible feauture to cover all direct +* accessible IO-APIC registers +*/ +#define IO_APIC_SLOT_SIZE 1024 +#define APIC_ID 0x20#define APIC_LVR 0x30
arch/x86/kernel/apic/io_apic.c +2 -3
@@ -4133,8 +4133,7 @@ void __init ioapic_init_mappings(void)#ifdef CONFIG_X86_32 fake_ioapic_page:#endif - ioapic_phys = (unsigned long ) -alloc_bootmem_pages (PAGE_SIZE ); + ioapic_phys = (unsigned long )alloc_bootmem_pages (PAGE_SIZE ); ioapic_phys =__pa (ioapic_phys); }set_fixmap_nocache (idx, ioapic_phys);
@@ -4144,7 +4143,7 @@ fake_ioapic_page: idx++; ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys +PAGE_SIZE -1 ; + ioapic_res->end = ioapic_phys +IO_APIC_SLOT_SIZE -1 ; ioapic_res++; } }
Quoted 16 lines · Cyrill Gorcunov
Quoted 3 lines · Yinghai Lu
Quoted 2 lines · Cyrill Gorcunov
Please review, I didn't manage to test (emulate actually since I don't
...
First of all -- thanks a lot for review Yinghai!
Quoted 8 lines
Quoted 1 line
Also
insert_resoursewill not fail anymore on 1K aligned io-apics.looks that we don't need that ...
notio_apic_basealready have that + &. left problems are
1. display.
2. insert resource problem.YH
Quoted 13 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4143
Quoted 10 lines
arch/x86/kernel/apic/io_apic.c +1
-1@@ -4140,11 +4140,13 @@ fake_ioapic_page:set_fixmap_nocache (idx, ioapic_phys); apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", -__fix_to_virt (idx), ioapic_phys); + __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK),Don't understand, why? What is wrong with physical address, could you elaborate please?
ioapic_phys could be 1k aligned, but __fix_to_virt(idx) will always return 4k aligned.
Quoted 15 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4147
Quoted 5 lines
arch/x86/kernel/apic/io_apic.c +2
-0+ ioapic_phys); idx++; +/* spec says size is 1024 */ Hmm, MP says nothing about size of IO-APIC direct registers cound and as a result -- the size of MMIO. It will (and
is) differ between IO-APIC versions. An example -- IO-APIC EOI register which 82489DX just dont have at all. At moment (ICH-10) the lenght is 68 bytes so you may note the comment in the former patch that we "hope" such a size will be enough for quite a long time to cover all direct register space an IO-APIC provides (though to be precise from this 68 bytes only index,data,eoi registers specified).
Quoted 13 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4149
Quoted 7 lines
arch/x86/kernel/apic/io_apic.c +1
-1ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys +PAGE_SIZE -1 ; + ioapic_res->end = ioapic_phys + (1 <<10 ) -1 ; ioapic_res++; } }I think I've compicated the patch/idea too much indeed :) Since we have fixmap for all
io_apicsbuild time reserved even if some io-apic is 1K aligned we still may use new fixmap index. So only issue remains -- resource allocation. Here is an updated patch. Please review.
2. print out ...?
YH
Quoted 31 lines · Yinghai Lu
Quoted 16 lines · Cyrill Gorcunov
Quoted 3 lines · Yinghai Lu
Quoted 2 lines · Cyrill Gorcunov
Please review, I didn't manage to test (emulate actually since I don't
...
First of all -- thanks a lot for review Yinghai!
Quoted 8 lines
Quoted 1 line
Also
insert_resoursewill not fail anymore on 1K aligned io-apics.looks that we don't need that ...
notio_apic_basealready have that + &. left problems are
1. display.
2. insert resource problem.YH
Quoted 13 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4143
Quoted 10 lines
arch/x86/kernel/apic/io_apic.c +1
-1@@ -4140,11 +4140,13 @@ fake_ioapic_page:set_fixmap_nocache (idx, ioapic_phys); apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", -__fix_to_virt (idx), ioapic_phys); + __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK),Don't understand, why? What is wrong with physical address, could you elaborate please?
Quoted 1 line
ioapic_physcould be 1k aligned, but__fix_to_virt(idx)will always return 4k aligned.
yeah, I just misread your patch, I thought you've changed second argument, sorry. OK, I see what you mean, good catch, thanks!
Quoted 30 lines
Quoted 16 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4147
Quoted 6 lines
arch/x86/kernel/apic/io_apic.c +2
-0+ ioapic_phys); idx++; +/* spec says size is 1024 */ Hmm, MP says nothing about size of IO-APIC direct registers cound and as a result -- the size of MMIO. It will (and
is) differ between IO-APIC versions. An example -- IO-APIC EOI register which 82489DX just dont have at all. At moment (ICH-10) the lenght is 68 bytes so you may note the comment in the former patch that we "hope" such a size will be enough for quite a long time to cover all direct register space an IO-APIC provides (though to be precise from this 68 bytes only index,data,eoi registers specified).Quoted 13 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4149
Quoted 7 lines
arch/x86/kernel/apic/io_apic.c +1
-1ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys +PAGE_SIZE -1 ; + ioapic_res->end = ioapic_phys + (1 <<10 ) -1 ; ioapic_res++; } }I think I've compicated the patch/idea too much indeed :) Since we have fixmap for all
io_apicsbuild time reserved even if some io-apic is 1K aligned we still may use new fixmap index. So only issue remains -- resource allocation. Here is an updated patch. Please review.
Quoted 1 line
2. print out ...?
Print out what? Not sure I understand you right. Perhaps you mean to check insert_resourse results?
Quoted 3 lines
YH
-- Cyrill
Quoted 60 lines · Cyrill Gorcunov
Quoted 29 lines · Yinghai Lu
Quoted 16 lines · Cyrill Gorcunov
Quoted 3 lines · Yinghai Lu
Quoted 2 lines · Cyrill Gorcunov
Please review, I didn't manage to test (emulate actually since I don't
...
First of all -- thanks a lot for review Yinghai!
Quoted 8 lines
Quoted 1 line
Also
insert_resoursewill not fail anymore on 1K aligned io-apics.looks that we don't need that ...
notio_apic_basealready have that + &. left problems are
1. display.
2. insert resource problem.YH
Quoted 12 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4143
Quoted 10 lines
arch/x86/kernel/apic/io_apic.c +1
-1@@ -4140,11 +4140,13 @@ fake_ioapic_page:set_fixmap_nocache (idx, ioapic_phys); apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", -__fix_to_virt (idx), ioapic_phys); + __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK),Don't understand, why? What is wrong with physical address, could you elaborate please?
Quoted 1 line
ioapic_physcould be 1k aligned, but__fix_to_virt(idx)will always return 4k aligned.yeah, I just misread your patch, I thought you've changed second argument, sorry. OK, I see what you mean, good catch, thanks!
Quoted 25 lines
Quoted 25 lines
arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4147
Quoted 4 lines
arch/x86/kernel/apic/io_apic.c +2
-0+ ioapic_phys); idx++; +/* spec says size is 1024 */ Hmm, MP says nothing about size of IO-APIC direct registers cound and as a result -- the size of MMIO. It will (and
is) differ between IO-APIC versions. An example -- IO-APIC EOI register which 82489DX just dont have at all. At moment (ICH-10) the lenght is 68 bytes so you may note the comment in the former patch that we "hope" such a size will be enough for quite a long time to cover all direct register space an IO-APIC provides (though to be precise from this 68 bytes only index,data,eoi registers specified).arch/x86/kernel/apic/io_apic.c fake_ioapic_page: · line 4149
Quoted 7 lines
arch/x86/kernel/apic/io_apic.c +1
-1ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys +PAGE_SIZE -1 ; + ioapic_res->end = ioapic_phys + (1 <<10 ) -1 ; ioapic_res++; } }I think I've compicated the patch/idea too much indeed :) Since we have fixmap for all
io_apicsbuild time reserved even if some io-apic is 1K aligned we still may use new fixmap index. So only issue remains -- resource allocation. Here is an updated patch. Please review.
Quoted 4 lines
Quoted 1 line
2. print out ...?
Print out what? Not sure I understand you right. Perhaps you mean to check
insert_resourseresults?
apic_printk(APIC_VERBOSE,
"mapped IOAPIC to %08lx (%08lx)\n",
- __fix_to_virt(idx), ioapic_phys);
+ __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK),
YH
Quoted 6 lines · Yinghai Lu
Quoted 6 lines
Quoted 3 lines
Quoted 1 line · Cyrill Gorcunov
On Thu, Nov 12, 2009 at 03:22:55PM -0800, Yinghai Lu wrote:
2. print out ...?
Print out what? Not sure I understand you right. Perhaps you mean to check
insert_resourseresults?
...
Quoted 8 lines
apic_printk(APIC_VERBOSE,
(quoted diff) +1
-1"mapped IOAPIC to %08lx (%08lx)\n", - __fix_to_virt(idx), ioapic_phys); + __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK),YH
Updated version below, thanks Yinghai! Looks good?
-- Cyrill
---
x86,io-apic: IO-APIC MMIO should not fail on resourse insertion
If IO-APIC base address is 1K aligned we should not fail on resourse insertion procedure. For this sake we define IO_APIC_SLOT_SIZE constant which should cover all IO-APIC direct accessible registers.
An example of a such configuration is there
http://marc.info/?l=linux-kernel&m=118114792006520
| Quoting the message | | IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23 | IOAPIC[1]: apic_id 3, version 32, address 0xfec80000, GSI 24-47 | IOAPIC[2]: apic_id 4, version 32, address 0xfec80400, GSI 48-71 | IOAPIC[3]: apic_id 5, version 32, address 0xfec84000, GSI 72-95 | IOAPIC[4]: apic_id 8, version 32, address 0xfec84400, GSI 96-119
--- arch/x86/include/asm/apicdef.h | 7 +++++++ arch/x86/kernel/apic/io_apic.c | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-)
arch/x86/include/asm/apicdef.h +7 -0
@@ -11,6 +11,13 @@#define IO_APIC_DEFAULT_PHYS_BASE 0xfec00000#define APIC_DEFAULT_PHYS_BASE 0xfee00000 +/* +* We assume that it will be more then enough +* in feasible feauture to cover all direct +* accessible IO-APIC registers +*/ +#define IO_APIC_SLOT_SIZE 1024 +#define APIC_ID 0x20#define APIC_LVR 0x30
arch/x86/kernel/apic/io_apic.c +5 -6
@@ -4133,18 +4133,17 @@ void __init ioapic_init_mappings(void)#ifdef CONFIG_X86_32 fake_ioapic_page:#endif - ioapic_phys = (unsigned long ) -alloc_bootmem_pages (PAGE_SIZE ); + ioapic_phys = (unsigned long )alloc_bootmem_pages (PAGE_SIZE ); ioapic_phys =__pa (ioapic_phys); }set_fixmap_nocache (idx, ioapic_phys); -apic_printk (APIC_VERBOSE , -"mapped IOAPIC to %08lx (%08lx)\n" , -__fix_to_virt (idx), ioapic_phys); +apic_printk (APIC_VERBOSE ,"mapped IOAPIC to %08lx (%08lx)\n" , +__fix_to_virt (idx) + (ioapic_phys & ~PAGE_MASK ), + ioapic_phys); idx++; ioapic_res->start = ioapic_phys; - ioapic_res->end = ioapic_phys +PAGE_SIZE -1 ; + ioapic_res->end = ioapic_phys +IO_APIC_SLOT_SIZE -1 ; ioapic_res++; } }
Quoted 12 lines · Cyrill Gorcunov
Quoted 5 lines · Yinghai Lu
Quoted 5 lines
Quoted 3 lines
Quoted 1 line · Cyrill Gorcunov
On Thu, Nov 12, 2009 at 03:22:55PM -0800, Yinghai Lu wrote:
2. print out ...?
Print out what? Not sure I understand you right. Perhaps you mean to check
insert_resourseresults?...
Quoted 5 lines
apic_printk(APIC_VERBOSE,
arch/x86/kernel/apic/io_apic.c +1
-1"mapped IOAPIC to %08lx (%08lx)\n" , - __fix_to_virt(idx), ioapic_phys); + __fix_to_virt(idx) + (ioapic_phys & ~PAGE_MASK),
Quoted 4 lines
Quoted 2 lines
YH
Updated version below, thanks Yinghai! Looks good?
good to me.
YH