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
This commit is contained in:
jhb 2014-06-25 20:30:47 +00:00
parent 52ca2df270
commit 82be9401d7

View File

@ -1196,15 +1196,24 @@ acpi_set_resource(device_t dev, device_t child, int type, int rid,
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);
}