[PATCH RESEND 0/2] riscv: fix minor typos and style issues in XIP code

[PATCH RESEND 0/2] riscv: fix minor typos and style issues in XIP code

[Kunwu Chan]

Fix a few minor issues found in riscv XIP-related code:

- xip_fixup.h: comment typo (_start vs _sdata) and spaces-vs-tab
- head.S: spelling typo and wrong #endif comment

Kunwu Chan (2):
  riscv: xip_fixup.h: fix comment typo and whitespace issue
  riscv: head.S: fix typo and wrong #endif comment

 arch/riscv/include/asm/xip_fixup.h | 4 ++--
 arch/riscv/kernel/head.S           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.25.1

[PATCH RESEND 1/2] riscv: xip_fixup.h: fix comment typo and whitespace issue

[Kunwu Chan]

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: Zhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: Kunwu Chan <kunwu.chan@linux.dev>
---
 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 f3d56299bc22..56db595b0e14 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
-- 
2.25.1

[PATCH RESEND 2/2] riscv: head.S: fix typo and wrong #endif comment

[Kunwu Chan]

- Fix spelling: "intruction" -> "instruction".

- Fix #endif comment: the matching #ifdef is CONFIG_XIP_KERNEL,
  not CONFIG_XIP.

Reviewed-by: Zhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: Kunwu Chan <kunwu.chan@linux.dev>
---
 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 9c99c5ad6fe8..1618d2cb91b3 100644
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -81,7 +81,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
@@ -287,7 +287,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
-- 
2.25.1

Re: [PATCH RESEND 0/2] riscv: fix minor typos and style issues in XIP code

[Paul Walmsley]

On Sat, 14 Feb 2026, Kunwu Chan wrote:

> Fix a few minor issues found in riscv XIP-related code:
> 
> - xip_fixup.h: comment typo (_start vs _sdata) and spaces-vs-tab
> - head.S: spelling typo and wrong #endif comment

Thanks for fixing the threading, but, Conor's message:

  https://lore.kernel.org/linux-riscv/20260213-canteen-diffuser-5ecc80f264b4@spud/   

was exactly right.  Folks who care about XIP support for RISC-V first need 
to send patches to fix it in mainline.  These typo fixes should be rolled 
in to that series.  Until that happens, I plan to keep the XIP removal 
patches queued.

I also want to see the XIP folks participating in testing and reviewing 
upstream patches going forward to confirm that they don't break XIP 
support.  Otherwise, the burden is just getting pushed to patch submitters 
and maintainers, most of whom probably don't care much about XIP.  And 
there's a good chance that we'll just go through this cycle again in 
another few months.


- Paul

Re: [PATCH RESEND 0/2] riscv: fix minor typos and style issues in XIP code

[Nam Cao]

Paul Walmsley <pjw@kernel.org> writes:
> Thanks for fixing the threading, but, Conor's message:
>
>   https://lore.kernel.org/linux-riscv/20260213-canteen-diffuser-5ecc80f264b4@spud/   
>
> was exactly right.  Folks who care about XIP support for RISC-V first need 
> to send patches to fix it in mainline.  These typo fixes should be rolled 
> in to that series.  Until that happens, I plan to keep the XIP removal 
> patches queued.
>
> I also want to see the XIP folks participating in testing and reviewing 
> upstream patches going forward to confirm that they don't break XIP 
> support.  Otherwise, the burden is just getting pushed to patch submitters 
> and maintainers, most of whom probably don't care much about XIP.  And 
> there's a good chance that we'll just go through this cycle again in 
> another few months.

I would be happy to take that responsibility, if there are users. But
that does not seem to be the case.

Nam

Re: [PATCH RESEND 0/2] riscv: fix minor typos and style issues in XIP code

[Jisheng Zhang]

On Sat, Feb 14, 2026 at 10:38:02AM +0800, Kunwu Chan wrote:
> Fix a few minor issues found in riscv XIP-related code:

'RESEND' isn't expected to be used as you did in this series.
You sent the v1 series on Feb 14, only 4 days ago, the series doesn't
miss any dev window.
https://lore.kernel.org/linux-riscv/8ee1b065-b021-411b-b5ee-22c4a108cbce@linux.dev/T/#t

> 
> - xip_fixup.h: comment typo (_start vs _sdata) and spaces-vs-tab
> - head.S: spelling typo and wrong #endif comment

I'm sorry, but how important is fixing comment/spelling typo or #endif
comment among maintainship? The riscv XIP code doesn't stand on itself,
but heavily affects and is affected by other riscv arch common code.

> 
> Kunwu Chan (2):
>   riscv: xip_fixup.h: fix comment typo and whitespace issue
>   riscv: head.S: fix typo and wrong #endif comment
> 
>  arch/riscv/include/asm/xip_fixup.h | 4 ++--
>  arch/riscv/kernel/head.S           | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> -- 
> 2.25.1
> 
> 
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Re: [PATCH RESEND 0/2] riscv: fix minor typos and style issues in XIP code

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 949 bytes --]

On Fri, Feb 20, 2026 at 11:38:03PM +0800, Jisheng Zhang wrote:
> On Sat, Feb 14, 2026 at 10:38:02AM +0800, Kunwu Chan wrote:
> > Fix a few minor issues found in riscv XIP-related code:
> 
> 'RESEND' isn't expected to be used as you did in this series.
> You sent the v1 series on Feb 14, only 4 days ago, the series doesn't
> miss any dev window.
> https://lore.kernel.org/linux-riscv/8ee1b065-b021-411b-b5ee-22c4a108cbce@linux.dev/T/#t

v1 wasn't threaded correctly, so I think a resend is fine as the content
didn't change.

> > - xip_fixup.h: comment typo (_start vs _sdata) and spaces-vs-tab
> > - head.S: spelling typo and wrong #endif comment
> 
> I'm sorry, but how important is fixing comment/spelling typo or #endif
> comment among maintainship?

It's not, but I think we've made this point already!

> The riscv XIP code doesn't stand on itself,
> but heavily affects and is affected by other riscv arch common code.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH RESEND 0/2] riscv: fix minor typos and style issues in XIP code

[Paul Walmsley]

Hi,

On Sat, 14 Feb 2026, Kunwu Chan wrote:

> Fix a few minor issues found in riscv XIP-related code:
> 
> - xip_fixup.h: comment typo (_start vs _sdata) and spaces-vs-tab
> - head.S: spelling typo and wrong #endif comment
> 
> Kunwu Chan (2):
>   riscv: xip_fixup.h: fix comment typo and whitespace issue
>   riscv: head.S: fix typo and wrong #endif comment
> 
>  arch/riscv/include/asm/xip_fixup.h | 4 ++--
>  arch/riscv/kernel/head.S           | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

Please see:

  https://lore.kernel.org/linux-riscv/609b889a-8bb1-d2b5-8de6-ddeec27cac04@kernel.org/


- Paul