diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-02-24 21:20:30 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-02-24 21:20:30 +0300 |
| commit | e93d78e05abb0da1f8a8409ba93c1a836536bffc (patch) | |
| tree | d95e580f71bac93ea3efa6af5a7fe6506e757f9d /arch/riscv/kvm/vcpu_sbi_system.c | |
| parent | 4647c822764d7baaa064cf97c43cfad64e953763 (diff) | |
| parent | d252435aca44d647d57b84de5108556f9c97614a (diff) | |
| download | linux-e93d78e05abb0da1f8a8409ba93c1a836536bffc.tar.xz | |
Merge tag 'kvm-riscv-fixes-6.14-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv fixes for 6.14, take #1
- Fix hart status check in SBI HSM extension
- Fix hart suspend_type usage in SBI HSM extension
- Fix error returned by SBI IPI and TIME extensions for
unsupported function IDs
- Fix suspend_type usage in SBI SUSP extension
- Remove unnecessary vcpu kick after injecting interrupt
via IMSIC guest file
Diffstat (limited to 'arch/riscv/kvm/vcpu_sbi_system.c')
| -rw-r--r-- | arch/riscv/kvm/vcpu_sbi_system.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/riscv/kvm/vcpu_sbi_system.c b/arch/riscv/kvm/vcpu_sbi_system.c index 5d55e08791fa..bc0ebba89003 100644 --- a/arch/riscv/kvm/vcpu_sbi_system.c +++ b/arch/riscv/kvm/vcpu_sbi_system.c @@ -4,6 +4,7 @@ */ #include <linux/kvm_host.h> +#include <linux/wordpart.h> #include <asm/kvm_vcpu_sbi.h> #include <asm/sbi.h> @@ -19,7 +20,7 @@ static int kvm_sbi_ext_susp_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, switch (funcid) { case SBI_EXT_SUSP_SYSTEM_SUSPEND: - if (cp->a0 != SBI_SUSP_SLEEP_TYPE_SUSPEND_TO_RAM) { + if (lower_32_bits(cp->a0) != SBI_SUSP_SLEEP_TYPE_SUSPEND_TO_RAM) { retdata->err_val = SBI_ERR_INVALID_PARAM; return 0; } |