From 4fdabaffd7c08924851d403891edbd43cad2ed27 Mon Sep 17 00:00:00 2001 From: Kunwu Chan Date: Fri, 13 Feb 2026 17:52:40 +0800 Subject: [PATCH 1/2] riscv: xip_fixup.h: fix comment typo and whitespace issue Fix two minor issues in XIP_FIXUP_OFFSET macro: - The comment describes the fixup formula as "reg += CONFIG_PHYS_RAM_BASE - _start", but the actual assembly code subtracts _sdata, not _start. Fix the comment to match. - Replace spaces with a tab for the "add" instruction to keep consistent indentation with surrounding lines. Reviewed-by: zhouzhouyi Signed-off-by: Kunwu Chan Signed-off-by: Linux RISC-V bot --- arch/riscv/include/asm/xip_fixup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/xip_fixup.h b/arch/riscv/include/asm/xip_fixup.h index f3d56299bc22c5..56db595b0e1498 100644 --- a/arch/riscv/include/asm/xip_fixup.h +++ b/arch/riscv/include/asm/xip_fixup.h @@ -16,10 +16,10 @@ * * The start of data in Flash is _sdata and the start of data in RAM is * CONFIG_PHYS_RAM_BASE. So this fix-up essentially does this: - * reg += CONFIG_PHYS_RAM_BASE - _start + * reg += CONFIG_PHYS_RAM_BASE - _sdata */ li t0, CONFIG_PHYS_RAM_BASE - add \reg, \reg, t0 + add \reg, \reg, t0 la t0, _sdata sub \reg, \reg, t0 .endm From c9a098e5460476ce895f2d7bb23dbf958507e8b2 Mon Sep 17 00:00:00 2001 From: Kunwu Chan Date: Fri, 13 Feb 2026 17:52:41 +0800 Subject: [PATCH 2/2] riscv: head.S: fix typo and wrong #endif comment - Fix spelling: "intruction" -> "instruction". - Fix #endif comment: the matching #ifdef is CONFIG_XIP_KERNEL, not CONFIG_XIP. Reviewed-by: zhouzhouyi Signed-off-by: Kunwu Chan Signed-off-by: Linux RISC-V bot --- arch/riscv/kernel/head.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index bdf3352acf4cb4..f42aa50de6edcc 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -80,7 +80,7 @@ relocate_enable_mmu: sub a1, a1, a2 add ra, ra, a1 - /* Point stvec to virtual address of intruction after satp write */ + /* Point stvec to virtual address of instruction after satp write */ la a2, 1f add a2, a2, a1 csrw CSR_TVEC, a2 @@ -273,7 +273,7 @@ SYM_CODE_START(_start_kernel) /* first time here if hart_lottery in RAM is not set */ beq t0, t1, .Lsecondary_start -#endif /* CONFIG_XIP */ +#endif /* CONFIG_XIP_KERNEL */ #endif /* CONFIG_RISCV_BOOT_SPINWAIT */ #ifdef CONFIG_XIP_KERNEL