Author: jhb
Date: Thu Mar 19 17:42:11 2009
New Revision: 190090
URL: http://svn.freebsd.org/changeset/base/190090

Log:
  MFC: Ignore I/O APICs with a starting IRQ > 255.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/acpica/madt.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/acpica/madt.c

Modified: stable/7/sys/amd64/acpica/madt.c
==============================================================================
--- stable/7/sys/amd64/acpica/madt.c    Thu Mar 19 17:16:33 2009        
(r190089)
+++ stable/7/sys/amd64/acpica/madt.c    Thu Mar 19 17:42:11 2009        
(r190090)
@@ -483,6 +483,10 @@ madt_parse_apics(ACPI_SUBTABLE_HEADER *e
                            apic->Id);
                if (ioapics[apic->Id].io_apic != NULL)
                        panic("%s: Double APIC ID %u", __func__, apic->Id);
+               if (apic->GlobalIrqBase >= FIRST_MSI_INT) {
+                       printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id);
+                       break;
+               }
                ioapics[apic->Id].io_apic = ioapic_create(apic->Address,
                    apic->Id, apic->GlobalIrqBase);
                ioapics[apic->Id].io_vector = apic->GlobalIrqBase;

Modified: stable/7/sys/i386/acpica/madt.c
==============================================================================
--- stable/7/sys/i386/acpica/madt.c     Thu Mar 19 17:16:33 2009        
(r190089)
+++ stable/7/sys/i386/acpica/madt.c     Thu Mar 19 17:42:11 2009        
(r190090)
@@ -482,6 +482,10 @@ madt_parse_apics(ACPI_SUBTABLE_HEADER *e
                            apic->Id);
                if (ioapics[apic->Id].io_apic != NULL)
                        panic("%s: Double APIC ID %u", __func__, apic->Id);
+               if (apic->GlobalIrqBase >= FIRST_MSI_INT) {
+                       printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id);
+                       break;
+               }
                ioapics[apic->Id].io_apic = ioapic_create(apic->Address,
                    apic->Id, apic->GlobalIrqBase);
                ioapics[apic->Id].io_vector = apic->GlobalIrqBase;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to