hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ID65P3 -------------------------------- On certain specific chip platforms, the PMG function is not fully supported. Using a non-zero PMG as a monitoring resource can lead to the loss of write traffic statistics. Therefore, impose restrictions on the PMG usage range for such chips. Fixes: 9cb26074545b ("arm_mpam: Probe MSCs to find the supported partid/pmg values") Signed-off-by: Zeng Heng <zengheng4@huawei.com> --- drivers/platform/mpam/mpam_devices.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/platform/mpam/mpam_devices.c b/drivers/platform/mpam/mpam_devices.c index ebc8887d8267..82e592a527fc 100644 --- a/drivers/platform/mpam/mpam_devices.c +++ b/drivers/platform/mpam/mpam_devices.c @@ -745,6 +745,19 @@ static void mpam_ris_hw_probe(struct mpam_msc_ris *ris) } } +static int mpam_pmg_max_workaround(u64 idr) +{ + static const struct midr_range cpus[] = { + MIDR_ALL_VERSIONS(MIDR_HISI_HIP12), + { /* sentinel */ } + }; + + if (is_midr_in_range_list(cpus)) + return 0; + + return FIELD_GET(MPAMF_IDR_PMG_MAX, idr); +} + static int mpam_msc_hw_probe(struct mpam_msc *msc) { u64 idr; @@ -770,7 +783,7 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc) /* Use these values so partid/pmg always starts with a valid value */ msc->partid_max = FIELD_GET(MPAMF_IDR_PARTID_MAX, idr); - msc->pmg_max = FIELD_GET(MPAMF_IDR_PMG_MAX, idr); + msc->pmg_max = mpam_pmg_max_workaround(idr); for (ris_idx = 0; ris_idx <= msc->ris_max; ris_idx++) { spin_lock(&msc->part_sel_lock); -- 2.25.1