Skip to contentSkip to conversation

powerpc-64e-drop-mmu_ftr_type_fsl_e-checks-in-64-bit-code.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 12, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: powerpc/64e: drop MMU_FTR_TYPE_FSL_E checks in 64-bit code
has been removed from the -mm tree. Its filename was

     powerpc-64e-drop-mmu_ftr_type_fsl_e-checks-in-64-bit-code.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Michael Ellerman <[email protected]>
Subject: powerpc/64e: drop MMU_FTR_TYPE_FSL_E checks in 64-bit code
Date: Tue, 2 Jul 2024 15:51:16 +0200

All 64-bit Book3E have MMU_FTR_TYPE_FSL_E, since A2 was removed, so remove checks for it in 64-bit only code.

---

 arch/powerpc/kernel/setup_64.c   |    6 -
 arch/powerpc/mm/nohash/tlb_64e.c |  101 +++++++++++------------------
 2 files changed, 40 insertions(+), 67 deletions(-)
arch/powerpc/kernel/setup_64.c renamed from arch/powerpc/kernel/setup_64.c~powerpc-64e-drop-mmu_ftr_type_fsl_e-checks-in-64-bit-code +1 -5
@@ -696,11 +696,7 @@ __init u64 ppc64_bolted_size(void)
 {
 #ifdef CONFIG_PPC_BOOK3E_64
 	/* Freescale BookE bolts the entire linear mapping */
-	/* XXX: BookE ppc64_rma_limit setup seems to disagree? */
-	if (early_mmu_has_feature(MMU_FTR_TYPE_FSL_E))
-		return linear_map_top;
-	/* Other BookE, we assume the first GB is bolted */
-	return 1ul << 30;
+	return linear_map_top;
 #else
 	/* BookS radix, does not take faults on linear mapping */
 	if (early_radix_enabled())
arch/powerpc/mm/nohash/tlb_64e.c renamed from arch/powerpc/mm/nohash/tlb_64e.c~powerpc-64e-drop-mmu_ftr_type_fsl_e-checks-in-64-bit-code +39 -62

157 lines not on this page · raw message

_

Patches currently in -mm which might be from [email protected] are