2007-02-02 20:54:15

by John Keller

[permalink] [raw]
Subject: [PATCH 1/1] - Altix: more ACPI PRT support

The SN Altix platform does not conform to the
IOSAPIC IRQ routing model. Add code in acpi_unregister_gsi()
to check if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) and
return.

Signed-off-by: John Keller <[email protected]>
---

Due to an oversight, this code was not added previously when
similar code was added to acpi_register_gsi().

http://marc.theaimsgroup.com/?l=linux-acpi&m=116680983430121&w=2

arch/ia64/kernel/acpi.c | 3 +++
1 file changed, 3 insertions(+)


Index: linux-2.6/arch/ia64/kernel/acpi.c
===================================================================
--- linux-2.6.orig/arch/ia64/kernel/acpi.c 2007-02-02 14:44:31.000000000 -0600
+++ linux-2.6/arch/ia64/kernel/acpi.c 2007-02-02 14:47:44.658143727 -0600
@@ -609,6 +609,9 @@ EXPORT_SYMBOL(acpi_register_gsi);

void acpi_unregister_gsi(u32 gsi)
{
+ if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
+ return;
+
iosapic_unregister_intr(gsi);
}


2007-02-03 01:39:08

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH 1/1] - Altix: more ACPI PRT support

On Fri, 02 Feb 2007 14:54:12 -0600
John Keller <[email protected]> wrote:

> The SN Altix platform does not conform to the
> IOSAPIC IRQ routing model. Add code in acpi_unregister_gsi()
> to check if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) and
> return.
>
> Signed-off-by: John Keller <[email protected]>
> ---
>
> Due to an oversight, this code was not added previously when
> similar code was added to acpi_register_gsi().
>
> http://marc.theaimsgroup.com/?l=linux-acpi&m=116680983430121&w=2
>
> arch/ia64/kernel/acpi.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>
> Index: linux-2.6/arch/ia64/kernel/acpi.c
> ===================================================================
> --- linux-2.6.orig/arch/ia64/kernel/acpi.c 2007-02-02 14:44:31.000000000 -0600
> +++ linux-2.6/arch/ia64/kernel/acpi.c 2007-02-02 14:47:44.658143727 -0600
> @@ -609,6 +609,9 @@ EXPORT_SYMBOL(acpi_register_gsi);
>
> void acpi_unregister_gsi(u32 gsi)
> {
> + if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
> + return;
> +
> iosapic_unregister_intr(gsi);
> }

Given that the December 22 patch appears to be in mainline, and that this
patch is simple, I shall cheerily bypass maintainers and send it in for
2.6.20.

2007-02-03 02:58:13

by Len Brown

[permalink] [raw]
Subject: Re: [PATCH 1/1] - Altix: more ACPI PRT support

On Friday 02 February 2007 20:37, Andrew Morton wrote:
> On Fri, 02 Feb 2007 14:54:12 -0600
> John Keller <[email protected]> wrote:
>
> > The SN Altix platform does not conform to the
> > IOSAPIC IRQ routing model. Add code in acpi_unregister_gsi()
> > to check if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) and
> > return.
> >
> > Signed-off-by: John Keller <[email protected]>
> > ---
> >
> > Due to an oversight, this code was not added previously when
> > similar code was added to acpi_register_gsi().
> >
> > http://marc.theaimsgroup.com/?l=linux-acpi&m=116680983430121&w=2
> >
> > arch/ia64/kernel/acpi.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> >
> > Index: linux-2.6/arch/ia64/kernel/acpi.c
> > ===================================================================
> > --- linux-2.6.orig/arch/ia64/kernel/acpi.c 2007-02-02 14:44:31.000000000 -0600
> > +++ linux-2.6/arch/ia64/kernel/acpi.c 2007-02-02 14:47:44.658143727 -0600
> > @@ -609,6 +609,9 @@ EXPORT_SYMBOL(acpi_register_gsi);
> >
> > void acpi_unregister_gsi(u32 gsi)
> > {
> > + if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
> > + return;
> > +
> > iosapic_unregister_intr(gsi);
> > }
>
> Given that the December 22 patch appears to be in mainline, and that this
> patch is simple, I shall cheerily bypass maintainers and send it in for
> 2.6.20.

Yep.

Acked-by: Len Brown <[email protected]>

thanks,
-Len