| Message ID | 1583484257-8493-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | fe13692e23b3786d4de060a98c65c922385d6c70 |
| Headers | show |
| Series | [1/2] riscv: Fix sbi_remote_sfence_vma{,_asid} | expand |
Hi Rick, On Fri, Mar 6, 2020 at 4:44 PM Bin Meng <bmeng.cn at gmail.com> wrote: > > Currently sbi_remote_sfence_vma{,_asid} does not pass their arguments > to SBI at all, which is semantically incorrect. > > This keeps in sync with Linux kernel commit: > a21344dfc6ad: fix sbi_remote_sfence_vma{,_asid} > > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > --- > > arch/riscv/include/asm/sbi.h | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > Ping? I think these 2 patches in this series should be in v2020.04 Regards, Bin
Hi Bin > From: Bin Meng [mailto:bmeng.cn at gmail.com] > Sent: Tuesday, March 10, 2020 9:54 AM > To: Lukas Auer; Rick Jian-Zhi Chen(???); U-Boot Mailing List > Subject: Re: [PATCH 1/2] riscv: Fix sbi_remote_sfence_vma{,_asid} > > Hi Rick, > > On Fri, Mar 6, 2020 at 4:44 PM Bin Meng <bmeng.cn at gmail.com> wrote: > > > > Currently sbi_remote_sfence_vma{,_asid} does not pass their arguments > > to SBI at all, which is semantically incorrect. > > > > This keeps in sync with Linux kernel commit: > > a21344dfc6ad: fix sbi_remote_sfence_vma{,_asid} > > > > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > > --- > > > > arch/riscv/include/asm/sbi.h | 19 ++++++++++++------- > > 1 file changed, 12 insertions(+), 7 deletions(-) > > > > Ping? > > I think these 2 patches in this series should be in v2020.04 OK, no problem. I will review and pull it later. Thanks, Rick > > Regards, > Bin
On Fri, 2020-03-06 at 00:44 -0800, Bin Meng wrote: > Currently sbi_remote_sfence_vma{,_asid} does not pass their arguments > to SBI at all, which is semantically incorrect. > > This keeps in sync with Linux kernel commit: > a21344dfc6ad: fix sbi_remote_sfence_vma{,_asid} > > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > --- > > arch/riscv/include/asm/sbi.h | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > Reviewed-by: Lukas Auer <lukas at auer.io>
diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index ced57de..d5081f9 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -20,22 +20,27 @@ #define SBI_REMOTE_SFENCE_VMA_ASID 7 #define SBI_SHUTDOWN 8 -#define SBI_CALL(which, arg0, arg1, arg2) ({ \ +#define SBI_CALL(which, arg0, arg1, arg2, arg3) ({ \ register uintptr_t a0 asm ("a0") = (uintptr_t)(arg0); \ register uintptr_t a1 asm ("a1") = (uintptr_t)(arg1); \ register uintptr_t a2 asm ("a2") = (uintptr_t)(arg2); \ + register uintptr_t a3 asm ("a3") = (uintptr_t)(arg3); \ register uintptr_t a7 asm ("a7") = (uintptr_t)(which); \ asm volatile ("ecall" \ : "+r" (a0) \ - : "r" (a1), "r" (a2), "r" (a7) \ + : "r" (a1), "r" (a2), "r" (a3), "r" (a7) \ : "memory"); \ a0; \ }) /* Lazy implementations until SBI is finalized */ -#define SBI_CALL_0(which) SBI_CALL(which, 0, 0, 0) -#define SBI_CALL_1(which, arg0) SBI_CALL(which, arg0, 0, 0) -#define SBI_CALL_2(which, arg0, arg1) SBI_CALL(which, arg0, arg1, 0) +#define SBI_CALL_0(which) SBI_CALL(which, 0, 0, 0, 0) +#define SBI_CALL_1(which, arg0) SBI_CALL(which, arg0, 0, 0, 0) +#define SBI_CALL_2(which, arg0, arg1) SBI_CALL(which, arg0, arg1, 0, 0) +#define SBI_CALL_3(which, arg0, arg1, arg2) \ + SBI_CALL(which, arg0, arg1, arg2, 0) +#define SBI_CALL_4(which, arg0, arg1, arg2, arg3) \ + SBI_CALL(which, arg0, arg1, arg2, arg3) static inline void sbi_console_putchar(int ch) { @@ -80,7 +85,7 @@ static inline void sbi_remote_sfence_vma(const unsigned long *hart_mask, unsigned long start, unsigned long size) { - SBI_CALL_1(SBI_REMOTE_SFENCE_VMA, hart_mask); + SBI_CALL_3(SBI_REMOTE_SFENCE_VMA, hart_mask, start, size); } static inline void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask, @@ -88,7 +93,7 @@ static inline void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask, unsigned long size, unsigned long asid) { - SBI_CALL_1(SBI_REMOTE_SFENCE_VMA_ASID, hart_mask); + SBI_CALL_4(SBI_REMOTE_SFENCE_VMA_ASID, hart_mask, start, size, asid); } #endif
Currently sbi_remote_sfence_vma{,_asid} does not pass their arguments to SBI at all, which is semantically incorrect. This keeps in sync with Linux kernel commit: a21344dfc6ad: fix sbi_remote_sfence_vma{,_asid} Signed-off-by: Bin Meng <bmeng.cn at gmail.com> --- arch/riscv/include/asm/sbi.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)