From nobody Sun Feb 8 23:05:45 2026 Received: from canpmsgout08.his.huawei.com (canpmsgout08.his.huawei.com [113.46.200.223]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26B7930648C for ; Sun, 4 Jan 2026 13:34:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.223 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767533691; cv=none; b=LvdgtZCL1U8HtvLta7+uk0RH2kbQcMthUWK/gDriIP80gtDuezg74SWsap7T1jbqz+1WYz+AHIYkyqgObD+rSfcpHw966PmO/LCIaZ3nPU0frbyWfs+3MwVxpeUMR7woRYean2kOJgCclFeyT3wqrcNg5qtjGNjtXauVcbudlEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767533691; c=relaxed/simple; bh=14qcawHXRm2Ezrx/hXDeuejXRFTco6SUat/RrekKYkY=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=ZZCn8ZJTjvNBuXf+L2dhxJvQGlSvctr27C93xLe92OXsUwVsXv2+kS8x419/u13JU0kIqzK3svFLUCiul/2u5/RE3Dh9mGeaU7EtstUhmnwWzyt/h5WJrNdEFjOtix18VwSwROQ99xNK4N5LIO/LG3aOUcUgk2VVSGG3m+q+szs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=h-partners.com; dkim=pass (1024-bit key) header.d=h-partners.com header.i=@h-partners.com header.b=QJDPpwCj; arc=none smtp.client-ip=113.46.200.223 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=h-partners.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=h-partners.com header.i=@h-partners.com header.b="QJDPpwCj" dkim-signature: v=1; a=rsa-sha256; d=h-partners.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=35k2Qius4SFCnV/aj/qYOl0lTPhCwV+oICdVuqJczm4=; b=QJDPpwCj/f1x6vJ/sxE/k8xds5nH1n4hpcvGDKbgDLB6GSMUiEEPFiHzSKwlzwf/CzT1nsg4p c241toTjDFCKwx4K82z1AsKDjPqn1OrtCV8AJCxMjboQJrm1wTMv+0ttJJG3BqkFGM7hjQ7IIEa LzNhvN2HR72wYK7GkJtiHcY= Received: from mail.maildlp.com (unknown [172.19.163.163]) by canpmsgout08.his.huawei.com (SkyGuard) with ESMTPS id 4dkdcc6RDNzmVB1; Sun, 4 Jan 2026 21:31:28 +0800 (CST) Received: from kwepemf100008.china.huawei.com (unknown [7.202.181.222]) by mail.maildlp.com (Postfix) with ESMTPS id 3606740565; Sun, 4 Jan 2026 21:34:43 +0800 (CST) Received: from huawei.com (10.50.87.109) by kwepemf100008.china.huawei.com (7.202.181.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.36; Sun, 4 Jan 2026 21:34:42 +0800 From: Zeng Heng To: , , , , , , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH] arm64: cpufeature: Add support for the MPAM v0.1 architecture version Date: Sun, 4 Jan 2026 21:34:34 +0800 Message-ID: <20260104133434.1887677-1-zengheng4@huawei.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemf100008.china.huawei.com (7.202.181.222) Content-Type: text/plain; charset="utf-8" According to the MPAM spec [1], the supported architecture versions are v1.0, v1.1 and v0.1. MPAM versions v0.1 and v1.1 are functionally identical, but v0.1 additionally supports the FORCE_NS feature. ID_AA64PR | ID_AA64PR | MPAM Extension | Notes F0_EL1. | F1_EL1. | Architecture | MPAM | MPAM_frac | version | --------------------------------------------------------------------------- 0b0000 | 0b0001 | v0.1 | MPAM v0.1 is implemented. | | | MPAM v0.1 is the same as MPAM v1.1 | | | with FORCE_NS which is | | | incompatible with MPAM v1.0. --------------------------------------------------------------------------- 0b0001 | 0b0000 | v1.0 | MPAM v1.0 is implemented. --------------------------------------------------------------------------- 0b0001 | 0b0001 | v1.1 | MPAM v1.1 is implemented. | | | MPAM v1.1 includes all features of | | | MPAM v1.0. | | | It must not include FORCE_NS. FORCE_NS is a feature that operates in EL3 mode. Consequently, the current Linux MPAM driver is also compatible with MPAM v0.1. To support v0.1, the existing driver which only checks ID_AA64PFR0_EL1.MPAM for the major version needs to examine ID_AA64PFR1_EL1.MPAM_frac for the minor version as well. [1] https://developer.arm.com/documentation/ddi0598/db/?lang=3Den Signed-off-by: Zeng Heng --- arch/arm64/include/asm/cpufeature.h | 7 +++++++ arch/arm64/include/asm/el2_setup.h | 4 +++- arch/arm64/kernel/cpufeature.c | 15 +++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/c= pufeature.h index 4de51f8d92cb..a57870fa96db 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -620,6 +620,13 @@ static inline bool id_aa64pfr0_mpam(u64 pfr0) return val > 0; } =20 +static inline bool id_aa64pfr1_mpamfrac(u64 pfr1) +{ + u32 val =3D cpuid_feature_extract_unsigned_field(pfr1, ID_AA64PFR1_EL1_MP= AM_frac_SHIFT); + + return val > 0; +} + static inline bool id_aa64pfr1_mte(u64 pfr1) { u32 val =3D cpuid_feature_extract_unsigned_field(pfr1, ID_AA64PFR1_EL1_MT= E_SHIFT); diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el= 2_setup.h index cacd20df1786..606cf14e4044 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -501,7 +501,9 @@ #endif =20 .macro finalise_el2_state - check_override id_aa64pfr0, ID_AA64PFR0_EL1_MPAM_SHIFT, .Linit_mpam_\@, .= Lskip_mpam_\@, x1, x2 + check_override id_aa64pfr0, ID_AA64PFR0_EL1_MPAM_SHIFT, .Linit_mpam_\@, .= Lmpam_minor_\@, x1, x2 +.Lmpam_minor_\@: + check_override id_aa64pfr1, ID_AA64PFR1_EL1_MPAM_frac_SHIFT, .Linit_mpam_= \@, .Lskip_mpam_\@, x1, x2 =20 .Linit_mpam_\@: msr_s SYS_MPAM2_EL2, xzr // use the default partition diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index c840a93b9ef9..e8fa6f7cf2a2 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1159,6 +1159,14 @@ static __init void detect_system_supports_pseudo_nmi= (void) static inline void detect_system_supports_pseudo_nmi(void) { } #endif =20 +static bool detect_ftr_has_mpam(void) +{ + u64 pfr0 =3D read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1); + u64 pfr1 =3D read_sanitised_ftr_reg(SYS_ID_AA64PFR1_EL1); + + return id_aa64pfr0_mpam(pfr0) || id_aa64pfr1_mpamfrac(pfr1); +} + void __init init_cpu_features(struct cpuinfo_arm64 *info) { /* Before we start using the tables, make sure it is sorted */ @@ -1206,7 +1214,7 @@ void __init init_cpu_features(struct cpuinfo_arm64 *i= nfo) cpacr_restore(cpacr); } =20 - if (id_aa64pfr0_mpam(read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1))) { + if (detect_ftr_has_mpam()) { info->reg_mpamidr =3D read_cpuid(MPAMIDR_EL1); init_cpu_ftr_reg(SYS_MPAMIDR_EL1, info->reg_mpamidr); } @@ -1462,7 +1470,7 @@ void update_cpu_features(int cpu, cpacr_restore(cpacr); } =20 - if (id_aa64pfr0_mpam(read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1))) { + if (detect_ftr_has_mpam()) { info->reg_mpamidr =3D read_cpuid(MPAMIDR_EL1); taint |=3D check_update_ftr_reg(SYS_MPAMIDR_EL1, cpu, info->reg_mpamidr, boot->reg_mpamidr); @@ -2473,7 +2481,7 @@ cpucap_panic_on_conflict(const struct arm64_cpu_capab= ilities *cap) static bool test_has_mpam(const struct arm64_cpu_capabilities *entry, int scope) { - if (!has_cpuid_feature(entry, scope)) + if (!detect_ftr_has_mpam()) return false; =20 /* Check firmware actually enabled MPAM on this cpu. */ @@ -3078,7 +3086,6 @@ static const struct arm64_cpu_capabilities arm64_feat= ures[] =3D { .capability =3D ARM64_MPAM, .matches =3D test_has_mpam, .cpu_enable =3D cpu_enable_mpam, - ARM64_CPUID_FIELDS(ID_AA64PFR0_EL1, MPAM, 1) }, { .desc =3D "Memory Partitioning And Monitoring Virtualisation", --=20 2.25.1