projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e1e1058
)
riscv: Fixed wrong register in XIP_FIXUP_FLASH_OFFSET macro
author
Frederik Haxel
<haxel@fzi.de>
Tue, 12 Dec 2023 13:01:13 +0000
(14:01 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 23:35:50 +0000
(15:35 -0800)
[ Upstream commit
5daa3726410288075ba73c336bb2e80d6b06aa4d
]
During the refactoring, a bug was introduced in the rarly used
XIP_FIXUP_FLASH_OFFSET macro.
Fixes:
bee7fbc38579
("RISC-V CPU Idle Support")
Fixes:
e7681beba992
("RISC-V: Split out the XIP fixups into their own file")
Signed-off-by: Frederik Haxel <haxel@fzi.de>
Link:
https://lore.kernel.org/r/20231212130116.848530-3-haxel@fzi.de
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/riscv/include/asm/xip_fixup.h
patch
|
blob
|
history
diff --git
a/arch/riscv/include/asm/xip_fixup.h
b/arch/riscv/include/asm/xip_fixup.h
index
d4ffc3c
..
b65bf63
100644
(file)
--- a/
arch/riscv/include/asm/xip_fixup.h
+++ b/
arch/riscv/include/asm/xip_fixup.h
@@
-13,7
+13,7
@@
add \reg, \reg, t0
.endm
.macro XIP_FIXUP_FLASH_OFFSET reg
- la t
1
, __data_loc
+ la t
0
, __data_loc
REG_L t1, _xip_phys_offset
sub \reg, \reg, t1
add \reg, \reg, t0