Received: by 2002:ac0:8845:0:0:0:0:0 with SMTP id g63csp892526img; Tue, 26 Feb 2019 10:19:43 -0800 (PST) X-Google-Smtp-Source: AHgI3IbeoabPDTsP1At1gjlar+TCd7OXyx4t/URPH5QfmeVngczXrHjCZDkzDCm4AQvicVUOTcEZ X-Received: by 2002:a17:902:6681:: with SMTP id e1mr27014745plk.98.1551205183203; Tue, 26 Feb 2019 10:19:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551205183; cv=none; d=google.com; s=arc-20160816; b=kDBVxdAu3Tn7UUiRz/HCEAAFk7XX+6L7FSqJ+ipcci0Jjy+cGF402dLb7bbKIArFdy 2Hggc1mT3eNpZNbvMy6EJka2QGQ+nYdITH06hWUq6vApQjHsO3+A1p1HcHdKScUSX3GP dYXrywP3UweYc7okRLfzzFWHxU8LLmZdOhUREdmznaOf6Of5Ey2jHv5ASoidGb8q2Xcw kihURwOctBjTxSk5DR9eoVwb4cDImDq1tq0ic05Q6Ek/5hinbZPNEHqBrFQnPXuyUpRT TTRZKdt/UJEX3PVVwQ4KrCOgtf87IPsz8IjNpZJxuJ/YoBl48BdBjtPN5+gsg/EE4uB3 fk1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id :dkim-signature; bh=phBk+r7PeUz0uTJRypnFHUf3M0wwTCSFOcNFBfGPvaA=; b=hK6dgKolKSoLPIXzo7y2aYNgq2N4GLZtDvsBhbDRIBRqtmWL5gy8sDqtk//ZtBZZmJ dQbcx5jJ2gYlvmCxXSf4U3+Bv32PqtbRiEmYbCzot7DHHZOmhqptvM+7tmV+ejjUGytJ We8FopFJ2mrKTIqtdkMpsc3j8Noo8xaj/OKIupCw3lycfcSCtGT8SZeOZxIjR+xL2QLN eLwYCFquDCC2W7axKL2MSD5tycR+eHD1hYlmkYh0gc9QCJRB2oAZnPZfxd4+c6j4q84+ UN6mr+SWBuOp0tCSaaUPwpORFEH3yoA926O5pF4u7uCH3s+gxITcv3vCO5sfARO7znYH aOmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=HNF9X82C; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m11si12534581pfh.47.2019.02.26.10.19.27; Tue, 26 Feb 2019 10:19:43 -0800 (PST) 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=@c-s.fr header.s=mail header.b=HNF9X82C; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729138AbfBZSSw (ORCPT + 99 others); Tue, 26 Feb 2019 13:18:52 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:28804 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728736AbfBZSSu (ORCPT ); Tue, 26 Feb 2019 13:18:50 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4486Wq6GtJz9v6LN; Tue, 26 Feb 2019 19:18:47 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=HNF9X82C; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id XdqrqwF4cIP6; Tue, 26 Feb 2019 19:18:47 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4486Wq50z5z9v6L9; Tue, 26 Feb 2019 19:18:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1551205127; bh=phBk+r7PeUz0uTJRypnFHUf3M0wwTCSFOcNFBfGPvaA=; h=From:Subject:To:Cc:Date:From; b=HNF9X82CFB60ZHYJmr21oFwBOumBLvwxZv2TxbVJtxOwNFihQnV2cuMIIV06isjQt /NuCOOeLJKPQICSxrJj60MJrxOtTMYIduVcOR3L2E2wVNW6OePBm5xshwwlZp7b1ca TsWxFrMte8faT+XhzSZRzi0hSJcfcKD8LU762OnA= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 649A78B97A; Tue, 26 Feb 2019 19:18:49 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id rBvg0048uCIk; Tue, 26 Feb 2019 19:18:49 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3DE9C8B96A; Tue, 26 Feb 2019 19:18:49 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id D12826F7B5; Tue, 26 Feb 2019 18:18:48 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/fsl: Fix the flush of branch predictor. To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Diana Craciun Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 26 Feb 2019 18:18:48 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 4549ce8d4637..49381f32b374 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -338,6 +338,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.13.3