ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 18 Feb 2014 16:02:54 +0000 (17:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 21 Feb 2014 11:56:32 +0000 (11:56 +0000)
commitb3634575930857724d5c3987a2739b0637999b4e
tree424a9c3e69f298758dddceffff76a3cc2410ac6d
parentc9698e5cd6ad1ff2844bc44fabddc0f2e0562047
ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU

Currently, when the kernel is configured with LPAE support, but the
CPU doesn't support it, the error message is fairly cryptic:

  Error: unrecognized/unsupported processor variant (0x561f5811).

This messages is normally shown when there is an issue when comparing
the processor ID (CP15 0, c0, c0) with the values/masks described in
proc-v7.S. However, the same message is displayed when LPAE support is
enabled in the kernel configuration, but not available in the CPU,
after looking at ID_MMFR0 (CP15 0, c0, c1, 4). Having the same error
message is highly misleading.

This commit improves this by showing a different error message when
this situation occurs:

  Error: Kernel with LPAE support, but CPU does not support LPAE.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/head-common.S
arch/arm/kernel/head.S