ACPICA: 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.

Reported-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c
index e0a2e2779c2e..2c2b6ae5dfc4 100644
--- a/drivers/acpi/acpica/utaddress.c
+++ b/drivers/acpi/acpica/utaddress.c
@@ -224,10 +224,11 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
 
         while (range_info) {
                 /*
-                 * Check if the requested Address/Length overlaps this address_range.
-                 * 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
@@ -244,11 +245,17 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
                                                                   region_node);
 
                                 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)",
+                                              acpi_ut_get_region_name(space_id),
                                               ACPI_CAST_PTR(void, address),
                                               ACPI_CAST_PTR(void, end_address),
-                                              acpi_ut_get_region_name(space_id),
-                                              pathname, overlap_count));
+                                              ACPI_CAST_PTR(void,
+                                                            range_info->
+                                                            start_address),
+                                              ACPI_CAST_PTR(void,
+                                                            range_info->
+                                                            end_address),
+                                              pathname));
                                 ACPI_FREE(pathname);
                         }
                 }