riscv: Fix sbi_remote_sfence_vma{,_asid}
PATCH 1/2 riscv: Fix sbi_remote_sfence_vma{,_asid}
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}
---
arch/riscv/include/asm/sbi.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
arch/riscv/include/asm/sbi.h +12 -7
@@ -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
Signature · 1 line
2.7.4
PATCH 1/2 riscv: Fix sbi_remote_sfence_vma{,_asid}
Hi Rick,
Quoted 4 lines · Bin Meng
Currently sbi_remote_sfence_vma{,_asid} does not pass their arguments to SBI at all, which is semantically incorrect.
Quoted 9 lines
This keeps in sync with Linux kernel commit:
a21344dfc6ad: fix sbi_remote_sfence_vma{,_asid}Signed-off-by Bin Meng <[email protected]>---
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
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 riscv: Fix sbi_remote_sfence_vma{,_asid}
Hi Bin
Quoted 18 lines
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,
Quoted 10 lines · Bin Meng
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 <[email protected]>---
Quoted 7 lines
Quoted 3 lines
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
Quoted 3 lines
Regards,
Bin
PATCH 2/2 riscv: Avoid calling sbi_clear_ipi()
In reply to Bin MengThere is no need for S-mode U-Boot to call sbi_clear_ipi() as it can be cleared directly from S-mode. This saves some cycles.
---
arch/riscv/lib/sbi_ipi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/riscv/lib/sbi_ipi.c +2 -1
@@ -5,6 +5,7 @@*/ #include <common.h> +#include <asm/encoding.h> #include <asm/sbi.h> int riscv_send_ipi (int hart)
@@ -19,7 +20,7 @@ int riscv_send_ipi(int hart)int riscv_clear_ipi (int hart) { -sbi_clear_ipi (); +csr_clear (CSR_SIP ,SIP_SSIP );return 0 ; }
Signature · 1 line
2.7.4
PATCH 2/2 riscv: Avoid calling sbi_clear_ipi()
Quoted 9 lines · Bin Meng
There is no need for S-mode U-Boot to call
sbi_clear_ipi()as it can be cleared directly from S-mode. This saves some cycles.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/lib/sbi_ipi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
PATCH 1/2 riscv: Fix sbi_remote_sfence_vma{,_asid}
In reply to Bin MengQuoted 12 lines · Bin Meng
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 <[email protected]>---
arch/riscv/include/asm/sbi.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)