Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230423223210.126948-1-maskray@google.com>
In-Reply-To: <20230423223210.126948-1-maskray@google.com>
From:   Fangrui Song <maskray@google.com>
Date:   Thu, 11 May 2023 15:41:48 -0700
Message-ID: <CAFP8O3LksO-4JAoRnx9ND0E9rRyqb6xsUsGtBVQXOsaYxLmhBQ@mail.gmail.com>
Subject: Re: [PATCH] riscv: replace deprecated scall with ecall
To:     Paul Walmsley <paul.walmsley@sifive.com>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        linux-riscv@lists.infradead.org
Cc:     linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sun, Apr 23, 2023 at 3:32=E2=80=AFPM Fangrui Song <maskray@google.com> w=
rote:
>
> 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/vd=
so/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:)


--=20
=E5=AE=8B=E6=96=B9=E7=9D=BF