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>
OraBug: 26662731

(cherry picked from commit 5adad168e586cb381633f45d181bb729b04393a5)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 04b9c226c831334cc38470450732f88f908f395c..868990287687653f0448425302cae0d856327f5e 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1689,6 +1689,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;
@@ -1769,6 +1779,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