aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/boot.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-02-08 19:18:03 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-09 03:22:09 -0500
commitcc6c50066ec1ac98bef97117e2f078bb89bbccc7 (patch)
treec0dcc930e94f0738e0e7a29fd1e08b81cd03554c /arch/x86/kernel/acpi/boot.c
parentf72dccace737df74d04a96461785a3ad61724b9f (diff)
x86: find nr_irqs_gsi with mp_ioapic_routing
Impact: find right nr_irqs_gsi on some systems. One test-system has gap between gsi's: [ 0.000000] ACPI: IOAPIC (id[0x04] address[0xfec00000] gsi_base[0]) [ 0.000000] IOAPIC[0]: apic_id 4, version 0, address 0xfec00000, GSI 0-23 [ 0.000000] ACPI: IOAPIC (id[0x05] address[0xfeafd000] gsi_base[48]) [ 0.000000] IOAPIC[1]: apic_id 5, version 0, address 0xfeafd000, GSI 48-54 [ 0.000000] ACPI: IOAPIC (id[0x06] address[0xfeafc000] gsi_base[56]) [ 0.000000] IOAPIC[2]: apic_id 6, version 0, address 0xfeafc000, GSI 56-62 ... [ 0.000000] nr_irqs_gsi: 38 So nr_irqs_gsi is not right. some irq for MSI will overwrite with io_apic. need to get that with acpi_probe_gsi when acpi io_apic is used Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r--arch/x86/kernel/acpi/boot.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 3efa996b036c..c334fe75dcd6 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -961,6 +961,29 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
961 nr_ioapics++; 961 nr_ioapics++;
962} 962}
963 963
964int __init acpi_probe_gsi(void)
965{
966 int idx;
967 int gsi;
968 int max_gsi = 0;
969
970 if (acpi_disabled)
971 return 0;
972
973 if (!acpi_ioapic)
974 return 0;
975
976 max_gsi = 0;
977 for (idx = 0; idx < nr_ioapics; idx++) {
978 gsi = mp_ioapic_routing[idx].gsi_end;
979
980 if (gsi > max_gsi)
981 max_gsi = gsi;
982 }
983
984 return max_gsi + 1;
985}
986
964static void assign_to_mp_irq(struct mpc_intsrc *m, 987static void assign_to_mp_irq(struct mpc_intsrc *m,
965 struct mpc_intsrc *mp_irq) 988 struct mpc_intsrc *mp_irq)
966{ 989{