From patchwork Tue Jun 12 20:24:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 10461195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6CF6F601AE for ; Tue, 12 Jun 2018 20:31:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 503AD28BD5 for ; Tue, 12 Jun 2018 20:31:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 420CF28BD9; Tue, 12 Jun 2018 20:31:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B67D428BD5 for ; Tue, 12 Jun 2018 20:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t+RanlBd0BZBEsZlaUzjwD6oQ4jLpP6/xUVym4DIfEc=; b=UAvxZ9pPABLKOn rFs4ipJfl8e+vl8mSJPGWEEIT7Hk1OpzunefcMTErSBSVtdUzjpXNaM90fgkRxogoYoX47qKQRLf6 YWiWZL8BFALdmX5TgzF/uYOkaU5A+Qw4AZBMBt8qYQ+TR7AJ2zs9xNWzfiu5BZvin2E5ZcdE9dLm6 V+QmuF4QVqFfweenNU7o10ZrvShxNx9QWYWom/jTqC2AgVLDL2qKJUoyHcVnSmxghD6JYfKEfnMYr /1/BkndIH7RAs5iOCpndHXOWlzy9074C/6rmrymV0bnckEmqbRG/fWSb617EYBQdasQCELGWh3mU4 ALqtxsOqZiM/2gG9/Vcg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSpwL-0001Yw-Sl; Tue, 12 Jun 2018 20:30:53 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSpvg-0007vV-4D for linux-arm-kernel@bombadil.infradead.org; Tue, 12 Jun 2018 20:30:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dPREojNimxFYzgI3MQVg/7rR0UCE1nimJv6wY+3A9pA=; b=NPtZ/VlBZfSpz8eum3efmmgi4 YBwZYe66EO+BCHUIQ19dQcmmdASgC+DpHYUOXW3ts7MiHNRc/uPpxmkAth4Pa8XHO2yMMRzNEavIR yC9gl7GoVIVDyO1O+/KbTJyQU7YJSi9R3nxOlNgVjIboZiDAgNb2QvI9P90jj3OIBUTdAVb1z7uUj t25fKf1NnhM+j6j+8ox/6KxoFKhY/ersYjUcBi4c6dHOTxlumPFAiwGyiO3mVBsUPU0YBkpCcnMjA k0e0gpJveAsqd1HGFKqAdCojjSKLNAnhyzhIKiC2aoGgeDue1K6z5saRBv9osQYdjuZi6Ips6d8iU Mn7FbmUDA==; Received: from fllnx209.ext.ti.com ([198.47.19.16]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSpqU-0008CH-Pg for linux-arm-kernel@lists.infradead.org; Tue, 12 Jun 2018 20:24:52 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id w5CKOD3e026499; Tue, 12 Jun 2018 15:24:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1528835053; bh=dPREojNimxFYzgI3MQVg/7rR0UCE1nimJv6wY+3A9pA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=s+Vj+Udo/VBTZvuX+gBJtuzoAsg46PmXfsOBsoYANCda251cs/+EOU8W+5YIpfGHI yiamPDXzxQKfuG2CA7jkcV7eWSbilqaluROSX/HehDek0yGe56gEdGGeybcCC/tqxd I6N68Xis9zAI0NyGL1RTC1yaEFlcy/Yvj8S10q1U= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w5CKOD8F008045; Tue, 12 Jun 2018 15:24:13 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Tue, 12 Jun 2018 15:24:13 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Tue, 12 Jun 2018 15:24:13 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w5CKODq9025717; Tue, 12 Jun 2018 15:24:13 -0500 From: Nishanth Menon To: Tom Rini , Russell King , Marc Zyngier , Catalin Marinas , Will Deacon , Tony Lindgren Subject: [PATCH 3/4] ARM: mach-omap2: omap5/dra7: Enable ACTLR[0] (Enable invalidates of BTB) to facilitate CVE_2017-5715 WA in OS Date: Tue, 12 Jun 2018 15:24:10 -0500 Message-ID: <20180612202411.29798-4-nm@ti.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180612202411.29798-1-nm@ti.com> References: <20180612202411.29798-1-nm@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180612_212451_056336_4B4193D7 X-CRM114-Status: GOOD ( 10.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nishanth Menon , Ard Biesheuvel , Andre Przywara , U-Boot-Denx , Fabio Estevam , Robin Murphy , Marek Vasut , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Enable CVE_2017_5715 and since we have our own v7_arch_cp15_set_acr function to setup the bits, we are able to override the settings. Without this enabled, Linux kernel reports: CPU0: Spectre v2: firmware did not set auxiliary control register IBE bit, system vulnerable With this enabled, Linux kernel reports: CPU0: Spectre v2: using ICIALLU workaround NOTE: This by itself does not enable the workaround for CPU1 (on OMAP5 and DRA72/AM572 SoCs) and may require additional kernel patches. Signed-off-by: Nishanth Menon --- arch/arm/mach-omap2/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 3bb1ecb58de0..77820cc8d1e4 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -53,6 +53,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_ERRATA_798870 select SYS_THUMB_BUILD + select ARM_CORTEX_A15_CVE_2017_5715 imply NAND_OMAP_ELM imply NAND_OMAP_GPMC imply SPL_DISPLAY_PRINT