From patchwork Sat Jun 24 19:17:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 780397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ww4v36DHnz9s3T for ; Sun, 25 Jun 2017 05:21:51 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3ww4v35PCSzDr7H for ; Sun, 25 Jun 2017 05:21:51 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3ww4pB1q0yzDr1s for ; Sun, 25 Jun 2017 05:17:38 +1000 (AEST) Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3ww4p9742Vz9t1y; Sun, 25 Jun 2017 05:17:37 +1000 (AEST) Received: by localhost.localdomain (Postfix, from userid 1000) id 84F63EEE11B; Sun, 25 Jun 2017 05:17:35 +1000 (AEST) From: Michael Neuling To: stewart@linux.vnet.ibm.com Date: Sat, 24 Jun 2017 14:17:24 -0500 Message-Id: <20170624191728.14793-20-mikey@neuling.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170624191728.14793-1-mikey@neuling.org> References: <20170624191728.14793-1-mikey@neuling.org> Subject: [Skiboot] [PATCH v2 19/23] Rename cleanup_tlb() to cleanup_local_tlb() X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: skiboot@lists.ozlabs.org, Michael Neuling MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" From: Benjamin Herrenschmidt It uses tlbiel and only cleans up the TLB of the calling core Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Michael Neuling --- 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);