From patchwork Tue Sep 12 12:11:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 138155 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp378866vqx; Tue, 12 Sep 2023 05:45:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKbpY026L36h3Dli5C5AoZAMQErIfXwZQSTkFaP+2jRfWnc9RzdtaLJA1cizHGqWsKvXw0 X-Received: by 2002:a05:6a20:cea0:b0:137:74f8:62ee with SMTP id if32-20020a056a20cea000b0013774f862eemr12843105pzb.18.1694522753281; Tue, 12 Sep 2023 05:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694522753; cv=none; d=google.com; s=arc-20160816; b=Wg+dcb73Y2xcNqhW2SwAh3ZL9V3VCXyCvYCe1RxV5oSCZI0Uh9SGqML2xNeAvtQwN8 MQGxiu3cR0E3xp+lN210x6t9VGGlEUsl/ttWKXenPQ9i6pIYDtkGTmwkTtNX4ztTpH/D XbMA7imjTepCORVPAqhovy6aPCkTwvAuSHyX65tXDujA6tbUy07QGtF/ySaivdumDGd6 SjYnJ166ZYSmc3wbxhMEJ9MeoCdH3fYpMdRjpUpZpLvufIaVcobP02qT9Nn77vqnBnPF qlKa1OoPA6v7UFC3vw821UH35jKXXCY3c14BgVRnatrB6Tq3LrZFO4yI042H6ilF7iTt UCKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=LfXllbNXNOrJ5hBJPYWcLPB+5EzqR3sR0rhXVJkM6VM=; fh=RmlggGvvGTgRBupgQa970SHNhwJUMTEJdPUxQm6aC70=; b=d4OvH0+5RmTPObvgkZUUZd0KXbTjsOpbYrxzsBsOnQYZcncpP5Gi+eDu4Slf3EuA+n xXezeWdFXH+4JvZa2on3cJgPCivy0wlmu9Cscn8aGHnAiD+x5NF5iLbN6YfZPCMlnzue yXB/nbIFYTnb8HGYwYtxbvZTPiQMchdl1sWGxKmx6q9WvQv5MH7p7/XWGxjh9prJrPA+ 1PudgqyY2rSpa2tMJCmou6bz08WIpklKDULiYyDlj/xkiXkY/8LvrjkAGESFBIzPGLRI xKK1ZFo2lye7qll879n5oDJ6KHZ1O/2BZkIf5icrtkqs/wTRRakGemzHtR5w56RiNsIm /Ztg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MqOlKaLi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id p4-20020a056a000b4400b0068a3da84110si8150368pfo.333.2023.09.12.05.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 05:45:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MqOlKaLi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 40DC5812A627; Tue, 12 Sep 2023 05:11:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234963AbjILMLd (ORCPT + 37 others); Tue, 12 Sep 2023 08:11:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234950AbjILMLb (ORCPT ); Tue, 12 Sep 2023 08:11:31 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D7AF10EC for ; Tue, 12 Sep 2023 05:11:26 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C41B7C433C7; Tue, 12 Sep 2023 12:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694520686; bh=KXNNit1NR0Sy8mgpeMe5utffy8Ysa2Z5Lh2pnEXXbtY=; h=From:To:Cc:Subject:Date:From; b=MqOlKaLiuoyjAdBLO5SRg2YsMzBaQeoMfgxh6uUAYTQ7qzik7rNC1Xid7haASVvN7 9VGIVRKdO1vxWv42KfVk4tfuJyOs4O5VkYNKUDe+MNQGPHvRpPPqsUTvXLdLyJRYEW WyyaEkxQgvItBsK5kxhkExvlrUA33dynP1vnbgsPBtPB+hXiD3mD59UrJCNcZ4oCrf W2GU6ew3DOHMc/BhslpTUMxb6f4sELYcxfZRoqQhDU9seEeDeFyMiBN1qnar4B71Av lNEZmsLaNWpKVlY+vkGsWhvgBDorrd03Z3A1UEi7ZaGPCo13nN3Ab8dz29aiIp1shz zpMi8CUDGcwxQ== Received: (nullmailer pid 380681 invoked by uid 1000); Tue, 12 Sep 2023 12:11:24 -0000 From: Rob Herring To: Catalin Marinas , Will Deacon Cc: James Morse , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: Add Cortex-A520 CPU part definition Date: Tue, 12 Sep 2023 07:11:14 -0500 Message-Id: <20230912121120.380420-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 05:11:37 -0700 (PDT) X-Spam-Status: No, score=-0.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776835890777389528 X-GMAIL-MSGID: 1776835890777389528 Add the CPU Part number for the new Arm design. Cc: stable@vger.kernel.org Signed-off-by: Rob Herring --- arch/arm64/include/asm/cputype.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index 5f6f84837a49..74d00feb62f0 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -79,6 +79,7 @@ #define ARM_CPU_PART_CORTEX_A78AE 0xD42 #define ARM_CPU_PART_CORTEX_X1 0xD44 #define ARM_CPU_PART_CORTEX_A510 0xD46 +#define ARM_CPU_PART_CORTEX_A520 0xD80 #define ARM_CPU_PART_CORTEX_A710 0xD47 #define ARM_CPU_PART_CORTEX_A715 0xD4D #define ARM_CPU_PART_CORTEX_X2 0xD48 @@ -148,6 +149,7 @@ #define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE) #define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1) #define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510) +#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520) #define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710) #define MIDR_CORTEX_A715 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A715) #define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2) From patchwork Tue Sep 12 12:11:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 138135 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp363755vqx; Tue, 12 Sep 2023 05:18:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDUagsBDT1Uo0dhdnZLA9Iv8G5OF+beTCFGQ3vuk+yh1FWLkVpOvZYWp6dWidraeBlTBB1 X-Received: by 2002:a17:90b:150:b0:269:7eea:d7f6 with SMTP id em16-20020a17090b015000b002697eead7f6mr8360452pjb.49.1694521080078; Tue, 12 Sep 2023 05:18:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694521080; cv=none; d=google.com; s=arc-20160816; b=xUrBjnV3wLuWFLSF+DmH77iM2U/sm+6ccAQ8blZIcvwcljqs7OSOQ0K0rsg9CbtwBj Qs1FkcmDcGUnFNrR5DAy908yL/8qZRKGT5IE+yM29xVcsFZiCp94intkvvipdAkFnojN B/9psdjdbY5eI57Rbqfu3SoQViloT9Mmky88UyxvLUR3MoXNrVkuRrM7HoxAs7Usxo8D Z22efEc5gzhMb3lBvoFN3ysCYCEQntL9HDIYkAluo/uKKR0n16ed0qnUkRyNwA+kDgHD u82W/V1HkKN3+zCUHHDFonqgGd2aSLuteg0Zl4LAzuhLvXqA9fu/yNroKwsdNj+PrUiT dXqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DwVAT0jQeI1tSpDFSnOVCKo5jn8gzAVIIlQ8KQjwSEM=; fh=lC0u3CpegRSOcygOrgi/ENDVeE7QySBtvykLKmQ7PxI=; b=J19z/McPNF/ktmlzjxl5TYeX10VntV0hiZSuxp0sLhCct/yyDVc4o7RJXGTdy2+VHe 2L8fM5U8tPQ3vk+ADVCUe73R0yZmEjE45RA+2qtTYJyCLJjFAPFqMYIMHUYjdMWBkO0J DCE4aExXW/L+K2Oususx6azAX2BxSPj413cME4D2vQMlqxIaQ9qxGbwJxI5sfgHNflUy 3Ogh9Z6xHLg7rKI4LQHtx/yjzkvoAMafPymNBCY49Kjkf2xtsR8UGjy0XagjNUBaoAiR a8MO708EeL9mdVU8AQHnuNwOUGMGrj9K3qrdTC1heN6aNVIzdpr3YIDYyaTFG/cjeg+o 84gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UPbOrAEY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bb3-20020a17090b008300b0027015573fbasi9857202pjb.70.2023.09.12.05.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 05:18:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UPbOrAEY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id DFF9A80A07E1; Tue, 12 Sep 2023 05:12:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235072AbjILMLx (ORCPT + 37 others); Tue, 12 Sep 2023 08:11:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234958AbjILMLm (ORCPT ); Tue, 12 Sep 2023 08:11:42 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8107610D7; Tue, 12 Sep 2023 05:11:38 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BB3CC433C8; Tue, 12 Sep 2023 12:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694520698; bh=UnP676PHVFmD+xd/rrOcUM5eKwT8h7XsEaGKrA6BnPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UPbOrAEYk47sY4lofsMhaoB2INy9+JzCY4RFhlRNtN1j3ifspkYV7HUY/WyqamW1K gHTC8N0P1/qUYxjnme9h3ajz6+wuLlDAI9R40WQNFHzXp9lJhKKNcciCj/pBFv4KE5 I6i9GSFRoFHOLwVMW89I0TyRiGQad3+QCvpBgemNfjNYWHgTuiI5Cqssm9Ysq+UfBZ qbDh+vDK68ivhnmFBH+WkZI+WCIxtxpqrRQiellM4HK5lV0EweGGA8zpjEQgHArtxw 85+/Dvh5RKY48wLJh+hpaCyYlBL5oXidSBk0uC85Y5MS3Ia8GLwzf/E8D3xJ19AQoA pScfClbopmdrA== Received: (nullmailer pid 381617 invoked by uid 1000); Tue, 12 Sep 2023 12:11:36 -0000 From: Rob Herring To: Catalin Marinas , Will Deacon , Jonathan Corbet Cc: James Morse , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH 2/2] arm64: errata: Add Cortex-A520 speculative unprivileged load workaround Date: Tue, 12 Sep 2023 07:11:15 -0500 Message-Id: <20230912121120.380420-2-robh@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230912121120.380420-1-robh@kernel.org> References: <20230912121120.380420-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 12 Sep 2023 05:12:06 -0700 (PDT) X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776834136211700662 X-GMAIL-MSGID: 1776834136211700662 Implement the workaround for ARM Cortex-A520 erratum 2966298. On an affected Cortex-A520 core, a speculatively executed unprivileged load might leak data from a privileged level via a cache side channel. The workaround is to execute a TLBI before returning to EL0. A non-shareable TLBI to any address is sufficient. The workaround isn't necessary if page table isolation (KPTI) is enabled, but for simplicity it will be. Page table isolation should normally be disabled for Cortex-A520 as it supports the CSV3 feature and the E0PD feature (used when KASLR is enabled). Cc: stable@vger.kernel.org Signed-off-by: Rob Herring --- Documentation/arch/arm64/silicon-errata.rst | 2 ++ arch/arm64/Kconfig | 13 +++++++++++++ arch/arm64/kernel/cpu_errata.c | 8 ++++++++ arch/arm64/kernel/entry.S | 4 ++++ arch/arm64/tools/cpucaps | 1 + 5 files changed, 28 insertions(+) diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst index e96f057ea2a0..f47f63bcf67c 100644 --- a/Documentation/arch/arm64/silicon-errata.rst +++ b/Documentation/arch/arm64/silicon-errata.rst @@ -71,6 +71,8 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A510 | #2658417 | ARM64_ERRATUM_2658417 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A520 | #2966298 | ARM64_ERRATUM_2966298 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 | diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b10515c0200b..78f20e632712 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1037,6 +1037,19 @@ config ARM64_ERRATUM_2645198 If unsure, say Y. +config ARM64_ERRATUM_2966298 + bool "Cortex-A520: 2966298: workaround for speculatively executed unprivileged load" + default y + help + This option adds the workaround for ARM Cortex-A520 erratum 2966298. + + On an affected Cortex-A520 core, a speculatively executed unprivileged + load might leak data from a privileged level via a cache side channel. + + Work around this problem by executing a TLBI before returning to EL0. + + If unsure, say Y. + config CAVIUM_ERRATUM_22375 bool "Cavium erratum 22375, 24313" default y diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index be66e94a21bd..5706e74c5578 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -730,6 +730,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .cpu_enable = cpu_clear_bf16_from_user_emulation, }, #endif +#ifdef CONFIG_ARM64_ERRATUM_2966298 + { + .desc = "ARM erratum 2966298", + .capability = ARM64_WORKAROUND_2966298, + /* Cortex-A520 r0p0 - r0p1 */ + ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A520, 0, 0, 1), + }, +#endif #ifdef CONFIG_AMPERE_ERRATUM_AC03_CPU_38 { .desc = "AmpereOne erratum AC03_CPU_38", diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 6ad61de03d0a..a6030913cd58 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -428,6 +428,10 @@ alternative_else_nop_endif ldp x28, x29, [sp, #16 * 14] .if \el == 0 +alternative_if ARM64_WORKAROUND_2966298 + tlbi vale1, xzr + dsb nsh +alternative_else_nop_endif alternative_if_not ARM64_UNMAP_KERNEL_AT_EL0 ldr lr, [sp, #S_LR] add sp, sp, #PT_REGS_SIZE // restore sp diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index c3f06fdef609..dea3dc89234b 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -84,6 +84,7 @@ WORKAROUND_2077057 WORKAROUND_2457168 WORKAROUND_2645198 WORKAROUND_2658417 +WORKAROUND_2966298 WORKAROUND_AMPERE_AC03_CPU_38 WORKAROUND_TRBE_OVERWRITE_FILL_MODE WORKAROUND_TSB_FLUSH_FAILURE