LoongArch: Override higher address bits in JUMP_VIRT_ADDR

BugLink: https://bugs.launchpad.net/bugs/2073788

commit 1098efd299ffe9c8af818425338c7f6c4f930a98 upstream.

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 <jiaxun.yang@flygoat.com>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>

This commit is contained in:

Jiaxun Yang

2024-06-03 15:45:53 +08:00

committed by

Roxana Nicolescu

parent 1bacd34468

commit ff25c42581

1 changed files with 1 additions and 1 deletions

									
										arch/loongarch/include/asm/stackframe.h
									
		+1
		-1
	
												View File
												
				@@ -41,7 +41,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