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

Commit 7ffcf8ec authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix little endian lppaca, slb_shadow and dtl_entry 



The lppaca, slb_shadow and dtl_entry hypervisor structures are
big endian, so we have to byte swap them in little endian builds.

LE KVM hosts will also need to be fixed but for now add an #error
to remind us.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent c72cd555

arch/powerpc/include/asm/asm-compat.h

+9 −0
Original line number Diff line number Diff line
@@ -32,6 +32,15 @@ 
#define PPC_MTOCRF(FXM, RS) MTOCRF((FXM), RS)

#define PPC_LR_STKOFF	16

#define PPC_MIN_STKFRM	112



#ifdef __BIG_ENDIAN__

#define LDX_BE	stringify_in_c(ldx)

#define STDX_BE	stringify_in_c(stdx)

#else

#define LDX_BE	stringify_in_c(ldbrx)

#define STDX_BE	stringify_in_c(stdbrx)

#endif



#else /* 32-bit */



/* operations for longs and pointers */

arch/powerpc/include/asm/ppc_asm.h

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ BEGIN_FW_FTR_SECTION; \ 
	/* from user - see if there are any DTL entries to process */	\

	ld	r10,PACALPPACAPTR(r13);	/* get ptr to VPA */		\

	ld	r11,PACA_DTL_RIDX(r13);	/* get log read index */	\

	ld	r10,LPPACA_DTLIDX(r10);	/* get log write index */	\

	addi	r10,r10,LPPACA_DTLIDX;					\

	LDX_BE	r10,0,r10;		/* get log write index */	\

	cmpd	cr1,r11,r10;						\

	beq+	cr1,33f;						\

	bl	.accumulate_stolen_time;				\

arch/powerpc/kernel/entry_64.S

+7 −4
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ BEGIN_FW_FTR_SECTION 
	/* if from user, see if there are any DTL entries to process */

	ld	r10,PACALPPACAPTR(r13)	/* get ptr to VPA */

	ld	r11,PACA_DTL_RIDX(r13)	/* get log read index */

	ld	r10,LPPACA_DTLIDX(r10)	/* get log write index */

	addi	r10,r10,LPPACA_DTLIDX

	LDX_BE	r10,0,r10		/* get log write index */

	cmpd	cr1,r11,r10

	beq+	cr1,33f

	bl	.accumulate_stolen_time
@@ -532,8 +533,10 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT) 
	ld	r9,PACA_SLBSHADOWPTR(r13)

	li	r12,0

	std	r12,SLBSHADOW_STACKESID(r9)	/* Clear ESID */

	std	r7,SLBSHADOW_STACKVSID(r9)  /* Save VSID */

	std	r0,SLBSHADOW_STACKESID(r9)  /* Save ESID */

	li	r12,SLBSHADOW_STACKVSID

	STDX_BE	r7,r12,r9			/* Save VSID */

	li	r12,SLBSHADOW_STACKESID

	STDX_BE	r0,r12,r9			/* Save ESID */



	/* No need to check for MMU_FTR_NO_SLBIE_B here, since when

	 * we have 1TB segments, the only CPUs known to have the errata

arch/powerpc/kernel/lparcfg.c

+5 −4
Original line number Diff line number Diff line
@@ -387,8 +387,8 @@ static void pseries_cmo_data(struct seq_file *m) 
		return;



	for_each_possible_cpu(cpu) {

		cmo_faults += lppaca_of(cpu).cmo_faults;

		cmo_fault_time += lppaca_of(cpu).cmo_fault_time;

		cmo_faults += be64_to_cpu(lppaca_of(cpu).cmo_faults);

		cmo_fault_time += be64_to_cpu(lppaca_of(cpu).cmo_fault_time);

	}



	seq_printf(m, "cmo_faults=%lu\n", cmo_faults);
@@ -406,8 +406,9 @@ static void splpar_dispatch_data(struct seq_file *m) 
	unsigned long dispatch_dispersions = 0;



	for_each_possible_cpu(cpu) {

		dispatches += lppaca_of(cpu).yield_count;

		dispatch_dispersions += lppaca_of(cpu).dispersion_count;

		dispatches += be32_to_cpu(lppaca_of(cpu).yield_count);

		dispatch_dispersions +=

			be32_to_cpu(lppaca_of(cpu).dispersion_count);

	}



	seq_printf(m, "dispatches=%lu\n", dispatches);

arch/powerpc/kernel/paca.c

+5 −5
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ extern unsigned long __toc_start; 
 */

struct lppaca lppaca[] = {

	[0 ... (NR_LPPACAS-1)] = {

		.desc = 0xd397d781,	/* "LpPa" */

		.size = sizeof(struct lppaca),

		.desc = cpu_to_be32(0xd397d781),	/* "LpPa" */

		.size = cpu_to_be16(sizeof(struct lppaca)),

		.fpregs_in_use = 1,

		.slb_count = 64,

		.slb_count = cpu_to_be16(64),

		.vmxregs_in_use = 0,

		.page_ins = 0,

	},
@@ -101,8 +101,8 @@ static inline void free_lppacas(void) { } 
 */

struct slb_shadow slb_shadow[] __cacheline_aligned = {

	[0 ... (NR_CPUS-1)] = {

		.persistent = SLB_NUM_BOLTED,

		.buffer_length = sizeof(struct slb_shadow),

		.persistent = cpu_to_be32(SLB_NUM_BOLTED),

		.buffer_length = cpu_to_be32(sizeof(struct slb_shadow)),

	},

};