diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2013-12-11 13:04:58 -0800 |
|---|---|---|
| committer | Robert Moore <Robert.Moore@intel.com> | 2013-12-11 13:04:58 -0800 |
| commit | ab67a215c6d720527caa8541ad7553441b0d7625 (patch) | |
| tree | b1e74c61ea2f67bd1e37c74ea83eec860ce7e213 | |
| parent | 596c02e9162bd54a437abca6365b8eafd58d782c (diff) | |
Enhance ACPI warning for memory/IO address conflicts.
This change improves the warning message when a system address
conflicts with an existing operation region. It now emits the region
address range in addition to the input (system) address range.
Suggested by Prarit Bhargava <prarit@redhat.com>
| -rw-r--r-- | source/components/utilities/utaddress.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/components/utilities/utaddress.c b/source/components/utilities/utaddress.c index 7c0197b29..38069ccc2 100644 --- a/source/components/utilities/utaddress.c +++ b/source/components/utilities/utaddress.c @@ -320,10 +320,11 @@ AcpiUtCheckAddressRange ( while (RangeInfo) { /* - * Check if the requested Address/Length overlaps this AddressRange. - * Four cases to consider: + * Check if the requested address/length overlaps this + * address range. There are four cases to consider: * - * 1) Input address/length is contained completely in the address range + * 1) Input address/length is contained completely in the + * address range * 2) Input address/length overlaps range at the range start * 3) Input address/length overlaps range at the range end * 4) Input address/length completely encompasses the range @@ -339,10 +340,13 @@ AcpiUtCheckAddressRange ( Pathname = AcpiNsGetExternalPathname (RangeInfo->RegionNode); ACPI_WARNING ((AE_INFO, - "0x%p-0x%p %s conflicts with Region %s %d", + "%s range 0x%p-0x%p conflicts with OpRegion 0x%p-0x%p (%s)", + AcpiUtGetRegionName (SpaceId), ACPI_CAST_PTR (void, Address), ACPI_CAST_PTR (void, EndAddress), - AcpiUtGetRegionName (SpaceId), Pathname, OverlapCount)); + ACPI_CAST_PTR (void, RangeInfo->StartAddress), + ACPI_CAST_PTR (void, RangeInfo->EndAddress), + Pathname)); ACPI_FREE (Pathname); } } |