Skip to content

Commit 2d4fbad

Browse files
Avenger-285714Sasha Levin
authored and
Sasha Levin
committed
riscv: KGDB: Remove ".option norvc/.option rvc" for kgdb_compiled_break
[ Upstream commit 550c2aa ] [ Quoting Samuel Holland: ] This is a separate issue, but using ".option rvc" here is a bug. It will unconditionally enable the C extension for the rest of the file, even if the kernel is being built with CONFIG_RISCV_ISA_C=n. [ Quoting Palmer Dabbelt: ] We're just looking at the address of kgdb_compiled_break, so it's fine if it ends up as a c.ebreak. [ Quoting Alexandre Ghiti: ] .option norvc is used to prevent the assembler from using compressed instructions, but it's generally used when we need to ensure the size of the instructions that are used, which is not the case here as noted by Palmer since we only care about the address. So yes it will work fine with C enabled :) So let's just remove them all. Link: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/mhng-69513841-5068-441d-be8f-2aeebdc56a08@palmer-ri-x1c9a/ Link: https://lore.kernel.org/all/[email protected]/ Fixes: fe89bd2 ("riscv: Add KGDB support") Cc: Samuel Holland <[email protected]> Cc: Palmer Dabbelt <[email protected]> Cc: Alexandre Ghiti <[email protected]> Signed-off-by: WangYuli <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent d158c89 commit 2d4fbad

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/riscv/kernel/kgdb.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)
257257
noinline void arch_kgdb_breakpoint(void)
258258
{
259259
asm(".global kgdb_compiled_break\n"
260-
".option norvc\n"
261-
"kgdb_compiled_break: ebreak\n"
262-
".option rvc\n");
260+
"kgdb_compiled_break: ebreak\n");
263261
}
264262

265263
void kgdb_arch_handle_qxfer_pkt(char *remcom_in_buffer,

0 commit comments

Comments
 (0)