From owner-svn-src-stable-9@FreeBSD.ORG Thu Jul 24 00:02:40 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CB33FC0; Thu, 24 Jul 2014 00:02:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0F38C2A16; Thu, 24 Jul 2014 00:02:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6O02dYU072201; Thu, 24 Jul 2014 00:02:39 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6O02dOY072200; Thu, 24 Jul 2014 00:02:39 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201407240002.s6O02dOY072200@svn.freebsd.org> From: John Baldwin Date: Thu, 24 Jul 2014 00:02:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r269038 - in stable: 10/sys/dev/acpica 9/sys/dev/acpica X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2014 00:02:40 -0000 Author: jhb Date: Thu Jul 24 00:02:39 2014 New Revision: 269038 URL: http://svnweb.freebsd.org/changeset/base/269038 Log: MFC 267883: Expand r261243 even further and ignore any I/O port resources assigned to PCI root bridges except for the one known-valid case on x86 where bridges claim the I/O port registers used for PCI config space access. Modified: stable/9/sys/dev/acpica/acpi.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/acpica/acpi.c Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/dev/acpica/acpi.c ============================================================================== --- stable/9/sys/dev/acpica/acpi.c Wed Jul 23 23:01:54 2014 (r269037) +++ stable/9/sys/dev/acpica/acpi.c Thu Jul 24 00:02:39 2014 (r269038) @@ -1196,15 +1196,24 @@ acpi_set_resource(device_t dev, device_t return (0); /* - * Ignore memory resources for PCI root bridges. Some BIOSes + * Ignore most resources for PCI root bridges. Some BIOSes * incorrectly enumerate the memory ranges they decode as plain - * memory resources instead of as a ResourceProducer range. + * memory resources instead of as ResourceProducer ranges. Other + * BIOSes incorrectly list system resource entries for I/O ranges + * under the PCI bridge. Do allow the one known-correct case on + * x86 of a PCI bridge claiming the I/O ports used for PCI config + * access. */ - if (type == SYS_RES_MEMORY) { + if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { if (ACPI_SUCCESS(AcpiGetObjectInfo(ad->ad_handle, &devinfo))) { if ((devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) != 0) { - AcpiOsFree(devinfo); - return (0); +#if defined(__i386__) || defined(__amd64__) + if (!(type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT)) +#endif + { + AcpiOsFree(devinfo); + return (0); + } } AcpiOsFree(devinfo); }