Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fa301f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-20140304' of... 

Merge tag 'kvm-s390-20140304' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next
parents 332967a3 96b14536

arch/s390/include/asm/airq.h

+12 −2
Original line number Diff line number Diff line
@@ -44,11 +44,21 @@ struct airq_iv { 


struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags);

void airq_iv_release(struct airq_iv *iv);

unsigned long airq_iv_alloc_bit(struct airq_iv *iv);

void airq_iv_free_bit(struct airq_iv *iv, unsigned long bit);

unsigned long airq_iv_alloc(struct airq_iv *iv, unsigned long num);

void airq_iv_free(struct airq_iv *iv, unsigned long bit, unsigned long num);

unsigned long airq_iv_scan(struct airq_iv *iv, unsigned long start,

			   unsigned long end);



static inline unsigned long airq_iv_alloc_bit(struct airq_iv *iv)

{

	return airq_iv_alloc(iv, 1);

}



static inline void airq_iv_free_bit(struct airq_iv *iv, unsigned long bit)

{

	airq_iv_free(iv, bit, 1);

}



static inline unsigned long airq_iv_end(struct airq_iv *iv)

{

	return iv->end;

arch/s390/include/asm/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ enum interruption_class { 
	IRQIO_PCI,

	IRQIO_MSI,

	IRQIO_VIR,

	IRQIO_VAI,

	NMI_NMI,

	CPU_RST,

	NR_ARCH_IRQS

arch/s390/include/asm/kvm_host.h

+3 −2
Original line number Diff line number Diff line
@@ -107,7 +107,9 @@ struct kvm_s390_sie_block { 
	__u64	gbea;			/* 0x0180 */

	__u8	reserved188[24];	/* 0x0188 */

	__u32	fac;			/* 0x01a0 */

	__u8	reserved1a4[68];	/* 0x01a4 */

	__u8	reserved1a4[58];	/* 0x01a4 */

	__u64	pp;			/* 0x01de */

	__u8	reserved1e6[2];		/* 0x01e6 */

	__u64	itdba;			/* 0x01e8 */

	__u8	reserved1f0[16];	/* 0x01f0 */

} __attribute__((packed));
@@ -213,7 +215,6 @@ struct kvm_s390_float_interrupt { 
	int next_rr_cpu;

	unsigned long idle_mask[(KVM_MAX_VCPUS + sizeof(long) - 1)

				/ sizeof(long)];

	struct kvm_s390_local_interrupt *local_int[KVM_MAX_VCPUS];

	unsigned int irq_count;

};

arch/s390/include/uapi/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -76,4 +76,6 @@ struct kvm_sync_regs { 
#define KVM_REG_S390_PFTOKEN	(KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x5)

#define KVM_REG_S390_PFCOMPARE	(KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x6)

#define KVM_REG_S390_PFSELECT	(KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x7)

#define KVM_REG_S390_PP		(KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x8)

#define KVM_REG_S390_GBEA	(KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x9)

#endif

arch/s390/kernel/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = { 
	[IRQIO_PCI]  = {.name = "PCI", .desc = "[I/O] PCI Interrupt" },

	[IRQIO_MSI]  = {.name = "MSI", .desc = "[I/O] MSI Interrupt" },

	[IRQIO_VIR]  = {.name = "VIR", .desc = "[I/O] Virtual I/O Devices"},

	[IRQIO_VAI]  = {.name = "VAI", .desc = "[I/O] Virtual I/O Devices AI"},

	[NMI_NMI]    = {.name = "NMI", .desc = "[NMI] Machine Check"},

	[CPU_RST]    = {.name = "RST", .desc = "[CPU] CPU Restart"},

};