Commit 9ff0251b authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/ppc-kvm' into next 

Merge the powerpc KVM topic branch.
parents 90e812ac ca8dad04

Documentation/arch/powerpc/kvm-nested.rst

+3 −1
Original line number Diff line number Diff line
@@ -546,7 +546,9 @@ table information. 
+--------+-------+----+--------+----------------------------------+

| 0x1052 | 0x08  | RW |   T    | CTRL                             |

+--------+-------+----+--------+----------------------------------+

| 0x1053-|       |    |        | Reserved                         |

| 0x1053 | 0x08  | RW |   T    | DPDES                            |

+--------+-------+----+--------+----------------------------------+

| 0x1054-|       |    |        | Reserved                         |

| 0x1FFF |       |    |        |                                  |

+--------+-------+----+--------+----------------------------------+

| 0x2000 | 0x04  | RW |   T    | CR                               |

Documentation/virt/kvm/api.rst

+3 −0
Original line number Diff line number Diff line
@@ -2439,8 +2439,11 @@ registers, find a list below: 
  PPC     KVM_REG_PPC_PSSCR               64

  PPC     KVM_REG_PPC_DEC_EXPIRY          64

  PPC     KVM_REG_PPC_PTCR                64

  PPC     KVM_REG_PPC_HASHKEYR            64

  PPC     KVM_REG_PPC_HASHPKEYR           64

  PPC     KVM_REG_PPC_DAWR1               64

  PPC     KVM_REG_PPC_DAWRX1              64

  PPC     KVM_REG_PPC_DEXCR               64

  PPC     KVM_REG_PPC_TM_GPR0             64

  ...

  PPC     KVM_REG_PPC_TM_GPR31            64

arch/powerpc/include/asm/guest-state-buffer.h

+2 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
#define KVMPPC_GSID_HASHKEYR			0x1050

#define KVMPPC_GSID_HASHPKEYR			0x1051

#define KVMPPC_GSID_CTRL			0x1052

#define KVMPPC_GSID_DPDES			0x1053



#define KVMPPC_GSID_CR				0x2000

#define KVMPPC_GSID_PIDR			0x2001
@@ -110,7 +111,7 @@ 
#define KVMPPC_GSE_META_COUNT (KVMPPC_GSE_META_END - KVMPPC_GSE_META_START + 1)



#define KVMPPC_GSE_DW_REGS_START KVMPPC_GSID_GPR(0)

#define KVMPPC_GSE_DW_REGS_END KVMPPC_GSID_CTRL

#define KVMPPC_GSE_DW_REGS_END KVMPPC_GSID_DPDES

#define KVMPPC_GSE_DW_REGS_COUNT \

	(KVMPPC_GSE_DW_REGS_END - KVMPPC_GSE_DW_REGS_START + 1)

arch/powerpc/include/asm/kvm_book3s.h

+1 −0
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu) \ 




KVMPPC_BOOK3S_VCORE_ACCESSOR(vtb, 64, KVMPPC_GSID_VTB)

KVMPPC_BOOK3S_VCORE_ACCESSOR(dpdes, 64, KVMPPC_GSID_DPDES)

KVMPPC_BOOK3S_VCORE_ACCESSOR_GET(arch_compat, 32, KVMPPC_GSID_LOGICAL_PVR)

KVMPPC_BOOK3S_VCORE_ACCESSOR_GET(lpcr, 64, KVMPPC_GSID_LPCR)

KVMPPC_BOOK3S_VCORE_ACCESSOR_SET(tb_offset, 64, KVMPPC_GSID_TB_OFFSET)

arch/powerpc/include/asm/kvm_book3s_64.h

+5 −0
Original line number Diff line number Diff line
@@ -684,6 +684,11 @@ int kvmhv_nestedv2_set_ptbl_entry(unsigned long lpid, u64 dw0, u64 dw1); 
int kvmhv_nestedv2_parse_output(struct kvm_vcpu *vcpu);

int kvmhv_nestedv2_set_vpa(struct kvm_vcpu *vcpu, unsigned long vpa);



int kmvhv_counters_tracepoint_regfunc(void);

void kmvhv_counters_tracepoint_unregfunc(void);

int kvmhv_get_l2_counters_status(void);

void kvmhv_set_l2_counters_status(int cpu, bool status);



#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */



#endif /* __ASM_KVM_BOOK3S_64_H__ */