summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2021-03-08 16:19:08 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-03-16 11:31:22 +0100
commit1813937c953703bf88a89c671b64d73e9e89ca8a (patch)
tree208e04bae46df3e4bd3d775f4a4d4e922114cd15 /common
parentfa39b6afe1f0c6d0ca55f1446a11278115b2e00e (diff)
downloadbarebox-1813937c953703bf88a89c671b64d73e9e89ca8a.tar.gz
barebox-1813937c953703bf88a89c671b64d73e9e89ca8a.tar.xz
resource: include region name in conflict's debug output
The iomem command does print names, but it won't list dynamically allocated and deallocated regions, like those requested during bootm. Include region name in conflict debug output to make them easier to debug. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r--common/resource.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/resource.c b/common/resource.c
index 92fe96252f..ff4318a0d7 100644
--- a/common/resource.c
+++ b/common/resource.c
@@ -61,12 +61,14 @@ struct resource *__request_region(struct resource *parent,
goto ok;
if (start > r->end)
continue;
- debug("%s: 0x%08llx:0x%08llx conflicts with 0x%08llx:0x%08llx\n",
+ debug("%s: 0x%08llx:0x%08llx (%s) conflicts with 0x%08llx:0x%08llx (%s)\n",
__func__,
(unsigned long long)start,
(unsigned long long)end,
+ name,
(unsigned long long)r->start,
- (unsigned long long)r->end);
+ (unsigned long long)r->end,
+ r->name);
return ERR_PTR(-EBUSY);
}