From: Jiaxun Yang Date: Mon, 3 Jun 2024 07:45:53 +0000 (+0800) Subject: LoongArch: Override higher address bits in JUMP_VIRT_ADDR X-Git-Tag: v6.10-rc3~41^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1098efd299ffe9c8af818425338c7f6c4f930a98;p=thirdparty%2Fkernel%2Flinux.git LoongArch: Override higher address bits in JUMP_VIRT_ADDR In JUMP_VIRT_ADDR we are performing an or calculation on address value directly from pcaddi. This will only work if we are currently running from direct 1:1 mapping addresses or firmware's DMW is configured exactly same as kernel. Still, we should not rely on such assumption. Fix by overriding higher bits in address comes from pcaddi, so we can get rid of or operator. Cc: stable@vger.kernel.org Signed-off-by: Jiaxun Yang Signed-off-by: Huacai Chen --- diff --git a/arch/loongarch/include/asm/stackframe.h b/arch/loongarch/include/asm/stackframe.h index 45b507a7b06fc..d9eafd3ee3d1e 100644 --- a/arch/loongarch/include/asm/stackframe.h +++ b/arch/loongarch/include/asm/stackframe.h @@ -42,7 +42,7 @@ .macro JUMP_VIRT_ADDR temp1 temp2 li.d \temp1, CACHE_BASE pcaddi \temp2, 0 - or \temp1, \temp1, \temp2 + bstrins.d \temp1, \temp2, (DMW_PABITS - 1), 0 jirl zero, \temp1, 0xc .endm