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 1A815C04E87 for ; Wed, 15 May 2019 12:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1A38206BF for ; Wed, 15 May 2019 12:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922465; bh=dvCDnZeiJu6gG4l8p6ZHwSqeri0h0jPKwc5tIqUHTAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EDXkwgNCIG7oH2cF6311XsCynSBbllsjxVwicxVRzFX8I1d1FbMwqIc4Pwn+DWq30 lJ26UOXCt2rLCTPp7DKsHf/qyGreV5JZ9vSvEpytl4+iiitsAWcTCrf8x200hR5SC5 wkHkzOlol7HPYy3KW3VDNrY2lc1ktzOwpoaY2XzI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728422AbfEOLEW (ORCPT ); Wed, 15 May 2019 07:04:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:33926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728414AbfEOLEV (ORCPT ); Wed, 15 May 2019 07:04:21 -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 6844820881; Wed, 15 May 2019 11:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918260; bh=dvCDnZeiJu6gG4l8p6ZHwSqeri0h0jPKwc5tIqUHTAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kC3gq2Mh0gR33z44ZrnsKGKta1vZxqVNQI4jjct+FKoywwqUfs6YEsONw5m8JfljS rEcUIafTmV3MHY4Rapc6Q9DUaubbPbU3ALnNoAgIxS1bduhcIZSEnVMR7BsIUDiDKX W+JJ5R9uBR64q77WpJTxOGjj4Tm167NX57z4d1A0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Diana Craciun , Christophe Leroy , Daniel Axtens , Michael Ellerman Subject: [PATCH 4.4 064/266] powerpc/fsl: Fix the flush of branch predictor. Date: Wed, 15 May 2019 12:52:51 +0200 Message-Id: <20190515090724.605371541@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe Leroy commit 27da80719ef132cf8c80eb406d5aeb37dddf78cc upstream. The commit identified below adds MC_BTB_FLUSH macro only when CONFIG_PPC_FSL_BOOK3E is defined. This results in the following error on some configs (seen several times with kisskb randconfig_defconfig) arch/powerpc/kernel/exceptions-64e.S:576: Error: Unrecognized opcode: `mc_btb_flush' make[3]: *** [scripts/Makefile.build:367: arch/powerpc/kernel/exceptions-64e.o] Error 1 make[2]: *** [scripts/Makefile.build:492: arch/powerpc/kernel] Error 2 make[1]: *** [Makefile:1043: arch/powerpc] Error 2 make: *** [Makefile:152: sub-make] Error 2 This patch adds a blank definition of MC_BTB_FLUSH for other cases. Fixes: 10c5e83afd4a ("powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)") Cc: Diana Craciun Signed-off-by: Christophe Leroy Reviewed-by: Daniel Axtens Reviewed-by: Diana Craciun Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/exceptions-64e.S | 1 + 1 file changed, 1 insertion(+) --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -348,6 +348,7 @@ ret_from_mc_except: #define GEN_BTB_FLUSH #define CRIT_BTB_FLUSH #define DBG_BTB_FLUSH +#define MC_BTB_FLUSH #define GDBELL_BTB_FLUSH #endif