| Message ID | 20180118085628.40798-2-borntraeger@de.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x/kvm: implement new hardware/firmware features | expand |
On 18.01.2018 09:56, Christian Borntraeger wrote: > replace with proper header sync > > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > linux-headers/asm-s390/kvm.h | 9 ++++----- > linux-headers/linux/kvm.h | 5 +++-- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h > index 32d372e..11def14 100644 > --- a/linux-headers/asm-s390/kvm.h > +++ b/linux-headers/asm-s390/kvm.h > @@ -6,10 +6,6 @@ > * > * Copyright IBM Corp. 2008 > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License (version 2 only) > - * as published by the Free Software Foundation. > - * > * Author(s): Carsten Otte <cotte@de.ibm.com> > * Christian Borntraeger <borntraeger@de.ibm.com> > */ > @@ -228,6 +224,7 @@ struct kvm_guest_debug_arch { > #define KVM_SYNC_RICCB (1UL << 7) > #define KVM_SYNC_FPRS (1UL << 8) > #define KVM_SYNC_GSCB (1UL << 9) > +#define KVM_SYNC_BPBC (1UL << 10) > /* length and alignment of the sdnx as a power of two */ > #define SDNXC 8 > #define SDNXL (1UL << SDNXC) > @@ -251,7 +248,9 @@ struct kvm_sync_regs { > }; > __u8 reserved[512]; /* for future vector expansion */ > __u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */ > - __u8 padding1[52]; /* riccb needs to be 64byte aligned */ > + __u8 bpbc : 1; /* bp mode */ > + __u8 reserved2 : 7; > + __u8 padding1[51]; /* riccb needs to be 64byte aligned */ > __u8 riccb[64]; /* runtime instrumentation controls block */ > __u8 padding2[192]; /* sdnx needs to be 256byte aligned */ > union { > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index ce6c2f1..b4503d8 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -630,9 +630,9 @@ struct kvm_s390_irq { > > struct kvm_s390_irq_state { > __u64 buf; > - __u32 flags; > + __u32 flags; /* will stay unused for compatibility reasons */ > __u32 len; > - __u32 reserved[4]; > + __u32 reserved[4]; /* will stay unused for compatibility reasons */ > }; > > /* for KVM_SET_GUEST_DEBUG */ > @@ -932,6 +932,7 @@ struct kvm_ppc_resize_hpt { > #define KVM_CAP_HYPERV_SYNIC2 148 > #define KVM_CAP_HYPERV_VP_INDEX 149 > #define KVM_CAP_S390_AIS_MIGRATION 150 > +#define KVM_CAP_S390_BPB 151 > > #ifdef KVM_CAP_IRQ_ROUTING > > Acked-by: David Hildenbrand <david@redhat.com>
kernel patch has now landed as
commit 35b3fde6203b932b2b1a5b53b3d8808abc9c4f60
KVM: s390: wire up bpb feature
in Linus tree.
The new number is
#define KVM_CAP_S390_BPB 152
(instead of 151)
On 01/18/2018 12:42 PM, David Hildenbrand wrote:
> On 18.01.2018 09:56, Christian Borntraeger wrote:
>> replace with proper header sync
>>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>> linux-headers/asm-s390/kvm.h | 9 ++++-----
>> linux-headers/linux/kvm.h | 5 +++--
>> 2 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
>> index 32d372e..11def14 100644
>> --- a/linux-headers/asm-s390/kvm.h
>> +++ b/linux-headers/asm-s390/kvm.h
>> @@ -6,10 +6,6 @@
>> *
>> * Copyright IBM Corp. 2008
>> *
>> - * This program is free software; you can redistribute it and/or modify
>> - * it under the terms of the GNU General Public License (version 2 only)
>> - * as published by the Free Software Foundation.
>> - *
>> * Author(s): Carsten Otte <cotte@de.ibm.com>
>> * Christian Borntraeger <borntraeger@de.ibm.com>
>> */
>> @@ -228,6 +224,7 @@ struct kvm_guest_debug_arch {
>> #define KVM_SYNC_RICCB (1UL << 7)
>> #define KVM_SYNC_FPRS (1UL << 8)
>> #define KVM_SYNC_GSCB (1UL << 9)
>> +#define KVM_SYNC_BPBC (1UL << 10)
>> /* length and alignment of the sdnx as a power of two */
>> #define SDNXC 8
>> #define SDNXL (1UL << SDNXC)
>> @@ -251,7 +248,9 @@ struct kvm_sync_regs {
>> };
>> __u8 reserved[512]; /* for future vector expansion */
>> __u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */
>> - __u8 padding1[52]; /* riccb needs to be 64byte aligned */
>> + __u8 bpbc : 1; /* bp mode */
>> + __u8 reserved2 : 7;
>> + __u8 padding1[51]; /* riccb needs to be 64byte aligned */
>> __u8 riccb[64]; /* runtime instrumentation controls block */
>> __u8 padding2[192]; /* sdnx needs to be 256byte aligned */
>> union {
>> diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
>> index ce6c2f1..b4503d8 100644
>> --- a/linux-headers/linux/kvm.h
>> +++ b/linux-headers/linux/kvm.h
>> @@ -630,9 +630,9 @@ struct kvm_s390_irq {
>>
>> struct kvm_s390_irq_state {
>> __u64 buf;
>> - __u32 flags;
>> + __u32 flags; /* will stay unused for compatibility reasons */
>> __u32 len;
>> - __u32 reserved[4];
>> + __u32 reserved[4]; /* will stay unused for compatibility reasons */
>> };
>>
>> /* for KVM_SET_GUEST_DEBUG */
>> @@ -932,6 +932,7 @@ struct kvm_ppc_resize_hpt {
>> #define KVM_CAP_HYPERV_SYNIC2 148
>> #define KVM_CAP_HYPERV_VP_INDEX 149
>> #define KVM_CAP_S390_AIS_MIGRATION 150
>> +#define KVM_CAP_S390_BPB 151
>>
>> #ifdef KVM_CAP_IRQ_ROUTING
>>
>>
>
> Acked-by: David Hildenbrand <david@redhat.com>
>
On Mon, 22 Jan 2018 09:31:43 +0100 Christian Borntraeger <borntraeger@de.ibm.com> wrote: > kernel patch has now landed as > > commit 35b3fde6203b932b2b1a5b53b3d8808abc9c4f60 > KVM: s390: wire up bpb feature > > in Linus tree. > > > The new number is > #define KVM_CAP_S390_BPB 152 > (instead of 151) I'll replace this with a proper header sync and push out later today.
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h index 32d372e..11def14 100644 --- a/linux-headers/asm-s390/kvm.h +++ b/linux-headers/asm-s390/kvm.h @@ -6,10 +6,6 @@ * * Copyright IBM Corp. 2008 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. - * * Author(s): Carsten Otte <cotte@de.ibm.com> * Christian Borntraeger <borntraeger@de.ibm.com> */ @@ -228,6 +224,7 @@ struct kvm_guest_debug_arch { #define KVM_SYNC_RICCB (1UL << 7) #define KVM_SYNC_FPRS (1UL << 8) #define KVM_SYNC_GSCB (1UL << 9) +#define KVM_SYNC_BPBC (1UL << 10) /* length and alignment of the sdnx as a power of two */ #define SDNXC 8 #define SDNXL (1UL << SDNXC) @@ -251,7 +248,9 @@ struct kvm_sync_regs { }; __u8 reserved[512]; /* for future vector expansion */ __u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */ - __u8 padding1[52]; /* riccb needs to be 64byte aligned */ + __u8 bpbc : 1; /* bp mode */ + __u8 reserved2 : 7; + __u8 padding1[51]; /* riccb needs to be 64byte aligned */ __u8 riccb[64]; /* runtime instrumentation controls block */ __u8 padding2[192]; /* sdnx needs to be 256byte aligned */ union { diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index ce6c2f1..b4503d8 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -630,9 +630,9 @@ struct kvm_s390_irq { struct kvm_s390_irq_state { __u64 buf; - __u32 flags; + __u32 flags; /* will stay unused for compatibility reasons */ __u32 len; - __u32 reserved[4]; + __u32 reserved[4]; /* will stay unused for compatibility reasons */ }; /* for KVM_SET_GUEST_DEBUG */ @@ -932,6 +932,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_HYPERV_SYNIC2 148 #define KVM_CAP_HYPERV_VP_INDEX 149 #define KVM_CAP_S390_AIS_MIGRATION 150 +#define KVM_CAP_S390_BPB 151 #ifdef KVM_CAP_IRQ_ROUTING
replace with proper header sync Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- linux-headers/asm-s390/kvm.h | 9 ++++----- linux-headers/linux/kvm.h | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-)