diff --git a/arch/arm64/kernel/mpam/mpam_device.c b/arch/arm64/kernel/mpam/mpam_device.c
index b6a00ee24ec356cd4e1b2387ee41069c1c64e95d..a5011c145421e0a8e34746428d8da6a15c1f22c1 100644
--- a/arch/arm64/kernel/mpam/mpam_device.c
+++ b/arch/arm64/kernel/mpam/mpam_device.c
@@ -53,6 +53,7 @@ LIST_HEAD(mpam_classes);
 static DEFINE_MUTEX(mpam_cpuhp_lock);
 static int mpam_cpuhp_state;
 
+static bool resctrl_registered;
 
 static inline int mpam_cpu_online(unsigned int cpu);
 static inline int mpam_cpu_offline(unsigned int cpu);
@@ -431,11 +432,24 @@ static void __init mpam_enable(struct work_struct *work)
 		return;
 	}
 	cpuhp_remove_state(mpam_cpuhp_state);
-	mutex_unlock(&mpam_cpuhp_lock);
 
 	mutex_lock(&mpam_devices_lock);
 	err = mpam_resctrl_setup();
+	if (!err) {
+		err = mpam_resctrl_init();
+		if (!err)
+			resctrl_registered = true;
+	}
+	if (err)
+		pr_err("Failed to setup/init resctrl\n");
 	mutex_unlock(&mpam_devices_lock);
+
+	mpam_cpuhp_state = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
+						"mpam:online", mpam_cpu_online,
+						mpam_cpu_offline);
+	if (mpam_cpuhp_state <= 0)
+		pr_err("Failed to re-register 'dyn' cpuhp callbacks");
+	mutex_unlock(&mpam_cpuhp_lock);
 }
 
 static void mpam_failed(struct work_struct *work)
@@ -868,6 +882,9 @@ static int mpam_cpu_online(unsigned int cpu)
 		return err;
 	}
 
+	if (resctrl_registered)
+		mpam_resctrl_cpu_online(cpu);
+
 	return 0;
 }
 
@@ -881,6 +898,9 @@ static int mpam_cpu_offline(unsigned int cpu)
 
 	mutex_unlock(&mpam_devices_lock);
 
+	if (resctrl_registered)
+		mpam_resctrl_cpu_offline(cpu);
+
 	return 0;
 }
 
diff --git a/arch/arm64/kernel/mpam/mpam_internal.h b/arch/arm64/kernel/mpam/mpam_internal.h
index be4109c19de9e37670bb43f347e22026d51a51cb..106a67ef687a5fafbf2d403442bc2ab530499b00 100644
--- a/arch/arm64/kernel/mpam/mpam_internal.h
+++ b/arch/arm64/kernel/mpam/mpam_internal.h
@@ -121,9 +121,15 @@ u16 mpam_sysprops_num_pmg(void);
 
 void mpam_class_list_lock_held(void);
 
+int mpam_resctrl_cpu_online(unsigned int cpu);
+
+int mpam_resctrl_cpu_offline(unsigned int cpu);
+
 int mpam_resctrl_setup(void);
 
 struct raw_resctrl_resource *
 mpam_get_raw_resctrl_resource(u32 level);
 
+int __init mpam_resctrl_init(void);
+
 #endif
diff --git a/arch/arm64/kernel/mpam/mpam_resctrl.c b/arch/arm64/kernel/mpam/mpam_resctrl.c
index e63c8409a65b32b4732bfae14f7648f7044288d2..d15b6b8271181eeadb03eb3172f13681d14b39d1 100644
--- a/arch/arm64/kernel/mpam/mpam_resctrl.c
+++ b/arch/arm64/kernel/mpam/mpam_resctrl.c
@@ -1399,8 +1399,6 @@ static int __init mpam_init(void)
 	rdt_alloc_capable = 1;
 	rdt_mon_capable = 1;
 
-	mpam_init_padding();
-
 	ret = mpam_nodes_init();
 	if (ret) {
 		pr_err("internal error: bad cpu list\n");
@@ -1418,12 +1416,7 @@ static int __init mpam_init(void)
 		goto out;
 	}
 
-	register_resctrl_specific_files(res_specific_files, ARRAY_SIZE(res_specific_files));
-
-	seq_buf_init(&last_cmd_status, last_cmd_status_buf,
-		     sizeof(last_cmd_status_buf));
-
-	ret = resctrl_group_init();
+	ret = mpam_resctrl_init();
 	if (ret) {
 		cpuhp_remove_state(state);
 		goto out;
@@ -1444,6 +1437,19 @@ static int __init mpam_init(void)
 	return ret;
 }
 
+int __init mpam_resctrl_init(void)
+{
+	mpam_init_padding();
+
+	register_resctrl_specific_files(res_specific_files,
+			ARRAY_SIZE(res_specific_files));
+
+	seq_buf_init(&last_cmd_status, last_cmd_status_buf,
+			sizeof(last_cmd_status_buf));
+
+	return resctrl_group_init();
+}
+
 /*
  * __intel_rdt_sched_in() - Writes the task's CLOSid/RMID to IA32_PQR_MSR
  *
diff --git a/arch/arm64/kernel/mpam/mpam_setup.c b/arch/arm64/kernel/mpam/mpam_setup.c
index a80584cbe61b6641b15ce35650818131210f1cbb..c0746a9058b7d5513c1be26fb6ba3e55bb4d6a86 100644
--- a/arch/arm64/kernel/mpam/mpam_setup.c
+++ b/arch/arm64/kernel/mpam/mpam_setup.c
@@ -41,6 +41,16 @@
 struct mpam_resctrl_res mpam_resctrl_exports[RDT_NUM_RESOURCES];
 struct mpam_resctrl_res mpam_resctrl_events[RESCTRL_NUM_EVENT_IDS];
 
+int mpam_resctrl_cpu_online(unsigned int cpu)
+{
+	return 0;
+}
+
+int mpam_resctrl_cpu_offline(unsigned int cpu)
+{
+	return 0;
+}
+
 /* Test whether we can export MPAM_CLASS_CACHE:{2,3}? */
 static void mpam_resctrl_pick_caches(void)
 {