diff --git a/arch/arm64/kernel/mpam/mpam_device.c b/arch/arm64/kernel/mpam/mpam_device.c
index c8f2d66da051bc487f1509401cc10935ed0f0b6f..deaf990d0c747bc1207276466f7bb9184d0cf1cc 100644
--- a/arch/arm64/kernel/mpam/mpam_device.c
+++ b/arch/arm64/kernel/mpam/mpam_device.c
@@ -127,12 +127,14 @@ mpam_probe_update_sysprops(u16 max_partid, u16 max_pmg)
 
 static int mpam_device_probe(struct mpam_device *dev)
 {
+	u64 idr;
 	u32 hwfeatures, part_sel;
 	u16 max_intpartid = 0;
 	u16 max_partid, max_pmg;
 
-	if (mpam_read_reg(dev, MPAMF_AIDR) != MPAM_ARCHITECTURE_V1) {
-		pr_err_once("device at 0x%llx does not match MPAM architecture v1.0\n",
+	idr = mpam_read_reg(dev, MPAMF_AIDR);
+	if ((idr & MPAMF_AIDR_ARCH_MAJOR_REV) != MPAM_ARCHITECTURE_V1) {
+		pr_err_once("device at 0x%llx does not match MPAM architecture v1.x\n",
 			dev->hwpage_address);
 		return -EIO;
 	}
diff --git a/arch/arm64/kernel/mpam/mpam_resource.h b/arch/arm64/kernel/mpam/mpam_resource.h
index 93452498c8d10aa1fce7088dd6da1dbe8d9a42a0..7a644634c8264a7f340131238a8c461e3aff57cb 100644
--- a/arch/arm64/kernel/mpam/mpam_resource.h
+++ b/arch/arm64/kernel/mpam/mpam_resource.h
@@ -48,6 +48,10 @@
 #define HAS_MSMON           BIT(30)
 #define HAS_PARTID_NRW      BIT(31)
 
+/* MPAMF_AIDR - MPAM architecture ID register */
+#define MPAMF_AIDR_ARCH_MAJOR_REV       GENMASK(7, 4)
+#define MPAMF_AIDR_ARCH_MINOR_REV       GENMASK(3, 0)
+
 /* MPAMF_IDR */
 #define MPAMF_IDR_PMG_MAX_MASK      ((BIT(8) - 1) << 16)
 #define MPAMF_IDR_PMG_MAX_SHIFT     16