[PATCH] m68k: sun3: Use str_read_write() helper in mmu_emu_handle_fault()

Thorsten Blum posted 1 patch 1 year ago
arch/m68k/sun3/mmu_emu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH] m68k: sun3: Use str_read_write() helper in mmu_emu_handle_fault()
Posted by Thorsten Blum 1 year ago
Remove hard-coded strings by using the str_read_write() helper.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 arch/m68k/sun3/mmu_emu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c
index 119bd32efcfb..7b15cc12637b 100644
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/sched/mm.h>
+#include <linux/string_choices.h>
 
 #include <asm/setup.h>
 #include <asm/traps.h>
@@ -371,7 +372,7 @@ int mmu_emu_handle_fault (unsigned long vaddr, int read_flag, int kernel_fault)
 
 #ifdef DEBUG_MMU_EMU
 	pr_info("%s: vaddr=%lx type=%s crp=%p\n", __func__, vaddr,
-		read_flag ? "read" : "write", crp);
+		str_read_write(read_flag), crp);
 #endif
 
 	segment = (vaddr >> SUN3_PMEG_SIZE_BITS) & 0x7FF;
-- 
2.48.0
Re: [PATCH] m68k: sun3: Use str_read_write() helper in mmu_emu_handle_fault()
Posted by Geert Uytterhoeven 1 year ago
Hi Thorsten,

On Fri, 17 Jan 2025 at 13:06, Thorsten Blum <thorsten.blum@linux.dev> wrote:
> Remove hard-coded strings by using the str_read_write() helper.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>

Thanks for your patch!

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
i.e. will queue in the m68k tree for v6.15.

> --- a/arch/m68k/sun3/mmu_emu.c
> +++ b/arch/m68k/sun3/mmu_emu.c
> @@ -371,7 +372,7 @@ int mmu_emu_handle_fault (unsigned long vaddr, int read_flag, int kernel_fault)
>
>  #ifdef DEBUG_MMU_EMU
>         pr_info("%s: vaddr=%lx type=%s crp=%p\n", __func__, vaddr,
> -               read_flag ? "read" : "write", crp);
> +               str_read_write(read_flag), crp);

You haven't really tested this with DEBUG_MMU_EMU enabled, have you?
Fix sent.

>  #endif
>
>         segment = (vaddr >> SUN3_PMEG_SIZE_BITS) & 0x7FF;

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Re: [PATCH] m68k: sun3: Use str_read_write() helper in mmu_emu_handle_fault()
Posted by Thorsten Blum 1 year ago
On 20. Jan 2025, at 16:41, Geert Uytterhoeven wrote:
>> --- a/arch/m68k/sun3/mmu_emu.c
>> +++ b/arch/m68k/sun3/mmu_emu.c
>> @@ -371,7 +372,7 @@ int mmu_emu_handle_fault (unsigned long vaddr, int read_flag, int kernel_fault)
>> 
>> #ifdef DEBUG_MMU_EMU
>>        pr_info("%s: vaddr=%lx type=%s crp=%p\n", __func__, vaddr,
>> -               read_flag ? "read" : "write", crp);
>> +               str_read_write(read_flag), crp);
> 
> You haven't really tested this with DEBUG_MMU_EMU enabled, have you?
> Fix sent.

Sorry, I missed this question.

I compile-tested it with DEBUG_MMU_EMU, but ignored the pr_info() error
you fixed in [1].

Thanks,
Thorsten

[1] https://lore.kernel.org/linux-kernel/b1d12a1d24b4aea9f98d905383ba932b2dc382e6.1737387419.git.geert@linux-m68k.org/