| From 810de840e9d63e048af480326561696c3470c2ff Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 4 Mar 2022 17:12:22 +1100 |
| Subject: powerpc/64e: Tie PPC_BOOK3E_64 to PPC_FSL_BOOK3E |
| |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| |
| [ Upstream commit 1a76e520ee1831a81dabf8a9a58c6453f700026e ] |
| |
| Since the IBM A2 CPU support was removed, see commit |
| fb5a515704d7 ("powerpc: Remove platforms/wsp and associated pieces"), |
| the only 64-bit Book3E CPUs we support are Freescale (NXP) ones. |
| |
| However our Kconfig still allows configurating a kernel that has 64-bit |
| Book3E support, but no Freescale CPU support enabled. Such a kernel |
| would never boot, it doesn't know about any CPUs. |
| |
| It also causes build errors, as reported by lkp, because |
| PPC_BARRIER_NOSPEC is not enabled in such a configuration: |
| |
| powerpc64-linux-ld: arch/powerpc/net/bpf_jit_comp64.o:(.toc+0x0): |
| undefined reference to `powerpc_security_features' |
| |
| To fix this, force PPC_FSL_BOOK3E to be selected whenever we are |
| building a 64-bit Book3E kernel. |
| |
| Reported-by: kernel test robot <lkp@intel.com> |
| Reported-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> |
| Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20220304061222.2478720-1-mpe@ellerman.id.au |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/platforms/Kconfig.cputype | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype |
| index a208997ade88..87a95cbff2f3 100644 |
| --- a/arch/powerpc/platforms/Kconfig.cputype |
| +++ b/arch/powerpc/platforms/Kconfig.cputype |
| @@ -111,6 +111,7 @@ config PPC_BOOK3S_64 |
| |
| config PPC_BOOK3E_64 |
| bool "Embedded processors" |
| + select PPC_FSL_BOOK3E |
| select PPC_FPU # Make it a choice ? |
| select PPC_SMP_MUXED_IPI |
| select PPC_DOORBELL |
| @@ -287,7 +288,7 @@ config FSL_BOOKE |
| config PPC_FSL_BOOK3E |
| bool |
| select ARCH_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64 |
| - select FSL_EMB_PERFMON |
| + imply FSL_EMB_PERFMON |
| select PPC_SMP_MUXED_IPI |
| select PPC_DOORBELL |
| default y if FSL_BOOKE |
| -- |
| 2.35.1 |
| |
