driver inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9840 ---------------------------------------------------------------------- Add workaround for hisi llc gran 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 | 37 ++++++++++++++++++ drivers/platform/mpam/mpam_internal.h | 1 + drivers/platform/mpam/mpam_resctrl.c | 56 +++++++++++++-------------- 3 files changed, 66 insertions(+), 28 deletions(-) diff --git a/drivers/platform/mpam/mpam_devices.c b/drivers/platform/mpam/mpam_devices.c index 74e02ca99e27..d1686290ac35 100644 --- a/drivers/platform/mpam/mpam_devices.c +++ b/drivers/platform/mpam/mpam_devices.c @@ -110,6 +110,13 @@ static const struct midr_range hisi_cpus[] = { }; /* Values for the HISI workaround */ +#define HIP09_ACPI_PLAT { "HISI ", "HIP09 ", 0, ACPI_SIG_MPAM, all_versions } +#define HIP09A_ACPI_PLAT { "HISI ", "HIP09A ", 0, ACPI_SIG_MPAM, all_versions } +#define HIP10_ACPI_PLAT { "HISI ", "HIP10 ", 0, ACPI_SIG_MPAM, all_versions } +#define HIP10A_ACPI_PLAT { "HISI ", "HIP10A ", 0, ACPI_SIG_MPAM, all_versions } +#define HIP10B_ACPI_PLAT { "HISI ", "HIP10B ", 0, ACPI_SIG_MPAM, all_versions } +#define HIP10C_ACPI_PLAT { "HISI ", "HIP10C ", 0, ACPI_SIG_MPAM, all_versions } +#define HIP10D_ACPI_PLAT { "HISI ", "HIP10D ", 0, ACPI_SIG_MPAM, all_versions } #define HIP12_ACPI_PLAT { "HISI ", "HIP12 ", 0, ACPI_SIG_MPAM, all_versions } #define HIP12B_ACPI_PLAT { "HISI ", "HIP12B ", 0, ACPI_SIG_MPAM, all_versions } #define HIP13_ACPI_PLAT { "HISI ", "HIP13 ", 0, ACPI_SIG_MPAM, all_versions } @@ -661,6 +668,19 @@ static int mpam_enable_quirk_hisi_csu(struct mpam_msc *msc, const struct mpam_qu return -EINVAL; } +static int mpam_enable_quirk_hisi_llc_gran(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 == 3) + return 0; + } + return -EINVAL; +} + static const struct mpam_quirk mpam_quirks[] = { { .iidr_mask = MPAM_IIDR_MATCH_ONE, @@ -698,6 +718,23 @@ static const struct mpam_quirk mpam_quirks[] = { {} }, .workaround = HISI_CSU_WORKAROUND, }, + { + .init = mpam_enable_quirk_hisi_llc_gran, + .iidr_mask = MPAM_IIDR_MATCH_ONE, + .plat = (struct acpi_platform_list[]) { + HIP09_ACPI_PLAT, + HIP09A_ACPI_PLAT, + HIP10_ACPI_PLAT, + HIP10A_ACPI_PLAT, + HIP10B_ACPI_PLAT, + HIP10C_ACPI_PLAT, + HIP10D_ACPI_PLAT, + HIP12_ACPI_PLAT, + HIP12B_ACPI_PLAT, + HIP13_ACPI_PLAT, + {} }, + .workaround = HISI_EXPAND_LLC_GRAN, + }, { NULL } /* Sentinel */ }; diff --git a/drivers/platform/mpam/mpam_internal.h b/drivers/platform/mpam/mpam_internal.h index 33409472eb25..63e2b5c9a66f 100644 --- a/drivers/platform/mpam/mpam_internal.h +++ b/drivers/platform/mpam/mpam_internal.h @@ -157,6 +157,7 @@ enum mpam_device_quirks { HISI_EXPAND_CPBM_WD, HISI_SHRINK_MIN_CBM, HISI_CSU_WORKAROUND, + HISI_EXPAND_LLC_GRAN, MPAM_QUIRK_LAST }; diff --git a/drivers/platform/mpam/mpam_resctrl.c b/drivers/platform/mpam/mpam_resctrl.c index 5e937badb203..df9cc2201d24 100644 --- a/drivers/platform/mpam/mpam_resctrl.c +++ b/drivers/platform/mpam/mpam_resctrl.c @@ -885,19 +885,20 @@ static u16 percent_to_ca_max(u32 pc, u8 wd, struct mpam_class *class) struct rdt_resource *l3 = resctrl_arch_get_resource(RDT_RESOURCE_L3); u32 valid_max, ca_max; - if (read_cpuid_implementor() != ARM_CPU_IMP_HISI) - return percent_to_mbw_max(pc, wd); + if (mpam_has_quirk(HISI_EXPAND_LLC_GRAN, class)) { + valid_max = l3->cache.cbm_len; - valid_max = l3->cache.cbm_len; + if (mpam_has_quirk(HISI_EXPAND_CPBM_WD, class)) + valid_max = hisi_hardware_cpbm_wd; - if (mpam_has_quirk(HISI_EXPAND_CPBM_WD, class)) - valid_max = hisi_hardware_cpbm_wd; + if (pc >= MAX_MBA_BW) + return valid_max << (16 - wd); - if (pc >= MAX_MBA_BW) - return valid_max << (16 - wd); + ca_max = DIV_ROUND_UP(pc * valid_max, 100); + return ca_max << (16 - wd); + } - ca_max = DIV_ROUND_UP(pc * valid_max, 100); - return ca_max << (16 - wd); + return percent_to_mbw_max(pc, wd); } static u16 ca_max_to_percent(u16 ca_max, u8 wd, struct mpam_class *class) @@ -905,19 +906,20 @@ static u16 ca_max_to_percent(u16 ca_max, u8 wd, struct mpam_class *class) struct rdt_resource *l3 = resctrl_arch_get_resource(RDT_RESOURCE_L3); u32 valid_max; - if (read_cpuid_implementor() != ARM_CPU_IMP_HISI) - return mbw_max_to_percent(ca_max, wd); + if (mpam_has_quirk(HISI_EXPAND_LLC_GRAN, class)) { + valid_max = l3->cache.cbm_len; - valid_max = l3->cache.cbm_len; + if (mpam_has_quirk(HISI_EXPAND_CPBM_WD, class)) + valid_max = hisi_hardware_cpbm_wd; - if (mpam_has_quirk(HISI_EXPAND_CPBM_WD, class)) - valid_max = hisi_hardware_cpbm_wd; + ca_max = ca_max >> (16 - wd); + if (ca_max >= valid_max) + return MAX_MBA_BW; - ca_max = ca_max >> (16 - wd); - if (ca_max >= valid_max) - return MAX_MBA_BW; + return (ca_max * 100) / valid_max; + } - return (ca_max * 100) / valid_max; + return mbw_max_to_percent(ca_max, wd); } /* Test whether we can export MPAM_CLASS_CACHE:{2,3}? */ @@ -1138,18 +1140,16 @@ void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_domain *d) mpam_msmon_reset_all_mbwu(dom->comp); } -static void mpam_llc_gran_hisi_workaround(struct rdt_resource *r) +static void mpam_llc_gran_workaround(struct rdt_resource *r, struct mpam_class *class) { unsigned int cbm_len; - if (read_cpuid_implementor() != ARM_CPU_IMP_HISI) - return; - - if (r->fflags != RFTYPE_RES_CACHE || r->cache_level != 3) - return; + if (mpam_has_quirk(HISI_EXPAND_LLC_GRAN, class)) { + cbm_len = resctrl_arch_get_resource(RDT_RESOURCE_L3)->cache.cbm_len; + r->membw.bw_gran = max(100 / cbm_len, 1); + } - cbm_len = resctrl_arch_get_resource(RDT_RESOURCE_L3)->cache.cbm_len; - r->membw.bw_gran = max(100 / cbm_len, 1); + return; } static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res) @@ -1277,7 +1277,7 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res) r->membw.min_bw = 1; r->membw.bw_gran = max(100 / (1 << cprops->cmax_wd), 1); - mpam_llc_gran_hisi_workaround(r); + mpam_llc_gran_workaround(r, class); break; case RDT_RESOURCE_L3_MIN: @@ -1295,7 +1295,7 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res) r->membw.min_bw = 0; r->membw.bw_gran = max(100 / (1 << cprops->cmax_wd), 1); - mpam_llc_gran_hisi_workaround(r); + mpam_llc_gran_workaround(r, class); break; case RDT_RESOURCE_MB_MIN: -- 2.33.0