[ck] [PATCH openEuler v1 096/119] openEuler: arm64/mpam: fix hard code address map for 1620 3P

From: Xie XiuQi <xiexiuqi(a)huawei.com> commit 3b6b6c44cff2bfc2b2a16b712cd22696bb7064f4 openEuler-1.0 hulk inclusion category: bugfix bugzilla: 14212 CVE: NA The base address is hard code in current version. P1's base address changed from 0x4000xxxxxxxx to 0x200000xxxxxx. We need adjust it, or failed to enable mpam. Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Xin Hao <haoxing990(a)gmail.com> --- arch/arm64/kernel/mpam.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index eb9e38284bc7..bd94cd31c2fa 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -74,8 +74,8 @@ char *mpam_types_str[] = { * ------------------------------------ * 01 | 0 | P0 TB | 0x000098xxxxxx * 03 | 1 | P0 TA | 0x000090xxxxxx - * 05 | 2 | P1 TB | 0x400098xxxxxx - * 07 | 3 | P2 TA | 0x400090xxxxxx + * 05 | 2 | P1 TB | 0x200098xxxxxx + * 07 | 3 | P2 TA | 0x200090xxxxxx * * AFF2: MPIDR.AFF2 */ @@ -92,13 +92,13 @@ char *mpam_types_str[] = { struct mpam_node mpam_node_all[] = { MPAM_NODE(L3TALL0, MPAM_RESOURCE_CACHE, 0x000098ULL, 0xB9), MPAM_NODE(L3TALL1, MPAM_RESOURCE_CACHE, 0x000090ULL, 0xB9), - MPAM_NODE(L3TALL2, MPAM_RESOURCE_CACHE, 0x400098ULL, 0xB9), - MPAM_NODE(L3TALL3, MPAM_RESOURCE_CACHE, 0x400090ULL, 0xB9), + MPAM_NODE(L3TALL2, MPAM_RESOURCE_CACHE, 0x200098ULL, 0xB9), + MPAM_NODE(L3TALL3, MPAM_RESOURCE_CACHE, 0x200090ULL, 0xB9), MPAM_NODE(HHAALL0, MPAM_RESOURCE_MC, 0x000098ULL, 0xC1), MPAM_NODE(HHAALL1, MPAM_RESOURCE_MC, 0x000090ULL, 0xC1), - MPAM_NODE(HHAALL2, MPAM_RESOURCE_MC, 0x400098ULL, 0xC1), - MPAM_NODE(HHAALL3, MPAM_RESOURCE_MC, 0x400090ULL, 0xC1), + MPAM_NODE(HHAALL2, MPAM_RESOURCE_MC, 0x200098ULL, 0xC1), + MPAM_NODE(HHAALL3, MPAM_RESOURCE_MC, 0x200090ULL, 0xC1), }; int mpam_nodes_init(void) -- 2.31.0