Commit 843a90db authored by Xie XiuQi's avatar Xie XiuQi Committed by Zheng Zengkai
Browse files

arm64/mpam: correct num of partid/pmg 



hulk inclusion
category: bugfix
bugzilla: 48265
CVE: NA

--------------------------------

Perious we hard code num of partids and pmgs, now
we get it from MPAMF_IDS regs. The id is start from 0,
so NUM = MAX + 1. Fix it.

Hi1620's new spec use NUM_MAX as the MAX id of partid/pmg.

Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: default avatarCheng Jian <cj.chengjian@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 143014f7

arch/arm64/kernel/mpam.c

+2 −2
Original line number Diff line number Diff line
@@ -1215,8 +1215,8 @@ static void mpam_domains_init(struct resctrl_resource *r) 
		rr->default_ctrl = n->default_ctrl;



		val = mpam_readl(d->base + MPAMF_IDR);

		rr->num_partid = MPAMF_IDR_PARTID_MAX_GET(val);

		rr->num_pmg = MPAMF_IDR_PMG_MAX_GET(val);

		rr->num_partid = MPAMF_IDR_PARTID_MAX_GET(val) + 1;

		rr->num_pmg = MPAMF_IDR_PMG_MAX_GET(val) + 1;



		r->mon_capable = MPAMF_IDR_HAS_MSMON(val);

		r->mon_enabled = MPAMF_IDR_HAS_MSMON(val);