From patchwork Thu Sep 21 19:41:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 142874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5107652vqi; Thu, 21 Sep 2023 13:08:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0l4IqmT+brkRmQyMLAFsvSVoWK9SVjdMWCe0gPgJRxswFAOxYq+aKynlzQyDciUABR3AX X-Received: by 2002:a05:6a00:2389:b0:68a:5395:7aa5 with SMTP id f9-20020a056a00238900b0068a53957aa5mr7348965pfc.17.1695326898935; Thu, 21 Sep 2023 13:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695326898; cv=none; d=google.com; s=arc-20160816; b=jk3KTt26mp2ro0eBCy8u8G0Me3vgTLrNA1Xrg2m50E/aECUYERTqa7Ol8wrPfcJagq j5qPrsD6GviYCc4juYH6gN9tcFso05C7ojDp1nDWPG3Ov7qX+LR3plxBlfpJZatH0ppZ cXdElzgsgxEe4SCDopWcr5zuwpyjwJsrd+4QA55Iqp+WY/2iyLJ+Nq4J7piqShLXBx/c 6JXXdhP6NFVW/C0c6s21ARhCWuZSZ38y/gYBe0Sq7bACDAGI5n7uK4SeZ7dOHXuNTtdO zfaaRN/hlkIRc7lFz/KnTLpu/au0k0ALQFaPYC3ep2qboWJ7uBUuMqvgYfE7Z8NPF+Ja SUDA== 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=pnkcIULy8sAG26d48P4ZzBQZrEneBl46XUCkB8Qn0NQ=; b=NiVJVPerW3d6ooFnxfPn0XANqKqGfKISR3ztTJZ6VeENMzngRTsSzYkTpo/Aake65F WnDFblDtEk1zAsFJUap682XqLft0/7blFRtMMEafbUwbXjbwTbyjLaC8zy7erzT+TofN gn/cvSlpiZTWpSCZCiHRNEyMVJ5HNi2d5H4ls88J4MharTma5NXdnjC1dDaXxE41klZv liFNn1aJhIRBsXBxa8HcrbuBf/mkmzkcpkyCCAvFRNEq+v3ihTOIbYbMrF5MqnQ1H6mh e/FKwn0rtQeKMZPiEdc2Bg/nS2ERo78YOipfLMKSFho+QYWWt2MlVSfU7gKlxM9vtQQH 1cJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Yj43bkTi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id y7-20020a636407000000b00566022bbcafsi2133175pgb.566.2023.09.21.13.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 13:08:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Yj43bkTi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id DC33E82A1030; Thu, 21 Sep 2023 12:52:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbjIUTwI (ORCPT + 28 others); Thu, 21 Sep 2023 15:52:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbjIUTvt (ORCPT ); Thu, 21 Sep 2023 15:51:49 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C0496DE12 for ; Thu, 21 Sep 2023 12:42:30 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86BC6C433C8; Thu, 21 Sep 2023 19:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695325350; bh=KXNNit1NR0Sy8mgpeMe5utffy8Ysa2Z5Lh2pnEXXbtY=; h=From:To:Cc:Subject:Date:From; b=Yj43bkTiD1Tf/7RhNKf5XH2vsSxWTiZ0qB5gqZHiMiih9zRHiHUvlCVdbdGXNkGeH gOOBf3RDuHt6OssPBu4ivRVvQFsocBE9W4b+ELoGb1uKiDRvpzn1EJxGPLCywmNMmG nVckkYw4qU47jbiOIU9O9l5JbY1uDydM04VsTDRcq44TrMis4S7/Vgu0K1btCWd95O AcuBL6+i0IOG7McOEAZmECpK/sZtWeTxhyhXjTDsBrMu0DZ3oVVIEqmVPtoqS7TbEP 1hUFDXvdtDHX5jQ6t3wl4Ve81BQnSzprKy5DsSB8TqNFet1nUZjRoPNEFtVejWb1Qq kkqTrBGaLX0tA== Received: (nullmailer pid 1050671 invoked by uid 1000); Thu, 21 Sep 2023 19:42:28 -0000 From: Rob Herring To: Catalin Marinas , Will Deacon Cc: Marc Zyngier , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] arm64: Add Cortex-A520 CPU part definition Date: Thu, 21 Sep 2023 14:41:51 -0500 Message-Id: <20230921194156.1050055-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 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 lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Thu, 21 Sep 2023 12:52:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777679098222290226 X-GMAIL-MSGID: 1777679098222290226 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 Thu Sep 21 19:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 142872 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5104451vqi; Thu, 21 Sep 2023 13:03:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTUEusX79EaHL1MJHtR+7kyQnzVAj4theXeY8QzY4evU9iEN02HyLWMgUf6nqVX0iIhLKy X-Received: by 2002:a05:6a21:3e0d:b0:133:f5c1:57bb with SMTP id bk13-20020a056a213e0d00b00133f5c157bbmr6057232pzc.20.1695326591228; Thu, 21 Sep 2023 13:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695326591; cv=none; d=google.com; s=arc-20160816; b=i63sINHrp7rkwCxvHFSNPxVMD7Nfcb3a3wXjxDo63VR17W3dFDZ/rm5sDDi0EytH7Z XIYgZYEiXRXS3d/Bng17XmTEUsvGBUu3uXZWC6aiRoMjzJQjSUcD/46Lxo8xZF05IvzP xomPCvgEzVRuMscrWxkCb99bgu44M3MzG5aF0dHL8zWaKUbLq/eS6G1xSuCiQLo9OlM4 drbaJimSW6My2urmrv/fNQVPQleLe5gNfV0j2rt0haI55WzBya9wxNHv8LwAe1gHR1Gq ITUnPM7EqY/u0ON6C1ZzefH2zD2b1CamtntBw6ri5MUlPEH9+SmA2qOgYgv7BqQB1Fr8 aTDA== 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=ZBWngsT/QVH5y5PYPzhX38z04fgB/eOmiLhsWMwkYvM=; fh=YwWVhITasnCM1jQRJBJB1XiOMYBz88ca7n8dMR/TUXI=; b=c9eKnG7eUatThXguTvF4dooMEV8RdFZuNgUnU6AXgIxxHaI6jZGlad4wdp4a02Gvo+ o3UWmx7+gGkmpAPCVas06QW2Sb/vDafTwwtK26FYpW8XEhMKV1eSY0+33CAycQwzIyi9 GxyR3A+Ej78ITiV0Nxwjr/eNnNlzgPbOaZk50XxFASvkDvmVqoebF1fb1k6xeBYz3VXD AyF9gu9sTx3Tq5DtrPbnleiYOvTSTg8eYWzxqLltMJvTzAtmrtkhHPbZApVOtF9Abk8q REjMMgdE08zJAbaaxZGF1+8hF1POU8mgl5/CixQne/fT2cwKXbBxuvitbYRsWWnUniO7 +EkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=s6mMtEmf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id bz3-20020a056a02060300b005650ad0d543si2462677pgb.113.2023.09.21.13.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 13:03:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=s6mMtEmf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 0F3CE831507C; Thu, 21 Sep 2023 12:52:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229969AbjIUTwL (ORCPT + 28 others); Thu, 21 Sep 2023 15:52:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230505AbjIUTvw (ORCPT ); Thu, 21 Sep 2023 15:51:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 944AC6FEBB; Thu, 21 Sep 2023 12:42:35 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88870C433C8; Thu, 21 Sep 2023 19:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695325355; bh=bObmmHWvGoY13yIgsUgxwWw+0bq9aSwE6jDnMp+s9X0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s6mMtEmf/1QACJ7KcK+VEfYpibLW3rn9Aplu/8Gg5tI2fuweHgKfqjrtH4Ip+pPl0 g1otlco2Ve1kuDAbSQODDOxRR/U+rBqKb/FFuyn6400zLqPIUCtSVQ9iIl2S97QfjV c5RVYN8jCVaDzqtIW9EHsjoVxkc/T8JP9eo28lvTYlGXx4lRxPA8O+N7SOkIa2g4PY 4JGwPbe5NGOO5AV9OJPxeKIHtb66hyRZmgSvdMpbg5A36RbCf+LwMTrWr0FQC9bTpE p7x26p+S4LOdIxueXlGyERZOdnjTemrkXD54tpInfuaOri77vCzByl9TdIy8dsb2zt N4dC6aJCemnOg== Received: (nullmailer pid 1050817 invoked by uid 1000); Thu, 21 Sep 2023 19:42:33 -0000 From: Rob Herring To: Catalin Marinas , Will Deacon , Jonathan Corbet Cc: Marc Zyngier , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v2 2/2] arm64: errata: Add Cortex-A520 speculative unprivileged load workaround Date: Thu, 21 Sep 2023 14:41:52 -0500 Message-Id: <20230921194156.1050055-2-robh@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230921194156.1050055-1-robh@kernel.org> References: <20230921194156.1050055-1-robh@kernel.org> MIME-Version: 1.0 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 pete.vger.email 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 (pete.vger.email [0.0.0.0]); Thu, 21 Sep 2023 12:52:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777678775505810966 X-GMAIL-MSGID: 1777678775505810966 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 load via a cache side channel. The issue only exists for loads within a translation regime with the same translation (e.g. same ASID and VMID). Therefore, the issue only affects the return to EL0. The workaround is to execute a TLBI before returning to EL0 after all loads of privileged data. 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 --- v2: - Add more details on conditions necessary for the errata to occur. --- 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