d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On non-Intel platforms don't ignore the PCI root bridge mapping in

Browse Source 
acpi_set_resource, the mappings are needed on arm64.

Obtained from:	ABT Systenms Ltd
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Andrew Turner 2016-12-12 16:53:55 +00:00
parent bbd72acb3b
commit f9a22a068d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/acpica/acpi.c
View File

@ -1276,7 +1276,9 @@ acpi_set_resource(device_t dev, device_t child, int type, int rid,
struct acpi_softc *sc = device_get_softc(dev);
struct acpi_device *ad = device_get_ivars(child);
struct resource_list *rl = &ad->ad_rl;
#if defined(__i386__) || defined(__amd64__)
ACPI_DEVICE_INFO *devinfo;
#endif
rman_res_t end;
/* Ignore IRQ resources for PCI link devices. */
@ -1292,13 +1294,11 @@ acpi_set_resource(device_t dev, device_t child, int type, int rid,
* x86 of a PCI bridge claiming the I/O ports used for PCI config
* access.
*/
#if defined(__i386__) || defined(__amd64__)
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) {
#if defined(__i386__) || defined(__amd64__)
if (!(type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT))
#endif
{
if (!(type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT)) {
AcpiOsFree(devinfo);
return (0);
}
@ -1306,6 +1306,7 @@ acpi_set_resource(device_t dev, device_t child, int type, int rid,
AcpiOsFree(devinfo);
}
}
#endif
/* If the resource is already allocated, fail. */
if (resource_list_busy(rl, type, rid))