Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp5652172img; Wed, 27 Mar 2019 12:29:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqyeDlKO/jPz+M96AvEHJWsneuxvxgi0Q1O5ZehY+W6Y2AAfzJOPH0ijAy3KR1NSuY4sW8Ur X-Received: by 2002:a17:902:bb98:: with SMTP id m24mr16995735pls.17.1553714959882; Wed, 27 Mar 2019 12:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553714959; cv=none; d=google.com; s=arc-20160816; b=F2sAeJAoTMRgG1mpdTnhiUGcv3FF7Qc+0WYkHK11z1akzkd55bAcGf5yoTkEWWQyRC T5DriZqeEWrhvppbCnOkcOSHAzyoy+TR/OCEzSIMgjiJAqEBpBhhN+Ronxs+EH5zVrMw XD9bIG0UP7IRQbNL4zJKBW8RRgh5tEWMd21Z+/ilI1A1LOHUcq2TRtrsL0lX74uSwrlN 6Y27jVRqP4nBJIHtai0LXIjSjpleBAGyjqS93eC2QkFGeMqkm5UPKTAvXakIURhu2LHH mjxnvIgMl8Mj2Rs1VnpxENyBmQv+HfDhHBcsohKtaPk7eTcfMuaEvpUy7BfccDRwNPzS pA1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tSYEx08pbPaY6G063IDTHlzO8FxQ82cGSjneZtF3rt4=; b=aHID/VEXarsBn4tWwdLsvnLf3sUAPC7dq98cauH3nvQ1XJ5mwRLYglO0M0dXyYicbQ jQa11MxCNPQ8FaSuwTy3baw3g+BFQPIy7oZnICgnB6gwjUkxq0gvuWT6dbFgDkadovUB qyhL0LW+VFw6D0B4lSX9ATOPhQRAtcB+8XbJSHsT6ON/Sc3jFuw/DKbkYQGQvd2GqR7E 307QpHUmixhBd1PUqD3s7xxw4W4Dtp/2Hfut8mg3vL0n3YTk1rLng226Z6FHbcu2gCjV mQj+L5qQI527R5+HAhEseswmslBCzJAfZ9lgNmkhF+MV+Gze+nX770PSWMNagoCFtJ5b n8ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PKufl1zV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w15si5928672pgj.427.2019.03.27.12.29.04; Wed, 27 Mar 2019 12:29:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PKufl1zV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387896AbfC0T2a (ORCPT + 99 others); Wed, 27 Mar 2019 15:28:30 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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