Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90f6881e authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Stefano Stabellini
Browse files

xen: add xen hvm acpi_register_gsi variant 



Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 2f065aef

arch/x86/include/asm/acpi.h

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ extern u8 acpi_sci_flags; 
extern int acpi_sci_override_gsi;

void acpi_pic_sci_set_trigger(unsigned int, u16);



extern int (*__acpi_register_gsi)(struct device *dev, u32 gsi,

				  int trigger, int polarity);



static inline void disable_acpi(void)

{

	acpi_disabled = 1;

arch/x86/kernel/acpi/boot.c

+2 −1
Original line number Diff line number Diff line
@@ -537,7 +537,8 @@ static int acpi_register_gsi_ioapic(struct device *dev, u32 gsi, 
	return gsi;

}



static int (*__acpi_register_gsi)(struct device *dev, u32 gsi, int trigger, int polarity) = acpi_register_gsi_pic;

int (*__acpi_register_gsi)(struct device *dev, u32 gsi,

			   int trigger, int polarity) = acpi_register_gsi_pic;



/*

 * success: return IRQ number (>=0)

arch/x86/pci/xen.c

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ static int xen_hvm_register_pirq(u32 gsi, int triggering) 


	return irq;

}



static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi,

				 int trigger, int polarity)

{

	return xen_hvm_register_pirq(gsi, trigger);

}

#endif



#if defined(CONFIG_PCI_MSI)