Commit 303d77a6 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/ppc-kvm' into next 

Merge our KVM topic branch, this has been independently included in linux-next
for most of the development cycle.
parents 36e826b5 b7bce570

Documentation/powerpc/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ powerpc 
    isa-versions

    kaslr-booke32

    mpc52xx

    kvm-nested

    papr_hcalls

    pci_iov_resource_on_powernv

    pmu-ebb

Documentation/powerpc/kvm-nested.rst

0 → 100644
+634 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/powerpc/Kconfig.debug

+12 −0
Original line number Diff line number Diff line
@@ -82,6 +82,18 @@ config MSI_BITMAP_SELFTEST 
	bool "Run self-tests of the MSI bitmap code"

	depends on DEBUG_KERNEL



config GUEST_STATE_BUFFER_TEST

	def_tristate n

	prompt "Enable Guest State Buffer unit tests"

	depends on KUNIT

	depends on KVM_BOOK3S_HV_POSSIBLE

	default KUNIT_ALL_TESTS

	help

	  The Guest State Buffer is a data format specified in the PAPR.

	  It is by hcalls to communicate the state of L2 guests between

	  the L1 and L0 hypervisors. Enable unit tests for the library

	  used to create and use guest state buffers.



config PPC_IRQ_SOFT_MASK_DEBUG

	bool "Include extra checks for powerpc irq soft masking"

	depends on PPC64

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

0 → 100644
+995 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/powerpc/include/asm/hvcall.h

+30 −0
Original line number Diff line number Diff line
@@ -100,6 +100,18 @@ 
#define H_COP_HW	-74

#define H_STATE		-75

#define H_IN_USE	-77



#define H_INVALID_ELEMENT_ID			-79

#define H_INVALID_ELEMENT_SIZE			-80

#define H_INVALID_ELEMENT_VALUE			-81

#define H_INPUT_BUFFER_NOT_DEFINED		-82

#define H_INPUT_BUFFER_TOO_SMALL		-83

#define H_OUTPUT_BUFFER_NOT_DEFINED		-84

#define H_OUTPUT_BUFFER_TOO_SMALL		-85

#define H_PARTITION_PAGE_TABLE_NOT_DEFINED	-86

#define H_GUEST_VCPU_STATE_NOT_HV_OWNED		-87





#define H_UNSUPPORTED_FLAG_START	-256

#define H_UNSUPPORTED_FLAG_END		-511

#define H_MULTI_THREADS_ACTIVE	-9005
@@ -381,6 +393,15 @@ 
#define H_ENTER_NESTED		0xF804

#define H_TLB_INVALIDATE	0xF808

#define H_COPY_TOFROM_GUEST	0xF80C

#define H_GUEST_GET_CAPABILITIES 0x460

#define H_GUEST_SET_CAPABILITIES 0x464

#define H_GUEST_CREATE		0x470

#define H_GUEST_CREATE_VCPU	0x474

#define H_GUEST_GET_STATE	0x478

#define H_GUEST_SET_STATE	0x47C

#define H_GUEST_RUN_VCPU	0x480

#define H_GUEST_COPY_MEMORY	0x484

#define H_GUEST_DELETE		0x488



/* Flags for H_SVM_PAGE_IN */

#define H_PAGE_IN_SHARED        0x1
@@ -467,6 +488,15 @@ 
#define H_RPTI_PAGE_1G	0x08

#define H_RPTI_PAGE_ALL (-1UL)



/* Flags for H_GUEST_{S,G}_STATE */

#define H_GUEST_FLAGS_WIDE     (1UL<<(63-0))



/* Flag values used for H_{S,G}SET_GUEST_CAPABILITIES */

#define H_GUEST_CAP_COPY_MEM	(1UL<<(63-0))

#define H_GUEST_CAP_POWER9	(1UL<<(63-1))

#define H_GUEST_CAP_POWER10	(1UL<<(63-2))

#define H_GUEST_CAP_BITMAP2	(1UL<<(63-63))



#ifndef __ASSEMBLY__

#include <linux/types.h>