[PATCH v2 2/2] arm_mpam: Update architecture version check for MPAM MSC
From: Zeng Heng <hidden>
Date: 2026-02-03 09:54:41
Also in:
lkml
Subsystem:
mpam driver, the rest · Maintainers:
James Morse, Ben Horgan, Linus Torvalds
In addition to updating the CPU MPAM version check, the MPAM MSC version check also need to be updated. mpam_msc_check_aidr() is added to check the MSC AIDR register, ensuring that both the major and minor version numbers fall within the supported range of the MPAM architecture version. Signed-off-by: Zeng Heng <redacted> --- drivers/resctrl/mpam_devices.c | 16 +++++++++++++--- drivers/resctrl/mpam_internal.h | 5 ++++- 2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index 744df3a6a078..a58031f0a280 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c@@ -202,6 +202,17 @@ static inline void _mpam_write_monsel_reg(struct mpam_msc *msc, u16 reg, u32 val #define mpam_write_monsel_reg(msc, reg, val) _mpam_write_monsel_reg(msc, MSMON_##reg, val) +static bool mpam_msc_check_aidr(struct mpam_msc *msc) +{ + u32 rev; + + rev = __mpam_read_reg(msc, MPAMF_AIDR) & MPAMF_AIDR_ARCH_REV; + + return rev == MPAM_ARCHITECTURE_V0_1 || + rev == MPAM_ARCHITECTURE_V1_0 || + rev == MPAM_ARCHITECTURE_V1_1; +} + static u64 mpam_msc_read_idr(struct mpam_msc *msc) { u64 idr_high = 0, idr_low;
@@ -842,9 +853,8 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc) lockdep_assert_held(&msc->probe_lock); - idr = __mpam_read_reg(msc, MPAMF_AIDR); - if ((idr & MPAMF_AIDR_ARCH_MAJOR_REV) != MPAM_ARCHITECTURE_V1) { - dev_err_once(dev, "MSC does not match MPAM architecture v1.x\n"); + if (!mpam_msc_check_aidr(msc)) { + dev_err_once(dev, "MSC does not match MPAM architecture\n"); return -EIO; }
diff --git a/drivers/resctrl/mpam_internal.h b/drivers/resctrl/mpam_internal.h
index e79c3c47259c..7c6431405d5a 100644
--- a/drivers/resctrl/mpam_internal.h
+++ b/drivers/resctrl/mpam_internal.h@@ -394,7 +394,9 @@ int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level, * Component Specification. * https://developer.arm.com/documentation/ihi0099/aa/ */ -#define MPAM_ARCHITECTURE_V1 0x10 +#define MPAM_ARCHITECTURE_V0_1 0x01 +#define MPAM_ARCHITECTURE_V1_0 0x10 +#define MPAM_ARCHITECTURE_V1_1 0x11 /* Memory mapped control pages */ /* ID Register offsets in the memory mapped page */
@@ -518,6 +520,7 @@ int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level, /* MPAMF_AIDR - MPAM architecture ID register */ #define MPAMF_AIDR_ARCH_MINOR_REV GENMASK(3, 0) #define MPAMF_AIDR_ARCH_MAJOR_REV GENMASK(7, 4) +#define MPAMF_AIDR_ARCH_REV (MPAMF_AIDR_ARCH_MAJOR_REV | MPAMF_AIDR_ARCH_MINOR_REV) /* MPAMCFG_PART_SEL - MPAM partition configuration selection register */ #define MPAMCFG_PART_SEL_PARTID_SEL GENMASK(15, 0)
--
2.25.1