driver inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9840 ---------------------------------------------------------------------- Add workaround for hisi min_cbm When a specific device cannot be identified through the IIDR. Signed-off-by: Yifan Wu <wuyifan50@huawei.com> Signed-off-by: Hongye Lin <linhongye@h-partners.com> --- drivers/platform/mpam/mpam_devices.c | 31 ++++++++++++++++++--------- drivers/platform/mpam/mpam_internal.h | 3 +-- drivers/platform/mpam/mpam_resctrl.c | 6 +++++- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/platform/mpam/mpam_devices.c b/drivers/platform/mpam/mpam_devices.c index 6b9b7433b360..687dfa77d991 100644 --- a/drivers/platform/mpam/mpam_devices.c +++ b/drivers/platform/mpam/mpam_devices.c @@ -635,6 +635,19 @@ static int mpam_enable_quirk_hisi_cpbm_wd(struct mpam_msc *msc, const struct mpa return -EINVAL; } +static int mpam_enable_quirk_hisi_min_cbm(struct mpam_msc *msc, const struct mpam_quirk *quirk) +{ + struct mpam_msc_ris *ris; + + list_for_each_entry(ris, &msc->ris, msc_list) { + struct mpam_class *class = ris->comp->class; + + if (class->type == MPAM_CLASS_CACHE && class->level == 2) + return 0; + } + return -EINVAL; +} + static const struct mpam_quirk mpam_quirks[] = { { .iidr_mask = MPAM_IIDR_MATCH_ONE, @@ -654,6 +667,14 @@ static const struct mpam_quirk mpam_quirks[] = { {} }, .workaround = HISI_EXPAND_CPBM_WD, }, + { + .init = mpam_enable_quirk_hisi_min_cbm, + .iidr_mask = MPAM_IIDR_MATCH_ONE, + .plat = (struct acpi_platform_list[]) { + HIP13_ACPI_PLAT, + {} }, + .workaround = HISI_SHRINK_MIN_CBM, + }, { NULL } /* Sentinel */ }; @@ -1127,16 +1148,6 @@ static u64 mpam_csu_hisi_need_halved(struct mpam_msc_ris *ris, u64 now) return now >> 1; } -u32 mpam_min_cbm_bits(enum resctrl_res_level rid) -{ - if (rid == RDT_RESOURCE_L2) { - if (is_midr_in_range_list(hip13_cpus)) - return 0; - } - - return 1; -} - static bool read_msmon_mbwu_is_overflow(struct mpam_msc *msc) { u32 ctl; diff --git a/drivers/platform/mpam/mpam_internal.h b/drivers/platform/mpam/mpam_internal.h index 65bcae070d99..a3fa32d30ced 100644 --- a/drivers/platform/mpam/mpam_internal.h +++ b/drivers/platform/mpam/mpam_internal.h @@ -155,6 +155,7 @@ static inline void mpam_clear_feature(enum mpam_device_features feat, enum mpam_device_quirks { HISI_SHRINK_PMG_MAX, HISI_EXPAND_CPBM_WD, + HISI_SHRINK_MIN_CBM, MPAM_QUIRK_LAST }; @@ -373,8 +374,6 @@ int mpam_resctrl_offline_cpu(unsigned int cpu); int mpam_resctrl_setup(void); void mpam_resctrl_exit(void); -u32 mpam_min_cbm_bits(enum resctrl_res_level rid); - /* * MPAM MSCs have the following register layout. See: * Arm Architecture Reference Manual Supplement - Memory System Resource diff --git a/drivers/platform/mpam/mpam_resctrl.c b/drivers/platform/mpam/mpam_resctrl.c index d04e1f0b1911..5e937badb203 100644 --- a/drivers/platform/mpam/mpam_resctrl.c +++ b/drivers/platform/mpam/mpam_resctrl.c @@ -1173,7 +1173,11 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res) r->cache.arch_has_sparse_bitmasks = true; /* mpam_devices will reject empty bitmaps */ - r->cache.min_cbm_bits = mpam_min_cbm_bits(res->resctrl_res.rid); + r->cache.min_cbm_bits = 1; + + /* HIP13 supports disabling L2 cache entirely by setting CPBM to zero */ + if (mpam_has_quirk(HISI_SHRINK_MIN_CBM, class)) + r->cache.min_cbm_bits = 0; /* TODO: kill these properties off as they are derivatives */ r->format_str = "%d=%0*x"; -- 2.33.0