| Message ID | 20230418142241.1456070-2-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [kvmtool,1/2] riscv: add mvendorid/marchid/mimpid to sync kvm_riscv_config | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/tree_selection | fail | Failed to apply to next/pending-fixes or riscv/for-next |
On Tue, Apr 18, 2023 at 03:22:40PM +0100, Ben Dooks wrote: > Add the ONE_REG for the mvendorid/marchid/mimpid from the kernel > commit 6ebbdecff6ae00557a52539287b681641f4f0d33, to ensure the > struct is in sync with newer kernels for adding zicboz. > > Ref: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/id=6ebbdecff6ae00557a52539287b681641f4f0d33 > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> > --- > riscv/include/asm/kvm.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/riscv/include/asm/kvm.h b/riscv/include/asm/kvm.h > index 8985ff2..92af6f3 100644 > --- a/riscv/include/asm/kvm.h > +++ b/riscv/include/asm/kvm.h > @@ -49,6 +49,9 @@ struct kvm_sregs { > struct kvm_riscv_config { > unsigned long isa; > unsigned long zicbom_block_size; > + unsigned long mvendorid; > + unsigned long marchid; > + unsigned long mimpid; > }; > > /* CORE registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ > -- > 2.39.2 > These should get updated with a proper header update using util/update_headers.sh Thanks, drew
diff --git a/riscv/include/asm/kvm.h b/riscv/include/asm/kvm.h index 8985ff2..92af6f3 100644 --- a/riscv/include/asm/kvm.h +++ b/riscv/include/asm/kvm.h @@ -49,6 +49,9 @@ struct kvm_sregs { struct kvm_riscv_config { unsigned long isa; unsigned long zicbom_block_size; + unsigned long mvendorid; + unsigned long marchid; + unsigned long mimpid; }; /* CORE registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */
Add the ONE_REG for the mvendorid/marchid/mimpid from the kernel commit 6ebbdecff6ae00557a52539287b681641f4f0d33, to ensure the struct is in sync with newer kernels for adding zicboz. Ref: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/id=6ebbdecff6ae00557a52539287b681641f4f0d33 Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- riscv/include/asm/kvm.h | 3 +++ 1 file changed, 3 insertions(+)