Unverified Commit e3a190cb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12139 arm64/mpam: Be compatible with MPAM architecture v1.x 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WOXEPV5DNMLWYDBSLGJWWF32Z5ZBOFA4/ 
 
https://gitee.com/openeuler/kernel/issues/IAWM0R 
 
Link:https://gitee.com/openeuler/kernel/pulls/12139

 

Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 3d5cc9b3 2a6c6476

arch/arm64/kernel/mpam/mpam_device.c

+4 −2
Original line number Diff line number Diff line
@@ -127,12 +127,14 @@ mpam_probe_update_sysprops(u16 max_partid, u16 max_pmg) 


static int mpam_device_probe(struct mpam_device *dev)

{

	u64 idr;

	u32 hwfeatures, part_sel;

	u16 max_intpartid = 0;

	u16 max_partid, max_pmg;



	if (mpam_read_reg(dev, MPAMF_AIDR) != MPAM_ARCHITECTURE_V1) {

		pr_err_once("device at 0x%llx does not match MPAM architecture v1.0\n",

	idr = mpam_read_reg(dev, MPAMF_AIDR);

	if ((idr & MPAMF_AIDR_ARCH_MAJOR_REV) != MPAM_ARCHITECTURE_V1) {

		pr_err_once("device at 0x%llx does not match MPAM architecture v1.x\n",

			dev->hwpage_address);

		return -EIO;

	}

arch/arm64/kernel/mpam/mpam_resource.h

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ 
#define HAS_MSMON           BIT(30)

#define HAS_PARTID_NRW      BIT(31)



/* MPAMF_AIDR - MPAM architecture ID register */

#define MPAMF_AIDR_ARCH_MAJOR_REV       GENMASK(7, 4)

#define MPAMF_AIDR_ARCH_MINOR_REV       GENMASK(3, 0)



/* MPAMF_IDR */

#define MPAMF_IDR_PMG_MAX_MASK      ((BIT(8) - 1) << 16)

#define MPAMF_IDR_PMG_MAX_SHIFT     16