Current implementation:
- Looses PCI IRQ links on resume from
ACPI S1-S4 when the router was powered down.
This results in nonfunctional PCI IRQ's
after S3 for example.
- Does not set PCI IRQ links claimed to be set by BIOS,
which results in the IRQ not working when BIOS did
not really set it or when setting was "lost".
- BIOS enabled IRQ's are frequently reused resulting in 2
links being assigned to the same IRQ while other
IRQ's remain available and unused.
This patch:
1) Always sets ACPI-routed PCI interrupt links regardless of whether
link is claimed to be set by BIOS already.
2) Restores ACPI-routed PCI interrupt links on resume from ACPI S1-S4
3) Prevents BIOS-enabled IRQ's being reused by BIOS-disabled IRQ's
On my system, all PCI interrupts are now routed without conflicts
and functional on resume. yenta_socket and e100 resume fine.
ohci-hcd must be reloaded, as it's interrupt handler does not
survive suspending.
Please try it out and let me have your feedback,
Regards
Michael
===== include/acpi/acpi_drivers.h 1.15 vs edited =====
--- 1.15/include/acpi/acpi_drivers.h Wed Jun 25 05:16:55 2003
+++ edited/include/acpi/acpi_drivers.h Fri Jul 18 17:49:16 2003
@@ -59,6 +59,7 @@
/* ACPI PCI Interrupt Link (pci_link.c) */
+int acpi_pci_links_set (void);
int acpi_pci_link_check (void);
int acpi_pci_link_get_irq (acpi_handle handle, int index);
===== drivers/acpi/sleep/main.c 1.24 vs edited =====
--- 1.24/drivers/acpi/sleep/main.c Wed Jul 9 06:13:14 2003
+++ edited/drivers/acpi/sleep/main.c Fri Jul 18 18:11:31 2003
@@ -264,7 +264,10 @@
acpi_leave_sleep_state(state);
acpi_system_restore_state(state);
- /* make sure interrupts are enabled */
+ /* Resume pci interrupt links */
+ acpi_pci_links_set();
+
+ /* make sure interrupts are enabled */
ACPI_ENABLE_IRQS();
/* reset firmware waking vector */
===== drivers/acpi/pci_link.c 1.15 vs edited =====
--- 1.15/drivers/acpi/pci_link.c Fri Feb 28 08:24:14 2003
+++ edited/drivers/acpi/pci_link.c Fri Jul 18 17:51:16 2003
@@ -294,10 +294,6 @@
if (!link || !irq)
return_VALUE(-EINVAL);
- /* See if we're already at the target IRQ. */
- if (irq == link->irq.active)
- return_VALUE(0);
-
/* Make sure the target IRQ in the list of possible IRQs. */
for (i=0; i<link->irq.possible_count; i++) {
if (irq == link->irq.possible[i])
@@ -368,7 +364,6 @@
return_VALUE(0);
}
-
/* --------------------------------------------------------------------------
PCI Link IRQ Management
-------------------------------------------------------------------------- */
@@ -396,6 +391,42 @@
10000, 100000, 100000, 100000,
};
+/*
+ * acpi_pci_links_set sets all PCI IRQ links
+ * on completion of acpi_pci_link_check
+ * or
+ * on resume from S1-S4 as the PCI IRQ router
+ * may have lost power
+ * W
+ */
+
+int
+acpi_pci_links_set (void)
+{
+ int result = 0;
+
+ struct list_head *node = NULL;
+ struct acpi_pci_link *link = NULL;
+
+ ACPI_FUNCTION_TRACE("acpi_pci_links_set");
+
+ list_for_each(node, &acpi_link.entries) {
+
+ link = list_entry(node, struct acpi_pci_link, node);
+ if (!link) {
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid link context\n"));
+ continue;
+ }
+
+ if (link->irq.active) {
+ printk(PREFIX "%s [%s] enabled at IRQ %d\n",
+ acpi_device_name(link->device),
+ acpi_device_bid(link->device), link->irq.active);
+ result |= acpi_pci_link_set(link, link->irq.active) != 0;
+ }
+ }
+ return_VALUE(result ? -ENODEV : 0);
+}
int
acpi_pci_link_check (void)
@@ -417,8 +448,9 @@
continue;
}
- if (link->irq.active)
- acpi_irq_penalty[link->irq.active] += 100;
+ /* Never use an active IRQ */
+ if (link->irq.active)
+ acpi_irq_penalty[link->irq.active] = 1000000;
else if (link->irq.possible_count) {
int penalty = 100 / link->irq.possible_count;
for (i=0; i<link->irq.possible_count; i++) {
@@ -432,7 +464,6 @@
* Pass #2: Enable boot-disabled Links at 'best' IRQ.
*/
list_for_each(node, &acpi_link.entries) {
- int irq = 0;
int i = 0;
link = list_entry(node, struct acpi_pci_link, node);
@@ -441,33 +472,27 @@
continue;
}
- if (link->irq.active)
+ /* Never use BIOS enabled IRQ's */
+ if (link->irq.active)
continue;
-
- irq = link->irq.possible[0];
+ link->irq.active = link->irq.possible[0];
/*
* Select the best IRQ. This is done in reverse to promote
* the use of IRQs 9, 10, 11, and >15.
*/
for (i=(link->irq.possible_count-1); i>0; i--) {
- if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
- irq = link->irq.possible[i];
+ if (acpi_irq_penalty[link->irq.active] > acpi_irq_penalty[link->irq.possible[i]])
+ link->irq.active = link->irq.possible[i];
}
- /* Enable the link device at this IRQ. */
- acpi_pci_link_set(link, irq);
-
- acpi_irq_penalty[link->irq.active] += 100;
-
- printk(PREFIX "%s [%s] enabled at IRQ %d\n",
- acpi_device_name(link->device),
- acpi_device_bid(link->device), link->irq.active);
+ /* Never re-use an activated IRQ */
+ acpi_irq_penalty[link->irq.active] = 1000000;
}
-
- return_VALUE(0);
+
+ /* Now set all links */
+ return acpi_pci_links_set();
}
-
int
acpi_pci_link_get_irq (
-- Powered by linux-2.6-test1-mm1. Compiled with gcc-2.95-3 - mature and rock solidI current test and desire feedback on: 2.6 PCMCIA yenta_socket, ACPI S3/S4, swsusp
More info on swsusp: http://sourceforge.net/projects/swsusp/
- 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 http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jul 23 2003 - 22:00:33 EST