diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-02-06 03:50:58 +0300 |
|---|---|---|
| committer | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-02-07 16:07:01 +0300 |
| commit | 5adad168e586cb381633f45d181bb729b04393a5 (patch) | |
| tree | 9c8169c08b3f192155745ffe60bb505d8ec02b66 | |
| parent | 7243b93345f7f8de260e8f5b4670803e64fcbb00 (diff) | |
| download | linux-5adad168e586cb381633f45d181bb729b04393a5.tar.xz | |
xen/pvh: Make sure we don't use ACPI_IRQ_MODEL_PIC for SCI
Since we are not using PIC and (at least currently) don't have IOAPIC
we want to make sure that acpi_irq_model doesn't stay set to
ACPI_IRQ_MODEL_PIC (which is the default value). If we allowed it to
stay then acpi_os_install_interrupt_handler() would try (and fail) to
request_irq() for PIC.
Instead we set the model to ACPI_IRQ_MODEL_PLATFORM which will prevent
this from happening.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
| -rw-r--r-- | arch/x86/xen/enlighten.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index d2144f7c8fab..6d406f3465bc 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1672,6 +1672,16 @@ asmlinkage __visible void __init xen_start_kernel(void) } #ifdef CONFIG_XEN_PVH + +static void xen_pvh_arch_setup(void) +{ +#ifdef CONFIG_ACPI + /* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */ + if (nr_ioapics == 0) + acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; +#endif +} + static void __init init_pvh_bootparams(void) { struct xen_memory_map memmap; @@ -1752,6 +1762,8 @@ void __init xen_prepare_pvh(void) wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32)); init_pvh_bootparams(); + + x86_init.oem.arch_setup = xen_pvh_arch_setup; } #endif |