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

Commit d2b9b207 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-ppc-next-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

PPC KVM update for 4.16

- Allow HPT guests to run on a radix host on POWER9 v2.2 CPUs
  without requiring the complex thread synchronization that earlier
  CPU versions required.

- A series from Ben Herrenschmidt to improve the handling of
  escalation interrupts with the XIVE interrupt controller.

- Provide for the decrementer register to be copied across on
  migration.

- Various minor cleanups and bugfixes.
parents 7bf14c28 9b9b13a6

Documentation/virtual/kvm/api.txt

+1 −0
Original line number Diff line number Diff line
@@ -1841,6 +1841,7 @@ registers, find a list below: 
  PPC	| KVM_REG_PPC_DBSR              | 32

  PPC   | KVM_REG_PPC_TIDR              | 64

  PPC   | KVM_REG_PPC_PSSCR             | 64

  PPC   | KVM_REG_PPC_DEC_EXPIRY        | 64

  PPC   | KVM_REG_PPC_TM_GPR0           | 64

          ...

  PPC   | KVM_REG_PPC_TM_GPR31          | 64

arch/powerpc/include/asm/hmi.h

+4 −0
Original line number Diff line number Diff line
@@ -42,4 +42,8 @@ extern void wait_for_tb_resync(void); 
static inline void wait_for_subcore_guest_exit(void) { }

static inline void wait_for_tb_resync(void) { }

#endif



struct pt_regs;

extern long hmi_handle_debugtrig(struct pt_regs *regs);



#endif /* __ASM_PPC64_HMI_H__ */

arch/powerpc/include/asm/kvm_book3s_64.h

+9 −5
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ static inline int kvmppc_hpte_page_shifts(unsigned long h, unsigned long l) 
	lphi = (l >> 16) & 0xf;

	switch ((l >> 12) & 0xf) {

	case 0:

		return !lphi ? 24 : -1;		/* 16MB */

		return !lphi ? 24 : 0;		/* 16MB */

		break;

	case 1:

		return 16;			/* 64kB */

		break;

	case 3:

		return !lphi ? 34 : -1;		/* 16GB */

		return !lphi ? 34 : 0;		/* 16GB */

		break;

	case 7:

		return (16 << 8) + 12;		/* 64kB in 4kB */
@@ -140,7 +140,7 @@ static inline int kvmppc_hpte_page_shifts(unsigned long h, unsigned long l) 
			return (24 << 8) + 12;	/* 16MB in 4kB */

		break;

	}

	return -1;

	return 0;

}



static inline int kvmppc_hpte_base_page_shift(unsigned long h, unsigned long l)
@@ -159,7 +159,11 @@ static inline int kvmppc_hpte_actual_page_shift(unsigned long h, unsigned long l 


static inline unsigned long kvmppc_actual_pgsz(unsigned long v, unsigned long r)

{

	return 1ul << kvmppc_hpte_actual_page_shift(v, r);

	int shift = kvmppc_hpte_actual_page_shift(v, r);



	if (shift)

		return 1ul << shift;

	return 0;

}



static inline int kvmppc_pgsize_lp_encoding(int base_shift, int actual_shift)
@@ -232,7 +236,7 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r, 
		va_low ^= v >> (SID_SHIFT_1T - 16);

	va_low &= 0x7ff;



	if (b_pgshift == 12) {

	if (b_pgshift <= 12) {

		if (a_pgshift > 12) {

			sllp = (a_pgshift == 16) ? 5 : 4;

			rb |= sllp << 5;	/*  AP field */

arch/powerpc/include/asm/kvm_host.h

+5 −1
Original line number Diff line number Diff line
@@ -709,6 +709,7 @@ struct kvm_vcpu_arch { 
	u8 ceded;

	u8 prodded;

	u8 doorbell_request;

	u8 irq_pending; /* Used by XIVE to signal pending guest irqs */

	u32 last_inst;



	struct swait_queue_head *wqp;
@@ -738,8 +739,11 @@ struct kvm_vcpu_arch { 
	struct kvmppc_icp *icp; /* XICS presentation controller */

	struct kvmppc_xive_vcpu *xive_vcpu; /* XIVE virtual CPU data */

	__be32 xive_cam_word;    /* Cooked W2 in proper endian with valid bit */

	u32 xive_pushed;	 /* Is the VP pushed on the physical CPU ? */

	u8 xive_pushed;		 /* Is the VP pushed on the physical CPU ? */

	u8 xive_esc_on;		 /* Is the escalation irq enabled ? */

	union xive_tma_w01 xive_saved_state; /* W0..1 of XIVE thread state */

	u64 xive_esc_raddr;	 /* Escalation interrupt ESB real addr */

	u64 xive_esc_vaddr;	 /* Escalation interrupt ESB virt addr */

#endif



#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

arch/powerpc/include/asm/opal-api.h

+1 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,7 @@ enum { 
/* Flags for OPAL_XIVE_GET/SET_VP_INFO */

enum {

	OPAL_XIVE_VP_ENABLED		= 0x00000001,

	OPAL_XIVE_VP_SINGLE_ESCALATION	= 0x00000002,

};



/* "Any chip" replacement for chip ID for allocation functions */