aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2010-12-08 10:57:12 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-08 10:57:12 +0000
commit23b9d43c54c52e59fbec09ce98f42991aa9419fd (patch)
treecba368dceedd1f5db6b71fcca452c00823deef79
parent2a186961a4379d7c2d60f29387971482c44f4408 (diff)
downloadmrst-s0i3-test-23b9d43c54c52e59fbec09ce98f42991aa9419fd.tar.gz
mrst-s0i3-test-23b9d43c54c52e59fbec09ce98f42991aa9419fd.tar.xz
mrst-s0i3-test-23b9d43c54c52e59fbec09ce98f42991aa9419fd.zip
x86/mrst: set ISA bus type for fake MP IRQs
We use MP IRQs for SFI presented timer interrupts, we should also set mp_bus_not_pci for MP_ISA_BUS so that pin_2_irq mapping is correct. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
-rw-r--r--arch/x86/kernel/apic/io_apic.c4
-rw-r--r--arch/x86/platform/mrst/mrst.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 162677e3eb5..7cc0a721f62 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -938,7 +938,7 @@ static int pin_2_irq(int idx, int apic, int pin)
} else {
u32 gsi = mp_gsi_routing[apic].gsi_base + pin;
- if (gsi >= legacy_pic->nr_legacy_irqs)
+ if (gsi >= NR_IRQS_LEGACY)
irq = gsi;
else
irq = gsi_top + gsi;
@@ -3643,7 +3643,7 @@ void __init probe_nr_irqs_gsi(void)
{
int nr;
- nr = gsi_top + legacy_pic->nr_legacy_irqs;
+ nr = gsi_top + NR_IRQS_LEGACY;
if (nr > nr_irqs_gsi)
nr_irqs_gsi = nr;
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index c31e37f3891..70ab361165e 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -291,6 +291,7 @@ void __init x86_mrst_early_setup(void)
* in tsc calibration later.
*/
cpu_khz = 1500000;
+ set_bit(0, mp_bus_not_pci);
}
/*