svn commit: r346066 - head/sys/dev/acpica
John Baldwin
jhb at FreeBSD.org
Tue Apr 9 21:18:04 UTC 2019
Author: jhb
Date: Tue Apr 9 21:18:02 2019
New Revision: 346066
URL: https://svnweb.freebsd.org/changeset/base/346066
Log:
Refine r330113 to honor the ProducerConsumer flag most of the time.
While it is true that the ACPI spec says that the flag is only valid
on Extended Address Space Descriptors, examples of other descriptors
in the spec use the ProducerConsumer flag explicitly, and real
hardware uses it as well. In fact, even in the ASL of the Thunder X2
for which r330113 was a workaround, some devices use this flag on
non-Extended Address Space Descriptors correctly. Instead, only
ignore the flag for resources associated with the UART devices on the
Thunder X2 using the "ARMH0011" HID to identify these devices.
This should fix regressions from ignoring this flag in other contexts
such as Hyper-V.
PR: 235876
Reported by: Wei Hu <weh at microsoft.com>
Tested by: emaste (Thunder X2)
MFC after: 2 weeks
Modified:
head/sys/dev/acpica/acpi_resource.c
Modified: head/sys/dev/acpica/acpi_resource.c
==============================================================================
--- head/sys/dev/acpica/acpi_resource.c Tue Apr 9 20:20:04 2019 (r346065)
+++ head/sys/dev/acpica/acpi_resource.c Tue Apr 9 21:18:02 2019 (r346066)
@@ -202,6 +202,7 @@ struct acpi_resource_context {
struct acpi_parse_resource_set *set;
device_t dev;
void *context;
+ bool ignore_producer_flag;
};
#ifdef ACPI_DEBUG_OUTPUT
@@ -385,7 +386,7 @@ acpi_parse_resource(ACPI_RESOURCE *res, void *context)
}
if (length <= 0)
break;
- if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 &&
+ if (!arc->ignore_producer_flag &&
res->Data.Address.ProducerConsumer != ACPI_CONSUMER) {
ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
"ignored %s %s producer\n", name,
@@ -474,6 +475,12 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
set->set_init(dev, arg, &arc.context);
arc.set = set;
arc.dev = dev;
+ arc.ignore_producer_flag = false;
+
+ /* UARTs on ThunderX2 set ResourceProducer on memory resources. */
+ if (acpi_MatchHid(handle, "ARMH0011") != ACPI_MATCHHID_NOMATCH)
+ arc.ignore_producer_flag = true;
+
status = AcpiWalkResources(handle, "_CRS", acpi_parse_resource, &arc);
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
printf("can't fetch resources for %s - %s\n",
More information about the svn-src-all
mailing list