[Patch v2]
PATCH v2 1/1 [Patch v2]
Hi Nick,
Rafael and Thomas have concerns about the way to solve the
regression by quirk, so could you please help to test this patch? Thanks!
Gerry
Signed-off-by Jiang Liu <[email protected]>
--- arch/x86/kernel/acpi/boot.c | 1 + drivers/acpi/pci_link.c | 16 ++++++++++++++++ include/linux/acpi.h | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-)
arch/x86/kernel/acpi/boot.c +1 -0
@@ -445,6 +445,7 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger, polarity = acpi_sci_flags &ACPI_MADT_POLARITY_MASK ;mp_override_legacy_irq (bus_irq, polarity, trigger, gsi); +acpi_penalize_sci_irq (bus_irq, trigger, polarity);/* * stash over-ride to indicate we've been here
drivers/acpi/pci_link.c +16 -0
@@ -826,6 +826,22 @@ void acpi_penalize_isa_irq(int irq, int active) }/* +* Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict with +* PCI IRQ attributes, mark ACPI SCI as ISA_ALWAYS so it won't be use for +* PCI IRQs. +*/ +void acpi_penalize_sci_irq (int irq,int trigger,int polarity) +{ +if (irq >=0 && irq <ARRAY_SIZE (acpi_irq_penalty)) { +if (trigger !=ACPI_MADT_TRIGGER_LEVEL || + polarity !=ACPI_MADT_POLARITY_ACTIVE_LOW ) + acpi_irq_penalty[irq] +=PIRQ_PENALTY_ISA_ALWAYS ; +else + acpi_irq_penalty[irq] +=PIRQ_PENALTY_PCI_USING ; + } +} + +/* * Over-ride default table to reserve additional IRQs for use by ISA * e.g. acpi_irq_isa=5 * Useful for telling ACPI how not to interfere with your ISA sound card.
include/linux/acpi.h +1 -1
@@ -221,7 +221,7 @@ struct pci_dev;int acpi_pci_irq_enable (struct pci_dev *dev);void acpi_penalize_isa_irq (int irq,int active); - +void acpi_penalize_sci_irq (int irq,int trigger,int polarity);void acpi_pci_irq_disable (struct pci_dev *dev);extern int ec_read (u8 addr,u8 *val);
Signature · 1 line
1.7.10.4
Hi all,
Sorry press send to fast, will resend with proper commit message.
Thanks!
Gerry
Quoted 66 lines · Jiang Liu
Hi Nick,
Rafael and Thomas have concerns about the way to solve the
regression by quirk, so could you please help to test this patch? Thanks!
GerrySigned-off-by Jiang Liu <[email protected]>--- arch/x86/kernel/acpi/boot.c | 1 + drivers/acpi/pci_link.c | 16 ++++++++++++++++ include/linux/acpi.h | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-)arch/x86/kernel/acpi/boot.c +1
-0@@ -445,6 +445,7 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger, polarity = acpi_sci_flags &ACPI_MADT_POLARITY_MASK ;mp_override_legacy_irq (bus_irq, polarity, trigger, gsi); +acpi_penalize_sci_irq (bus_irq, trigger, polarity);/* * stash over-ride to indicate we've been here drivers/acpi/pci_link.c +16
-0@@ -826,6 +826,22 @@ void acpi_penalize_isa_irq(int irq, int active) }/* +* Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict with +* PCI IRQ attributes, mark ACPI SCI as ISA_ALWAYS so it won't be use for +* PCI IRQs. +*/ +void acpi_penalize_sci_irq (int irq,int trigger,int polarity) +{ +if (irq >=0 && irq <ARRAY_SIZE (acpi_irq_penalty)) { +if (trigger !=ACPI_MADT_TRIGGER_LEVEL || + polarity !=ACPI_MADT_POLARITY_ACTIVE_LOW ) + acpi_irq_penalty[irq] +=PIRQ_PENALTY_ISA_ALWAYS ; +else + acpi_irq_penalty[irq] +=PIRQ_PENALTY_PCI_USING ; + } +} + +/* * Over-ride default table to reserve additional IRQs for use by ISA * e.g. acpi_irq_isa=5 * Useful for telling ACPI how not to interfere with your ISA sound card. include/linux/acpi.h +1
-1@@ -221,7 +221,7 @@ struct pci_dev;int acpi_pci_irq_enable (struct pci_dev *dev);void acpi_penalize_isa_irq (int irq,int active); - +void acpi_penalize_sci_irq (int irq,int trigger,int polarity);void acpi_pci_irq_disable (struct pci_dev *dev);extern int ec_read (u8 addr,u8 *val);