svn commit: r269038 - in stable: 10/sys/dev/acpica 9/sys/dev/acpica

[John Baldwin]

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);
 	}