diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h
index 97e25970393316826f2505e4941c5618d358eef9..a70133fff4505df9c1a3628b1252340853ad8cde 100644
--- a/arch/arm64/include/asm/mpam.h
+++ b/arch/arm64/include/asm/mpam.h
@@ -263,7 +263,6 @@ struct msr_param {
  * @name:		Name to use in "schemata" file
  * @num_closid:		Number of CLOSIDs available
  * @cache_level:	Which cache level defines scope of this resource
- * @default_ctrl:	Specifies default cache cbm or memory B/W percent.
  * @msr_base:		Base MSR address for CBMs
  * @msr_update:		Function pointer to update QOS MSRs
  * @data_width:		Character width of data when displaying
@@ -278,15 +277,19 @@ struct msr_param {
  */
 
 struct raw_resctrl_resource {
-	int			num_partid;
-	u32			default_ctrl;
+	u16                 num_partid;
+	u16                 num_intpartid;
+	u16                 num_pmg;
+
+	u16                 pri_wd;
+	u16                 hdl_wd;
+
 	void (*msr_update)	(struct rdt_domain *d, int partid);
 	u64  (*msr_read)	(struct rdt_domain *d, int partid);
 	int			data_width;
 	const char		*format_str;
 	int (*parse_ctrlval)	(char *buf, struct raw_resctrl_resource *r,
 				 struct rdt_domain *d);
-	int			num_pmg;
 	int			num_mon;
 	u64 (*mon_read)		(struct rdt_domain *d, struct rdtgroup *g);
 	int (*mon_write)	(struct rdt_domain *d, struct rdtgroup *g, bool enable);
diff --git a/arch/arm64/kernel/mpam/mpam_ctrlmon.c b/arch/arm64/kernel/mpam/mpam_ctrlmon.c
index 522ed65bb8107db76e55caa01da7681547e58217..0d4ba3afe419611b0e276c9775df2525016ed458 100644
--- a/arch/arm64/kernel/mpam/mpam_ctrlmon.c
+++ b/arch/arm64/kernel/mpam/mpam_ctrlmon.c
@@ -594,7 +594,6 @@ int resctrl_mkdir_ctrlmon_mondata(struct kernfs_node *parent_kn,
 int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)
 {
 	struct resctrl_resource *r;
-	struct raw_resctrl_resource *rr;
 	struct rdt_domain *d;
 	int ret;
 
@@ -602,9 +601,8 @@ int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)
 		if (!r->alloc_enabled)
 			continue;
 
-		rr = (struct raw_resctrl_resource *)r->res;
 		list_for_each_entry(d, &r->domains, list) {
-			d->new_ctrl = rr->default_ctrl;
+			d->new_ctrl = r->default_ctrl;
 			d->have_new_ctrl = true;
 		}
 
diff --git a/arch/arm64/kernel/mpam/mpam_resctrl.c b/arch/arm64/kernel/mpam/mpam_resctrl.c
index 58c7582b2eef58ea7eefacf98da48fd12e1e0db9..d4870e33c3bdb07c73062f14701345a31af1d59d 100644
--- a/arch/arm64/kernel/mpam/mpam_resctrl.c
+++ b/arch/arm64/kernel/mpam/mpam_resctrl.c
@@ -313,7 +313,7 @@ void closid_init(void)
 	for_each_resctrl_resource(r) {
 		if (r->alloc_enabled) {
 			rr = r->res;
-			num_closid = min(num_closid, rr->num_partid);
+			num_closid = min(num_closid, (int)rr->num_partid);
 		}
 	}
 	closid_free_map = BIT_MASK(num_closid) - 1;
diff --git a/arch/arm64/kernel/mpam/mpam_setup.c b/arch/arm64/kernel/mpam/mpam_setup.c
index 45639a1fecb9862c6d362870c55a2d819df0184d..265e700cd7c05970c5391910f62ca955cff66c61 100644
--- a/arch/arm64/kernel/mpam/mpam_setup.c
+++ b/arch/arm64/kernel/mpam/mpam_setup.c
@@ -331,6 +331,7 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res)
 {
 	struct mpam_class *class = res->class;
 	struct resctrl_resource *r = &res->resctrl_res;
+	struct raw_resctrl_resource *rr = NULL;
 
 	if (class == mpam_resctrl_exports[RDT_RESOURCE_SMMU].class) {
 		return 0;
@@ -339,7 +340,8 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res)
 		r->name = "MB";
 		r->fflags = RFTYPE_RES_MC;
 		r->mbw.delay_linear = true;
-		r->res = mpam_get_raw_resctrl_resource(RDT_RESOURCE_MC);
+		rr = mpam_get_raw_resctrl_resource(RDT_RESOURCE_MC);
+		r->res = rr;
 
 		if (mpam_has_feature(mpam_feat_mbw_part, class->features)) {
 			res->resctrl_mba_uses_mbw_part = true;
@@ -382,7 +384,8 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res)
 		r->mon_enabled = true;
 	} else if (class == mpam_resctrl_exports[RDT_RESOURCE_L3].class) {
 		r->rid = RDT_RESOURCE_L3;
-		r->res = mpam_get_raw_resctrl_resource(RDT_RESOURCE_L3);
+		rr = mpam_get_raw_resctrl_resource(RDT_RESOURCE_L3);
+		r->res = rr;
 		r->fflags = RFTYPE_RES_CACHE;
 		r->name = "L3";
 
@@ -413,7 +416,8 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res)
 
 	} else if (class == mpam_resctrl_exports[RDT_RESOURCE_L2].class) {
 		r->rid = RDT_RESOURCE_L2;
-		r->res = mpam_get_raw_resctrl_resource(RDT_RESOURCE_L2);
+		rr = mpam_get_raw_resctrl_resource(RDT_RESOURCE_L2);
+		r->res = rr;
 		r->fflags = RFTYPE_RES_CACHE;
 		r->name = "L2";
 
@@ -442,6 +446,15 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res)
 		r->mon_capable = false;
 	}
 
+	if (rr && class) {
+		rr->num_partid = class->num_partid;
+		rr->num_intpartid = class->num_intpartid;
+		rr->num_pmg = class->num_pmg;
+
+		rr->pri_wd = max(class->intpri_wd, class->dspri_wd);
+		rr->hdl_wd = 2;
+	}
+
 	return 0;
 }