Re: [PATCH v4 5/7] xen: add xen hvm acpi_register_gsi variant

[Rafael J. Wysocki]

On Tuesday, October 12, 2010, stefano.stabellini@xxxxxxxxxxxxx wrote:
> From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
> 
> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>

I'm not really familiar with Xen, but the patch looks reasonable.

Thanks,
Rafael


> ---
>  arch/x86/include/asm/acpi.h |    3 +++
>  arch/x86/kernel/acpi/boot.c |    3 ++-
>  arch/x86/pci/xen.c          |    6 ++++++
>  3 files changed, 11 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
> index 92091de..55d106b 100644
> --- a/arch/x86/include/asm/acpi.h
> +++ b/arch/x86/include/asm/acpi.h
> @@ -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;
> diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
> index 031f0c2..71232b9 100644
> --- a/arch/x86/kernel/acpi/boot.c
> +++ b/arch/x86/kernel/acpi/boot.c
> @@ -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)
> diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
> index e7f897b..ef9b8b2 100644
> --- a/arch/x86/pci/xen.c
> +++ b/arch/x86/pci/xen.c
> @@ -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)
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/