Commit ef9f7cfa authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge our fixes branch, primarily to bring in the ebb selftests build
fix and the pkey fix, which is a dependency for some future work.
parents 61f879d9 f0479c4b

Documentation/powerpc/vas-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ request buffers are not in memory. The operating system handles the fault by 
updating CSB with the following data:



	csb.flags = CSB_V;

	csb.cc = CSB_CC_TRANSLATION;

	csb.cc = CSB_CC_FAULT_ADDRESS;

	csb.ce = CSB_CE_TERMINATION;

	csb.address = fault_address;

arch/powerpc/include/asm/icswx.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ struct coprocessor_completion_block { 
#define CSB_CC_CHAIN		(37)

#define CSB_CC_SEQUENCE		(38)

#define CSB_CC_HW		(39)

/* P9 DD2 NX Workbook 3.2 (Table 4-36): Address translation fault */

#define	CSB_CC_FAULT_ADDRESS	(250)



#define CSB_SIZE		(0x10)

#define CSB_ALIGN		CSB_SIZE

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Diff line number Diff line
@@ -2551,7 +2551,7 @@ EXC_VIRT_NONE(0x5400, 0x100) 
INT_DEFINE_BEGIN(denorm_exception)

	IVEC=0x1500

	IHSRR=1

	IBRANCH_COMMON=0

	IBRANCH_TO_COMMON=0

	IKVM_REAL=1

INT_DEFINE_END(denorm_exception)

arch/powerpc/kernel/paca.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void *__init alloc_shared_lppaca(unsigned long size, unsigned long limit, 
	 * This is very early in boot, so no harm done if the kernel crashes at

	 * this point.

	 */

	BUG_ON(shared_lppaca_size >= shared_lppaca_total_size);

	BUG_ON(shared_lppaca_size > shared_lppaca_total_size);



	return ptr;

}

arch/powerpc/kvm/book3s_64_mmu_radix.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid, 
	/* Can't access quadrants 1 or 2 in non-HV mode, call the HV to do it */

	if (kvmhv_on_pseries())

		return plpar_hcall_norets(H_COPY_TOFROM_GUEST, lpid, pid, eaddr,

					  __pa(to), __pa(from), n);

					  (to != NULL) ? __pa(to): 0,

					  (from != NULL) ? __pa(from): 0, n);



	quadrant = 1;

	if (!pid)

CRA Git | Maintained and supported by SUSTech CRA and CCSE