p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Boris Ostrovsky 2017-02-05 19:50:58 -05:00
parent 7243b93345
commit 5adad168e5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/xen/enlighten.c
View File

@ -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