projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'kvmarm-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar...
[platform/kernel/linux-rpi.git]
/
arch
/
arm64
/
kvm
/
guest.c
diff --git
a/arch/arm64/kvm/guest.c
b/arch/arm64/kvm/guest.c
index
6cb39ee
..
5cb4a1c
100644
(file)
--- a/
arch/arm64/kvm/guest.c
+++ b/
arch/arm64/kvm/guest.c
@@
-299,7
+299,7
@@
static int get_sve_vls(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
memset(vqs, 0, sizeof(vqs));
memset(vqs, 0, sizeof(vqs));
- max_vq =
sve_vq_from_vl(vcpu->arch.sve_max_vl
);
+ max_vq =
vcpu_sve_max_vq(vcpu
);
for (vq = SVE_VQ_MIN; vq <= max_vq; ++vq)
if (sve_vq_available(vq))
vqs[vq_word(vq)] |= vq_mask(vq);
for (vq = SVE_VQ_MIN; vq <= max_vq; ++vq)
if (sve_vq_available(vq))
vqs[vq_word(vq)] |= vq_mask(vq);
@@
-427,7
+427,7
@@
static int sve_reg_to_region(struct sve_state_reg_region *region,
if (!vcpu_has_sve(vcpu) || (reg->id & SVE_REG_SLICE_MASK) > 0)
return -ENOENT;
if (!vcpu_has_sve(vcpu) || (reg->id & SVE_REG_SLICE_MASK) > 0)
return -ENOENT;
- vq =
sve_vq_from_vl(vcpu->arch.sve_max_vl
);
+ vq =
vcpu_sve_max_vq(vcpu
);
reqoffset = SVE_SIG_ZREG_OFFSET(vq, reg_num) -
SVE_SIG_REGS_OFFSET;
reqoffset = SVE_SIG_ZREG_OFFSET(vq, reg_num) -
SVE_SIG_REGS_OFFSET;
@@
-437,7
+437,7
@@
static int sve_reg_to_region(struct sve_state_reg_region *region,
if (!vcpu_has_sve(vcpu) || (reg->id & SVE_REG_SLICE_MASK) > 0)
return -ENOENT;
if (!vcpu_has_sve(vcpu) || (reg->id & SVE_REG_SLICE_MASK) > 0)
return -ENOENT;
- vq =
sve_vq_from_vl(vcpu->arch.sve_max_vl
);
+ vq =
vcpu_sve_max_vq(vcpu
);
reqoffset = SVE_SIG_PREG_OFFSET(vq, reg_num) -
SVE_SIG_REGS_OFFSET;
reqoffset = SVE_SIG_PREG_OFFSET(vq, reg_num) -
SVE_SIG_REGS_OFFSET;