[Skiboot] [PATCH v2 19/23] Rename cleanup_tlb() to cleanup_local_tlb()

Michael Neuling mikey at neuling.org
Sun Jun 25 05:17:24 AEST 2017


From: Benjamin Herrenschmidt <benh at kernel.crashing.org>

It uses tlbiel and only cleans up the TLB of the calling core

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Michael Neuling <mikey at neuling.org>
---
 asm/misc.S         | 4 ++--
 core/fast-reboot.c | 2 +-
 include/skiboot.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/asm/misc.S b/asm/misc.S
index 8f8696f7c3..4c9eee974f 100644
--- a/asm/misc.S
+++ b/asm/misc.S
@@ -51,8 +51,8 @@ _mcount:
 	b	__mcount_stack_check
 #endif
 
-	.global cleanup_tlb
-cleanup_tlb:
+	.global cleanup_local_tlb
+cleanup_local_tlb:
 	/* Clean the TLB */
 	li	%r3,512
 	mtctr	%r3
diff --git a/core/fast-reboot.c b/core/fast-reboot.c
index b99eb9989c..884441df7c 100644
--- a/core/fast-reboot.c
+++ b/core/fast-reboot.c
@@ -392,7 +392,7 @@ static void cleanup_cpu_state(void)
 		chiptod_wakeup_resync();
 
 		/* The TLB surely contains garbage */
-		cleanup_tlb();
+		cleanup_local_tlb();
 	}
 
 	/* Per-thread additional cleanup */
diff --git a/include/skiboot.h b/include/skiboot.h
index 394ce93870..87d8503f52 100644
--- a/include/skiboot.h
+++ b/include/skiboot.h
@@ -203,7 +203,7 @@ extern void disable_fast_reboot(const char *reason);
 extern void fast_reboot(void);
 extern void __noreturn __secondary_cpu_entry(void);
 extern void __noreturn load_and_boot_kernel(bool is_reboot);
-extern void cleanup_tlb(void);
+extern void cleanup_local_tlb(void);
 extern void init_shared_sprs(void);
 extern void init_replicated_sprs(void);
 extern bool start_preload_kernel(void);
-- 
2.11.0



More information about the Skiboot mailing list