acpi, add region addresses to conflict output
Subsystems (2)
PATCH 1/1 acpi, add region addresses to conflict output
Currently the kernel does
ACPI Warning: 0x0000000000000428-0x000000000000042f SystemIO conflicts with Region \PMIO 1 (20130517/utaddress-251)
This patch outputs the region address so that we now see
ACPI Warning: 0x0000000000000428-0x000000000000042f SystemIO conflicts with Region 0x0000000000000400-0x000000000000047f \PMIO 1 (20130927/utaddress-252)
which is a lot more useful for debugging.
Also fix some simple comment linewrapping issues in this function.
Signed-off-by Prarit Bhargava <[email protected]>
Cc Myron Stowe <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Len Brown <[email protected]>
Cc Lin Ming <[email protected]>
--- drivers/acpi/acpica/utaddress.c | 52 +++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 23 deletions(-)
drivers/acpi/acpica/utaddress.c +29 -23
@@ -224,35 +224,41 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,while (range_info) {/* -* Check if the requested Address/Length overlaps this address_range. +* Check if the requested Address/Length overlaps this +* address_range. * 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 */ -if ((address <= range_info->end_address) && - (end_address >= range_info->start_address)) { - -/* Found an address range overlap */ - - overlap_count++; -if (warn) {/* Optional warning message */ - pathname = -acpi_ns_get_external_pathname (range_info-> - region_node); - -ACPI_WARNING ((AE_INFO , -"0x%p-0x%p %s conflicts with Region %s %d" , -ACPI_CAST_PTR (void, address), -ACPI_CAST_PTR (void, end_address), -acpi_ut_get_region_name (space_id), - pathname, overlap_count)); -ACPI_FREE (pathname); - } - } - +if ((address > range_info->end_address) && + (end_address < range_info->start_address)) + goto next_range; + +/* Found an address range overlap */ + overlap_count++; + +if (!warn) + goto next_range; + +/* Optional warning message */ + pathname = +acpi_ns_get_external_pathname (range_info->region_node); + +ACPI_WARNING ((AE_INFO , +"0x%p-0x%p %s conflicts with Region 0x%p-0x%p %s %d" , +ACPI_CAST_PTR (void, address), +ACPI_CAST_PTR (void, end_address), +acpi_ut_get_region_name (space_id), +ACPI_CAST_PTR (void, range_info->start_address), +ACPI_CAST_PTR (void, range_info->end_address), + pathname, overlap_count)); +ACPI_FREE (pathname); + +next_range: range_info = range_info->next; }
Signature · 1 line
1.8.4.2
drivers/acpi/acpica/utaddress.c acpi_ut_check_address_range(acpi_adr_space_type space_id, · line 229
Quoted 3 lines · Prarit Bhargava
drivers/acpi/acpica/utaddress.c +2
-0+* Check if the requested Address/Length overlaps this +* address_range. * Four cases to consider:
Can you either merge these lines or add a blank line between them? It looks a bit awkward as is. Otherwise, looks good.
Signature · 1 line
Matthew Garrett | [email protected]