Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e79c65a9 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: io-apic: IO-APIC MMIO should not fail on resource 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
 |

Reported-by: default avatar"Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <20091116151426.GC5653@lenovo>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 200a9ae2

arch/x86/include/asm/apicdef.h

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ 
#define IO_APIC_DEFAULT_PHYS_BASE	0xfec00000

#define	APIC_DEFAULT_PHYS_BASE		0xfee00000



/*

 * This is the IO-APIC register space as specified

 * by Intel docs:

 */

#define IO_APIC_SLOT_SIZE		1024



#define	APIC_ID		0x20



#define	APIC_LVR	0x30

arch/x86/kernel/apic/io_apic.c

+5 −6
Original line number Diff line number Diff line
@@ -4100,18 +4100,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++;

	}

}