Re: [PATCH v5 09/22] RISC-V: KVM: Rename the SBI_STA_SHMEM_DISABLE to a generic name

On Wed, Apr 03, 2024 at 01:04:38AM -0700, Atish Patra wrote:

SBI_STA_SHMEM_DISABLE is a macro to invoke disable shared memory commands. As this can be invoked from other SBI extension context as well, rename it to more generic name as SBI_SHMEM_DISABLE.

Signed-off-by: Atish Patra atishp@rivosinc.com

arch/riscv/include/asm/sbi.h | 2 +- arch/riscv/kernel/paravirt.c | 6 +++--- arch/riscv/kvm/vcpu_sbi_sta.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 9aada4b9f7b5..f31650b10899 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -277,7 +277,7 @@ struct sbi_sta_struct { u8 pad[47]; } __packed; -#define SBI_STA_SHMEM_DISABLE -1 +#define SBI_SHMEM_DISABLE -1 /* SBI spec version fields */ #define SBI_SPEC_VERSION_DEFAULT 0x1 diff --git a/arch/riscv/kernel/paravirt.c b/arch/riscv/kernel/paravirt.c index 0d6225fd3194..fa6b0339a65d 100644 --- a/arch/riscv/kernel/paravirt.c +++ b/arch/riscv/kernel/paravirt.c @@ -62,7 +62,7 @@ static int sbi_sta_steal_time_set_shmem(unsigned long lo, unsigned long hi, ret = sbi_ecall(SBI_EXT_STA, SBI_EXT_STA_STEAL_TIME_SET_SHMEM, lo, hi, flags, 0, 0, 0); if (ret.error) {

• if (lo == SBI_STA_SHMEM_DISABLE && hi == SBI_STA_SHMEM_DISABLE)
  

• if (lo == SBI_SHMEM_DISABLE && hi == SBI_SHMEM_DISABLE)
  pr_warn("Failed to disable steal-time shmem");
  

  else pr_warn("Failed to set steal-time shmem");

@@ -84,8 +84,8 @@ static int pv_time_cpu_online(unsigned int cpu) static int pv_time_cpu_down_prepare(unsigned int cpu) {

• return sbi_sta_steal_time_set_shmem(SBI_STA_SHMEM_DISABLE,

• 			    SBI_STA_SHMEM_DISABLE, 0);
  

• return sbi_sta_steal_time_set_shmem(SBI_SHMEM_DISABLE,

• 			    SBI_SHMEM_DISABLE, 0);
  

} static u64 pv_time_steal_clock(int cpu) diff --git a/arch/riscv/kvm/vcpu_sbi_sta.c b/arch/riscv/kvm/vcpu_sbi_sta.c index d8cf9ca28c61..5f35427114c1 100644 --- a/arch/riscv/kvm/vcpu_sbi_sta.c +++ b/arch/riscv/kvm/vcpu_sbi_sta.c @@ -93,8 +93,8 @@ static int kvm_sbi_sta_steal_time_set_shmem(struct kvm_vcpu *vcpu) if (flags != 0) return SBI_ERR_INVALID_PARAM;

• if (shmem_phys_lo == SBI_STA_SHMEM_DISABLE &&

•    shmem_phys_hi == SBI_STA_SHMEM_DISABLE) {
  

• if (shmem_phys_lo == SBI_SHMEM_DISABLE &&

•    shmem_phys_hi == SBI_SHMEM_DISABLE) {
  

  vcpu->arch.sta.shmem = INVALID_GPA; return 0; }

-- 2.34.1

Reviewed-by: Andrew Jones ajones@ventanamicro.com