of: Print rather than WARN'ing when overlap check fails

mpe · robherring · commit 85a1c77fb8c4 · 2015-11-10T17:23:47.000-06:00
__rmem_check_for_overlap() is called very early in boot, and on some powerpc systems it's not safe to call WARN that early in boot. If the overlap check fails the system will oops instead of printing a warning. Furthermore because it's so early in boot the console is not up and the user doesn't see the oops, they just get a dead system. Fix it by printing an error instead of calling WARN. Fixes: ae1add2 ("of: Check for overlap in reserved memory regions") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Rob Herring <robh@kernel.org>
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
@@ -226,10 +226,9 @@ static void __init __rmem_check_for_overlap(void)
 
 			this_end = this->base + this->size;
 			next_end = next->base + next->size;
-			WARN(1,
-			     "Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n",
-			     this->name, &this->base, &this_end,
-			     next->name, &next->base, &next_end);
+			pr_err("Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n",
+			       this->name, &this->base, &this_end,
+			       next->name, &next->base, &next_end);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -226,10 +226,9 @@ static void __init __rmem_check_for_overlap(void)`
`226`	`226`
`227`	`227`	`this_end = this->base + this->size;`
`228`	`228`	`next_end = next->base + next->size;`
`229`		`- WARN(1,`
`230`		`- "Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n",`
`231`		`- this->name, &this->base, &this_end,`
`232`		`- next->name, &next->base, &next_end);`
	`229`	`+ pr_err("Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n",`
	`230`	`+ this->name, &this->base, &this_end,`
	`231`	`+ next->name, &next->base, &next_end);`
`233`	`232`	`}`
`234`	`233`	`}`
`235`	`234`	`}`