Changeset e2793a4 in mainline

Timestamp:

2011-10-29T16:08:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b50bf6c2

Parents:

069b80d

Message:

Improve handling of ACPI MADT Interrupt Source Overrides slightly.

• Do not ignore the override entries in the first place and propagate the changes into the IRQ to IO APIC pin map.
• Do not assert on IRQ beyond the ISA IRQ limit in madt_irq_to_pin(); the excessive entries should be mapped identically.
• The IRQ to pin map is still not used for anything.

File:

• kernel/genarch/src/acpi/madt.c (modified) (2 diffs)

kernel/genarch/src/acpi/madt.c

@@ -116 +116 @@
 static int madt_irq_to_pin(unsigned int irq)
 {
-        ASSERT(irq < sizeof(isa_irq_map) / sizeof(int));
+        if (irq >= sizeof(isa_irq_map) / sizeof(int))
+                return (int) irq;
         
         return isa_irq_map[irq];
@@ -178 +179 @@
         ASSERT(override->source < sizeof(isa_irq_map) / sizeof(int));
         
-        printf("MADT: Ignoring %s entry: bus=%" PRIu8 ", source=%" PRIu8
-            ", global_int=%" PRIu32 ", flags=%#" PRIx16 "\n",
-            entry[override->header.type], override->bus, override->source,
-            override->global_int, override->flags);
+        isa_irq_map[override->source] = override->global_int;
 }