From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2014 21:50:10 +0000 (-0700)
Subject: Merge tag 'kvm-3.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: MMI-PSA29.97-13-9~12479
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cbb39d4d4d530dff12f2ff06ed6c85c504ba91a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'kvm-3.15-1' of git://git./virt/kvm/kvm

Pull kvm updates from Paolo Bonzini:
 "PPC and ARM do not have much going on this time.  Most of the cool
  stuff, instead, is in s390 and (after a few releases) x86.

  ARM has some caching fixes and PPC has transactional memory support in
  guests.  MIPS has some fixes, with more probably coming in 3.16 as
  QEMU will soon get support for MIPS KVM.

  For x86 there are optimizations for debug registers, which trigger on
  some Windows games, and other important fixes for Windows guests.  We
  now expose to the guest Broadwell instruction set extensions and also
  Intel MPX.  There's also a fix/workaround for OS X guests, nested
  virtualization features (preemption timer), and a couple kvmclock
  refinements.

  For s390, the main news is asynchronous page faults, together with
  improvements to IRQs (floating irqs and adapter irqs) that speed up
  virtio devices"

* tag 'kvm-3.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (96 commits)
  KVM: PPC: Book3S HV: Save/restore host PMU registers that are new in POWER8
  KVM: PPC: Book3S HV: Fix decrementer timeouts with non-zero TB offset
  KVM: PPC: Book3S HV: Don't use kvm_memslots() in real mode
  KVM: PPC: Book3S HV: Return ENODEV error rather than EIO
  KVM: PPC: Book3S: Trim top 4 bits of physical address in RTAS code
  KVM: PPC: Book3S HV: Add get/set_one_reg for new TM state
  KVM: PPC: Book3S HV: Add transactional memory support
  KVM: Specify byte order for KVM_EXIT_MMIO
  KVM: vmx: fix MPX detection
  KVM: PPC: Book3S HV: Fix KVM hang with CONFIG_KVM_XICS=n
  KVM: PPC: Book3S: Introduce hypervisor call H_GET_TCE
  KVM: PPC: Book3S HV: Fix incorrect userspace exit on ioeventfd write
  KVM: s390: clear local interrupts at cpu initial reset
  KVM: s390: Fix possible memory leak in SIGP functions
  KVM: s390: fix calculation of idle_mask array size
  KVM: s390: randomize sca address
  KVM: ioapic: reinject pending interrupts on KVM_SET_IRQCHIP
  KVM: Bump KVM_MAX_IRQ_ROUTES for s390
  KVM: s390: irq routing for adapter interrupts.
  KVM: s390: adapter interrupt sources
  ...
---

7cbb39d4d4d530dff12f2ff06ed6c85c504ba91a
diff --cc arch/s390/include/asm/kvm_host.h
index 9bf95bb30f1a,68897fc65950..154b60089be9
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@@ -106,9 -116,9 +116,11 @@@ struct kvm_s390_sie_block 
  	__u64	gbea;			/* 0x0180 */
  	__u8	reserved188[24];	/* 0x0188 */
  	__u32	fac;			/* 0x01a0 */
 -	__u8	reserved1a4[58];	/* 0x01a4 */
 +	__u8	reserved1a4[20];	/* 0x01a4 */
 +	__u64	cbrlo;			/* 0x01b8 */
- 	__u8	reserved1c0[40];	/* 0x01c0 */
++	__u8	reserved1c0[30];	/* 0x01c0 */
+ 	__u64	pp;			/* 0x01de */
+ 	__u8	reserved1e6[2];		/* 0x01e6 */
  	__u64	itdba;			/* 0x01e8 */
  	__u8	reserved1f0[16];	/* 0x01f0 */
  } __attribute__((packed));
diff --cc arch/x86/include/asm/xsave.h
index 6c1d7411eb00,dcd047b629ec..d949ef28c48b
--- a/arch/x86/include/asm/xsave.h
+++ b/arch/x86/include/asm/xsave.h
@@@ -6,16 -6,15 +6,18 @@@
  
  #define XSTATE_CPUID		0x0000000d
  
 -#define XSTATE_FP	0x1
 -#define XSTATE_SSE	0x2
 -#define XSTATE_YMM	0x4
 -#define XSTATE_BNDREGS	0x8
 -#define XSTATE_BNDCSR	0x10
 +#define XSTATE_FP		0x1
 +#define XSTATE_SSE		0x2
 +#define XSTATE_YMM		0x4
 +#define XSTATE_BNDREGS		0x8
 +#define XSTATE_BNDCSR		0x10
 +#define XSTATE_OPMASK		0x20
 +#define XSTATE_ZMM_Hi256	0x40
 +#define XSTATE_Hi16_ZMM		0x80
  
  #define XSTATE_FPSSE	(XSTATE_FP | XSTATE_SSE)
+ /* Bit 63 of XCR0 is reserved for future expansion */
+ #define XSTATE_EXTEND_MASK	(~(XSTATE_FPSSE | (1ULL << 63)))
  
  #define FXSAVE_SIZE	512