Commit 434eea4a authored by Wang ShaoBo's avatar Wang ShaoBo Committed by Zheng Zengkai
Browse files

mpam : fix missing fill MSMON_CFG_MON_SEL register 



hulk inclusion
category: bugfix
bugzilla: 48265
CVE: NA

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

MSMON_CFG_MON_SEL should be set when mpam driver attempt to write/read, fix the
problem by filling MSMON_CFG_MON_SEL with according mon ID.

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

arch/arm64/kernel/mpam.c

+4 −4
Original line number Diff line number Diff line
@@ -247,14 +247,14 @@ static int mbwu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable) 
{

	u32 mon, pmg, partid, flt, ctl = 0;



	if (enable) {

	mon = g->mon.mon;

	mpam_writel(mon, d->base + MSMON_CFG_MON_SEL);

	if (enable) {

		pmg = g->mon.rmid;

		partid = g->closid;

		flt = MSMON_CFG_FLT_SET(pmg, partid);

		ctl = MSMON_CFG_MBWU_CTL_SET(MSMON_MATCH_PMG|MSMON_MATCH_PARTID);



		mpam_writel(mon, d->base + MSMON_CFG_MON_SEL);

		mpam_writel(flt, d->base + MSMON_CFG_MBWU_FLT);

	}
@@ -267,14 +267,14 @@ static int csu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable) 
{

	u32 mon, pmg, partid, flt, ctl = 0;



	if (enable) {

	mon = g->mon.mon;

	mpam_writel(mon, d->base + MSMON_CFG_MON_SEL);

	if (enable) {

		pmg = g->mon.rmid;

		partid = g->closid;

		flt = MSMON_CFG_FLT_SET(pmg, partid);

		ctl = MSMON_CFG_CSU_CTL_SET(MSMON_MATCH_PMG|MSMON_MATCH_PARTID);



		mpam_writel(mon, d->base + MSMON_CFG_MON_SEL);

		mpam_writel(flt, d->base + MSMON_CFG_CSU_FLT);

	}