driver inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9840 ---------------------------------------------------------------------- Add workaround for hisi csu When a specific device cannot be identified through the IIDR. On specific platforms, __ris_msmon_read requires resetting the CSU. Multiple MSCs within the same component may not become nrdy simultaneously; setting reset_on_next_read separately within __ris_msmon_read could result in different reset_on_next_read values for different MSCs. Therefore, set the component's reset_on_next_read prior to invoking __ris_msmon_read. Signed-off-by: Yifan Wu <wuyifan50@huawei.com> Signed-off-by: Hongye Lin <linhongye@h-partners.com> --- drivers/platform/mpam/mpam_devices.c | 128 +++++++++++++++++--------- drivers/platform/mpam/mpam_internal.h | 6 ++ 2 files changed, 92 insertions(+), 42 deletions(-) diff --git a/drivers/platform/mpam/mpam_devices.c b/drivers/platform/mpam/mpam_devices.c index 687dfa77d991..74e02ca99e27 100644 --- a/drivers/platform/mpam/mpam_devices.c +++ b/drivers/platform/mpam/mpam_devices.c @@ -648,6 +648,19 @@ static int mpam_enable_quirk_hisi_min_cbm(struct mpam_msc *msc, const struct mpa return -EINVAL; } +static int mpam_enable_quirk_hisi_csu(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, @@ -675,6 +688,16 @@ static const struct mpam_quirk mpam_quirks[] = { {} }, .workaround = HISI_SHRINK_MIN_CBM, }, + { + .init = mpam_enable_quirk_hisi_csu, + .iidr_mask = MPAM_IIDR_MATCH_ONE, + .plat = (struct acpi_platform_list[]) { + HIP12_ACPI_PLAT, + HIP12B_ACPI_PLAT, + HIP13_ACPI_PLAT, + {} }, + .workaround = HISI_CSU_WORKAROUND, + }, { NULL } /* Sentinel */ }; @@ -1058,22 +1081,6 @@ static void read_msmon_ctl_flt_vals(struct mon_read *m, u32 *ctl_val, } } -static bool mpam_csu_hisi_need_retrigger(struct mpam_msc_ris *ris, - bool read_again) -{ - if (ris->comp->class->type != MPAM_CLASS_CACHE || - ris->comp->class->level != 3) - return false; - - if (!is_midr_in_range_list(hisi_cpus)) - return false; - - if (read_again) - return false; - - return true; -} - static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val, u32 flt_val) { @@ -1136,18 +1143,6 @@ static bool mpam_ris_has_nrdy_bit(struct mpam_msc_ris *ris) return true; } -static u64 mpam_csu_hisi_need_halved(struct mpam_msc_ris *ris, u64 now) -{ - if (!is_midr_in_range_list(hisi_cpus)) - return now; - - if (ris->comp->class->type != MPAM_CLASS_CACHE || - ris->comp->class->level != 3) - return now; - - return now >> 1; -} - static bool read_msmon_mbwu_is_overflow(struct mpam_msc *msc) { u32 ctl; @@ -1176,6 +1171,7 @@ static void __ris_msmon_read(void *arg) struct mpam_msc_ris *ris = m->ris; struct mpam_msc *msc = m->ris->msc; struct msmon_mbwu_state *mbwu_state = NULL; + struct msmon_csu_state *csu_state = NULL; u32 mon_sel, ctl_val, flt_val, cur_ctl, cur_flt; lockdep_assert_held(&msc->lock); @@ -1187,8 +1183,8 @@ static void __ris_msmon_read(void *arg) /* Selects a monitor instance to configure PARTID. */ wmb(); - - if (m->type == mpam_feat_msmon_mbwu) { + switch (m->type) { + case mpam_feat_msmon_mbwu: mbwu_state = &ris->mbwu_state[ctx->mon]; if (mbwu_state) { reset_on_next_read = mbwu_state->reset_on_next_read; @@ -1199,6 +1195,16 @@ static void __ris_msmon_read(void *arg) } mbwu_overflow = read_msmon_mbwu_is_overflow(msc); + break; + case mpam_feat_msmon_csu: + csu_state = &ris->csu_state[ctx->mon]; + if (csu_state) { + reset_on_next_read = csu_state->reset_on_next_read; + csu_state->reset_on_next_read = false; + } + break; + default: + return; } /* @@ -1210,8 +1216,7 @@ static void __ris_msmon_read(void *arg) config_mismatch = cur_flt != flt_val || cur_ctl != (ctl_val | MSMON_CFG_x_CTL_EN); - if (config_mismatch || reset_on_next_read || - mpam_csu_hisi_need_retrigger(ris, m->err == -EBUSY)) { + if (config_mismatch || reset_on_next_read) { write_msmon_ctl_flt_vals(m, ctl_val, flt_val); if (mbwu_state) { mbwu_state->correction = 0; @@ -1230,7 +1235,9 @@ static void __ris_msmon_read(void *arg) now = mpam_read_monsel_reg(msc, CSU); nrdy = now & MSMON___NRDY; now = FIELD_GET(MSMON___VALUE, now); - now = mpam_csu_hisi_need_halved(ris, now); + if (!nrdy && mpam_has_quirk(HISI_CSU_WORKAROUND, msc)) { + now >>= 1; + } break; case mpam_feat_msmon_mbwu: /* @@ -1328,9 +1335,12 @@ static int _msmon_read(struct mpam_component *comp, struct mon_read *arg) int mpam_msmon_read(struct mpam_component *comp, struct mon_cfg *ctx, enum mpam_device_features type, u64 *val) { - struct mon_read arg; struct mpam_props *cprops = &comp->class->props; - int err = 0; + struct mpam_msc_ris *ris; + struct mpam_msc *msc; + struct mon_read arg; + unsigned long flags; + int err = 0, idx; might_sleep(); @@ -1347,6 +1357,18 @@ int mpam_msmon_read(struct mpam_component *comp, struct mon_cfg *ctx, arg.err = 0; *val = 0; + if (mpam_has_quirk(HISI_CSU_WORKAROUND, comp->class)) { + idx = srcu_read_lock(&mpam_srcu); + list_for_each_entry_rcu(ris, &comp->ris, comp_list) { + msc = ris->msc; + spin_lock_irqsave(&msc->mon_sel_lock, flags); + if (ris->csu_state) + ris->csu_state[ctx->mon].reset_on_next_read = true; + spin_unlock_irqrestore(&msc->mon_sel_lock, flags); + } + srcu_read_unlock(&mpam_srcu, idx); + } + err = _msmon_read(comp, &arg); if (err == -EBUSY && comp->class->nrdy_usec) { fsleep(comp->class->nrdy_usec); @@ -2478,6 +2500,7 @@ static void __destroy_component_cfg(struct mpam_component *comp) unsigned long flags; struct mpam_msc_ris *ris; struct msmon_mbwu_state *mbwu_state; + struct msmon_csu_state *csu_state; kfree(comp->cfg); comp->cfg = NULL; @@ -2485,11 +2508,14 @@ static void __destroy_component_cfg(struct mpam_component *comp) mutex_lock(&ris->msc->lock); spin_lock_irqsave(&ris->msc->mon_sel_lock, flags); mbwu_state = ris->mbwu_state; + csu_state = ris->csu_state; ris->mbwu_state = NULL; + ris->csu_state = NULL; spin_unlock_irqrestore(&ris->msc->mon_sel_lock, flags); mutex_unlock(&ris->msc->lock); kfree(mbwu_state); + kfree(csu_state); } } @@ -2497,7 +2523,8 @@ static int __allocate_component_cfg(struct mpam_component *comp) { unsigned long flags; struct mpam_msc_ris *ris; - struct msmon_mbwu_state *mbwu_state; + struct msmon_mbwu_state *mbwu_state = NULL; + struct msmon_csu_state *csu_state = NULL; if (comp->cfg) return 0; @@ -2508,24 +2535,41 @@ static int __allocate_component_cfg(struct mpam_component *comp) return -ENOMEM; list_for_each_entry(ris, &comp->ris, comp_list) { - if (!ris->props.num_mbwu_mon) + if (!ris->props.num_mbwu_mon && !ris->props.num_csu_mon) continue; - mbwu_state = kcalloc(ris->props.num_mbwu_mon, - sizeof(*ris->mbwu_state), GFP_KERNEL); - if (!mbwu_state) { - __destroy_component_cfg(comp); - return -ENOMEM; + mbwu_state = NULL; + csu_state = NULL; + + if (ris->props.num_mbwu_mon) { + mbwu_state = kcalloc(ris->props.num_mbwu_mon, + sizeof(*ris->mbwu_state), GFP_KERNEL); + if (!mbwu_state) + goto out; + } + + if (ris->props.num_csu_mon) { + csu_state = kcalloc(ris->props.num_csu_mon, + sizeof(*ris->csu_state), GFP_KERNEL); + if (!csu_state) + goto out; } mutex_lock(&ris->msc->lock); spin_lock_irqsave(&ris->msc->mon_sel_lock, flags); ris->mbwu_state = mbwu_state; + ris->csu_state = csu_state; spin_unlock_irqrestore(&ris->msc->mon_sel_lock, flags); mutex_unlock(&ris->msc->lock); } return 0; + +out: + kfree(mbwu_state); + kfree(csu_state); + __destroy_component_cfg(comp); + return -ENOMEM; } static int mpam_allocate_config(void) diff --git a/drivers/platform/mpam/mpam_internal.h b/drivers/platform/mpam/mpam_internal.h index a3fa32d30ced..33409472eb25 100644 --- a/drivers/platform/mpam/mpam_internal.h +++ b/drivers/platform/mpam/mpam_internal.h @@ -156,6 +156,7 @@ enum mpam_device_quirks { HISI_SHRINK_PMG_MAX, HISI_EXPAND_CPBM_WD, HISI_SHRINK_MIN_CBM, + HISI_CSU_WORKAROUND, MPAM_QUIRK_LAST }; @@ -275,6 +276,10 @@ struct msmon_mbwu_state { u64 correction; }; +struct msmon_csu_state { + bool reset_on_next_read; +}; + struct mpam_msc_ris { u8 ris_idx; u64 idr; @@ -297,6 +302,7 @@ struct mpam_msc_ris { /* msmon mbwu configuration is preserved over reset */ struct msmon_mbwu_state *mbwu_state; + struct msmon_csu_state *csu_state; struct dentry *debugfs; }; -- 2.33.0