From owner-svn-src-head@FreeBSD.ORG  Wed Jun 25 20:30:48 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 28CE12AB;
 Wed, 25 Jun 2014 20:30:48 +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 15A652213;
 Wed, 25 Jun 2014 20:30:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5PKUl6t023267;
 Wed, 25 Jun 2014 20:30:47 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5PKUlT4023266;
 Wed, 25 Jun 2014 20:30:47 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201406252030.s5PKUlT4023266@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 25 Jun 2014 20:30:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267883 - head/sys/dev/acpica
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jun 2014 20:30:48 -0000

Author: jhb
Date: Wed Jun 25 20:30:47 2014
New Revision: 267883
URL: http://svnweb.freebsd.org/changeset/base/267883

Log:
  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.
  
  Tested by:	Hilko Meyer <hilko.meyer@gmx.de>
  MFC after:	1 week

Modified:
  head/sys/dev/acpica/acpi.c

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Wed Jun 25 19:41:39 2014	(r267882)
+++ head/sys/dev/acpica/acpi.c	Wed Jun 25 20:30:47 2014	(r267883)
@@ -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);
 	}