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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B5ED7FC6194 for ; Fri, 8 Nov 2019 12:36:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B43A22499 for ; Fri, 8 Nov 2019 12:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216607; bh=kEY/F/Ldc/xjgrznfurffqYh7kxLc2SPYlECzyaD8Js=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u0+nf36skygBfGfN08fQgJUz4rOMqkXsnZGouFA39rlDWfRQL1lMYBpHNDqECIqRF nLD54oe4+nSCDXrn+voCCd3IDWVECkz4vqFyq9qh3shrqKPEfYhMstrDal48kZVn/+ LtIG55KPVjDbwRFLQY+wQhpBO9OhXEMncQv9821M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727010AbfKHMgr (ORCPT ); Fri, 8 Nov 2019 07:36:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:44332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726036AbfKHMgq (ORCPT ); Fri, 8 Nov 2019 07:36:46 -0500 Received: from localhost.localdomain (lfbn-mar-1-550-151.w90-118.abo.wanadoo.fr [90.118.131.151]) (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 5C7442248C; Fri, 8 Nov 2019 12:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216606; bh=kEY/F/Ldc/xjgrznfurffqYh7kxLc2SPYlECzyaD8Js=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fmqKbhX7Fs2BGfaiZ/uDKsI25T+fW7fK7oIx02UaTDTDWDxuFBsv28xySPUZHc9EJ Fqve3IXbcki9gvqvxRfwuzXdLNIwa+pln2IoEqFKYFBdZZtrV1OBTABeeIvrPfB3eC lkYXFKxSJrOMcO6VtlOC76n7QDeXTRrk3kbj9ydw= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Ard Biesheuvel Subject: [PATCH for-stable-4.4 21/50] ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectre Date: Fri, 8 Nov 2019 13:35:25 +0100 Message-Id: <20191108123554.29004-22-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108123554.29004-1-ardb@kernel.org> References: <20191108123554.29004-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King Commit c58d237d0852a57fde9bc2c310972e8f4e3d155d upstream. Add a Kconfig symbol for CPUs which are vulnerable to the Spectre attacks. Signed-off-by: Russell King Reviewed-by: Florian Fainelli Boot-tested-by: Tony Lindgren Reviewed-by: Tony Lindgren Acked-by: Marc Zyngier Signed-off-by: David A. Long Signed-off-by: Greg Kroah-Hartman Signed-off-by: Ard Biesheuvel --- arch/arm/mm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 41218867a9a6..7ef92e6692ab 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -396,6 +396,7 @@ config CPU_V7 select CPU_CP15_MPU if !MMU select CPU_HAS_ASID if MMU select CPU_PABRT_V7 + select CPU_SPECTRE if MMU select CPU_TLB_V7 if MMU # ARMv7M @@ -793,6 +794,9 @@ config CPU_BPREDICT_DISABLE help Say Y here to disable branch prediction. If unsure, say N. +config CPU_SPECTRE + bool + config TLS_REG_EMUL bool select NEED_KUSER_HELPERS -- 2.20.1