From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC928C04E53 for ; Wed, 15 May 2019 11:04:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82A932084F for ; Wed, 15 May 2019 11:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918249; bh=pJOGQxL8js92D2ZmrZ8Cv29N2yQDX0ZLCt6D+jVAz7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m1chyrotkfY53ai09n9KE770383Fnbk2csuRRku0Sb19TP1VG0UnRs5DLEXTUNM6G wIle3N0Fq1EEgPB62U0Lc6n+YHFSf3VO9RKJXI6LkeXNgDRZHqG0vnh1Otz2OtG3Sc 1MpbL2s1hIyy6d+2kZ7+qAovk0R6DUfiLCnXQetc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728348AbfEOLEH (ORCPT ); Wed, 15 May 2019 07:04:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:33454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727501AbfEOLED (ORCPT ); Wed, 15 May 2019 07:04:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 132332084F; Wed, 15 May 2019 11:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918242; bh=pJOGQxL8js92D2ZmrZ8Cv29N2yQDX0ZLCt6D+jVAz7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WsGAoY+5x6dOeOTeSaZP1LPgjcTdnSSdwmh8l7Nvd+IjZiRAXuNyZOCLB2T1qgpT0 uKJHmwo8LXeeSlWceJC5sXUbcYpXd2mR7icU27XZNWLep5ymYhJKA8vKOdk/hxyvdv 5Nbullod1IKO3KhpTTGpRHgPh0QSYF2rBoI3/GPw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Diana Craciun , Michael Ellerman Subject: [PATCH 4.4 058/266] powerpc/fsl: Add macro to flush the branch predictor Date: Wed, 15 May 2019 12:52:45 +0200 Message-Id: <20190515090724.402733242@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Diana Craciun commit 1cbf8990d79ff69da8ad09e8a3df014e1494462b upstream. The BUCSR register can be used to invalidate the entries in the branch prediction mechanisms. Signed-off-by: Diana Craciun Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/ppc_asm.h | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -821,4 +821,15 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,C .long 0x2400004c /* rfid */ #endif /* !CONFIG_PPC_BOOK3E */ #endif /* __ASSEMBLY__ */ + +#ifdef CONFIG_PPC_FSL_BOOK3E +#define BTB_FLUSH(reg) \ + lis reg,BUCSR_INIT@h; \ + ori reg,reg,BUCSR_INIT@l; \ + mtspr SPRN_BUCSR,reg; \ + isync; +#else +#define BTB_FLUSH(reg) +#endif /* CONFIG_PPC_FSL_BOOK3E */ + #endif /* _ASM_POWERPC_PPC_ASM_H */