[PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present
Posted by Florian Mickler
|
Re: [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 01, 2011 12:50AM |
(Something, somewhere, chocked on that "[.34+]@schatten.dmk.lab" address
that was in the CC list, so I removed it. Invalid address? Invalid TLD?)
On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> index 68df09b..3940103 100644
> --- a/arch/x86/kernel/apic/io_apic.c
> +++ b/arch/x86/kernel/apic/io_apic.c
> @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
> {
> int ioapic, pin, idx;
>
> + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
> + return -1;
> +
> if (skip_ioapic_setup)
> return -1;
>
Seems to have the same goal as commit
678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
non-existing IOAPICs if we have none"
, which got merged in the v2.6.38
cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
more correct. I can't say as I was happy with the effect of my patch
(ie, make an uninteresting error disappear) and didn't investigate any
further. I have also no desire to dive into this matter again.
Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
that was in the CC list, so I removed it. Invalid address? Invalid TLD?)
On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> index 68df09b..3940103 100644
> --- a/arch/x86/kernel/apic/io_apic.c
> +++ b/arch/x86/kernel/apic/io_apic.c
> @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
> {
> int ioapic, pin, idx;
>
> + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
> + return -1;
> +
> if (skip_ioapic_setup)
> return -1;
>
Seems to have the same goal as commit
678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
non-existing IOAPICs if we have none"
, which got merged in the v2.6.38cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
more correct. I can't say as I was happy with the effect of my patch
(ie, make an uninteresting error disappear) and didn't investigate any
further. I have also no desire to dive into this matter again.
Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 01, 2011 02:54AM |
On Thu, 31 Mar 2011 10:48:43 +0200
Paul Bolle <pebolle@tiscali.nl> wrote:
> On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
> > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> > index 68df09b..3940103 100644
> > --- a/arch/x86/kernel/apic/io_apic.c
> > +++ b/arch/x86/kernel/apic/io_apic.c
> > @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
> > {
> > int ioapic, pin, idx;
> >
> > + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
> > + return -1;
> > +
> > if (skip_ioapic_setup)
> > return -1;
> >
>
> Seems to have the same goal as commit
> 678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
> non-existing IOAPICs if we have none", which got merged in the v2.6.38
> cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
> more correct. I can't say as I was happy with the effect of my patch
> (ie, make an uninteresting error disappear) and didn't investigate any
> further. I have also no desire to dive into this matter again.
>
>
> Paul
>
Thanks for letting me know. Sedat, did you actually test with 2.6.38?
Regards,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
Paul Bolle <pebolle@tiscali.nl> wrote:
> On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
> > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> > index 68df09b..3940103 100644
> > --- a/arch/x86/kernel/apic/io_apic.c
> > +++ b/arch/x86/kernel/apic/io_apic.c
> > @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
> > {
> > int ioapic, pin, idx;
> >
> > + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
> > + return -1;
> > +
> > if (skip_ioapic_setup)
> > return -1;
> >
>
> Seems to have the same goal as commit
> 678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
> non-existing IOAPICs if we have none"
, which got merged in the v2.6.38> cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
> more correct. I can't say as I was happy with the effect of my patch
> (ie, make an uninteresting error disappear) and didn't investigate any
> further. I have also no desire to dive into this matter again.
>
>
> Paul
>
Thanks for letting me know. Sedat, did you actually test with 2.6.38?
Regards,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 01, 2011 03:01AM |
On Thu, 31 Mar 2011 10:43:42 +0200
Ingo Molnar <mingo@elte.hu> wrote:
>
> * Florian Mickler <florian@mickler.org> wrote:
>
> > From: Eric W. Biederman <ebiederm@xmission.com>
> >
> > [I submit this as the corresponding bug report is still not closed, the patch
> > not merged, distributions applying this patch, it is tested to work and I found
> > nowhere any resoning as to why this should be out of tree. I just guessed on
> > the stable tag and number. -Florian]
>
> The patch does not build when CONFIG_ACPI is disabled:
>
> arch/x86/kernel/apic/io_apic.c: In function ‘acpi_get_override_irq’:
> arch/x86/kernel/apic/io_apic.c:3792:6: error: ‘acpi_irq_model’ undeclared (first use in this function)
> arch/x86/kernel/apic/io_apic.c:3792:24: error: ‘ACPI_IRQ_MODEL_IOAPIC’ undeclared (first use in this function)
>
> When you or Eric resubmits the fixed patch please use the improved changelog
> below.
>
> Thanks,
>
> Ingo
Thank you. Will do if it turns out this is still necessary.
Paul Bolle mentioned in another messgage that there is a commit in
2.6.38 to the same effect:
commit 678301ecadec24ff77ab310eebf8a32ccddb1850
("x86, ioapic: Don't warn about non-existing IOAPICs if we have none"
Regards,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
Ingo Molnar <mingo@elte.hu> wrote:
>
> * Florian Mickler <florian@mickler.org> wrote:
>
> > From: Eric W. Biederman <ebiederm@xmission.com>
> >
> > [I submit this as the corresponding bug report is still not closed, the patch
> > not merged, distributions applying this patch, it is tested to work and I found
> > nowhere any resoning as to why this should be out of tree. I just guessed on
> > the stable tag and number. -Florian]
>
> The patch does not build when CONFIG_ACPI is disabled:
>
> arch/x86/kernel/apic/io_apic.c: In function ‘acpi_get_override_irq’:
> arch/x86/kernel/apic/io_apic.c:3792:6: error: ‘acpi_irq_model’ undeclared (first use in this function)
> arch/x86/kernel/apic/io_apic.c:3792:24: error: ‘ACPI_IRQ_MODEL_IOAPIC’ undeclared (first use in this function)
>
> When you or Eric resubmits the fixed patch please use the improved changelog
> below.
>
> Thanks,
>
> Ingo
Thank you. Will do if it turns out this is still necessary.
Paul Bolle mentioned in another messgage that there is a commit in
2.6.38 to the same effect:
commit 678301ecadec24ff77ab310eebf8a32ccddb1850
("x86, ioapic: Don't warn about non-existing IOAPICs if we have none"
Regards,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 01, 2011 03:02AM |
On Thu, Mar 31, 2011 at 12:53 PM, Florian Mickler <florian@mickler.org> wrote:
> On Thu, 31 Mar 2011 10:48:43 +0200
> Paul Bolle <pebolle@tiscali.nl> wrote:
>
>> On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
>> > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
>> > index 68df09b..3940103 100644
>> > --- a/arch/x86/kernel/apic/io_apic.c
>> > +++ b/arch/x86/kernel/apic/io_apic.c
>> > @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
>> > {
>> > int ioapic, pin, idx;
>> >
>> > + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
>> > + return -1;
>> > +
>> > if (skip_ioapic_setup)
>> > return -1;
>> >
>>
>> Seems to have the same goal as commit
>> 678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
>> non-existing IOAPICs if we have none", which got merged in the v2.6.38
>> cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
>> more correct. I can't say as I was happy with the effect of my patch
>> (ie, make an uninteresting error disappear) and didn't investigate any
>> further. I have also no desire to dive into this matter again.
>>
>>
>> Paul
>>
>
> Thanks for letting me know. Sedat, did you actually test with 2.6.38?
>
> Regards,
> Flo
>
I have and had this patch in my own patch-series *before* Debian
included it (IIRC right after Eric committed it to LKML).
To answer your question: Yes.
I have the patch also in my current linux-next kernels (next-20110331).
- Sedat -
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
> On Thu, 31 Mar 2011 10:48:43 +0200
> Paul Bolle <pebolle@tiscali.nl> wrote:
>
>> On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
>> > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
>> > index 68df09b..3940103 100644
>> > --- a/arch/x86/kernel/apic/io_apic.c
>> > +++ b/arch/x86/kernel/apic/io_apic.c
>> > @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
>> > {
>> > int ioapic, pin, idx;
>> >
>> > + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
>> > + return -1;
>> > +
>> > if (skip_ioapic_setup)
>> > return -1;
>> >
>>
>> Seems to have the same goal as commit
>> 678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
>> non-existing IOAPICs if we have none"
, which got merged in the v2.6.38>> cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
>> more correct. I can't say as I was happy with the effect of my patch
>> (ie, make an uninteresting error disappear) and didn't investigate any
>> further. I have also no desire to dive into this matter again.
>>
>>
>> Paul
>>
>
> Thanks for letting me know. Sedat, did you actually test with 2.6.38?
>
> Regards,
> Flo
>
I have and had this patch in my own patch-series *before* Debian
included it (IIRC right after Eric committed it to LKML).
To answer your question: Yes.
I have the patch also in my current linux-next kernels (next-20110331).
- Sedat -
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 01, 2011 04:06AM |
Sedat Dilek <sedat.dilek@googlemail.com> writes:
> On Thu, Mar 31, 2011 at 12:53 PM, Florian Mickler <florian@mickler.org> wrote:
>> On Thu, 31 Mar 2011 10:48:43 +0200
>> Paul Bolle <pebolle@tiscali.nl> wrote:
>>
>>> On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
>>> > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
>>> > index 68df09b..3940103 100644
>>> > --- a/arch/x86/kernel/apic/io_apic.c
>>> > +++ b/arch/x86/kernel/apic/io_apic.c
>>> > @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
>>> > {
>>> > int ioapic, pin, idx;
>>> >
>>> > + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
>>> > + return -1;
>>> > +
>>> > if (skip_ioapic_setup)
>>> > return -1;
>>> >
>>>
>>> Seems to have the same goal as commit
>>> 678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
>>> non-existing IOAPICs if we have none", which got merged in the v2.6.38
>>> cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
>>> more correct. I can't say as I was happy with the effect of my patch
>>> (ie, make an uninteresting error disappear) and didn't investigate any
>>> further. I have also no desire to dive into this matter again.
Yes. My patch is more correct. We really do want the warning if we have
0 ioapics and we expect to be using ioapics. It doesn't make sense to
suppress the warning unless we aren't in ioapic mode.
I don't have a clue why my patch got lost, but can we please get it
applied?
>> Thanks for letting me know. Sedat, did you actually test with 2.6.38?
>>
>> Regards,
>> Flo
> I have and had this patch in my own patch-series *before* Debian
> included it (IIRC right after Eric committed it to LKML).
> To answer your question: Yes.
> I have the patch also in my current linux-next kernels
> (next-20110331).
Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
> On Thu, Mar 31, 2011 at 12:53 PM, Florian Mickler <florian@mickler.org> wrote:
>> On Thu, 31 Mar 2011 10:48:43 +0200
>> Paul Bolle <pebolle@tiscali.nl> wrote:
>>
>>> On Thu, 2011-03-31 at 10:01 +0200, Florian Mickler wrote:
>>> > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
>>> > index 68df09b..3940103 100644
>>> > --- a/arch/x86/kernel/apic/io_apic.c
>>> > +++ b/arch/x86/kernel/apic/io_apic.c
>>> > @@ -3789,6 +3789,9 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
>>> > {
>>> > int ioapic, pin, idx;
>>> >
>>> > + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
>>> > + return -1;
>>> > +
>>> > if (skip_ioapic_setup)
>>> > return -1;
>>> >
>>>
>>> Seems to have the same goal as commit
>>> 678301ecadec24ff77ab310eebf8a32ccddb1850 ("x86, ioapic: Don't warn about
>>> non-existing IOAPICs if we have none"
, which got merged in the v2.6.38>>> cycle (authored by me, signed off by Ingo Molnar). Maybe Eric's patch is
>>> more correct. I can't say as I was happy with the effect of my patch
>>> (ie, make an uninteresting error disappear) and didn't investigate any
>>> further. I have also no desire to dive into this matter again.
Yes. My patch is more correct. We really do want the warning if we have
0 ioapics and we expect to be using ioapics. It doesn't make sense to
suppress the warning unless we aren't in ioapic mode.
I don't have a clue why my patch got lost, but can we please get it
applied?
>> Thanks for letting me know. Sedat, did you actually test with 2.6.38?
>>
>> Regards,
>> Flo
> I have and had this patch in my own patch-series *before* Debian
> included it (IIRC right after Eric committed it to LKML).
> To answer your question: Yes.
> I have the patch also in my current linux-next kernels
> (next-20110331).
Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 01, 2011 05:18AM |
On Thu, 31 Mar 2011 13:01:18 +0200
Sedat Dilek <sedat.dilek@googlemail.com> wrote:
> >
> > Thanks for letting me know. Sedat, did you actually test with 2.6.38?
> >
> > Regards,
> > Flo
>
> I have and had this patch in my own patch-series *before* Debian
> included it (IIRC right after Eric committed it to LKML).
> To answer your question: Yes.
> I have the patch also in my current linux-next kernels (next-20110331).
>
> - Sedat -
Sorry, I meant tested _without_ the patch. (i.e. does Paul's patch work
or not for you...) And double sorry, if you did already test
vanilla 2.6.38. Tripple sorry if you already wrote that you did test
_without_ the patch and it is still needed... I guess in that case I
should just ditch my copy of 'speed-reading for dummies' ...
)
But anyhow, Eric already stepped up and said that the current state is
supoptimal, so it doesn't matter if vanilla 2.6.38 (without Eric's
patch) fixes it for you since it looks like Eric's patch should go in
nevertheless.
Thanks,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
Sedat Dilek <sedat.dilek@googlemail.com> wrote:
> >
> > Thanks for letting me know. Sedat, did you actually test with 2.6.38?
> >
> > Regards,
> > Flo
>
> I have and had this patch in my own patch-series *before* Debian
> included it (IIRC right after Eric committed it to LKML).
> To answer your question: Yes.
> I have the patch also in my current linux-next kernels (next-20110331).
>
> - Sedat -
Sorry, I meant tested _without_ the patch. (i.e. does Paul's patch work
or not for you...) And double sorry, if you did already test
vanilla 2.6.38. Tripple sorry if you already wrote that you did test
_without_ the patch and it is still needed... I guess in that case I
should just ditch my copy of 'speed-reading for dummies' ...
) But anyhow, Eric already stepped up and said that the current state is
supoptimal, so it doesn't matter if vanilla 2.6.38 (without Eric's
patch) fixes it for you since it looks like Eric's patch should go in
nevertheless.
Thanks,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 01, 2011 05:26AM |
On Thu, Mar 31, 2011 at 3:16 PM, Florian Mickler <florian@mickler.org> wrote:
> On Thu, 31 Mar 2011 13:01:18 +0200
> Sedat Dilek <sedat.dilek@googlemail.com> wrote:
>
>> >
>> > Thanks for letting me know. Sedat, did you actually test with 2.6.38?
>> >
>> > Regards,
>> > Flo
>>
>> I have and had this patch in my own patch-series *before* Debian
>> included it (IIRC right after Eric committed it to LKML).
>> To answer your question: Yes.
>> I have the patch also in my current linux-next kernels (next-20110331).
>>
>> - Sedat -
>
> Sorry, I meant tested _without_ the patch. (i.e. does Paul's patch work
> or not for you...) And double sorry, if you did already test
> vanilla 2.6.38. Tripple sorry if you already wrote that you did test
> _without_ the patch and it is still needed... I guess in that case I
> should just ditch my copy of 'speed-reading for dummies' ... )
>
No worries, no sorries needed for this (I know you fight to get things done).
I can't really say what is w/o Eric's patch.
As I replied to the BR #17772:
I added "lapic" boot-parameter as a result of a perf/NMI patch.
With both things "WorksForMe" I headed to other stuff in kernel development :-).
I was not aware that there was further discussion on the initial patch.
> But anyhow, Eric already stepped up and said that the current state is
> supoptimal, so it doesn't matter if vanilla 2.6.38 (without Eric's
> patch) fixes it for you since it looks like Eric's patch should go in
> nevertheless.
>
I am as always open for testing if there is a new patch around, just
let me know.
- Sedat -
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
> On Thu, 31 Mar 2011 13:01:18 +0200
> Sedat Dilek <sedat.dilek@googlemail.com> wrote:
>
>> >
>> > Thanks for letting me know. Sedat, did you actually test with 2.6.38?
>> >
>> > Regards,
>> > Flo
>>
>> I have and had this patch in my own patch-series *before* Debian
>> included it (IIRC right after Eric committed it to LKML).
>> To answer your question: Yes.
>> I have the patch also in my current linux-next kernels (next-20110331).
>>
>> - Sedat -
>
> Sorry, I meant tested _without_ the patch. (i.e. does Paul's patch work
> or not for you...) And double sorry, if you did already test
> vanilla 2.6.38. Tripple sorry if you already wrote that you did test
> _without_ the patch and it is still needed... I guess in that case I
> should just ditch my copy of 'speed-reading for dummies' ...
)>
No worries, no sorries needed for this (I know you fight to get things done).
I can't really say what is w/o Eric's patch.
As I replied to the BR #17772:
I added "lapic" boot-parameter as a result of a perf/NMI patch.
With both things "WorksForMe" I headed to other stuff in kernel development :-).
I was not aware that there was further discussion on the initial patch.
> But anyhow, Eric already stepped up and said that the current state is
> supoptimal, so it doesn't matter if vanilla 2.6.38 (without Eric's
> patch) fixes it for you since it looks like Eric's patch should go in
> nevertheless.
>
I am as always open for testing if there is a new patch around, just
let me know.
- Sedat -
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
[PATCH] x86, ioapic: move acpi_get_override_irq to acpi.c April 02, 2011 07:46AM |
In order to get rid of the ugly CONFIG_ACPI ifdef, we move
the function acpi_get_override_irq into acpi.c and add a new
helper function ioapic_get_irq to io_apic.c.
Signed-off-by: Florian Mickler <florian@mickler.org>
Cc: Len Brown <lenb@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: kurup_avinash@yahoo.com
Cc: maciej.rutecki@gmail.com
Cc: rjw@sisk.pl
Cc: sedat.dilek@gmail.com
LKML-Reference: <1301558489-4198-1-git-send-email-florian@mickler.org>
---
Hi Ingo,
Instead of exporting find_irq_entry, irq_trigger and irq_polarity, I added a
new helper function 'ioapic_get_irq(..)' and exported that.
Also I did it as a seperate commit, since it is more of a cleanup and the other
commit is already tested... hope this is ok.
Regards,
Flo
arch/x86/include/asm/io_apic.h | 8 +++++++-
arch/x86/kernel/apic/io_apic.c | 40 ++++++++++++----------------------------
arch/x86/pci/acpi.c | 24 ++++++++++++++++++++++++
include/linux/acpi.h | 6 ++++++
4 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index c4bd267..89d3fc6 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -177,6 +177,7 @@ extern void __init pre_init_apic_IRQ0(void);
extern void mp_save_irq(struct mpc_intsrc *m);
extern void disable_ioapic_support(void);
+extern int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity);
#else /* !CONFIG_X86_IO_APIC */
@@ -209,8 +210,13 @@ static inline int restore_IO_APIC_setup(struct IO_APIC_route_entry **ent)
return -ENOMEM;
}
-static inline void mp_save_irq(struct mpc_intsrc *m) { };
+static inline void mp_save_irq(struct mpc_intsrc *m) { }
static inline void disable_ioapic_support(void) { }
+static inline int ioapic_get_irq(int ioapic, int pin, int *trigger,
+ int *polarity)
+{
+ return -1;
+}
#endif
#endif /* _ASM_X86_IO_APIC_H */
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index edf86ca..35eb531 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -938,6 +938,18 @@ static int irq_trigger(int idx)
return trigger;
}
+int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity)
+{
+ int idx = find_irq_entry(ioapic, pin, mp_INT);
+
+ if (idx >= 0) {
+ *trigger = irq_trigger(idx);
+ *polarity = irq_polarity(idx);
+ }
+
+ return idx;
+}
+
static int pin_2_irq(int idx, int apic, int pin)
{
int irq;
@@ -3785,34 +3797,6 @@ static int __init io_apic_get_version(int ioapic)
return reg_01.bits.version;
}
-int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
-{
- int ioapic, pin, idx;
-
-#ifdef CONFIG_ACPI
- if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
- return -1;
-#endif
- if (skip_ioapic_setup)
- return -1;
-
- ioapic = mp_find_ioapic(gsi);
- if (ioapic < 0)
- return -1;
-
- pin = mp_find_ioapic_pin(ioapic, gsi);
- if (pin < 0)
- return -1;
-
- idx = find_irq_entry(ioapic, pin, mp_INT);
- if (idx < 0)
- return -1;
-
- *trigger = irq_trigger(idx);
- *polarity = irq_polarity(idx);
- return 0;
-}
-
/*
* This function currently is only a helper for the i386 smp boot process where
* we need to reprogram the ioredtbls to cater for the cpus which have come online
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 0972315..941328d 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -70,6 +70,30 @@ void __init pci_acpi_crs_quirks(void)
pci_use_crs ? "nocrs" : "use_crs";
}
+int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ int ioapic, pin;
+
+ if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
+ return -1;
+
+ if (skip_ioapic_setup)
+ return -1;
+
+ ioapic = mp_find_ioapic(gsi);
+ if (ioapic < 0)
+ return -1;
+
+ pin = mp_find_ioapic_pin(ioapic, gsi);
+ if (pin < 0)
+ return -1;
+
+ if (ioapic_get_irq(ioapic, pin, trigger, polarity) < 0)
+ return -1;
+
+ return 0;
+}
+
static acpi_status
resource_to_addr(struct acpi_resource *resource,
struct acpi_resource_address64 *addr)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index a2e910e..82c03db 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -348,6 +348,12 @@ static inline int acpi_table_parse(char *id,
{
return -1;
}
+
+static inline int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ return -1;
+}
+
#endif /* !CONFIG_ACPI */
#ifdef CONFIG_ACPI_SLEEP
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
the function acpi_get_override_irq into acpi.c and add a new
helper function ioapic_get_irq to io_apic.c.
Signed-off-by: Florian Mickler <florian@mickler.org>
Cc: Len Brown <lenb@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: kurup_avinash@yahoo.com
Cc: maciej.rutecki@gmail.com
Cc: rjw@sisk.pl
Cc: sedat.dilek@gmail.com
LKML-Reference: <1301558489-4198-1-git-send-email-florian@mickler.org>
---
Hi Ingo,
Instead of exporting find_irq_entry, irq_trigger and irq_polarity, I added a
new helper function 'ioapic_get_irq(..)' and exported that.
Also I did it as a seperate commit, since it is more of a cleanup and the other
commit is already tested... hope this is ok.
Regards,
Flo
arch/x86/include/asm/io_apic.h | 8 +++++++-
arch/x86/kernel/apic/io_apic.c | 40 ++++++++++++----------------------------
arch/x86/pci/acpi.c | 24 ++++++++++++++++++++++++
include/linux/acpi.h | 6 ++++++
4 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index c4bd267..89d3fc6 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -177,6 +177,7 @@ extern void __init pre_init_apic_IRQ0(void);
extern void mp_save_irq(struct mpc_intsrc *m);
extern void disable_ioapic_support(void);
+extern int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity);
#else /* !CONFIG_X86_IO_APIC */
@@ -209,8 +210,13 @@ static inline int restore_IO_APIC_setup(struct IO_APIC_route_entry **ent)
return -ENOMEM;
}
-static inline void mp_save_irq(struct mpc_intsrc *m) { };
+static inline void mp_save_irq(struct mpc_intsrc *m) { }
static inline void disable_ioapic_support(void) { }
+static inline int ioapic_get_irq(int ioapic, int pin, int *trigger,
+ int *polarity)
+{
+ return -1;
+}
#endif
#endif /* _ASM_X86_IO_APIC_H */
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index edf86ca..35eb531 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -938,6 +938,18 @@ static int irq_trigger(int idx)
return trigger;
}
+int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity)
+{
+ int idx = find_irq_entry(ioapic, pin, mp_INT);
+
+ if (idx >= 0) {
+ *trigger = irq_trigger(idx);
+ *polarity = irq_polarity(idx);
+ }
+
+ return idx;
+}
+
static int pin_2_irq(int idx, int apic, int pin)
{
int irq;
@@ -3785,34 +3797,6 @@ static int __init io_apic_get_version(int ioapic)
return reg_01.bits.version;
}
-int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
-{
- int ioapic, pin, idx;
-
-#ifdef CONFIG_ACPI
- if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
- return -1;
-#endif
- if (skip_ioapic_setup)
- return -1;
-
- ioapic = mp_find_ioapic(gsi);
- if (ioapic < 0)
- return -1;
-
- pin = mp_find_ioapic_pin(ioapic, gsi);
- if (pin < 0)
- return -1;
-
- idx = find_irq_entry(ioapic, pin, mp_INT);
- if (idx < 0)
- return -1;
-
- *trigger = irq_trigger(idx);
- *polarity = irq_polarity(idx);
- return 0;
-}
-
/*
* This function currently is only a helper for the i386 smp boot process where
* we need to reprogram the ioredtbls to cater for the cpus which have come online
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 0972315..941328d 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -70,6 +70,30 @@ void __init pci_acpi_crs_quirks(void)
pci_use_crs ? "nocrs" : "use_crs"
;}
+int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ int ioapic, pin;
+
+ if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
+ return -1;
+
+ if (skip_ioapic_setup)
+ return -1;
+
+ ioapic = mp_find_ioapic(gsi);
+ if (ioapic < 0)
+ return -1;
+
+ pin = mp_find_ioapic_pin(ioapic, gsi);
+ if (pin < 0)
+ return -1;
+
+ if (ioapic_get_irq(ioapic, pin, trigger, polarity) < 0)
+ return -1;
+
+ return 0;
+}
+
static acpi_status
resource_to_addr(struct acpi_resource *resource,
struct acpi_resource_address64 *addr)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index a2e910e..82c03db 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -348,6 +348,12 @@ static inline int acpi_table_parse(char *id,
{
return -1;
}
+
+static inline int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ return -1;
+}
+
#endif /* !CONFIG_ACPI */
#ifdef CONFIG_ACPI_SLEEP
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [stable] [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 03, 2011 07:12AM |
> Thank you. Will do if it turns out this is still necessary.
> Paul Bolle mentioned in another messgage that there is a commit in
> 2.6.38 to the same effect:
>
> commit 678301ecadec24ff77ab310eebf8a32ccddb1850
> ("x86, ioapic: Don't warn about non-existing IOAPICs if we have none"
Folks, do you want that commit in .35 longterm or should some other
patch be used?
Thanks,
-Andi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
> Paul Bolle mentioned in another messgage that there is a commit in
> 2.6.38 to the same effect:
>
> commit 678301ecadec24ff77ab310eebf8a32ccddb1850
> ("x86, ioapic: Don't warn about non-existing IOAPICs if we have none"
Folks, do you want that commit in .35 longterm or should some other
patch be used?
Thanks,
-Andi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [stable] [PATCH][POKE] Skip looking for ioapic overrides when ioapics are not present April 03, 2011 10:36AM |
* Andi Kleen <andi@firstfloor.org> wrote:
> > Thank you. Will do if it turns out this is still necessary.
> > Paul Bolle mentioned in another messgage that there is a commit in
> > 2.6.38 to the same effect:
> >
> > commit 678301ecadec24ff77ab310eebf8a32ccddb1850
> > ("x86, ioapic: Don't warn about non-existing IOAPICs if we have none"
>
> Folks, do you want that commit in .35 longterm or should some other
> patch be used?
Nope, that one's fine for -stable.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
> > Thank you. Will do if it turns out this is still necessary.
> > Paul Bolle mentioned in another messgage that there is a commit in
> > 2.6.38 to the same effect:
> >
> > commit 678301ecadec24ff77ab310eebf8a32ccddb1850
> > ("x86, ioapic: Don't warn about non-existing IOAPICs if we have none"
>
> Folks, do you want that commit in .35 longterm or should some other
> patch be used?
Nope, that one's fine for -stable.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
Re: [PATCH] x86, ioapic: move acpi_get_override_irq to acpi.c April 13, 2011 11:54AM |
On Tue, 12 Apr 2011 09:39:29 +0200
Ingo Molnar <mingo@elte.hu> wrote:
>
> * Florian Mickler <florian@mickler.org> wrote:
>
> > In order to get rid of the ugly CONFIG_ACPI ifdef, we move
> > the function acpi_get_override_irq into acpi.c and add a new
> > helper function ioapic_get_irq to io_apic.c.
> >
> > Signed-off-by: Florian Mickler <florian@mickler.org>
> > Cc: Len Brown <lenb@kernel.org>
> > Cc: "Eric W. Biederman" <ebiederm@xmission.com>
> > Cc: kurup_avinash@yahoo.com
> > Cc: maciej.rutecki@gmail.com
> > Cc: rjw@sisk.pl
> > Cc: sedat.dilek@gmail.com
> > LKML-Reference: <1301558489-4198-1-git-send-email-florian@mickler.org>
> > ---
> >
> > Hi Ingo,
> >
> > Instead of exporting find_irq_entry, irq_trigger and irq_polarity, I added a
> > new helper function 'ioapic_get_irq(..)' and exported that.
> >
> > Also I did it as a seperate commit, since it is more of a cleanup and the other
> > commit is already tested... hope this is ok.
>
> Yeah, looks good in principle.
>
> Mind porting to the latest x86 devel tree and resend the patch? I tried to
> apply your patch but there's a conflict. You can find the tree at:
>
> [people.redhat.com]
>
> Thanks,
>
> Ingo
It does still apply on top of
[PATCH v2] x86, ioapic: Skip looking for ioapic overrides when ioapics
are not present (<1301621025-3858-1-git-send-email-florian@mickler.org>
I'm going to send both patches as a reply to this message, since I
have updated the $subject patch to also remove the #define
acpi_get_override_irq in acpi.h ..
Regards,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
Ingo Molnar <mingo@elte.hu> wrote:
>
> * Florian Mickler <florian@mickler.org> wrote:
>
> > In order to get rid of the ugly CONFIG_ACPI ifdef, we move
> > the function acpi_get_override_irq into acpi.c and add a new
> > helper function ioapic_get_irq to io_apic.c.
> >
> > Signed-off-by: Florian Mickler <florian@mickler.org>
> > Cc: Len Brown <lenb@kernel.org>
> > Cc: "Eric W. Biederman" <ebiederm@xmission.com>
> > Cc: kurup_avinash@yahoo.com
> > Cc: maciej.rutecki@gmail.com
> > Cc: rjw@sisk.pl
> > Cc: sedat.dilek@gmail.com
> > LKML-Reference: <1301558489-4198-1-git-send-email-florian@mickler.org>
> > ---
> >
> > Hi Ingo,
> >
> > Instead of exporting find_irq_entry, irq_trigger and irq_polarity, I added a
> > new helper function 'ioapic_get_irq(..)' and exported that.
> >
> > Also I did it as a seperate commit, since it is more of a cleanup and the other
> > commit is already tested... hope this is ok.
>
> Yeah, looks good in principle.
>
> Mind porting to the latest x86 devel tree and resend the patch? I tried to
> apply your patch but there's a conflict. You can find the tree at:
>
> [people.redhat.com]
>
> Thanks,
>
> Ingo
It does still apply on top of
[PATCH v2] x86, ioapic: Skip looking for ioapic overrides when ioapics
are not present (<1301621025-3858-1-git-send-email-florian@mickler.org>
I'm going to send both patches as a reply to this message, since I
have updated the $subject patch to also remove the #define
acpi_get_override_irq in acpi.h ..
Regards,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
|
[PATCH 2/2 v2] x86, ioapic: move acpi_get_override_irq to acpi.c April 13, 2011 12:02PM |
In order to get rid of the ugly CONFIG_ACPI ifdef, we move
the function acpi_get_override_irq into acpi.c and add a new
helper function ioapic_get_irq to io_apic.c.
Signed-off-by: Florian Mickler <florian@mickler.org>
Cc: Len Brown <lenb@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: kurup_avinash@yahoo.com
Cc: maciej.rutecki@gmail.com
Cc: rjw@sisk.pl
Cc: sedat.dilek@gmail.com
Cc: # .34+ <stable@kernel.org>
LKML-Reference: <1301558489-4198-1-git-send-email-florian@mickler.org>
---
[v2: removed the acpi_get_override_irq macro in acpi.h]
arch/x86/include/asm/io_apic.h | 8 +++++++-
arch/x86/kernel/apic/io_apic.c | 40 ++++++++++++----------------------------
arch/x86/pci/acpi.c | 24 ++++++++++++++++++++++++
include/linux/acpi.h | 6 ++++++
4 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index c4bd267..89d3fc6 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -177,6 +177,7 @@ extern void __init pre_init_apic_IRQ0(void);
extern void mp_save_irq(struct mpc_intsrc *m);
extern void disable_ioapic_support(void);
+extern int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity);
#else /* !CONFIG_X86_IO_APIC */
@@ -209,8 +210,13 @@ static inline int restore_IO_APIC_setup(struct IO_APIC_route_entry **ent)
return -ENOMEM;
}
-static inline void mp_save_irq(struct mpc_intsrc *m) { };
+static inline void mp_save_irq(struct mpc_intsrc *m) { }
static inline void disable_ioapic_support(void) { }
+static inline int ioapic_get_irq(int ioapic, int pin, int *trigger,
+ int *polarity)
+{
+ return -1;
+}
#endif
#endif /* _ASM_X86_IO_APIC_H */
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index edf86ca..35eb531 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -938,6 +938,18 @@ static int irq_trigger(int idx)
return trigger;
}
+int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity)
+{
+ int idx = find_irq_entry(ioapic, pin, mp_INT);
+
+ if (idx >= 0) {
+ *trigger = irq_trigger(idx);
+ *polarity = irq_polarity(idx);
+ }
+
+ return idx;
+}
+
static int pin_2_irq(int idx, int apic, int pin)
{
int irq;
@@ -3785,34 +3797,6 @@ static int __init io_apic_get_version(int ioapic)
return reg_01.bits.version;
}
-int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
-{
- int ioapic, pin, idx;
-
-#ifdef CONFIG_ACPI
- if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
- return -1;
-#endif
- if (skip_ioapic_setup)
- return -1;
-
- ioapic = mp_find_ioapic(gsi);
- if (ioapic < 0)
- return -1;
-
- pin = mp_find_ioapic_pin(ioapic, gsi);
- if (pin < 0)
- return -1;
-
- idx = find_irq_entry(ioapic, pin, mp_INT);
- if (idx < 0)
- return -1;
-
- *trigger = irq_trigger(idx);
- *polarity = irq_polarity(idx);
- return 0;
-}
-
/*
* This function currently is only a helper for the i386 smp boot process where
* we need to reprogram the ioredtbls to cater for the cpus which have come online
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 0972315..941328d 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -70,6 +70,30 @@ void __init pci_acpi_crs_quirks(void)
pci_use_crs ? "nocrs" : "use_crs";
}
+int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ int ioapic, pin;
+
+ if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
+ return -1;
+
+ if (skip_ioapic_setup)
+ return -1;
+
+ ioapic = mp_find_ioapic(gsi);
+ if (ioapic < 0)
+ return -1;
+
+ pin = mp_find_ioapic_pin(ioapic, gsi);
+ if (pin < 0)
+ return -1;
+
+ if (ioapic_get_irq(ioapic, pin, trigger, polarity) < 0)
+ return -1;
+
+ return 0;
+}
+
static acpi_status
resource_to_addr(struct acpi_resource *resource,
struct acpi_resource_address64 *addr)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index a2e910e..2a793b2 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -118,11 +118,8 @@ int acpi_register_gsi (struct device *dev, u32 gsi, int triggering, int polarity
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);
-#ifdef CONFIG_X86_IO_APIC
extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity);
-#else
-#define acpi_get_override_irq(gsi, trigger, polarity) (-1)
-#endif
+
/*
* This function undoes the effect of one call to acpi_register_gsi().
* If this matches the last registration, any IRQ resources for gsi
@@ -348,6 +345,12 @@ static inline int acpi_table_parse(char *id,
{
return -1;
}
+
+static inline int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ return -1;
+}
+
#endif /* !CONFIG_ACPI */
#ifdef CONFIG_ACPI_SLEEP
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
the function acpi_get_override_irq into acpi.c and add a new
helper function ioapic_get_irq to io_apic.c.
Signed-off-by: Florian Mickler <florian@mickler.org>
Cc: Len Brown <lenb@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: kurup_avinash@yahoo.com
Cc: maciej.rutecki@gmail.com
Cc: rjw@sisk.pl
Cc: sedat.dilek@gmail.com
Cc: # .34+ <stable@kernel.org>
LKML-Reference: <1301558489-4198-1-git-send-email-florian@mickler.org>
---
[v2: removed the acpi_get_override_irq macro in acpi.h]
arch/x86/include/asm/io_apic.h | 8 +++++++-
arch/x86/kernel/apic/io_apic.c | 40 ++++++++++++----------------------------
arch/x86/pci/acpi.c | 24 ++++++++++++++++++++++++
include/linux/acpi.h | 6 ++++++
4 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index c4bd267..89d3fc6 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -177,6 +177,7 @@ extern void __init pre_init_apic_IRQ0(void);
extern void mp_save_irq(struct mpc_intsrc *m);
extern void disable_ioapic_support(void);
+extern int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity);
#else /* !CONFIG_X86_IO_APIC */
@@ -209,8 +210,13 @@ static inline int restore_IO_APIC_setup(struct IO_APIC_route_entry **ent)
return -ENOMEM;
}
-static inline void mp_save_irq(struct mpc_intsrc *m) { };
+static inline void mp_save_irq(struct mpc_intsrc *m) { }
static inline void disable_ioapic_support(void) { }
+static inline int ioapic_get_irq(int ioapic, int pin, int *trigger,
+ int *polarity)
+{
+ return -1;
+}
#endif
#endif /* _ASM_X86_IO_APIC_H */
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index edf86ca..35eb531 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -938,6 +938,18 @@ static int irq_trigger(int idx)
return trigger;
}
+int ioapic_get_irq(int ioapic, int pin, int *trigger, int *polarity)
+{
+ int idx = find_irq_entry(ioapic, pin, mp_INT);
+
+ if (idx >= 0) {
+ *trigger = irq_trigger(idx);
+ *polarity = irq_polarity(idx);
+ }
+
+ return idx;
+}
+
static int pin_2_irq(int idx, int apic, int pin)
{
int irq;
@@ -3785,34 +3797,6 @@ static int __init io_apic_get_version(int ioapic)
return reg_01.bits.version;
}
-int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
-{
- int ioapic, pin, idx;
-
-#ifdef CONFIG_ACPI
- if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
- return -1;
-#endif
- if (skip_ioapic_setup)
- return -1;
-
- ioapic = mp_find_ioapic(gsi);
- if (ioapic < 0)
- return -1;
-
- pin = mp_find_ioapic_pin(ioapic, gsi);
- if (pin < 0)
- return -1;
-
- idx = find_irq_entry(ioapic, pin, mp_INT);
- if (idx < 0)
- return -1;
-
- *trigger = irq_trigger(idx);
- *polarity = irq_polarity(idx);
- return 0;
-}
-
/*
* This function currently is only a helper for the i386 smp boot process where
* we need to reprogram the ioredtbls to cater for the cpus which have come online
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 0972315..941328d 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -70,6 +70,30 @@ void __init pci_acpi_crs_quirks(void)
pci_use_crs ? "nocrs" : "use_crs"
;}
+int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ int ioapic, pin;
+
+ if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
+ return -1;
+
+ if (skip_ioapic_setup)
+ return -1;
+
+ ioapic = mp_find_ioapic(gsi);
+ if (ioapic < 0)
+ return -1;
+
+ pin = mp_find_ioapic_pin(ioapic, gsi);
+ if (pin < 0)
+ return -1;
+
+ if (ioapic_get_irq(ioapic, pin, trigger, polarity) < 0)
+ return -1;
+
+ return 0;
+}
+
static acpi_status
resource_to_addr(struct acpi_resource *resource,
struct acpi_resource_address64 *addr)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index a2e910e..2a793b2 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -118,11 +118,8 @@ int acpi_register_gsi (struct device *dev, u32 gsi, int triggering, int polarity
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);
-#ifdef CONFIG_X86_IO_APIC
extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity);
-#else
-#define acpi_get_override_irq(gsi, trigger, polarity) (-1)
-#endif
+
/*
* This function undoes the effect of one call to acpi_register_gsi().
* If this matches the last registration, any IRQ resources for gsi
@@ -348,6 +345,12 @@ static inline int acpi_table_parse(char *id,
{
return -1;
}
+
+static inline int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+ return -1;
+}
+
#endif /* !CONFIG_ACPI */
#ifdef CONFIG_ACPI_SLEEP
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]
Sorry, you do not have permission to post/reply in this forum.