powerpc-64e-consolidate-tlb-miss-handler-patching.patch removed from -mm tree
The quilt patch titled
Subject: powerpc/64e: consolidate TLB miss handler patching
has been removed from the -mm tree. Its filename was
powerpc-64e-consolidate-tlb-miss-handler-patching.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: consolidate TLB miss handler patching
Date: Tue, 2 Jul 2024 15:51:17 +0200
The 64e TLB miss handler patching is done in setup_mmu_htw(), and then again immediately afterward in early_init_mmu_global(). Consolidate it into a single location.
---
arch/powerpc/mm/nohash/tlb_64e.c | 38 +++++++++++------------------ 1 file changed, 15 insertions(+), 23 deletions(-)
arch/powerpc/mm/nohash/tlb_64e.c renamed from arch/powerpc/mm/nohash/tlb_64e.c~powerpc-64e-consolidate-tlb-miss-handler-patching +15 -23
@@ -169,24 +169,6 @@ out: } } -static void __init setup_mmu_htw (void ) -{ -/* -* If we want to use HW tablewalk, enable it by patching the TLB miss -* handlers to branch to the one dedicated to it. -*/ - -switch (book3e_htw_mode) { -case PPC_HTW_E6500 : - extlb_level_exc =EX_TLB_SIZE ; -patch_exception (0x1c0 , exc_data_tlb_miss_e6500_book3e); -patch_exception (0x1e0 , exc_instruction_tlb_miss_e6500_book3e); -break ; - } -pr_info ("MMU: Book3E HW tablewalk %s\n" , - book3e_htw_mode !=PPC_HTW_NONE ?"enabled" :"not supported" ); -} -/* * Early initialization of the MMU TLB code */
@@ -252,15 +234,25 @@ static void __init early_init_mmu_global/* Look for supported page sizes */ setup_page_sizes (); -/* Look for HW tablewalk support */ -setup_mmu_htw (); - -if (book3e_htw_mode ==PPC_HTW_NONE ) { - extlb_level_exc =EX_TLB_SIZE ; +/* +* If we want to use HW tablewalk, enable it by patching the TLB miss +* handlers to branch to the one dedicated to it. +*/ + extlb_level_exc =EX_TLB_SIZE ; +switch (book3e_htw_mode) { +case PPC_HTW_E6500 : +patch_exception (0x1c0 , exc_data_tlb_miss_e6500_book3e); +patch_exception (0x1e0 , exc_instruction_tlb_miss_e6500_book3e); +break ; +case PPC_HTW_NONE :patch_exception (0x1c0 , exc_data_tlb_miss_bolted_book3e);patch_exception (0x1e0 , exc_instruction_tlb_miss_bolted_book3e); +break ; } +pr_info ("MMU: Book3E HW tablewalk %s\n" , + book3e_htw_mode !=PPC_HTW_NONE ?"enabled" :"not supported" ); +/* Set the global containing the top of the linear mapping * for use by the TLB miss code */
_
Patches currently in -mm which might be from [email protected] are