hulk inclusion category: feature bugzilla: https://atomgit.com/openeuler/kernel/issues/8420 ------------------ This reverts commit 6420897facc73e9a86d9a1c6deababcf4d0a22cd. --- drivers/platform/mpam/mpam_resctrl.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/platform/mpam/mpam_resctrl.c b/drivers/platform/mpam/mpam_resctrl.c index 18e23f47a5c1..3b53eccda018 100644 --- a/drivers/platform/mpam/mpam_resctrl.c +++ b/drivers/platform/mpam/mpam_resctrl.c @@ -151,24 +151,8 @@ u32 resctrl_arch_get_num_closid(struct rdt_resource *ignored) return mpam_intpartid_max + 1; } -/* It's valid only after mpam_resctrl_pick_mba() */ static u32 get_num_reqpartid(void) { - struct mpam_resctrl_res *res; - struct rdt_resource *r_mba; - struct mpam_props *cprops; - - r_mba = resctrl_arch_get_resource(RDT_RESOURCE_MBA); - res = container_of(r_mba, struct mpam_resctrl_res, resctrl_res); - cprops = &res->class->props; - - /* - * If the MBA does not support Narrow-PARTID, - * then the feature should be disabled at the system level. - */ - if (!mpam_has_feature(mpam_feat_partid_nrw, cprops)) - return resctrl_arch_get_num_closid(NULL); - return mpam_partid_max + 1; } @@ -1234,9 +1218,9 @@ int mpam_resctrl_setup(void) res->resctrl_res.rid = i; } + mpam_resctrl_pick_caches(); mpam_resctrl_pick_mba(); /* TODO: mpam_resctrl_pick_counters(); */ - mpam_resctrl_pick_caches(); for (i = 0; i < RDT_NUM_RESOURCES; i++) { res = &mpam_resctrl_exports[i]; -- 2.25.1