diff mbox series

riscv: replace deprecated scall with ecall

Message ID 20230423223210.126948-1-maskray@google.com
State New
Headers
Series riscv: replace deprecated scall with ecall |

Commit Message

Fangrui Song April 23, 2023, 10:32 p.m. UTC 
  scall is a deprecated alias for ecall. ecall is used in several places,
so there is no assembler compatibility concern.

Signed-off-by: Fangrui Song <maskray@google.com>
---
 arch/riscv/kernel/entry.S             | 4 ++--
 arch/riscv/kernel/vdso/rt_sigreturn.S | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Fangrui Song May 11, 2023, 10:41 p.m. UTC | #1 
On Sun, Apr 23, 2023 at 3:32 PM Fangrui Song <maskray@google.com> wrote:
>
> scall is a deprecated alias for ecall. ecall is used in several places,
> so there is no assembler compatibility concern.
>
> Signed-off-by: Fangrui Song <maskray@google.com>
> ---
>  arch/riscv/kernel/entry.S             | 4 ++--
>  arch/riscv/kernel/vdso/rt_sigreturn.S | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
> index 99d38fdf8b18..2f51935612d1 100644
> --- a/arch/riscv/kernel/entry.S
> +++ b/arch/riscv/kernel/entry.S
> @@ -191,7 +191,7 @@ handle_syscall:
>         REG_S a0, PT_ORIG_A0(sp)
>         /*
>          * Advance SEPC to avoid executing the original
> -        * scall instruction on sret
> +        * ecall instruction on sret
>          */
>         addi s2, s2, 0x4
>         REG_S s2, PT_EPC(sp)
> @@ -603,6 +603,6 @@ END(excp_vect_table)
>  #ifndef CONFIG_MMU
>  ENTRY(__user_rt_sigreturn)
>         li a7, __NR_rt_sigreturn
> -       scall
> +       ecall
>  END(__user_rt_sigreturn)
>  #endif
> diff --git a/arch/riscv/kernel/vdso/rt_sigreturn.S b/arch/riscv/kernel/vdso/rt_sigreturn.S
> index 0573705eac76..10438c7c626a 100644
> --- a/arch/riscv/kernel/vdso/rt_sigreturn.S
> +++ b/arch/riscv/kernel/vdso/rt_sigreturn.S
> @@ -11,6 +11,6 @@ ENTRY(__vdso_rt_sigreturn)
>         .cfi_startproc
>         .cfi_signal_frame
>         li a7, __NR_rt_sigreturn
> -       scall
> +       ecall
>         .cfi_endproc
>  ENDPROC(__vdso_rt_sigreturn)
> --
> 2.40.0.634.g4ca3ef3211-goog
>

Ping:)
Fangrui Song June 13, 2023, 9:51 p.m. UTC | #2 
On Thu, May 11, 2023 at 3:41 PM Fangrui Song <maskray@google.com> wrote:
>
> On Sun, Apr 23, 2023 at 3:32 PM Fangrui Song <maskray@google.com> wrote:
> >
> > scall is a deprecated alias for ecall. ecall is used in several places,
> > so there is no assembler compatibility concern.
> >
> > Signed-off-by: Fangrui Song <maskray@google.com>
> > ---
> >  arch/riscv/kernel/entry.S             | 4 ++--
> >  arch/riscv/kernel/vdso/rt_sigreturn.S | 2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
> > index 99d38fdf8b18..2f51935612d1 100644
> > --- a/arch/riscv/kernel/entry.S
> > +++ b/arch/riscv/kernel/entry.S
> > @@ -191,7 +191,7 @@ handle_syscall:
> >         REG_S a0, PT_ORIG_A0(sp)
> >         /*
> >          * Advance SEPC to avoid executing the original
> > -        * scall instruction on sret
> > +        * ecall instruction on sret
> >          */
> >         addi s2, s2, 0x4
> >         REG_S s2, PT_EPC(sp)
> > @@ -603,6 +603,6 @@ END(excp_vect_table)
> >  #ifndef CONFIG_MMU
> >  ENTRY(__user_rt_sigreturn)
> >         li a7, __NR_rt_sigreturn
> > -       scall
> > +       ecall
> >  END(__user_rt_sigreturn)
> >  #endif
> > diff --git a/arch/riscv/kernel/vdso/rt_sigreturn.S b/arch/riscv/kernel/vdso/rt_sigreturn.S
> > index 0573705eac76..10438c7c626a 100644
> > --- a/arch/riscv/kernel/vdso/rt_sigreturn.S
> > +++ b/arch/riscv/kernel/vdso/rt_sigreturn.S
> > @@ -11,6 +11,6 @@ ENTRY(__vdso_rt_sigreturn)
> >         .cfi_startproc
> >         .cfi_signal_frame
> >         li a7, __NR_rt_sigreturn
> > -       scall
> > +       ecall
> >         .cfi_endproc
> >  ENDPROC(__vdso_rt_sigreturn)
> > --
> > 2.40.0.634.g4ca3ef3211-goog
> >
>
> Ping:)
>
>
> --
> 宋方睿

