From owner-svn-src-stable@FreeBSD.ORG Thu Mar 19 17:42:11 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEEAE10656C0; Thu, 19 Mar 2009 17:42:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AB59B8FC20; Thu, 19 Mar 2009 17:42:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JHgBZX070887; Thu, 19 Mar 2009 17:42:11 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JHgBbe070885; Thu, 19 Mar 2009 17:42:11 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200903191742.n2JHgBbe070885@svn.freebsd.org> From: John Baldwin Date: Thu, 19 Mar 2009 17:42:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190090 - in stable/7/sys: . amd64/acpica contrib/pf dev/ath/ath_hal dev/cxgb i386/acpica X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2009 17:42:12 -0000 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;