| Message ID | 1389394340-2680-4-git-send-email-al.stone@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Friday, January 10, 2014 03:52:17 PM al.stone@linaro.org wrote: > From: Al Stone <al.stone@linaro.org> > > In HW reduced mode, the use of the SCI interrupt is not allowed. In > all those places that use the FADT sci_interrupt field, make sure we > do not execute that path when in HW reduced mode. > > In the case of acpi_os_install_interrupt_handler() in osl.c, this allows > us to open up the routine to installing interrupt handlers other than > acpi_gbl_FADT.sci_interrupt regardless of whether we are in ACPI legacy > mode or reduced HW mode; acpi_os_remove_interrupt_handler() changes to > maintain symmetry. > > Signed-off-by: Al Stone <al.stone@linaro.org> > --- > drivers/acpi/bus.c | 30 ++++++++++++++++-------------- > drivers/acpi/osl.c | 18 +++++++----------- > drivers/acpi/pci_link.c | 2 ++ > 3 files changed, 25 insertions(+), 25 deletions(-) > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > index 0710004..d871859 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -552,21 +552,23 @@ void __init acpi_early_init(void) > } > > #ifdef CONFIG_X86 > - if (!acpi_ioapic) { > - /* compatible (0) means level (3) */ > - if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { > - acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; > - acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; I wonder why exactly you want to make this change. It surely doesn't matter for ARM and do you have any HW-reduced x86 hardware to test it? > + if (!acpi_gbl_reduced_hardware) { > + if (!acpi_ioapic) { > + /* compatible (0) means level (3) */ > + if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { > + acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; > + acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; > + } > + /* Set PIC-mode SCI trigger type */ > + acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, > + (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); > + } else { > + /* > + * now that acpi_gbl_FADT is initialized, > + * update it with result from INT_SRC_OVR parsing > + */ > + acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; > } > - /* Set PIC-mode SCI trigger type */ > - acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, > - (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); > - } else { > - /* > - * now that acpi_gbl_FADT is initialized, > - * update it with result from INT_SRC_OVR parsing > - */ > - acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; > } > #endif > > diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c > index 44c07eb..c946a3a 100644 > --- a/drivers/acpi/osl.c > +++ b/drivers/acpi/osl.c > @@ -84,6 +84,7 @@ static int (*__acpi_os_prepare_extended_sleep)(u8 sleep_state, u32 val_a, > > static acpi_osd_handler acpi_irq_handler; > static void *acpi_irq_context; > +static u32 acpi_irq_number; > static struct workqueue_struct *kacpid_wq; > static struct workqueue_struct *kacpi_notify_wq; > static struct workqueue_struct *kacpi_hotplug_wq; > @@ -178,6 +179,10 @@ static void __init acpi_request_region (struct acpi_generic_address *gas, > > static int __init acpi_reserve_resources(void) > { > + /* Handle hardware reduced mode: i.e., do nothing. */ > + if (acpi_gbl_reduced_hardware) > + return 0; Does it actually break things if we do that? > + > acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length, > "ACPI PM1a_EVT_BLK"); > > @@ -795,13 +800,6 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, > > acpi_irq_stats_init(); > > - /* > - * ACPI interrupts different from the SCI in our copy of the FADT are > - * not supported. > - */ > - if (gsi != acpi_gbl_FADT.sci_interrupt) > - return AE_BAD_PARAMETER; > - > if (acpi_irq_handler) > return AE_ALREADY_ACQUIRED; > > @@ -818,15 +816,13 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, > acpi_irq_handler = NULL; > return AE_NOT_ACQUIRED; > } > + acpi_irq_number = irq; > > return AE_OK; > } > > acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) > { > - if (irq != acpi_gbl_FADT.sci_interrupt) > - return AE_BAD_PARAMETER; > - > free_irq(irq, acpi_irq); > acpi_irq_handler = NULL; > > @@ -1806,7 +1802,7 @@ acpi_status __init acpi_os_initialize1(void) > acpi_status acpi_os_terminate(void) > { > if (acpi_irq_handler) { > - acpi_os_remove_interrupt_handler(acpi_gbl_FADT.sci_interrupt, > + acpi_os_remove_interrupt_handler(acpi_irq_number, > acpi_irq_handler); > } > > diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c > index 2652a61..d5c155e 100644 > --- a/drivers/acpi/pci_link.c > +++ b/drivers/acpi/pci_link.c > @@ -505,6 +505,8 @@ int __init acpi_irq_penalty_init(void) > } > } > /* Add a penalty for the SCI */ > + if (acpi_gbl_reduced_hardware) > + return 0; > acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING; > return 0; > } Is ARM really going to use the code in pci_link.c? If so, then how exactly? Rafael
On 01/10/2014 04:20 PM, Rafael J. Wysocki wrote: > On Friday, January 10, 2014 03:52:17 PM al.stone@linaro.org wrote: >> From: Al Stone <al.stone@linaro.org> >> >> In HW reduced mode, the use of the SCI interrupt is not allowed. In >> all those places that use the FADT sci_interrupt field, make sure we >> do not execute that path when in HW reduced mode. >> >> In the case of acpi_os_install_interrupt_handler() in osl.c, this allows >> us to open up the routine to installing interrupt handlers other than >> acpi_gbl_FADT.sci_interrupt regardless of whether we are in ACPI legacy >> mode or reduced HW mode; acpi_os_remove_interrupt_handler() changes to >> maintain symmetry. >> >> Signed-off-by: Al Stone <al.stone@linaro.org> >> --- >> drivers/acpi/bus.c | 30 ++++++++++++++++-------------- >> drivers/acpi/osl.c | 18 +++++++----------- >> drivers/acpi/pci_link.c | 2 ++ >> 3 files changed, 25 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c >> index 0710004..d871859 100644 >> --- a/drivers/acpi/bus.c >> +++ b/drivers/acpi/bus.c >> @@ -552,21 +552,23 @@ void __init acpi_early_init(void) >> } >> >> #ifdef CONFIG_X86 >> - if (!acpi_ioapic) { >> - /* compatible (0) means level (3) */ >> - if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { >> - acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; >> - acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; > > I wonder why exactly you want to make this change. It surely doesn't matter > for ARM and do you have any HW-reduced x86 hardware to test it? The point of this exercise was not to make hardware reduced work for just ARM; the point was to ensure hardware reduced is working correctly for any architecture using ACPI. No, I do not have hardware reduced x86 hardware to test with. Nor can I predict if or when Intel will make such a thing. If you would rather wait until they do, so be it. My intent was to avoid problems before they occur, rather than waiting until they actually break. I chose to make this change because (a) it seemed silly to me to execute code you don't have to, (b) since the kernel code does end up acting as documentation for how ACPI is implemented and how it is compliant with the spec, it made sense to me to ensure all usage was compliant with the spec, and (c) if the machine has an IOAPIC and acpi_sci=n (n is non-zero) is supplied on the command line, the FADT SCI interrupt will end being initialized and used which is not allowed in hardware reduced mode. >> + if (!acpi_gbl_reduced_hardware) { >> + if (!acpi_ioapic) { >> + /* compatible (0) means level (3) */ >> + if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { >> + acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; >> + acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; >> + } >> + /* Set PIC-mode SCI trigger type */ >> + acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, >> + (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); >> + } else { >> + /* >> + * now that acpi_gbl_FADT is initialized, >> + * update it with result from INT_SRC_OVR parsing >> + */ >> + acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; >> } >> - /* Set PIC-mode SCI trigger type */ >> - acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, >> - (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); >> - } else { >> - /* >> - * now that acpi_gbl_FADT is initialized, >> - * update it with result from INT_SRC_OVR parsing >> - */ >> - acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; >> } >> #endif >> >> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c >> index 44c07eb..c946a3a 100644 >> --- a/drivers/acpi/osl.c >> +++ b/drivers/acpi/osl.c >> @@ -84,6 +84,7 @@ static int (*__acpi_os_prepare_extended_sleep)(u8 sleep_state, u32 val_a, >> >> static acpi_osd_handler acpi_irq_handler; >> static void *acpi_irq_context; >> +static u32 acpi_irq_number; >> static struct workqueue_struct *kacpid_wq; >> static struct workqueue_struct *kacpi_notify_wq; >> static struct workqueue_struct *kacpi_hotplug_wq; >> @@ -178,6 +179,10 @@ static void __init acpi_request_region (struct acpi_generic_address *gas, >> >> static int __init acpi_reserve_resources(void) >> { >> + /* Handle hardware reduced mode: i.e., do nothing. */ >> + if (acpi_gbl_reduced_hardware) >> + return 0; > > Does it actually break things if we do that? Not that I can see anywhere. All of the code I have looked at appears to behave correctly if the ignored fields in the FADT are set to zero -- in this case, not using or checking bits in the xpm1a_event_blocks if the FADT field is zero. >> + >> acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length, >> "ACPI PM1a_EVT_BLK"); >> >> @@ -795,13 +800,6 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, >> >> acpi_irq_stats_init(); >> >> - /* >> - * ACPI interrupts different from the SCI in our copy of the FADT are >> - * not supported. >> - */ >> - if (gsi != acpi_gbl_FADT.sci_interrupt) >> - return AE_BAD_PARAMETER; >> - >> if (acpi_irq_handler) >> return AE_ALREADY_ACQUIRED; >> >> @@ -818,15 +816,13 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, >> acpi_irq_handler = NULL; >> return AE_NOT_ACQUIRED; >> } >> + acpi_irq_number = irq; >> >> return AE_OK; >> } >> >> acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) >> { >> - if (irq != acpi_gbl_FADT.sci_interrupt) >> - return AE_BAD_PARAMETER; >> - >> free_irq(irq, acpi_irq); >> acpi_irq_handler = NULL; >> >> @@ -1806,7 +1802,7 @@ acpi_status __init acpi_os_initialize1(void) >> acpi_status acpi_os_terminate(void) >> { >> if (acpi_irq_handler) { >> - acpi_os_remove_interrupt_handler(acpi_gbl_FADT.sci_interrupt, >> + acpi_os_remove_interrupt_handler(acpi_irq_number, >> acpi_irq_handler); >> } >> >> diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c >> index 2652a61..d5c155e 100644 >> --- a/drivers/acpi/pci_link.c >> +++ b/drivers/acpi/pci_link.c >> @@ -505,6 +505,8 @@ int __init acpi_irq_penalty_init(void) >> } >> } >> /* Add a penalty for the SCI */ >> + if (acpi_gbl_reduced_hardware) >> + return 0; >> acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING; >> return 0; >> } > > Is ARM really going to use the code in pci_link.c? If so, then how exactly? I have no idea; I wasn't thinking strictly ARM in the first place. Just the same, why execute code if it is irrelevant? Further, if hardware reduced ACPI tables have the SCI interrupt field set to zero as they should, IRQ 0 gets a hefty penalty assessed; or, if the hardware reduced tables were made by taking a shortcut and just toggling the hardware reduced flag while leaving the SCI interrupt field alone, some other IRQ gets a penalty assessed, neither of which seemed to me to be correct either. > Rafael > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
On Monday, January 13, 2014 03:28:53 PM Al Stone wrote: > On 01/10/2014 04:20 PM, Rafael J. Wysocki wrote: > > On Friday, January 10, 2014 03:52:17 PM al.stone@linaro.org wrote: > >> From: Al Stone <al.stone@linaro.org> > >> > >> In HW reduced mode, the use of the SCI interrupt is not allowed. In > >> all those places that use the FADT sci_interrupt field, make sure we > >> do not execute that path when in HW reduced mode. > >> > >> In the case of acpi_os_install_interrupt_handler() in osl.c, this allows > >> us to open up the routine to installing interrupt handlers other than > >> acpi_gbl_FADT.sci_interrupt regardless of whether we are in ACPI legacy > >> mode or reduced HW mode; acpi_os_remove_interrupt_handler() changes to > >> maintain symmetry. > >> > >> Signed-off-by: Al Stone <al.stone@linaro.org> > >> --- > >> drivers/acpi/bus.c | 30 ++++++++++++++++-------------- > >> drivers/acpi/osl.c | 18 +++++++----------- > >> drivers/acpi/pci_link.c | 2 ++ > >> 3 files changed, 25 insertions(+), 25 deletions(-) > >> > >> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > >> index 0710004..d871859 100644 > >> --- a/drivers/acpi/bus.c > >> +++ b/drivers/acpi/bus.c > >> @@ -552,21 +552,23 @@ void __init acpi_early_init(void) > >> } > >> > >> #ifdef CONFIG_X86 > >> - if (!acpi_ioapic) { > >> - /* compatible (0) means level (3) */ > >> - if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { > >> - acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; > >> - acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; > > > > I wonder why exactly you want to make this change. It surely doesn't matter > > for ARM and do you have any HW-reduced x86 hardware to test it? > > The point of this exercise was not to make hardware reduced work for > just ARM; the point was to ensure hardware reduced is working correctly > for any architecture using ACPI. > > No, I do not have hardware reduced x86 hardware to test with. Nor can > I predict if or when Intel will make such a thing. If you would rather > wait until they do, so be it. My intent was to avoid problems before > they occur, rather than waiting until they actually break. > > I chose to make this change because (a) it seemed silly to me to > execute code you don't have to, (b) since the kernel code does end > up acting as documentation for how ACPI is implemented and how it > is compliant with the spec, it made sense to me to ensure all usage > was compliant with the spec, and (c) if the machine has an IOAPIC > and acpi_sci=n (n is non-zero) is supplied on the command line, the > FADT SCI interrupt will end being initialized and used which is not > allowed in hardware reduced mode. > > >> + if (!acpi_gbl_reduced_hardware) { > >> + if (!acpi_ioapic) { > >> + /* compatible (0) means level (3) */ > >> + if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { > >> + acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; > >> + acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; > >> + } > >> + /* Set PIC-mode SCI trigger type */ > >> + acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, > >> + (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); > >> + } else { > >> + /* > >> + * now that acpi_gbl_FADT is initialized, > >> + * update it with result from INT_SRC_OVR parsing > >> + */ > >> + acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; > >> } > >> - /* Set PIC-mode SCI trigger type */ > >> - acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, > >> - (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); > >> - } else { > >> - /* > >> - * now that acpi_gbl_FADT is initialized, > >> - * update it with result from INT_SRC_OVR parsing > >> - */ > >> - acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; > >> } > >> #endif > >> > >> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c > >> index 44c07eb..c946a3a 100644 > >> --- a/drivers/acpi/osl.c > >> +++ b/drivers/acpi/osl.c > >> @@ -84,6 +84,7 @@ static int (*__acpi_os_prepare_extended_sleep)(u8 sleep_state, u32 val_a, > >> > >> static acpi_osd_handler acpi_irq_handler; > >> static void *acpi_irq_context; > >> +static u32 acpi_irq_number; > >> static struct workqueue_struct *kacpid_wq; > >> static struct workqueue_struct *kacpi_notify_wq; > >> static struct workqueue_struct *kacpi_hotplug_wq; > >> @@ -178,6 +179,10 @@ static void __init acpi_request_region (struct acpi_generic_address *gas, > >> > >> static int __init acpi_reserve_resources(void) > >> { > >> + /* Handle hardware reduced mode: i.e., do nothing. */ > >> + if (acpi_gbl_reduced_hardware) > >> + return 0; > > > > Does it actually break things if we do that? > > Not that I can see anywhere. All of the code I have looked at appears > to behave correctly if the ignored fields in the FADT are set to zero > -- in this case, not using or checking bits in the xpm1a_event_blocks > if the FADT field is zero. > > >> + > >> acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length, > >> "ACPI PM1a_EVT_BLK"); > >> > >> @@ -795,13 +800,6 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, > >> > >> acpi_irq_stats_init(); > >> > >> - /* > >> - * ACPI interrupts different from the SCI in our copy of the FADT are > >> - * not supported. > >> - */ > >> - if (gsi != acpi_gbl_FADT.sci_interrupt) > >> - return AE_BAD_PARAMETER; > >> - > >> if (acpi_irq_handler) > >> return AE_ALREADY_ACQUIRED; > >> > >> @@ -818,15 +816,13 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, > >> acpi_irq_handler = NULL; > >> return AE_NOT_ACQUIRED; > >> } > >> + acpi_irq_number = irq; > >> > >> return AE_OK; > >> } > >> > >> acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) > >> { > >> - if (irq != acpi_gbl_FADT.sci_interrupt) > >> - return AE_BAD_PARAMETER; > >> - > >> free_irq(irq, acpi_irq); > >> acpi_irq_handler = NULL; > >> > >> @@ -1806,7 +1802,7 @@ acpi_status __init acpi_os_initialize1(void) > >> acpi_status acpi_os_terminate(void) > >> { > >> if (acpi_irq_handler) { > >> - acpi_os_remove_interrupt_handler(acpi_gbl_FADT.sci_interrupt, > >> + acpi_os_remove_interrupt_handler(acpi_irq_number, > >> acpi_irq_handler); > >> } > >> > >> diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c > >> index 2652a61..d5c155e 100644 > >> --- a/drivers/acpi/pci_link.c > >> +++ b/drivers/acpi/pci_link.c > >> @@ -505,6 +505,8 @@ int __init acpi_irq_penalty_init(void) > >> } > >> } > >> /* Add a penalty for the SCI */ > >> + if (acpi_gbl_reduced_hardware) > >> + return 0; > >> acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING; > >> return 0; > >> } > > > > Is ARM really going to use the code in pci_link.c? If so, then how exactly? > > I have no idea; I wasn't thinking strictly ARM in the first place. > Just the same, why execute code if it is irrelevant? Becase we don't know if it really is irrelevant. Had I known for a fact that it had been irrelevant, I wouldn't have had any concerns here. > Further, if hardware reduced ACPI tables have the SCI interrupt field set to > zero as they should, IRQ 0 gets a hefty penalty assessed; or, if the > hardware reduced tables were made by taking a shortcut and just toggling > the hardware reduced flag while leaving the SCI interrupt field alone, > some other IRQ gets a penalty assessed, neither of which seemed to me > to be correct either. That is a good point. I think it will be safe to avoid using the SCI if the HW reduced bit is set and the SCI interrupt field is 0 at the same time. So in my opinion it generally is better to avoid interpreting the spec literally in this particular respect and to treat the ACPI HW features as optional if the the HW reduced bit is set. I think it is OK to check if they are present (arguably, we should be doing that anyway, because there may be broken BIOSes that don't set HW-reduced and still don't implement those features although they should in that case), but changing the code to always ignore them altogether may be going a bit too far. Thanks!
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 0710004..d871859 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -552,21 +552,23 @@ void __init acpi_early_init(void) } #ifdef CONFIG_X86 - if (!acpi_ioapic) { - /* compatible (0) means level (3) */ - if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { - acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; - acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; + if (!acpi_gbl_reduced_hardware) { + if (!acpi_ioapic) { + /* compatible (0) means level (3) */ + if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { + acpi_sci_flags &= ~ACPI_MADT_TRIGGER_MASK; + acpi_sci_flags |= ACPI_MADT_TRIGGER_LEVEL; + } + /* Set PIC-mode SCI trigger type */ + acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, + (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); + } else { + /* + * now that acpi_gbl_FADT is initialized, + * update it with result from INT_SRC_OVR parsing + */ + acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; } - /* Set PIC-mode SCI trigger type */ - acpi_pic_sci_set_trigger(acpi_gbl_FADT.sci_interrupt, - (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2); - } else { - /* - * now that acpi_gbl_FADT is initialized, - * update it with result from INT_SRC_OVR parsing - */ - acpi_gbl_FADT.sci_interrupt = acpi_sci_override_gsi; } #endif diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 44c07eb..c946a3a 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -84,6 +84,7 @@ static int (*__acpi_os_prepare_extended_sleep)(u8 sleep_state, u32 val_a, static acpi_osd_handler acpi_irq_handler; static void *acpi_irq_context; +static u32 acpi_irq_number; static struct workqueue_struct *kacpid_wq; static struct workqueue_struct *kacpi_notify_wq; static struct workqueue_struct *kacpi_hotplug_wq; @@ -178,6 +179,10 @@ static void __init acpi_request_region (struct acpi_generic_address *gas, static int __init acpi_reserve_resources(void) { + /* Handle hardware reduced mode: i.e., do nothing. */ + if (acpi_gbl_reduced_hardware) + return 0; + acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length, "ACPI PM1a_EVT_BLK"); @@ -795,13 +800,6 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, acpi_irq_stats_init(); - /* - * ACPI interrupts different from the SCI in our copy of the FADT are - * not supported. - */ - if (gsi != acpi_gbl_FADT.sci_interrupt) - return AE_BAD_PARAMETER; - if (acpi_irq_handler) return AE_ALREADY_ACQUIRED; @@ -818,15 +816,13 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, acpi_irq_handler = NULL; return AE_NOT_ACQUIRED; } + acpi_irq_number = irq; return AE_OK; } acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) { - if (irq != acpi_gbl_FADT.sci_interrupt) - return AE_BAD_PARAMETER; - free_irq(irq, acpi_irq); acpi_irq_handler = NULL; @@ -1806,7 +1802,7 @@ acpi_status __init acpi_os_initialize1(void) acpi_status acpi_os_terminate(void) { if (acpi_irq_handler) { - acpi_os_remove_interrupt_handler(acpi_gbl_FADT.sci_interrupt, + acpi_os_remove_interrupt_handler(acpi_irq_number, acpi_irq_handler); } diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 2652a61..d5c155e 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -505,6 +505,8 @@ int __init acpi_irq_penalty_init(void) } } /* Add a penalty for the SCI */ + if (acpi_gbl_reduced_hardware) + return 0; acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING; return 0; }