RISC-V: Add SBI HSM suspend related defines

We add defines related to SBI HSM suspend call and also
update HSM states naming as-per latest SBI specification.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: mason.huo <mason.huo@starfivetech.com>

diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
index 0d42693..aca43fc 100644 (file)
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@ -61,14 +61,30 @@ enum sbi_ext_hsm_fid {
        SBI_EXT_HSM_HART_START = 0,
        SBI_EXT_HSM_HART_STOP,
        SBI_EXT_HSM_HART_STATUS,
+       SBI_EXT_HSM_HART_SUSPEND,
 };
 
-enum sbi_hsm_hart_status {
-       SBI_HSM_HART_STATUS_STARTED = 0,
-       SBI_HSM_HART_STATUS_STOPPED,
-       SBI_HSM_HART_STATUS_START_PENDING,
-       SBI_HSM_HART_STATUS_STOP_PENDING,
+enum sbi_hsm_hart_state {
+       SBI_HSM_STATE_STARTED = 0,
+       SBI_HSM_STATE_STOPPED,
+       SBI_HSM_STATE_START_PENDING,
+       SBI_HSM_STATE_STOP_PENDING,
+       SBI_HSM_STATE_SUSPENDED,
+       SBI_HSM_STATE_SUSPEND_PENDING,
+       SBI_HSM_STATE_RESUME_PENDING,
 };
+#define SBI_HSM_SUSP_BASE_MASK                 0x7fffffff
+#define SBI_HSM_SUSP_NON_RET_BIT               0x80000000
+#define SBI_HSM_SUSP_PLAT_BASE                 0x10000000
+
+#define SBI_HSM_SUSPEND_RET_DEFAULT            0x00000000
+#define SBI_HSM_SUSPEND_RET_PLATFORM           SBI_HSM_SUSP_PLAT_BASE
+#define SBI_HSM_SUSPEND_RET_LAST               SBI_HSM_SUSP_BASE_MASK
+#define SBI_HSM_SUSPEND_NON_RET_DEFAULT                SBI_HSM_SUSP_NON_RET_BIT
+#define SBI_HSM_SUSPEND_NON_RET_PLATFORM       (SBI_HSM_SUSP_NON_RET_BIT | \
+                                                SBI_HSM_SUSP_PLAT_BASE)
+#define SBI_HSM_SUSPEND_NON_RET_LAST           (SBI_HSM_SUSP_NON_RET_BIT | \
+                                                SBI_HSM_SUSP_BASE_MASK)
 
 #define SBI_SPEC_VERSION_DEFAULT       0x1
 #define SBI_SPEC_VERSION_MAJOR_SHIFT   24

diff --git a/arch/riscv/kernel/cpu_ops_sbi.c b/arch/riscv/kernel/cpu_ops_sbi.c
index 685fae7..5fd90f0 100644 (file)
--- a/arch/riscv/kernel/cpu_ops_sbi.c
+++ b/arch/riscv/kernel/cpu_ops_sbi.c
@@ -97,7 +97,7 @@ static int sbi_cpu_is_stopped(unsigned int cpuid)
 
        rc = sbi_hsm_hart_get_status(hartid);
 
-       if (rc == SBI_HSM_HART_STATUS_STOPPED)
+       if (rc == SBI_HSM_STATE_STOPPED)
                return 0;
        return rc;
 }