diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index caf88c460dd28..dac1ddd28e5a9 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -1380,28 +1380,41 @@ static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,
 	}
 }
 
-static u64 mpam_msmon_overflow_val(enum mpam_device_features type)
+static u64 __mpam_msmon_overflow_val(enum mpam_device_features type)
 {
 	/* TODO: implement scaling counters */
 	switch (type) {
 	case mpam_feat_msmon_mbwu_63counter:
-		return GENMASK_ULL(62, 0);
+		return BIT_ULL(hweight_long(MSMON___LWD_VALUE));
 	case mpam_feat_msmon_mbwu_44counter:
-		return GENMASK_ULL(43, 0);
+		return BIT_ULL(hweight_long(MSMON___L_VALUE));
 	case mpam_feat_msmon_mbwu_31counter:
-		return GENMASK_ULL(30, 0);
+		return BIT_ULL(hweight_long(MSMON___VALUE));
 	default:
 		return 0;
 	}
 }
 
+static u64 mpam_msmon_overflow_val(enum mpam_device_features type,
+				   struct mpam_msc *msc)
+{
+	u64 overflow_val = __mpam_msmon_overflow_val(type);
+
+	if (mpam_has_quirk(T241_MBW_COUNTER_SCALE_64, msc) &&
+	    type != mpam_feat_msmon_mbwu_63counter)
+		overflow_val *= 64;
+
+	return overflow_val;
+}
+
 /* Call with MSC lock held */
 static void __ris_msmon_read(void *arg)
 {
 	bool nrdy = false;
 	bool config_mismatch;
+	bool overflow;
 	struct mon_read *m = arg;
-	u64 now, overflow_val = 0;
+	u64 now;
 	struct mon_cfg *ctx = m->ctx;
 	bool reset_on_next_read = false;
 	struct mpam_msc_ris *ris = m->ris;
@@ -1418,7 +1431,9 @@ static void __ris_msmon_read(void *arg)
 		  FIELD_PREP(MSMON_CFG_MON_SEL_RIS, ris->ris_idx);
 	mpam_write_monsel_reg(msc, CFG_MON_SEL, mon_sel);
 
-	if (m->type == mpam_feat_msmon_mbwu) {
+	if (m->type == mpam_feat_msmon_mbwu_31counter ||
+	    m->type == mpam_feat_msmon_mbwu_44counter ||
+	    m->type == mpam_feat_msmon_mbwu_63counter) {
 		mbwu_state = &ris->mbwu_state[ctx->mon];
 		if (mbwu_state) {
 			reset_on_next_read = mbwu_state->reset_on_next_read;
@@ -1431,13 +1446,28 @@ static void __ris_msmon_read(void *arg)
 	 * This saves waiting for 'nrdy' on subsequent reads.
 	 */
 	read_msmon_ctl_flt_vals(m, &cur_ctl, &cur_flt);
+
+	if (mpam_feat_msmon_mbwu_31counter == m->type)
+		overflow = cur_ctl & MSMON_CFG_x_CTL_OFLOW_STATUS;
+	else if (mpam_feat_msmon_mbwu_44counter == m->type ||
+		 mpam_feat_msmon_mbwu_63counter == m->type)
+		overflow = cur_ctl & (MSMON_CFG_MBWU_CTL_OFLOW_STATUS_L |
+				      MSMON_CFG_x_CTL_OFLOW_STATUS);
+
 	clean_msmon_ctl_val(&cur_ctl);
 	gen_msmon_ctl_flt_vals(m, &ctl_val, &flt_val);
 	config_mismatch = cur_flt != flt_val ||
 			  cur_ctl != (ctl_val | MSMON_CFG_x_CTL_EN);
 
-	if (config_mismatch || reset_on_next_read)
+	if (config_mismatch || reset_on_next_read) {
 		write_msmon_ctl_flt_vals(m, ctl_val, flt_val);
+		overflow = false;
+	} else if (overflow) {
+		mpam_write_monsel_reg(msc, CFG_MBWU_CTL,
+				      cur_ctl &
+				      ~(MSMON_CFG_x_CTL_OFLOW_STATUS |
+					MSMON_CFG_MBWU_CTL_OFLOW_STATUS_L));
+	}
 
 	switch (m->type) {
 	case mpam_feat_msmon_csu:
@@ -1477,18 +1507,13 @@ static void __ris_msmon_read(void *arg)
 
 		mbwu_state = &ris->mbwu_state[ctx->mon];
 
-		/* Add any pre-overflow value to the mbwu_state->val */
-		if (mbwu_state->prev_val > now) {
-			overflow_val = mpam_msmon_overflow_val(m->type);
-			if (mpam_has_quirk(T241_MBW_COUNTER_SCALE_64, msc))
-				overflow_val *= 64;
-			overflow_val -= mbwu_state->prev_val;
-		}
-
-		mbwu_state->prev_val = now;
-		mbwu_state->correction += overflow_val;
+		if (overflow)
+			mbwu_state->correction += mpam_msmon_overflow_val(m->type, msc);
 
-		/* Include bandwidth consumed before the last hardware reset */
+		/*
+		 * Include bandwidth consumed before the last hardware reset and
+		 * a counter size increment for each overflow.
+		 */
 		now += mbwu_state->correction;
 		break;
 	default:
diff --git a/drivers/resctrl/mpam_internal.h b/drivers/resctrl/mpam_internal.h
index e006a1bdbd1ec..913821416bde6 100644
--- a/drivers/resctrl/mpam_internal.h
+++ b/drivers/resctrl/mpam_internal.h
@@ -327,7 +327,7 @@ struct msmon_mbwu_state {
 
 	/*
 	 * The value to add to the new reading to account for power management,
-	 * and shifts to trigger the overflow interrupt.
+	 * and overflow.
 	 */
 	u64		correction;