Commit a70b487b authored by Michael Ellerman's avatar Michael Ellerman

powerpc/powernv: Fix boot on Power8 bare metal due to opal_configure_cores()

In commit 1c0eaf0f ("powerpc/powernv: Tell OPAL about our MMU mode
on POWER9"), we added additional flags to the OPAL call to configure
CPUs at boot.

These flags only work on Power9 firmwares, and worse can cause boot
failures on Power8 machines, so we check for CPU_FTR_ARCH_300 (aka POWER9)
before adding the extra flags.

Unfortunately we forgot that opal_configure_cores() is called before
the CPU feature checks are dynamically patched, meaning the check
always returns true.

We definitely need to do something to make the CPU feature checks less
prone to bugs like this, but for now the minimal fix is to use
early_cpu_has_feature().
Reported-and-tested-by: default avatarAbdul Haleem <abdhalee@linux.vnet.ibm.com>
Fixes: 1c0eaf0f ("powerpc/powernv: Tell OPAL about our MMU mode on POWER9")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 01e6a61a
...@@ -78,7 +78,7 @@ void opal_configure_cores(void) ...@@ -78,7 +78,7 @@ void opal_configure_cores(void)
* ie. Host hash supports hash guests * ie. Host hash supports hash guests
* Host radix supports hash/radix guests * Host radix supports hash/radix guests
*/ */
if (cpu_has_feature(CPU_FTR_ARCH_300)) { if (early_cpu_has_feature(CPU_FTR_ARCH_300)) {
reinit_flags |= OPAL_REINIT_CPUS_MMU_HASH; reinit_flags |= OPAL_REINIT_CPUS_MMU_HASH;
if (early_radix_enabled()) if (early_radix_enabled())
reinit_flags |= OPAL_REINIT_CPUS_MMU_RADIX; reinit_flags |= OPAL_REINIT_CPUS_MMU_RADIX;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment