Commit 8abb850a authored Jan 20, 2015 by Jiang Liu Committed by Thomas Gleixner Jan 20, 2015

x86/xen: Override ACPI IRQ management callback __acpi_unregister_gsi



Xen overrides __acpi_register_gsi and leaves __acpi_unregister_gsi as is.
That means, an IRQ allocated by acpi_register_gsi_xen_hvm() or
acpi_register_gsi_xen() will be freed by acpi_unregister_gsi_ioapic(),
which may cause undesired effects. So override __acpi_unregister_gsi to
NULL for safety.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Sander Eikelenboom <linux@eikelenboom.it>
Cc: Tony Luck <tony.luck@intel.com>
Cc: xen-devel@lists.xenproject.org
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Graeme Gregory <graeme.gregory@linaro.org>
Cc: Lv Zheng <lv.zheng@intel.com>
Link: http://lkml.kernel.org/r/1421720467-7709-4-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 9889eaeb

arch/x86/include/asm/acpi.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ void acpi_pic_sci_set_trigger(unsigned int, u16);

		extern int (__acpi_register_gsi)(struct device dev, u32 gsi,
		int trigger, int polarity);
		extern void (*__acpi_unregister_gsi)(u32 gsi);

		static inline void disable_acpi(void)
		{

arch/x86/pci/xen.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -458,6 +458,7 @@ int __init pci_xen_hvm_init(void)
		* just how GSIs get registered.
		*/
		__acpi_register_gsi = acpi_register_gsi_xen_hvm;
		__acpi_unregister_gsi = NULL;
		#endif

		#ifdef CONFIG_PCI_MSI
		@@ -482,6 +483,7 @@ int __init pci_xen_initial_domain(void)
		pci_msi_ignore_mask = 1;
		#endif
		__acpi_register_gsi = acpi_register_gsi_xen;
		__acpi_unregister_gsi = NULL;
		/* Pre-allocate legacy irqs */
		for (irq = 0; irq < nr_legacy_irqs(); irq++) {
		int trigger, polarity;