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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,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 86F55C43381 for ; Wed, 27 Mar 2019 19:28:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FCFD2075C for ; Wed, 27 Mar 2019 19:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553714910; bh=RqPXrsMjM7S0nSetsJDiXM3heWfRxYPfkh6HyA8QHi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z2PoAs643MXl5sGWpJyJbB45JyeGueGpEJoWQCxPkolK9oIBbUdhktddsoomXaKSY Z+3ZfO+5h6NzmFqCf4cu6+AXHe07NhBrskE0YC306KdTuI0PG4hM6Hmqg2Ehcw33FJ yh/IPqQfnMBGF7QYB0SdAJe8y7bTlI7nJJOEtngk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733225AbfC0T23 (ORCPT ); Wed, 27 Mar 2019 15:28:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:44920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733223AbfC0SES (ORCPT ); Wed, 27 Mar 2019 14:04:18 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 191FF21871; Wed, 27 Mar 2019 18:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709857; bh=RqPXrsMjM7S0nSetsJDiXM3heWfRxYPfkh6HyA8QHi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PKufl1zVHX8w4L10bWlXhl4CQDwWJ3hM349ZdX7l8Wjt9F3IFk8qBsx5wire2x91G S5kIoXzaMQqUnZGdhei953HI75JRWm9HNod1W291rQOGA581KFUuKfxu3F5hR7nIFT 8BrsHHq7ZhYhn/4ZnHTDRcrFBoGkfzmk8sw0Mvlg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe Leroy , Diana Craciun , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.0 076/262] powerpc/fsl: Fix the flush of branch predictor. Date: Wed, 27 Mar 2019 13:58:51 -0400 Message-Id: <20190327180158.10245-76-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe Leroy [ Upstream commit 27da80719ef132cf8c80eb406d5aeb37dddf78cc ] 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: Sasha Levin --- arch/powerpc/kernel/exceptions-64e.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index afb638778f44..447defdd4503 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -349,6 +349,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 -- 2.19.1