From nobody Tue Sep 16 01:28:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15C3DC46467 for ; Sat, 7 Jan 2023 09:46:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231778AbjAGJqw (ORCPT ); Sat, 7 Jan 2023 04:46:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231765AbjAGJqr (ORCPT ); Sat, 7 Jan 2023 04:46:47 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A6B87CBE4 for ; Sat, 7 Jan 2023 01:46:44 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id p24so4218131plw.11 for ; Sat, 07 Jan 2023 01:46:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kb7WlyMl1q/VPJpFF+X4TfNx6Lfb11fY4VoBIq7ymlo=; b=AqPORj3k62mpcxB7NdBDjopWyyNb5AJfYksrKqYZ8SduFvlN6kk1lK58RTrTPHP73D eJf6pkgUiDlGkzbU81ofZ3d2XGwosFeIafV+SYjltN9RsdgD4nxNFJ1NdzVCbYFd49fK 8dop9omAdGIGlSmtluLbQcU6Z9DJKnRnnRvIhCQ8L2U6m7hoNew+YRm7OVd0L7lb/F2/ 53a/NxL7tlX/8IF4gVOONrKr6AXFIZPFnHBKCAk1OV9ua2nIMwK2oSwvzAaBG+Xl1Rsy PKoZvBnDKubcHrcALi1OVoFhST+8207mOGcvae3z3NXKVt9BQSqP5gqT8d19m3pV3giw GaqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kb7WlyMl1q/VPJpFF+X4TfNx6Lfb11fY4VoBIq7ymlo=; b=V/+iRh9QIit8QrKIZQ07cxUTtBYa9bOKzCO3wDzxltEcGoUwVT2W7wMCzEZJsiiWbU Tx+UHTrMikXQXJzyDd2jvD1zrW5zjgJVqB+VVYWvBOqHgx63AYq5B9MA+5v3QIRtSO66 u4pSkVs3Omzfb2dHOJ4iewnm/Xs2cTvvDYL86UPGOriastlGKYwfRbvvqjfHAbiFZsfY eGzDLPMZ6w7EO/xvel/2VkhTpKBw2tC3clE5dX5kPYKXgaEALAU1xA7nXkV6iqZEeaik oiqF+Yt7J5Xn+KpUrRN824P20DPvc5K8BoKWygoN2hDOQNaf8JKv3LIKn9AT/vxRkq23 pYkQ== X-Gm-Message-State: AFqh2kotaXCDj9WIOx9wzDS1yu0ZDwym6SeLi4unN884FJEWM/dbqxL0 e1TUoqRpKvpaW2EN0LGqYUnUsQ== X-Google-Smtp-Source: AMrXdXv2MV05CqQ25JMP8AE4lcoTf8VGAHYFqdK+gs3TuWYKAJT4CkVIYnxDYPsdwXkraKiJk5c9bA== X-Received: by 2002:a17:902:a601:b0:192:910e:6083 with SMTP id u1-20020a170902a60100b00192910e6083mr41156529plq.15.1673084803547; Sat, 07 Jan 2023 01:46:43 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b00183c6784704sm2263449plc.291.2023.01.07.01.46.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:46:43 -0800 (PST) From: Akihiko Odaki Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Oliver Upton , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki Subject: [PATCH v6 1/7] arm64: Allow the definition of UNKNOWN system register fields Date: Sat, 7 Jan 2023 18:46:23 +0900 Message-Id: <20230107094629.181236-2-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230107094629.181236-1-akihiko.odaki@daynix.com> References: <20230107094629.181236-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marc Zyngier The CCSIDR_EL1 register contains an UNKNOWN field (which replaces fields that were actually defined in previous revisions of the architecture). Define an 'Unkn' field type modeled after the Res0/Res1 types to allow such description. This allows the generation of #define CCSIDR_EL1_UNKN (UL(0) | GENMASK_ULL(31, 28)) which may have its use one day. Hopefully the architecture doesn't add too many of those in the future. Signed-off-by: Marc Zyngier Signed-off-by: Akihiko Odaki Reviewed-by: Mark Brown --- arch/arm64/tools/gen-sysreg.awk | 20 +++++++++++++++++++- arch/arm64/tools/sysreg | 2 ++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm64/tools/gen-sysreg.awk b/arch/arm64/tools/gen-sysreg.= awk index c350164a3955..e1df4b956596 100755 --- a/arch/arm64/tools/gen-sysreg.awk +++ b/arch/arm64/tools/gen-sysreg.awk @@ -98,6 +98,7 @@ END { =20 res0 =3D "UL(0)" res1 =3D "UL(0)" + unkn =3D "UL(0)" =20 next_bit =3D 63 =20 @@ -112,11 +113,13 @@ END { =20 define(reg "_RES0", "(" res0 ")") define(reg "_RES1", "(" res1 ")") + define(reg "_UNKN", "(" unkn ")") print "" =20 reg =3D null res0 =3D null res1 =3D null + unkn =3D null =20 next } @@ -134,6 +137,7 @@ END { =20 res0 =3D "UL(0)" res1 =3D "UL(0)" + unkn =3D "UL(0)" =20 define("REG_" reg, "S" op0 "_" op1 "_C" crn "_C" crm "_" op2) define("SYS_" reg, "sys_reg(" op0 ", " op1 ", " crn ", " crm ", " op2 ")") @@ -161,7 +165,9 @@ END { define(reg "_RES0", "(" res0 ")") if (res1 !=3D null) define(reg "_RES1", "(" res1 ")") - if (res0 !=3D null || res1 !=3D null) + if (unkn !=3D null) + define(reg "_UNKN", "(" unkn ")") + if (res0 !=3D null || res1 !=3D null || unkn !=3D null) print "" =20 reg =3D null @@ -172,6 +178,7 @@ END { op2 =3D null res0 =3D null res1 =3D null + unkn =3D null =20 next } @@ -190,6 +197,7 @@ END { next_bit =3D 0 res0 =3D null res1 =3D null + unkn =3D null =20 next } @@ -215,6 +223,16 @@ END { next } =20 +/^Unkn/ && (block =3D=3D "Sysreg" || block =3D=3D "SysregFields") { + expect_fields(2) + parse_bitdef(reg, "UNKN", $2) + field =3D "UNKN_" msb "_" lsb + + unkn =3D unkn " | GENMASK_ULL(" msb ", " lsb ")" + + next +} + /^Field/ && (block =3D=3D "Sysreg" || block =3D=3D "SysregFields") { expect_fields(3) field =3D $3 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 184e58fd5631..f754265aec5f 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -15,6 +15,8 @@ =20 # Res1 [:] =20 +# Unkn [:] + # Field [:] =20 # Enum [:] --=20 2.38.1 From nobody Tue Sep 16 01:28:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5F44C54EBE for ; Sat, 7 Jan 2023 09:46:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229815AbjAGJqy (ORCPT ); Sat, 7 Jan 2023 04:46:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231781AbjAGJqt (ORCPT ); Sat, 7 Jan 2023 04:46:49 -0500 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A2E97CBE4 for ; Sat, 7 Jan 2023 01:46:48 -0800 (PST) Received: by mail-pj1-x102c.google.com with SMTP id m7-20020a17090a730700b00225ebb9cd01so7701338pjk.3 for ; Sat, 07 Jan 2023 01:46:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WC3UnsmGOPR3/UTYcySRXnOtjQN5NHU3ow6N5a9AA1g=; b=GZWaUiXC7G9/KoJGzS+SXfWLuchaZwqiH1G0XI1U76KjSKrw6VfHPlCHtH8LMeiSyA je8wA/aJvQzr0jwJAD+C6qFkNSqOBEUeKSh3vXB+7WSVzFZtRGNCV0VYKZc3Ix3eYSVn 8sK3/5wIo/GhI78FQa4Z2IkAd2C0++LOJ+Fe5qd9dTtSXA7Cumb26i/NkpnOr4fX/UHh O0QC4VO9TbmhfoRDFrO2+uE6a1XrNF2vcQa93hQM0yEa1zXoIfN7rhNYPBBXnJ0l1er4 m2G2PtNtXJI23SHIhFR/N1miuNM5nIJbEvAkViQrt2qBHSUDCSqH+xBQeIVONe1sjYCC nX7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WC3UnsmGOPR3/UTYcySRXnOtjQN5NHU3ow6N5a9AA1g=; b=5OScAWxl0Hme3ZeYjy2Kxb+/ANMTZgMB8FtSxTXNjLfYWWs5BcALLOd2LA9mPVO4dA BMewbVPg8nOwYNbPjRLHF/DrIf7lZtE4ziVQ72ICu2x1XJS9S1HS5z8C366JYPiLXT/N ZHKo2ZtM0IJYvtHZuhKdzucpeSkbkDl9GSjrdDoVQWF5i6Dd5nvDfncHGvmNmL09Zj5C Ou+qUzvjtI+c6bqWkWFMDFP9021NlZgaVvUJs0OtWtnzNzOQVAKFuFj9o+mvqVQbXdjz V4jGmo8faxijMzd3V8BK6KinV3H+CCRTlHtncgzk+YWb6HvcGk+75xDExBsE1yY011db cOAQ== X-Gm-Message-State: AFqh2krb8WbT2kcxUmo3rvUlS1W0ED8XTkjUjP9i6MSiKQkmt7dm+xGN ljixCcfAPQrq2zhFhecX2Nuu0Q== X-Google-Smtp-Source: AMrXdXsoN7BjynbX+1FW+rDVAt3A++OMZD9/ZKjTPovZH3nsBWOYvCj2DSe9MecBeBaOcFEsZwV+vQ== X-Received: by 2002:a17:902:a513:b0:192:fe0a:11d4 with SMTP id s19-20020a170902a51300b00192fe0a11d4mr7793194plq.64.1673084807751; Sat, 07 Jan 2023 01:46:47 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b00183c6784704sm2263449plc.291.2023.01.07.01.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:46:47 -0800 (PST) From: Akihiko Odaki Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Oliver Upton , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki Subject: [PATCH v6 2/7] arm64/sysreg: Convert CCSIDR_EL1 to automatic generation Date: Sat, 7 Jan 2023 18:46:24 +0900 Message-Id: <20230107094629.181236-3-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230107094629.181236-1-akihiko.odaki@daynix.com> References: <20230107094629.181236-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert CCSIDR_EL1 to automatic generation as per DDI0487I.a. Signed-off-by: Akihiko Odaki Reviewed-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 1312fb48f18b..a2a93b3fc557 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -404,7 +404,6 @@ =20 #define SYS_CNTKCTL_EL1 sys_reg(3, 0, 14, 1, 0) =20 -#define SYS_CCSIDR_EL1 sys_reg(3, 1, 0, 0, 0) #define SYS_AIDR_EL1 sys_reg(3, 1, 0, 0, 7) =20 #define SYS_RNDR_EL0 sys_reg(3, 3, 2, 4, 0) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index f754265aec5f..45648fa89be8 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -1637,6 +1637,16 @@ Sysreg SCXTNUM_EL1 3 0 13 0 7 Field 63:0 SoftwareContextNumber EndSysreg =20 +# The bit layout for CCSIDR_EL1 depends on whether FEAT_CCIDX is implement= ed. +# The following is for case when FEAT_CCIDX is not implemented. +Sysreg CCSIDR_EL1 3 1 0 0 0 +Res0 63:32 +Unkn 31:28 +Field 27:13 NumSets +Field 12:3 Associativity +Field 2:0 LineSize +EndSysreg + Sysreg CLIDR_EL1 3 1 0 0 1 Res0 63:47 Field 46:33 Ttypen --=20 2.38.1 From nobody Tue Sep 16 01:28:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9EA5C46467 for ; Sat, 7 Jan 2023 09:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229951AbjAGJrA (ORCPT ); Sat, 7 Jan 2023 04:47:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231775AbjAGJqx (ORCPT ); Sat, 7 Jan 2023 04:46:53 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80DA67D1C2 for ; Sat, 7 Jan 2023 01:46:52 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id dw9so2458251pjb.5 for ; Sat, 07 Jan 2023 01:46:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fiIDHLmR6Z3DLA7ZmBUtEJMzeUne5nEPIKyDcmHBzVw=; b=yJu2zPLq+s3FH5mEbGHQnaCOt/fA1bkJ9uAuTdCgzCGYTMFL+vOE4qNDxb8QaYyqTT SmSc46YwBbIloQzijwBeh/41wdk9+x746aDufVmzZgqNxrXtG5ex4N37BM6umBV1A01X YNHNAMgbrMalLioaSGoV6M7TWVlAUjJ/FlPCJ1kndfbS4VpAEi/5RS9tXJvApoOLWpIM GWFqJxy+Ol7XHPIbWNO5RZydcFUH2Ur6+4RJPELKzDnoKNjVXYaAdJqdBJ7WDysSbxN2 Ysl+pE29yF5jM8zHPA9XPrevwOOh5Dh/068nECqwqSvwROBS+8X0Z0lsEgYI3X85o3KE vnYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fiIDHLmR6Z3DLA7ZmBUtEJMzeUne5nEPIKyDcmHBzVw=; b=GlSkoJjnGT/AofpqU7e6Sw1eXQGFjKWj7NoFS2VXZKmrnWUNTpumuwOCSkGZDmYVA1 PcUspbstQEjKL8XqyDVuTDPBFafX+BIO9yKx+CWgE0oaJelj1KKVGM/9yrqRciSB9TKU 5vLnCM4EDVSB115YZyLlO82wibyXRrWSy6JE0r34I6Q3FF2J2JHgYPAJeVNeBJY5hNQu sMDLQwccU+3ORQg8zCADYNk+7vFR9IuQDQ4XqRIFT+n4hSt1leMbbvSa31+ID8GgUJbn /Hyyf2Mt/Hfez1hkfljI+2heFvRAGR2qKows8VXjq5No2npTbfI9nYDFK+HS6uTqtNdo srDg== X-Gm-Message-State: AFqh2kphnedYcRfChMHhzf2CbSgJus+1uM/Wj7NbzN7+KkJh6RXy9xl7 S6yahrcpBHO2ImTsH2lZtQvLXA== X-Google-Smtp-Source: AMrXdXtmYw6MgSdZBfTMXKijPPEzf8bJIA2VpXjIRChc0KKR72/kDm2z6Pxza0jgOTVy14a/H48EyA== X-Received: by 2002:a17:903:181:b0:191:1b93:e391 with SMTP id z1-20020a170903018100b001911b93e391mr79420228plg.63.1673084811969; Sat, 07 Jan 2023 01:46:51 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b00183c6784704sm2263449plc.291.2023.01.07.01.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:46:51 -0800 (PST) From: Akihiko Odaki Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Oliver Upton , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki Subject: [PATCH v6 3/7] arm64/sysreg: Add CCSIDR2_EL1 Date: Sat, 7 Jan 2023 18:46:25 +0900 Message-Id: <20230107094629.181236-4-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230107094629.181236-1-akihiko.odaki@daynix.com> References: <20230107094629.181236-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" CCSIDR2_EL1 is available if FEAT_CCIDX is implemented as per DDI0487I.a. Signed-off-by: Akihiko Odaki Reviewed-by: Mark Brown --- arch/arm64/tools/sysreg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 45648fa89be8..90b64697345f 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -1663,6 +1663,11 @@ Field 5:3 Ctype2 Field 2:0 Ctype1 EndSysreg =20 +Sysreg CCSIDR2_EL1 3 1 0 0 2 +Res0 63:24 +Field 23:0 NumSets +EndSysreg + Sysreg GMID_EL1 3 1 0 0 4 Res0 63:4 Field 3:0 BS --=20 2.38.1 From nobody Tue Sep 16 01:28:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E7F3C54EBE for ; Sat, 7 Jan 2023 09:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236421AbjAGJrZ (ORCPT ); Sat, 7 Jan 2023 04:47:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231992AbjAGJrI (ORCPT ); Sat, 7 Jan 2023 04:47:08 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7352F7CDC3 for ; Sat, 7 Jan 2023 01:46:56 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id h7-20020a17090aa88700b00225f3e4c992so7742688pjq.1 for ; Sat, 07 Jan 2023 01:46:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4WsGIW0prujF8xnGwWysGoOLhN4qrtpWJqnT9WJSTvs=; b=uwwO51i+XHTXo8O9nKgbbA0lOkbriZTkrqa8jcN0VhIN4prie8UVuu7ej+GkwXbm5y jK0FWBckpsVp4AvFJIy2ne2goeAO3ym6QnETeO+6noasVeGVFnrKBMnXYfgicYGudp4b ESP+A9AzOlNEOZ3mCInyRtZC8an612XUuza95ok2/JoQy/eWFZ5NBP18Kv2hjxIFc+Ct DHp3cmMlP9f/519jZ5CvvPu8kjHLiPxFMeTDPglFVthapVvf4DgIzplS2sgkvx1CuQRK YaJkL5h4dVVQUO2DUetmoWH7VYCHdFRDFR8hj1dYIpgvDmrWn3WObSGNJAH7MrUOXUvQ MGig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4WsGIW0prujF8xnGwWysGoOLhN4qrtpWJqnT9WJSTvs=; b=kGvIRiNuiKK+SM0UvwAbebdIiHCAiaZTBAXxXaRXx883sXFeDqk9REJISs8AaQw2v9 rbOp6De/j9YLa1Iiuh9VZhT06HpCDSQLRPazkesfUiK7B4yDYlCPg6TiE0fMVm+cac74 Seyx40+P5300rF1+jwcira9SsCUXwdQLrBM6N9jCR9iQhS8wo8MaXfs8JlDNrRrJ9R/K 9Q/uWJTSh98F/Vy3SJzudlVDHsDHcUam/I4PMNu46NqPQL9UaaXoLR2/GHtOdbG+kZYJ CVqBn26lLSsx9nEGtmx8jyVUqilXLy31sJSHeH72h8Q+ARj2z8vbxtTBh5DC0yw/0w54 dPoQ== X-Gm-Message-State: AFqh2koqPukwD3y5pAZpaOCr4VmHP6T/t9/IFvLyCMG1aFm30FMXX7LU YbS2GhJqs4Dvr/p07rh/1BWI9g== X-Google-Smtp-Source: AMrXdXsdJ6TeUQc1Kx3Tfav35gNPG1ueF1TbZrqaKgy0AtqGnB9bhh4LQY40bWlMQSU35445eoUkfg== X-Received: by 2002:a17:902:cf0f:b0:188:f5de:8908 with SMTP id i15-20020a170902cf0f00b00188f5de8908mr60574722plg.65.1673084816052; Sat, 07 Jan 2023 01:46:56 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b00183c6784704sm2263449plc.291.2023.01.07.01.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:46:55 -0800 (PST) From: Akihiko Odaki Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Oliver Upton , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki Subject: [PATCH v6 4/7] arm64/cache: Move CLIDR macro definitions Date: Sat, 7 Jan 2023 18:46:26 +0900 Message-Id: <20230107094629.181236-5-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230107094629.181236-1-akihiko.odaki@daynix.com> References: <20230107094629.181236-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The macros are useful for KVM which needs to manage how CLIDR is exposed to vcpu so move them to include/asm/cache.h, which KVM can refer to. Signed-off-by: Akihiko Odaki --- arch/arm64/include/asm/cache.h | 6 ++++++ arch/arm64/kernel/cacheinfo.c | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index c0b178d1bb4f..ab7133654a72 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -16,6 +16,12 @@ #define CLIDR_LOC(clidr) (((clidr) >> CLIDR_LOC_SHIFT) & 0x7) #define CLIDR_LOUIS(clidr) (((clidr) >> CLIDR_LOUIS_SHIFT) & 0x7) =20 +/* Ctypen, bits[3(n - 1) + 2 : 3(n - 1)], for n =3D 1 to 7 */ +#define CLIDR_CTYPE_SHIFT(level) (3 * (level - 1)) +#define CLIDR_CTYPE_MASK(level) (7 << CLIDR_CTYPE_SHIFT(level)) +#define CLIDR_CTYPE(clidr, level) \ + (((clidr) & CLIDR_CTYPE_MASK(level)) >> CLIDR_CTYPE_SHIFT(level)) + /* * Memory returned by kmalloc() may be used for DMA, so we must make * sure that all such allocations are cache aligned. Otherwise, diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c index 97c42be71338..daa7b3f55997 100644 --- a/arch/arm64/kernel/cacheinfo.c +++ b/arch/arm64/kernel/cacheinfo.c @@ -11,11 +11,6 @@ #include =20 #define MAX_CACHE_LEVEL 7 /* Max 7 level supported */ -/* Ctypen, bits[3(n - 1) + 2 : 3(n - 1)], for n =3D 1 to 7 */ -#define CLIDR_CTYPE_SHIFT(level) (3 * (level - 1)) -#define CLIDR_CTYPE_MASK(level) (7 << CLIDR_CTYPE_SHIFT(level)) -#define CLIDR_CTYPE(clidr, level) \ - (((clidr) & CLIDR_CTYPE_MASK(level)) >> CLIDR_CTYPE_SHIFT(level)) =20 int cache_line_size(void) { --=20 2.38.1 From nobody Tue Sep 16 01:28:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1695BC61DB3 for ; Sat, 7 Jan 2023 09:47:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236799AbjAGJr3 (ORCPT ); Sat, 7 Jan 2023 04:47:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236779AbjAGJrM (ORCPT ); Sat, 7 Jan 2023 04:47:12 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD00A8060D for ; Sat, 7 Jan 2023 01:47:00 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id v23so3881010pju.3 for ; Sat, 07 Jan 2023 01:47:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IrHvMB16lAcrTCRgHPeXQ+m99p1hKRk4z+mzwMZ3/vQ=; b=XIR4iKAGY5tizFikPrCbS3m01UvFm1MG/NpL2cA/3LBGXtr/aI1d8C5NVAd/xF1+VQ 5JoQ/wB1dNT/qH8pnwi0ZtDwUbbdbpgemB5XDgepm++5Txb/Uqws6j70U7djjUDHGEvo gZXLG+Uk2JUQ/4rohKbG2rFh4HRaiLCAAcQ9i5olH31hO7SzAJDyOs1Usojcbxqq1nWI X23PwIX5hfVSp94lZxS9MoDKykWhz8M/i1iN/+YF7iWNCAdVydQoOI4EAOfd8P0S0sIS chYOElEP0EmIeUf/nG1GMHWU4ggzy+shP9+3gsf09Qi5wQsl7CSj8mub1vrombmlL4on rN8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IrHvMB16lAcrTCRgHPeXQ+m99p1hKRk4z+mzwMZ3/vQ=; b=WTr9EJqgcgbE5qgOMWSrUWicJT/mwxxHsjxhlf9lLUKfndGqJFy1jjkwL4CwsVb0HJ L7rDxVvJgb8DYob4fy0tguTFrfanThW4AgmyHCMxzo/Sc8Xe+yC+0n5W5SNXS6XNWrYp G9ltzpFz3DcmiKk9sjvB4OOOb+7WZmLNh9xwTOmr52zaFCHhWYyE+6KuvWHX1Gb4NLei zeX+NxuJUePvpORJ/0KEBgg+AnCosB2GyerTiXODOCgyCOwJFnelpbwBlejwUCLFa2tJ O1Dv/wZWa6yN6Omtd35dc+5HRuRROva5Zv2TE0ROz4Nr++rswDq/9uqOSLYRqvJWehYz QyRA== X-Gm-Message-State: AFqh2krrfjcp63HLZYYin/RlNwrICvWhZX72wylJ3WzBBqcwaf5dDsJz pdZzR4wOnDyGaCJwJf4qYpqRtA== X-Google-Smtp-Source: AMrXdXvSgLOZX5XyO03JF/K1p6Sj9gHpq7HzVmF626nTVj4T5INy7DN6cR/GnQ6UVqxTHUTpuELAkg== X-Received: by 2002:a17:902:7c90:b0:18f:6b2b:e88d with SMTP id y16-20020a1709027c9000b0018f6b2be88dmr58697261pll.36.1673084820291; Sat, 07 Jan 2023 01:47:00 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b00183c6784704sm2263449plc.291.2023.01.07.01.46.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:46:59 -0800 (PST) From: Akihiko Odaki Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Oliver Upton , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki , Reiji Watanabe Subject: [PATCH v6 5/7] KVM: arm64: Always set HCR_TID2 Date: Sat, 7 Jan 2023 18:46:27 +0900 Message-Id: <20230107094629.181236-6-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230107094629.181236-1-akihiko.odaki@daynix.com> References: <20230107094629.181236-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Always set HCR_TID2 to trap CTR_EL0, CCSIDR2_EL1, CLIDR_EL1, and CSSELR_EL1. This saves a few lines of code and allows to employ their access trap handlers for more purposes anticipated by the old condition for setting HCR_TID2. Suggested-by: Marc Zyngier Signed-off-by: Akihiko Odaki Reviewed-by: Reiji Watanabe --- arch/arm64/include/asm/kvm_arm.h | 3 ++- arch/arm64/include/asm/kvm_emulate.h | 4 ---- arch/arm64/include/asm/kvm_host.h | 2 -- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 2 -- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_= arm.h index 0df3fc3a0173..158f2033fde9 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -81,11 +81,12 @@ * SWIO: Turn set/way invalidates into set/way clean+invalidate * PTW: Take a stage2 fault if a stage1 walk steps in device memory * TID3: Trap EL1 reads of group 3 ID registers + * TID2: Trap CTR_EL0, CCSIDR2_EL1, CLIDR_EL1, and CSSELR_EL1 */ #define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \ HCR_BSU_IS | HCR_FB | HCR_TACR | \ HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \ - HCR_FMO | HCR_IMO | HCR_PTW | HCR_TID3 ) + HCR_FMO | HCR_IMO | HCR_PTW | HCR_TID3 | HCR_TID2) #define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF) #define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK | HCR_ATA) #define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/= kvm_emulate.h index 9bdba47f7e14..30c4598d643b 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -88,10 +88,6 @@ static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu) if (vcpu_el1_is_32bit(vcpu)) vcpu->arch.hcr_el2 &=3D ~HCR_RW; =20 - if (cpus_have_const_cap(ARM64_MISMATCHED_CACHE_TYPE) || - vcpu_el1_is_32bit(vcpu)) - vcpu->arch.hcr_el2 |=3D HCR_TID2; - if (kvm_has_mte(vcpu->kvm)) vcpu->arch.hcr_el2 |=3D HCR_ATA; } diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 35a159d131b5..374390a9212e 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -705,7 +705,6 @@ static inline bool __vcpu_read_sys_reg_from_cpu(int reg= , u64 *val) return false; =20 switch (reg) { - case CSSELR_EL1: *val =3D read_sysreg_s(SYS_CSSELR_EL1); break; case SCTLR_EL1: *val =3D read_sysreg_s(SYS_SCTLR_EL12); break; case CPACR_EL1: *val =3D read_sysreg_s(SYS_CPACR_EL12); break; case TTBR0_EL1: *val =3D read_sysreg_s(SYS_TTBR0_EL12); break; @@ -750,7 +749,6 @@ static inline bool __vcpu_write_sys_reg_to_cpu(u64 val,= int reg) return false; =20 switch (reg) { - case CSSELR_EL1: write_sysreg_s(val, SYS_CSSELR_EL1); break; case SCTLR_EL1: write_sysreg_s(val, SYS_SCTLR_EL12); break; case CPACR_EL1: write_sysreg_s(val, SYS_CPACR_EL12); break; case TTBR0_EL1: write_sysreg_s(val, SYS_TTBR0_EL12); break; diff --git a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h b/arch/arm64/kvm/hy= p/include/hyp/sysreg-sr.h index baa5b9b3dde5..147cb4c846c6 100644 --- a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h +++ b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h @@ -39,7 +39,6 @@ static inline bool ctxt_has_mte(struct kvm_cpu_context *c= txt) =20 static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) { - ctxt_sys_reg(ctxt, CSSELR_EL1) =3D read_sysreg(csselr_el1); ctxt_sys_reg(ctxt, SCTLR_EL1) =3D read_sysreg_el1(SYS_SCTLR); ctxt_sys_reg(ctxt, CPACR_EL1) =3D read_sysreg_el1(SYS_CPACR); ctxt_sys_reg(ctxt, TTBR0_EL1) =3D read_sysreg_el1(SYS_TTBR0); @@ -95,7 +94,6 @@ static inline void __sysreg_restore_user_state(struct kvm= _cpu_context *ctxt) static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt) { write_sysreg(ctxt_sys_reg(ctxt, MPIDR_EL1), vmpidr_el2); - write_sysreg(ctxt_sys_reg(ctxt, CSSELR_EL1), csselr_el1); =20 if (has_vhe() || !cpus_have_final_cap(ARM64_WORKAROUND_SPECULATIVE_AT)) { --=20 2.38.1 From nobody Tue Sep 16 01:28:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6CE1C46467 for ; Sat, 7 Jan 2023 09:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231775AbjAGJrw (ORCPT ); Sat, 7 Jan 2023 04:47:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236885AbjAGJrS (ORCPT ); Sat, 7 Jan 2023 04:47:18 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D60AB81C01 for ; Sat, 7 Jan 2023 01:47:04 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id o8-20020a17090a9f8800b00223de0364beso7696433pjp.4 for ; Sat, 07 Jan 2023 01:47:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xg/n7KWUh512YkFFVRRUXhVVh0fTVxc6svqLIUhoNiQ=; b=0I34P5jJlo/nvIXTeYrk4L5+O96rTMlwJ7WfyGOBNeCiyIOR/qyT6PW/FixkUUG1m3 l6OcWphnyNzjBSHkuF7YsMU1kTgtZrkzDqAVgsOLsrqt/OOoX+VCqYWvp+G+C6QBygb1 C+qTUegaPeODZ89vA3BSBEYIySlSW0jgD36dk0e4iyfVrPGWgTzrDpHcOosx1ga5dcJE DhJKw5qDaYJdE2y7GU1dyvC1GCgElSvN+W+EC2BkZRxKjr/Zplg+safg/Sb5Lzcnmhlt 1fDRVA5V8zW3i4VcDdoAAuc2m173pFgpmeQ2sImfO5gecqdrybO/jv5EKapreU68zyaO uDXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xg/n7KWUh512YkFFVRRUXhVVh0fTVxc6svqLIUhoNiQ=; b=VfUdBNvcJ7i1XYcU6wVncyHPXbJs6cZPiJrlT+UruLJ89wSb6b9S0echRgTDvsY6Uk wwKGydOKAvEiGqzDwwdVUvazlbLb/tENOyVWIusf1oafrNsMa9G9Q09cXh3Iww7ODqT+ NXPcIxomZ6sAv/uAxGf1NJStlGX7IAAaeK8VzamFHX+TMlvzIS8grdWKgDBNFXdARuSS vvkMoBPqMMiUIW1ob0LwBOh+I586U5oIFrhkl/LX13t1wIvOA7tuXhVSjPCpTLd1E11c YBIr21snb1+AHKDMtFRvQ/uI+SaEg7cwDbWzuu7JXWVX6ABO3L/++IQN+o2CaexK9Yzx fmrA== X-Gm-Message-State: AFqh2kquue5YxuydPdze3eKpw653rDmEYPKHg1es7sJXrrZ2bI2+/rn1 nMFT8DHcPriEJIJgyIZ17cPiBw== X-Google-Smtp-Source: AMrXdXt2FGAgxR9arR4ysw7S46BfkCKb4vip2gayWL9RQ803JqvJKtc1hGSoJT4gx1OOm3wZy6CdQw== X-Received: by 2002:a05:6a21:1506:b0:9d:efbf:813c with SMTP id nq6-20020a056a21150600b0009defbf813cmr83882135pzb.5.1673084824363; Sat, 07 Jan 2023 01:47:04 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b00183c6784704sm2263449plc.291.2023.01.07.01.47.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:47:04 -0800 (PST) From: Akihiko Odaki Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Oliver Upton , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki Subject: [PATCH v6 6/7] KVM: arm64: Mask FEAT_CCIDX Date: Sat, 7 Jan 2023 18:46:28 +0900 Message-Id: <20230107094629.181236-7-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230107094629.181236-1-akihiko.odaki@daynix.com> References: <20230107094629.181236-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The CCSIDR access handler masks the associativity bits according to the bit layout for processors without FEAT_CCIDX. KVM also assumes CCSIDR is 32-bit where it will be 64-bit if FEAT_CCIDX is enabled. Mask FEAT_CCIDX so that these assumptions hold. Suggested-by: Marc Zyngier Signed-off-by: Akihiko Odaki --- arch/arm64/kvm/sys_regs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index d5ee52d6bf73..5617de916c80 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1155,6 +1155,12 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu, = struct sys_reg_desc const *r val |=3D FIELD_PREP(ARM64_FEATURE_MASK(ID_DFR0_EL1_PerfMon), pmuver_to_perfmon(vcpu_pmuver(vcpu))); break; + case SYS_ID_AA64MMFR2_EL1: + val &=3D ~ID_AA64MMFR2_EL1_CCIDX_MASK; + break; + case SYS_ID_MMFR4_EL1: + val &=3D ~ARM64_FEATURE_MASK(ID_MMFR4_EL1_CCIDX); + break; } =20 return val; @@ -1718,6 +1724,7 @@ static const struct sys_reg_desc sys_reg_descs[] =3D { =20 { SYS_DESC(SYS_CCSIDR_EL1), access_ccsidr }, { SYS_DESC(SYS_CLIDR_EL1), access_clidr }, + { SYS_DESC(SYS_CCSIDR2_EL1), undef_access }, { SYS_DESC(SYS_SMIDR_EL1), undef_access }, { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, { SYS_DESC(SYS_CTR_EL0), access_ctr }, @@ -2219,6 +2226,10 @@ static const struct sys_reg_desc cp15_regs[] =3D { =20 { Op1(1), CRn( 0), CRm( 0), Op2(0), access_ccsidr }, { Op1(1), CRn( 0), CRm( 0), Op2(1), access_clidr }, + + /* CCSIDR2 */ + { Op1(1), CRn( 0), CRm( 0), Op2(2), undef_access }, + { Op1(2), CRn( 0), CRm( 0), Op2(0), access_csselr, NULL, CSSELR_EL1 }, }; =20 --=20 2.38.1 From nobody Tue Sep 16 01:28:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64B6EC54EBE for ; Sat, 7 Jan 2023 09:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229666AbjAGJr5 (ORCPT ); Sat, 7 Jan 2023 04:47:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231934AbjAGJrX (ORCPT ); Sat, 7 Jan 2023 04:47:23 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FBE580982 for ; Sat, 7 Jan 2023 01:47:09 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id d9so4225544pll.9 for ; Sat, 07 Jan 2023 01:47:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ShlaY+S8L5KHB0pCicTgPAywGL/1c0Us84LmSFBiIns=; b=3hDsg1g7dGedR8Tq8tzxwSn1cOji8n4K4xm8n9TtroYGegkNBccrrS9QxOYEWmMzRO loGzmfS3Dm4vDzgaxy5ee9hT4oTVsNXCFAMjNBmDmdDcqEdu315M0q/91YLoJW+htasr 3OOYxc8vAF7g1lTcGPzXwTUe+xpMfku2pob5F57l7VotLUv7+C4GqaduQY6ojmW5vXw8 DIszfhJ4Ro8FXXDng/zR4Tj6HBxiNzf0SxtUF8cI3uNJNH4NrU56TXZh4lhe60kclLeR YFjrsex9vO4JCWJxtTw1eImjaJ5WRknGlfXeN91D9FQwoQMZmHUFjN8wrHTgAKw2ioHB wXgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ShlaY+S8L5KHB0pCicTgPAywGL/1c0Us84LmSFBiIns=; b=CSCwg91Gj6zMQ+FUBiFu9y/gjDoSGoddyTxFtUm8MjqnZ3Q0T+NYbkImLbk/HmnyVg 3/qCmFO+sk5zm43nJ/qFrZ1qj0nqwe3UCwqxH7zb/N25N/8fQinhhZ7wIvsamBNRx2Zn m+qzLd/KQ42lBdUm8V64zTIFPqSKZw7GcnWt3s7tmnKrBHC2FQbD/E7PeZVWnEYYVVWz zJ1DcIKYnLN4OPp5FMruhnoy4PkKzo5rbsYC92V300lDoOClayxEUlKg9AIU/t/12WTA 1ussWh6mat2cxMtlWgQz/JvIbNPjCaIoml/VvhxwFVm6y4SNyDlTULYHE1ORiS0RM2nY q/BA== X-Gm-Message-State: AFqh2kqEPhASd7ya0srAfRcKKSc5zCg5vcdJICYFALHLhSVK+fJEHIlh gRBRY3PHL/S6pbzmVO5eTcxa5w== X-Google-Smtp-Source: AMrXdXvrwPlcEFJL6YC/gYvT8xh6A6fJNf7Lso6CDCRfmVebrxs13/zEz3MMjhS1BMl9k7KRlsf7/Q== X-Received: by 2002:a17:902:e948:b0:191:309a:d752 with SMTP id b8-20020a170902e94800b00191309ad752mr64388281pll.47.1673084828648; Sat, 07 Jan 2023 01:47:08 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id n9-20020a170902d2c900b00183c6784704sm2263449plc.291.2023.01.07.01.47.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 01:47:08 -0800 (PST) From: Akihiko Odaki Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Oliver Upton , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki Subject: [PATCH v6 7/7] KVM: arm64: Normalize cache configuration Date: Sat, 7 Jan 2023 18:46:29 +0900 Message-Id: <20230107094629.181236-8-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230107094629.181236-1-akihiko.odaki@daynix.com> References: <20230107094629.181236-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Before this change, the cache configuration of the physical CPU was exposed to vcpus. This is problematic because the cache configuration a vcpu sees varies when it migrates between vcpus with different cache configurations. Fabricate cache configuration from the sanitized value, which holds the CTR_EL0 value the userspace sees regardless of which physical CPU it resides on. CLIDR_EL1 and CCSIDR_EL1 are now writable from the userspace so that the VMM can restore the values saved with the old kernel. Suggested-by: Marc Zyngier Signed-off-by: Akihiko Odaki --- arch/arm64/include/asm/cache.h | 3 + arch/arm64/include/asm/kvm_host.h | 4 + arch/arm64/kvm/reset.c | 1 + arch/arm64/kvm/sys_regs.c | 252 ++++++++++++++++++------------ 4 files changed, 164 insertions(+), 96 deletions(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index ab7133654a72..a51e6e8f3171 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -22,6 +22,9 @@ #define CLIDR_CTYPE(clidr, level) \ (((clidr) & CLIDR_CTYPE_MASK(level)) >> CLIDR_CTYPE_SHIFT(level)) =20 +/* Ttypen, bits [2(n - 1) + 34 : 2(n - 1) + 33], for n =3D 1 to 7 */ +#define CLIDR_TTYPE_SHIFT(level) (2 * ((level) - 1) + CLIDR_EL1_Ttypen_SHI= FT) + /* * Memory returned by kmalloc() may be used for DMA, so we must make * sure that all such allocations are cache aligned. Otherwise, diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 374390a9212e..496602e0b299 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -252,6 +252,7 @@ struct kvm_vcpu_fault_info { enum vcpu_sysreg { __INVALID_SYSREG__, /* 0 is reserved as an invalid value */ MPIDR_EL1, /* MultiProcessor Affinity Register */ + CLIDR_EL1, /* Cache Level ID Register */ CSSELR_EL1, /* Cache Size Selection Register */ SCTLR_EL1, /* System Control Register */ ACTLR_EL1, /* Auxiliary Control Register */ @@ -501,6 +502,9 @@ struct kvm_vcpu_arch { u64 last_steal; gpa_t base; } steal; + + /* Per-vcpu CCSIDR override or NULL */ + u32 *ccsidr; }; =20 /* diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index e0267f672b8a..dc235ddc6172 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -157,6 +157,7 @@ void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) if (sve_state) kvm_unshare_hyp(sve_state, sve_state + vcpu_sve_state_size(vcpu)); kfree(sve_state); + kfree(vcpu->arch.ccsidr); } =20 static void kvm_vcpu_reset_sve(struct kvm_vcpu *vcpu) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 5617de916c80..e789f9dea277 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -11,6 +11,7 @@ =20 #include #include +#include #include #include #include @@ -81,25 +82,85 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val,= int reg) __vcpu_sys_reg(vcpu, reg) =3D val; } =20 -/* 3 bits per cache level, as per CLIDR, but non-existent caches always 0 = */ -static u32 cache_levels; - /* CSSELR values; used to index KVM_REG_ARM_DEMUX_ID_CCSIDR */ #define CSSELR_MAX 14 =20 +static u8 get_min_cache_line_size(u32 csselr) +{ + u64 ctr_el0; + int field; + + ctr_el0 =3D read_sanitised_ftr_reg(SYS_CTR_EL0); + field =3D csselr & CSSELR_EL1_InD ? CTR_EL0_IminLine_SHIFT : CTR_EL0_Dmin= Line_SHIFT; + + /* + * Determine Log2(Number of bytes) - 4, which is the encoding of cache + * line size in CCSIDR_EL0. In CTR_EL0, the cache line size is + * represented with: + * Log2(Number of words) =3D Log2((Number of bytes) / 4) + * =3D Log2(Number of bytes) - 2 + */ + return cpuid_feature_extract_unsigned_field(ctr_el0, field) - 2; +} + /* Which cache CCSIDR represents depends on CSSELR value. */ -static u32 get_ccsidr(u32 csselr) +static u32 get_ccsidr(struct kvm_vcpu *vcpu, u32 csselr) { - u32 ccsidr; + if (vcpu->arch.ccsidr) + return vcpu->arch.ccsidr[csselr]; =20 - /* Make sure noone else changes CSSELR during this! */ - local_irq_disable(); - write_sysreg(csselr, csselr_el1); - isb(); - ccsidr =3D read_sysreg(ccsidr_el1); - local_irq_enable(); + /* + * Fabricate a CCSIDR value as the overriding value does not exist. + * The real CCSIDR value will not be used as it can vary by the + * physical CPU which the vcpu currently resides in. + * + * The line size is determined with get_min_cache_line_size(), which + * should be valid for all CPUs even if they have different cache + * configuration. + * + * The associativity bits are cleared, meaning the geometry of all data + * and unified caches (which are guaranteed to be PIPT and thus + * non-aliasing) are 1 set and 1 way. + * Guests should not be doing cache operations by set/way at all, and + * for this reason, we trap them and attempt to infer the intent, so + * that we can flush the entire guest's address space at the appropriate + * time. The exposed geometry minimizes the number of the traps. + * [If guests should attempt to infer aliasing properties from the + * geometry (which is not permitted by the architecture), they would + * only do so for virtually indexed caches.] + * + * We don't check if the cache level exists as it is allowed to return + * an UNKNOWN value if not. + */ + return get_min_cache_line_size(csselr) << CCSIDR_EL1_LineSize_SHIFT; +} =20 - return ccsidr; +static int set_ccsidr(struct kvm_vcpu *vcpu, u32 csselr, u32 val) +{ + u8 line_size =3D FIELD_GET(CCSIDR_EL1_LineSize, val); + u32 *ccsidr =3D vcpu->arch.ccsidr; + u32 i; + + if ((val & CCSIDR_EL1_RES0) || line_size < get_min_cache_line_size(csselr= )) + return -EINVAL; + + if (!ccsidr) { + if (val =3D=3D get_ccsidr(vcpu, csselr)) + return 0; + + ccsidr =3D kmalloc_array(CSSELR_MAX, sizeof(u32), GFP_KERNEL); + if (!ccsidr) + return -ENOMEM; + + for (i =3D 0; i < CSSELR_MAX; i++) + ccsidr[i] =3D get_ccsidr(vcpu, i); + + vcpu->arch.ccsidr =3D ccsidr; + } + + ccsidr[csselr] =3D val; + + return 0; } =20 /* @@ -1391,10 +1452,78 @@ static bool access_clidr(struct kvm_vcpu *vcpu, str= uct sys_reg_params *p, if (p->is_write) return write_to_read_only(vcpu, p, r); =20 - p->regval =3D read_sysreg(clidr_el1); + p->regval =3D __vcpu_sys_reg(vcpu, r->reg); return true; } =20 +/* + * Fabricate a CLIDR_EL1 value instead of using the real value, which can = vary + * by the physical CPU which the vcpu currently resides in. + */ +static void reset_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *= r) +{ + u64 ctr_el0 =3D read_sanitised_ftr_reg(SYS_CTR_EL0); + u64 clidr; + u8 loc; + + if ((ctr_el0 & CTR_EL0_IDC)) { + /* + * Data cache clean to the PoU is not required so LoUU and LoUIS + * will not be set and a unified cache, which will be marked as + * LoC, will be added. + * + * If not DIC, let the unified cache L2 so that an instruction + * cache can be added as L1 later. + */ + loc =3D (ctr_el0 & CTR_EL0_DIC) ? 1 : 2; + clidr =3D CACHE_TYPE_UNIFIED << CLIDR_CTYPE_SHIFT(loc); + } else { + /* + * Data cache clean to the PoU is required so let L1 have a data + * cache and mark it as LoUU and LoUIS. As L1 has a data cache, + * it can be marked as LoC too. + */ + loc =3D 1; + clidr =3D 1 << CLIDR_LOUU_SHIFT; + clidr |=3D 1 << CLIDR_LOUIS_SHIFT; + clidr |=3D CACHE_TYPE_DATA << CLIDR_CTYPE_SHIFT(1); + } + + /* + * Instruction cache invalidation to the PoU is required so let L1 have + * an instruction cache. If L1 already has a data cache, it will be + * CACHE_TYPE_SEPARATE. + */ + if (!(ctr_el0 & CTR_EL0_DIC)) + clidr |=3D CACHE_TYPE_INST << CLIDR_CTYPE_SHIFT(1); + + clidr |=3D loc << CLIDR_LOC_SHIFT; + + /* + * Add tag cache unified to data cache. Allocation tags and data are + * unified in a cache line so that it looks valid even if there is only + * one cache line. + */ + if (kvm_has_mte(vcpu->kvm)) + clidr |=3D 2 << CLIDR_TTYPE_SHIFT(loc); + + __vcpu_sys_reg(vcpu, r->reg) =3D clidr; +} + +static int set_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, + u64 val) +{ + u64 ctr_el0 =3D read_sanitised_ftr_reg(SYS_CTR_EL0); + u64 idc =3D !CLIDR_LOC(val) || (!CLIDR_LOUIS(val) && !CLIDR_LOUU(val)); + + if ((val & CLIDR_EL1_RES0) || (!(ctr_el0 & CTR_EL0_IDC) && idc)) + return -EINVAL; + + __vcpu_sys_reg(vcpu, rd->reg) =3D val; + + return 0; +} + static bool access_csselr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) { @@ -1416,22 +1545,10 @@ static bool access_ccsidr(struct kvm_vcpu *vcpu, st= ruct sys_reg_params *p, return write_to_read_only(vcpu, p, r); =20 csselr =3D vcpu_read_sys_reg(vcpu, CSSELR_EL1); - p->regval =3D get_ccsidr(csselr); + csselr &=3D CSSELR_EL1_Level | CSSELR_EL1_InD; + if (csselr < CSSELR_MAX) + p->regval =3D get_ccsidr(vcpu, csselr); =20 - /* - * Guests should not be doing cache operations by set/way at all, and - * for this reason, we trap them and attempt to infer the intent, so - * that we can flush the entire guest's address space at the appropriate - * time. - * To prevent this trapping from causing performance problems, let's - * expose the geometry of all data and unified caches (which are - * guaranteed to be PIPT and thus non-aliasing) as 1 set and 1 way. - * [If guests should attempt to infer aliasing properties from the - * geometry (which is not permitted by the architecture), they would - * only do so for virtually indexed caches.] - */ - if (!(csselr & 1)) // data or unified cache - p->regval &=3D ~GENMASK(27, 3); return true; } =20 @@ -1723,7 +1840,8 @@ static const struct sys_reg_desc sys_reg_descs[] =3D { { SYS_DESC(SYS_CNTKCTL_EL1), NULL, reset_val, CNTKCTL_EL1, 0}, =20 { SYS_DESC(SYS_CCSIDR_EL1), access_ccsidr }, - { SYS_DESC(SYS_CLIDR_EL1), access_clidr }, + { SYS_DESC(SYS_CLIDR_EL1), access_clidr, reset_clidr, CLIDR_EL1, + .set_user =3D set_clidr }, { SYS_DESC(SYS_CCSIDR2_EL1), undef_access }, { SYS_DESC(SYS_SMIDR_EL1), undef_access }, { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, @@ -2735,7 +2853,6 @@ id_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id, =20 FUNCTION_INVARIANT(midr_el1) FUNCTION_INVARIANT(revidr_el1) -FUNCTION_INVARIANT(clidr_el1) FUNCTION_INVARIANT(aidr_el1) =20 static void get_ctr_el0(struct kvm_vcpu *v, const struct sys_reg_desc *r) @@ -2747,7 +2864,6 @@ static void get_ctr_el0(struct kvm_vcpu *v, const str= uct sys_reg_desc *r) static struct sys_reg_desc invariant_sys_regs[] =3D { { SYS_DESC(SYS_MIDR_EL1), NULL, get_midr_el1 }, { SYS_DESC(SYS_REVIDR_EL1), NULL, get_revidr_el1 }, - { SYS_DESC(SYS_CLIDR_EL1), NULL, get_clidr_el1 }, { SYS_DESC(SYS_AIDR_EL1), NULL, get_aidr_el1 }, { SYS_DESC(SYS_CTR_EL0), NULL, get_ctr_el0 }, }; @@ -2784,33 +2900,7 @@ static int set_invariant_sys_reg(u64 id, u64 __user = *uaddr) return 0; } =20 -static bool is_valid_cache(u32 val) -{ - u32 level, ctype; - - if (val >=3D CSSELR_MAX) - return false; - - /* Bottom bit is Instruction or Data bit. Next 3 bits are level. */ - level =3D (val >> 1); - ctype =3D (cache_levels >> (level * 3)) & 7; - - switch (ctype) { - case 0: /* No cache */ - return false; - case 1: /* Instruction cache only */ - return (val & 1); - case 2: /* Data cache only */ - case 4: /* Unified cache */ - return !(val & 1); - case 3: /* Separate instruction and data caches */ - return true; - default: /* Reserved: we can't know instruction or data. */ - return false; - } -} - -static int demux_c15_get(u64 id, void __user *uaddr) +static int demux_c15_get(struct kvm_vcpu *vcpu, u64 id, void __user *uaddr) { u32 val; u32 __user *uval =3D uaddr; @@ -2826,16 +2916,16 @@ static int demux_c15_get(u64 id, void __user *uaddr) return -ENOENT; val =3D (id & KVM_REG_ARM_DEMUX_VAL_MASK) >> KVM_REG_ARM_DEMUX_VAL_SHIFT; - if (!is_valid_cache(val)) + if (val >=3D CSSELR_MAX) return -ENOENT; =20 - return put_user(get_ccsidr(val), uval); + return put_user(get_ccsidr(vcpu, val), uval); default: return -ENOENT; } } =20 -static int demux_c15_set(u64 id, void __user *uaddr) +static int demux_c15_set(struct kvm_vcpu *vcpu, u64 id, void __user *uaddr) { u32 val, newval; u32 __user *uval =3D uaddr; @@ -2851,16 +2941,13 @@ static int demux_c15_set(u64 id, void __user *uaddr) return -ENOENT; val =3D (id & KVM_REG_ARM_DEMUX_VAL_MASK) >> KVM_REG_ARM_DEMUX_VAL_SHIFT; - if (!is_valid_cache(val)) + if (val >=3D CSSELR_MAX) return -ENOENT; =20 if (get_user(newval, uval)) return -EFAULT; =20 - /* This is also invariant: you can't change it. */ - if (newval !=3D get_ccsidr(val)) - return -EINVAL; - return 0; + return set_ccsidr(vcpu, val, newval); default: return -ENOENT; } @@ -2897,7 +2984,7 @@ int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, co= nst struct kvm_one_reg *reg int err; =20 if ((reg->id & KVM_REG_ARM_COPROC_MASK) =3D=3D KVM_REG_ARM_DEMUX) - return demux_c15_get(reg->id, uaddr); + return demux_c15_get(vcpu, reg->id, uaddr); =20 err =3D get_invariant_sys_reg(reg->id, uaddr); if (err !=3D -ENOENT) @@ -2941,7 +3028,7 @@ int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, co= nst struct kvm_one_reg *reg int err; =20 if ((reg->id & KVM_REG_ARM_COPROC_MASK) =3D=3D KVM_REG_ARM_DEMUX) - return demux_c15_set(reg->id, uaddr); + return demux_c15_set(vcpu, reg->id, uaddr); =20 err =3D set_invariant_sys_reg(reg->id, uaddr); if (err !=3D -ENOENT) @@ -2953,13 +3040,7 @@ int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, c= onst struct kvm_one_reg *reg =20 static unsigned int num_demux_regs(void) { - unsigned int i, count =3D 0; - - for (i =3D 0; i < CSSELR_MAX; i++) - if (is_valid_cache(i)) - count++; - - return count; + return CSSELR_MAX; } =20 static int write_demux_regids(u64 __user *uindices) @@ -2969,8 +3050,6 @@ static int write_demux_regids(u64 __user *uindices) =20 val |=3D KVM_REG_ARM_DEMUX_ID_CCSIDR; for (i =3D 0; i < CSSELR_MAX; i++) { - if (!is_valid_cache(i)) - continue; if (put_user(val | i, uindices)) return -EFAULT; uindices++; @@ -3072,7 +3151,6 @@ int kvm_sys_reg_table_init(void) { bool valid =3D true; unsigned int i; - struct sys_reg_desc clidr; =20 /* Make sure tables are unique and in order. */ valid &=3D check_sysreg_table(sys_reg_descs, ARRAY_SIZE(sys_reg_descs), f= alse); @@ -3089,23 +3167,5 @@ int kvm_sys_reg_table_init(void) for (i =3D 0; i < ARRAY_SIZE(invariant_sys_regs); i++) invariant_sys_regs[i].reset(NULL, &invariant_sys_regs[i]); =20 - /* - * CLIDR format is awkward, so clean it up. See ARM B4.1.20: - * - * If software reads the Cache Type fields from Ctype1 - * upwards, once it has seen a value of 0b000, no caches - * exist at further-out levels of the hierarchy. So, for - * example, if Ctype3 is the first Cache Type field with a - * value of 0b000, the values of Ctype4 to Ctype7 must be - * ignored. - */ - get_clidr_el1(NULL, &clidr); /* Ugly... */ - cache_levels =3D clidr.val; - for (i =3D 0; i < 7; i++) - if (((cache_levels >> (i*3)) & 7) =3D=3D 0) - break; - /* Clear all higher bits. */ - cache_levels &=3D (1 << (i*3))-1; - return 0; } --=20 2.38.1