Ping^2 :)
Palmer Dabbelt June 20, 2023, 7:30 p.m. UTC | #3 
On Tue, 13 Jun 2023 14:51:56 PDT (-0700), maskray@google.com wrote:
> On Thu, May 11, 2023 at 3:41 PM Fangrui Song <maskray@google.com> wrote:
>>
>> On Sun, Apr 23, 2023 at 3:32 PM Fangrui Song <maskray@google.com> wrote:
>> >
>> > scall is a deprecated alias for ecall. ecall is used in several places,
>> > so there is no assembler compatibility concern.
>> >
>> > Signed-off-by: Fangrui Song <maskray@google.com>
>> > ---
>> >  arch/riscv/kernel/entry.S             | 4 ++--
>> >  arch/riscv/kernel/vdso/rt_sigreturn.S | 2 +-
>> >  2 files changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
>> > index 99d38fdf8b18..2f51935612d1 100644
>> > --- a/arch/riscv/kernel/entry.S
>> > +++ b/arch/riscv/kernel/entry.S
>> > @@ -191,7 +191,7 @@ handle_syscall:
>> >         REG_S a0, PT_ORIG_A0(sp)
>> >         /*
>> >          * Advance SEPC to avoid executing the original
>> > -        * scall instruction on sret
>> > +        * ecall instruction on sret
>> >          */
>> >         addi s2, s2, 0x4
>> >         REG_S s2, PT_EPC(sp)
>> > @@ -603,6 +603,6 @@ END(excp_vect_table)
>> >  #ifndef CONFIG_MMU
>> >  ENTRY(__user_rt_sigreturn)
>> >         li a7, __NR_rt_sigreturn
>> > -       scall
>> > +       ecall
>> >  END(__user_rt_sigreturn)
>> >  #endif
>> > diff --git a/arch/riscv/kernel/vdso/rt_sigreturn.S b/arch/riscv/kernel/vdso/rt_sigreturn.S
>> > index 0573705eac76..10438c7c626a 100644
>> > --- a/arch/riscv/kernel/vdso/rt_sigreturn.S
>> > +++ b/arch/riscv/kernel/vdso/rt_sigreturn.S
>> > @@ -11,6 +11,6 @@ ENTRY(__vdso_rt_sigreturn)
>> >         .cfi_startproc
>> >         .cfi_signal_frame
>> >         li a7, __NR_rt_sigreturn
>> > -       scall
>> > +       ecall
>> >         .cfi_endproc
>> >  ENDPROC(__vdso_rt_sigreturn)
>> > --
>> > 2.40.0.634.g4ca3ef3211-goog
>> >
>>
>> Ping:)
>>
>>
>> --
>> 宋方睿
>
> Ping^2 :)

Sorry this took a while, I had to fix up some merge issues but I think 
it's OK.  Should be on for-next now.
patchwork-bot+linux-riscv@kernel.org June 20, 2023, 7:40 p.m. UTC | #4 
Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@rivosinc.com>:

On Sun, 23 Apr 2023 22:32:10 +0000 you wrote:
> scall is a deprecated alias for ecall. ecall is used in several places,
> so there is no assembler compatibility concern.
> 
> Signed-off-by: Fangrui Song <maskray@google.com>
> ---
>  arch/riscv/kernel/entry.S             | 4 ++--
>  arch/riscv/kernel/vdso/rt_sigreturn.S | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Here is the summary with links:
  - riscv: replace deprecated scall with ecall
    https://git.kernel.org/riscv/c/4681dacadeef

You are awesome, thank you!
diff mbox series

Patch

diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
index 99d38fdf8b18..2f51935612d1 100644
--- a/arch/riscv/kernel/entry.S
+++ b/arch/riscv/kernel/entry.S
@@ -191,7 +191,7 @@  handle_syscall:
 	REG_S a0, PT_ORIG_A0(sp)
 	/*
 	 * Advance SEPC to avoid executing the original
-	 * scall instruction on sret
+	 * ecall instruction on sret
 	 */
 	addi s2, s2, 0x4
 	REG_S s2, PT_EPC(sp)
@@ -603,6 +603,6 @@  END(excp_vect_table)
 #ifndef CONFIG_MMU
 ENTRY(__user_rt_sigreturn)
 	li a7, __NR_rt_sigreturn
-	scall
+	ecall
 END(__user_rt_sigreturn)
 #endif
diff --git a/arch/riscv/kernel/vdso/rt_sigreturn.S b/arch/riscv/kernel/vdso/rt_sigreturn.S
index 0573705eac76..10438c7c626a 100644
--- a/arch/riscv/kernel/vdso/rt_sigreturn.S
+++ b/arch/riscv/kernel/vdso/rt_sigreturn.S
@@ -11,6 +11,6 @@  ENTRY(__vdso_rt_sigreturn)
 	.cfi_startproc
 	.cfi_signal_frame
 	li a7, __NR_rt_sigreturn
-	scall
+	ecall
 	.cfi_endproc
 ENDPROC(__vdso_rt_sigreturn)