diff --git a/drivers/platform/mpam/mpam_resctrl.c b/drivers/platform/mpam/mpam_resctrl.c
index 041a39d61ed1897a7564267c76796e98793dba10..a6381bcdf0373dc92a6f352dce0a11cc376d9938 100644
--- a/drivers/platform/mpam/mpam_resctrl.c
+++ b/drivers/platform/mpam/mpam_resctrl.c
@@ -101,16 +101,20 @@ bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level rid)
 	}
 }
 
-int resctrl_arch_set_cdp_enabled(enum resctrl_res_level rid, bool enable)
+int resctrl_arch_set_cdp_enabled(enum resctrl_res_level ignored, bool enable)
 {
 	u64 regval;
 	struct rdt_resource *r;
-	u32 partid, partid_i, partid_d;
+	u32 i, partid, partid_i, partid_d;
 
-	r = resctrl_arch_get_resource(rid);
-	r->num_rmid = resctrl_arch_system_num_rmid_idx();
-	if (enable)
-		r->num_rmid >>= 1;
+	for (i = 0; i < RDT_NUM_RESOURCES; i++) {
+		r = resctrl_arch_get_resource(i);
+		if (r->mon_capable) {
+			r->num_rmid = resctrl_arch_system_num_rmid_idx();
+			if (enable)
+				r->num_rmid >>= 1;
+		}
+	}
 
 	cdp_enabled = enable;
 
diff --git a/include/linux/arm_mpam.h b/include/linux/arm_mpam.h
index 0c14f62a0e8f7f02b6cf4d0a7e60cae8bed47fec..3a06a8afad7c0b5d554eb77c2ee80c5675380cf8 100644
--- a/include/linux/arm_mpam.h
+++ b/include/linux/arm_mpam.h
@@ -74,7 +74,7 @@ bool resctrl_arch_would_mbm_overflow(void);
 void resctrl_arch_reset_resources(void);
 
 bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level ignored);
-int resctrl_arch_set_cdp_enabled(enum resctrl_res_level rid, bool enable);
+int resctrl_arch_set_cdp_enabled(enum resctrl_res_level ignored, bool enable);
 bool resctrl_arch_hide_cdp(enum resctrl_res_level rid);
 bool resctrl_arch_match_closid(struct task_struct *tsk, u32 closid);
 bool resctrl_arch_match_rmid(struct task_struct *tsk, u32 closid, u32 rmid);