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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14349C98318 for ; Thu, 24 Sep 2026 17:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U4LPKtq3FXQBzgDrkBOS1YtUwyGhKzpbZJU2kODjma0=; b=kj7+dqrXCGmVpzwDMj8bsdc5YO EsupaStMssj5Uo1eNrjjFVvU3/HWtNk3t/IvfxWJSYOLIOtSoaukj6CQtGCD4Z5hyyUSNLtA64U+X wanDW8FfxJASAtxe9ZFQ4hZ6sINULjDGSaYEWR7NIZ3AJdAMobqGh78G9vHUYBgPorM6Yoqm4F5gf izogTycAGEYWs+JFWzU0sAhCm8aaQufuykkv/8PjGg9bBxgjRYflKtAVYgCKTSevjUEQEuDWOtPBH g/Q90GGvtPNNoUYFbOMUgeu8uZNp0jkSUdSN/Syj+RXw7M36cLfeePnQaNDNhaXc3xOczH1ltQAtC iQUmwFfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9nGU-0000000BjuJ-09ro; Thu, 24 Sep 2026 17:29:46 +0000 Received: from mail-oi1-x245.google.com ([2607:f8b0:4864:20::245]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9nGH-0000000Bjnb-146H for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2026 17:29:34 +0000 Received: by mail-oi1-x245.google.com with SMTP id 5614622812f47-4b2f2b8d88fso215892b6e.2 for ; Thu, 24 Sep 2026 10:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790270972; x=1790875772; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=U4LPKtq3FXQBzgDrkBOS1YtUwyGhKzpbZJU2kODjma0=; b=VpMbbZxEFunSFMpT4pAackRHsBY+Zks/xgo3ICUs+rNyVIyp/rHSuTV/t+OVY8V+h8 dG6Pjdj+7FjiP5vWuWvTPx/YAM95yu8tkY0JmCWGA8EkVp2ybhF5wmMh0LKklD5TmITz 7T+Dm9irpTMCSqXspdMVt5YFccPaSc1ulhMEu1SDC2YPz7wuucdh3D5tZULBMXrc7clA CC1GaPheJuARgERqFzksZ7W+MlUqnS7gt5kRdBi+XVEGOf+x6TTlUUph877C1Jpc1Tq+ Ewg5pVDeXC2JdPUFgJ62hxrvqwonnLeNQfv2rSNfvAWGdfx6l6CCTxY4dUCGu2r5f20+ UQwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790270972; x=1790875772; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=U4LPKtq3FXQBzgDrkBOS1YtUwyGhKzpbZJU2kODjma0=; b=GgVXJQDK0l2bKgNHllk2VpvG8vAYrlSjht9vzTM4yiCNglPre/YyooZGoIg8bzqCGG 00sjy3rNfdY+ts0L6b5eWlVHZybm/ZQ93TlH6h7aM3opWaMwMvRI2xXHeqKrUJoaC09s XLOzuAqQua+b7xR1HfP6SWfzu51xmocEKCnJpsmGDJa3N46LnBu4qfzzX1tLf/BwilX+ KF6wtOVWG3seAiy49Qw0X9hTf3qzg0ADhCp1C1PZW/iJ8Wcq1K8HJak4tD6l4Pf3UFug P+vejRy0AZhydPdzom0W+MlYArI5N6lYaG4SWZTJNmogbmmcpKYeXFpU4c2sKemLhxvs VPtw== X-Forwarded-Encrypted: i=1; AKwUvBx2KvI5NvrbJGxpZO438+/wtwMb/APKHL4h12H87wDfxQkLa5AwqH+m9pkEWLO07dJYKIPKh+8DxMotT0/w5Ccj@lists.infradead.org X-Gm-Message-State: AFuF++lbVRK6T5Ir5UmAmSX3ASdkX4Ngp7NFoGMsDKgs0NPhvDfu23lV IyxkqoJ9tmYqXvHKRyTo7nfJNcIgRqCdioO8G5x5vrkRwZTx0fNKbK5RCh6QifBIYVb/HIyu1JR IJEYE+pCVPljiwaLNV3aIPm0iYg== X-Received: from japm26.prod.google.com ([2002:a02:cdda:0:b0:5f3:6745:a0fd]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:2396:b0:4c2:2fb4:3676 with SMTP id 5614622812f47-4d729123773mr3724796b6e.16.1790270971680; Thu, 24 Sep 2026 10:29:31 -0700 (PDT) Date: Thu, 24 Sep 2026 17:29:07 +0000 In-Reply-To: <20260924172928.2110956-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20260924172928.2110956-1-coltonlewis@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20260924172928.2110956-2-coltonlewis@google.com> Subject: [PATCH v9 01/22] arm64: cpufeature: Add cpucap for HPMN0 From: Colton Lewis To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Oliver Upton , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Fuad Tabba , Catalin Marinas , Will Deacon , Mark Rutland , Paolo Bonzini , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , James Clark , Robin Murphy , Zide Chen , Alexandru Elisei , Ganapatrao Kulkarni , Mingwei Zhang , Jonathan Corbet , Russell King , Shuah Khan , linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Colton Lewis Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260924_102933_305220_4EF5ACCE X-CRM114-Status: GOOD ( 15.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a capability for FEAT_HPMN0, whether MDCR_EL2.HPMN can specify 0 counters reserved for the guest. This required changing HPMN0 to an UnsignedEnum in tools/sysreg because otherwise not all the appropriate macros are generated to add it to arm64_cpu_capabilities_arm64_features. Acked-by: Mark Rutland Reviewed-by: Suzuki K Poulose Signed-off-by: Colton Lewis --- arch/arm64/kernel/cpufeature.c | 10 +++++++++- arch/arm64/kvm/sys_regs.c | 5 ++++- arch/arm64/tools/cpucaps | 1 + arch/arm64/tools/sysreg | 6 +++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 32102c3912fa7..f8431cf858619 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -77,7 +77,7 @@ #include #include -#include +#include #include #include #include @@ -564,6 +564,7 @@ static const struct arm64_ftr_bits ftr_id_mmfr0[] = { }; static const struct arm64_ftr_bits ftr_id_aa64dfr0[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64DFR0_EL1_HPMN0_SHIFT, 4, 0), S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_EL1_DoubleLock_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64DFR0_EL1_PMSVer_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_EL1_CTX_CMPs_SHIFT, 4, 0), @@ -3012,6 +3013,13 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .matches = has_cpuid_feature, ARM64_CPUID_FIELDS(ID_AA64MMFR0_EL1, FGT, FGT2) }, + { + .desc = "HPMN0", + .type = ARM64_CPUCAP_SYSTEM_FEATURE, + .capability = ARM64_HAS_HPMN0, + .matches = has_cpuid_feature, + ARM64_CPUID_FIELDS(ID_AA64DFR0_EL1, HPMN0, IMP) + }, #ifdef CONFIG_ARM64_SME { .desc = "Scalable Matrix Extension", diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 44aae52c473d7..f7f750b7a91c4 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2219,6 +2219,8 @@ static u64 sanitise_id_aa64dfr0_el1(const struct kvm_vcpu *vcpu, u64 val) if (kvm_vcpu_has_pmu(vcpu)) val |= SYS_FIELD_PREP(ID_AA64DFR0_EL1, PMUVer, kvm_arm_pmu_get_pmuver_limit()); + else + val &= ~ID_AA64DFR0_EL1_HPMN0_MASK; /* Hide SPE from guests */ val &= ~ID_AA64DFR0_EL1_PMSVer_MASK; @@ -3417,7 +3419,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { ID_AA64DFR0_EL1_DoubleLock_MASK | ID_AA64DFR0_EL1_WRPs_MASK | ID_AA64DFR0_EL1_PMUVer_MASK | - ID_AA64DFR0_EL1_DebugVer_MASK), + ID_AA64DFR0_EL1_DebugVer_MASK | + ID_AA64DFR0_EL1_HPMN0_MASK), ID_SANITISED(ID_AA64DFR1_EL1), ID_UNALLOCATED(5,2), ID_UNALLOCATED(5,3), diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index 2775ba3359cfe..a309c18235e71 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -43,6 +43,7 @@ HAS_GIC_PRIO_MASKING HAS_GIC_PRIO_RELAXED_SYNC HAS_ICH_HCR_EL2_TDIR HAS_HCR_NV1 +HAS_HPMN0 HAS_HCX HAS_LDAPR HAS_LPA2 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index e2d37ee221b84..1035b406ef183 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -1679,9 +1679,9 @@ EndEnum EndSysreg Sysreg ID_AA64DFR0_EL1 3 0 0 5 0 -Enum 63:60 HPMN0 - 0b0000 UNPREDICTABLE - 0b0001 DEF +UnsignedEnum 63:60 HPMN0 + 0b0000 NI + 0b0001 IMP EndEnum UnsignedEnum 59:56 ExtTrcBuff 0b0000 NI -- 2.56.0.rc1.310.g51773c2048-goog