Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-apei-fixes'
* acpica-fixes: ACPICA: Dispatcher: Fix interpreter locking around acpi_ev_initialize_region() ACPICA: Dispatcher: Fix an unbalanced lock exit path in acpi_ds_auto_serialize_method() ACPICA: Dispatcher: Fix order issue of method termination * acpi-pci-fixes: ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs ACPI/PCI: pci_link: penalize SCI correctly ACPI/PCI/IRQ: assign ISA IRQ directly during early boot stages * acpi-apei-fixes: ACPI / APEI: Fix incorrect return value of ghes_proc()
This commit is contained in:
commit
21e2d9d529
|
@ -454,6 +454,7 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger,
|
||||||
polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;
|
polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;
|
||||||
|
|
||||||
mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);
|
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
|
* stash over-ride to indicate we've been here
|
||||||
|
|
|
@ -662,7 +662,7 @@ static int ghes_proc(struct ghes *ghes)
|
||||||
ghes_do_proc(ghes, ghes->estatus);
|
ghes_do_proc(ghes, ghes->estatus);
|
||||||
out:
|
out:
|
||||||
ghes_clear_estatus(ghes);
|
ghes_clear_estatus(ghes);
|
||||||
return 0;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ghes_add_timer(struct ghes *ghes)
|
static void ghes_add_timer(struct ghes *ghes)
|
||||||
|
|
|
@ -87,6 +87,7 @@ struct acpi_pci_link {
|
||||||
|
|
||||||
static LIST_HEAD(acpi_link_list);
|
static LIST_HEAD(acpi_link_list);
|
||||||
static DEFINE_MUTEX(acpi_link_lock);
|
static DEFINE_MUTEX(acpi_link_lock);
|
||||||
|
static int sci_irq = -1, sci_penalty;
|
||||||
|
|
||||||
/* --------------------------------------------------------------------------
|
/* --------------------------------------------------------------------------
|
||||||
PCI Link Device Management
|
PCI Link Device Management
|
||||||
|
@ -496,25 +497,13 @@ static int acpi_irq_get_penalty(int irq)
|
||||||
{
|
{
|
||||||
int penalty = 0;
|
int penalty = 0;
|
||||||
|
|
||||||
/*
|
if (irq == sci_irq)
|
||||||
* Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict
|
penalty += sci_penalty;
|
||||||
* with PCI IRQ attributes, mark ACPI SCI as ISA_ALWAYS so it won't be
|
|
||||||
* use for PCI IRQs.
|
|
||||||
*/
|
|
||||||
if (irq == acpi_gbl_FADT.sci_interrupt) {
|
|
||||||
u32 type = irq_get_trigger_type(irq) & IRQ_TYPE_SENSE_MASK;
|
|
||||||
|
|
||||||
if (type != IRQ_TYPE_LEVEL_LOW)
|
|
||||||
penalty += PIRQ_PENALTY_ISA_ALWAYS;
|
|
||||||
else
|
|
||||||
penalty += PIRQ_PENALTY_PCI_USING;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (irq < ACPI_MAX_ISA_IRQS)
|
if (irq < ACPI_MAX_ISA_IRQS)
|
||||||
return penalty + acpi_isa_irq_penalty[irq];
|
return penalty + acpi_isa_irq_penalty[irq];
|
||||||
|
|
||||||
penalty += acpi_irq_pci_sharing_penalty(irq);
|
return penalty + acpi_irq_pci_sharing_penalty(irq);
|
||||||
return penalty;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init acpi_irq_penalty_init(void)
|
int __init acpi_irq_penalty_init(void)
|
||||||
|
@ -619,6 +608,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
|
||||||
acpi_device_bid(link->device));
|
acpi_device_bid(link->device));
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
} else {
|
} else {
|
||||||
|
if (link->irq.active < ACPI_MAX_ISA_IRQS)
|
||||||
|
acpi_isa_irq_penalty[link->irq.active] +=
|
||||||
|
PIRQ_PENALTY_PCI_USING;
|
||||||
|
|
||||||
printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
|
printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
|
||||||
acpi_device_name(link->device),
|
acpi_device_name(link->device),
|
||||||
acpi_device_bid(link->device), link->irq.active);
|
acpi_device_bid(link->device), link->irq.active);
|
||||||
|
@ -849,7 +842,7 @@ static int __init acpi_irq_penalty_update(char *str, int used)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (used)
|
if (used)
|
||||||
new_penalty = acpi_irq_get_penalty(irq) +
|
new_penalty = acpi_isa_irq_penalty[irq] +
|
||||||
PIRQ_PENALTY_ISA_USED;
|
PIRQ_PENALTY_ISA_USED;
|
||||||
else
|
else
|
||||||
new_penalty = 0;
|
new_penalty = 0;
|
||||||
|
@ -871,7 +864,7 @@ static int __init acpi_irq_penalty_update(char *str, int used)
|
||||||
void acpi_penalize_isa_irq(int irq, int active)
|
void acpi_penalize_isa_irq(int irq, int active)
|
||||||
{
|
{
|
||||||
if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty)))
|
if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty)))
|
||||||
acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) +
|
acpi_isa_irq_penalty[irq] +=
|
||||||
(active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING);
|
(active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -881,6 +874,17 @@ bool acpi_isa_irq_available(int irq)
|
||||||
acpi_irq_get_penalty(irq) < PIRQ_PENALTY_ISA_ALWAYS);
|
acpi_irq_get_penalty(irq) < PIRQ_PENALTY_ISA_ALWAYS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void acpi_penalize_sci_irq(int irq, int trigger, int polarity)
|
||||||
|
{
|
||||||
|
sci_irq = irq;
|
||||||
|
|
||||||
|
if (trigger == ACPI_MADT_TRIGGER_LEVEL &&
|
||||||
|
polarity == ACPI_MADT_POLARITY_ACTIVE_LOW)
|
||||||
|
sci_penalty = PIRQ_PENALTY_PCI_USING;
|
||||||
|
else
|
||||||
|
sci_penalty = PIRQ_PENALTY_ISA_ALWAYS;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Over-ride default table to reserve additional IRQs for use by ISA
|
* Over-ride default table to reserve additional IRQs for use by ISA
|
||||||
* e.g. acpi_irq_isa=5
|
* e.g. acpi_irq_isa=5
|
||||||
|
|
|
@ -326,6 +326,7 @@ struct pci_dev;
|
||||||
int acpi_pci_irq_enable (struct pci_dev *dev);
|
int acpi_pci_irq_enable (struct pci_dev *dev);
|
||||||
void acpi_penalize_isa_irq(int irq, int active);
|
void acpi_penalize_isa_irq(int irq, int active);
|
||||||
bool acpi_isa_irq_available(int irq);
|
bool acpi_isa_irq_available(int irq);
|
||||||
|
void acpi_penalize_sci_irq(int irq, int trigger, int polarity);
|
||||||
void acpi_pci_irq_disable (struct pci_dev *dev);
|
void acpi_pci_irq_disable (struct pci_dev *dev);
|
||||||
|
|
||||||
extern int ec_read(u8 addr, u8 *val);
|
extern int ec_read(u8 addr, u8 *val);
|
||||||
|
|
Loading…
Reference in a new issue