diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-10 14:37:38 (GMT) |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-10 14:37:38 (GMT) |
| commit | 6ac0f61f47a24bad3fa99ee6a46c0cc5a245ee91 (patch) | |
| tree | ae1380fe6e21773902bbb260b158cd426c8866f6 /drivers/s390/char/sclp_early.c | |
| parent | 4ac334295e4f3b996e9feabe36e79e44bf77a06f (diff) | |
| parent | 60a37709ce603da62d0b60699b713558b4cfd513 (diff) | |
| download | linux-6ac0f61f47a24bad3fa99ee6a46c0cc5a245ee91.tar.xz | |
Merge tag 'kvm-s390-next-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: features and fixes for 4.7 part2
- Use hardware provided information about facility bits that do not
need any hypervisor activitiy
- Add missing documentation for KVM_CAP_S390_RI
- Some updates/fixes for handling cpu models and facilities
Diffstat (limited to 'drivers/s390/char/sclp_early.c')
| -rw-r--r-- | drivers/s390/char/sclp_early.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c index 6804354..0ac520d 100644 --- a/drivers/s390/char/sclp_early.c +++ b/drivers/s390/char/sclp_early.c @@ -49,7 +49,9 @@ struct read_info_sccb { u8 _pad_117[119 - 117]; /* 117-118 */ u8 fac119; /* 119 */ u16 hcpua; /* 120-121 */ - u8 _pad_122[4096 - 122]; /* 122-4095 */ + u8 _pad_122[124 - 122]; /* 122-123 */ + u32 hmfai; /* 124-127 */ + u8 _pad_128[4096 - 128]; /* 128-4095 */ } __packed __aligned(PAGE_SIZE); static char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE) __initdata; @@ -155,6 +157,8 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb) sclp.mtid = (sccb->fac42 & 0x80) ? (sccb->fac42 & 31) : 0; sclp.mtid_cp = (sccb->fac42 & 0x80) ? (sccb->fac43 & 31) : 0; sclp.mtid_prev = (sccb->fac42 & 0x80) ? (sccb->fac66 & 31) : 0; + + sclp.hmfai = sccb->hmfai; } /* |