Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d5bc1a6 authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds
Browse files

ARM: dt: Only print warning, not WARN() on bad cpu map in device tree 



Due to recent changes and expecations of proper cpu bindings, there are
now cases for many of the in-tree devicetrees where a WARN() will hit
on boot due to badly formatted /cpus nodes.

Downgrade this to a pr_warn() to be less alarmist, since it's not a
new problem.

Tested on Arndale, Cubox, Seaboard and Panda ES. Panda hits the WARN
without this, the others do not.

Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 133841ca

arch/arm/kernel/devtree.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -152,9 +152,10 @@ void __init arm_dt_init_cpu_maps(void) 
		tmp_map[i] = hwid;

		tmp_map[i] = hwid;

	}

	}





	if (WARN(!bootcpu_valid, "DT missing boot CPU MPIDR[23:0], "

	if (!bootcpu_valid) {

				 "fall back to default cpu_logical_map\n"))

		pr_warn("DT missing boot CPU MPIDR[23:0], fall back to default cpu_logical_map\n");

		return;

		return;

	}





	/*

	/*

	 * Since the boot CPU node contains proper data, and all nodes have

	 * Since the boot CPU node contains proper data, and all nodes have