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

Commit 7442cf9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Ben Herrenschmidt:
 "Here is a handful of powerpc fixes for 3.16.  They are all pretty
  simple and self contained and should still make this release"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: use _GLOBAL_TOC for memmove
  powerpc/pseries: dynamically added OF nodes need to call of_node_init
  powerpc: subpage_protect: Increase the array size to take care of 64TB
  powerpc: Fix bugs in emulate_step()
  powerpc: Disable doorbells on Power8 DD1.x
parents 355cb093 6f5405bc

arch/powerpc/include/asm/cputable.h

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ extern const char *powerpc_base_platform; 
	    CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \

	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP)

#define CPU_FTRS_POWER8E (CPU_FTRS_POWER8 | CPU_FTR_PMAO_BUG)

#define CPU_FTRS_POWER8_DD1 (CPU_FTRS_POWER8 & ~CPU_FTR_DBELL)

#define CPU_FTRS_CELL	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \

	    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \

	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \

arch/powerpc/include/asm/mmu-hash64.h

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 */

#include <asm/pgtable-ppc64.h>

#include <asm/bug.h>

#include <asm/processor.h>



/*

 * Segment table
@@ -496,7 +497,7 @@ extern void slb_set_size(u16 size); 
 */

struct subpage_prot_table {

	unsigned long maxaddr;	/* only addresses < this are protected */

	unsigned int **protptrs[2];

	unsigned int **protptrs[(TASK_SIZE_USER64 >> 43)];

	unsigned int *low_prot[4];

};

arch/powerpc/kernel/cputable.c

+20 −0
Original line number Diff line number Diff line
@@ -527,6 +527,26 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check_early	= __machine_check_early_realmode_p8,

		.platform		= "power8",

	},

	{	/* Power8 DD1: Does not support doorbell IPIs */

		.pvr_mask		= 0xffffff00,

		.pvr_value		= 0x004d0100,

		.cpu_name		= "POWER8 (raw)",

		.cpu_features		= CPU_FTRS_POWER8_DD1,

		.cpu_user_features	= COMMON_USER_POWER8,

		.cpu_user_features2	= COMMON_USER2_POWER8,

		.mmu_features		= MMU_FTRS_POWER8,

		.icache_bsize		= 128,

		.dcache_bsize		= 128,

		.num_pmcs		= 6,

		.pmc_type		= PPC_PMC_IBM,

		.oprofile_cpu_type	= "ppc64/power8",

		.oprofile_type		= PPC_OPROFILE_INVALID,

		.cpu_setup		= __setup_cpu_power8,

		.cpu_restore		= __restore_cpu_power8,

		.flush_tlb		= __flush_tlb_power8,

		.machine_check_early	= __machine_check_early_realmode_p8,

		.platform		= "power8",

	},

	{	/* Power8 */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x004d0000,

arch/powerpc/lib/mem_64.S

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ _GLOBAL(memset) 
	stb	r4,0(r6)

	blr



_GLOBAL(memmove)

_GLOBAL_TOC(memmove)

	cmplw	0,r3,r4

	bgt	backwards_memcpy

	b	memcpy

arch/powerpc/lib/sstep.c

+5 −5
Original line number Diff line number Diff line
@@ -1198,7 +1198,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) 
			sh = regs->gpr[rb] & 0x3f;

			ival = (signed int) regs->gpr[rd];

			regs->gpr[ra] = ival >> (sh < 32 ? sh : 31);

			if (ival < 0 && (sh >= 32 || (ival & ((1 << sh) - 1)) != 0))

			if (ival < 0 && (sh >= 32 || (ival & ((1ul << sh) - 1)) != 0))

				regs->xer |= XER_CA;

			else

				regs->xer &= ~XER_CA;
@@ -1208,7 +1208,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) 
			sh = rb;

			ival = (signed int) regs->gpr[rd];

			regs->gpr[ra] = ival >> sh;

			if (ival < 0 && (ival & ((1 << sh) - 1)) != 0)

			if (ival < 0 && (ival & ((1ul << sh) - 1)) != 0)

				regs->xer |= XER_CA;

			else

				regs->xer &= ~XER_CA;
@@ -1216,7 +1216,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) 


#ifdef __powerpc64__

		case 27:	/* sld */

			sh = regs->gpr[rd] & 0x7f;

			sh = regs->gpr[rb] & 0x7f;

			if (sh < 64)

				regs->gpr[ra] = regs->gpr[rd] << sh;

			else
@@ -1235,7 +1235,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) 
			sh = regs->gpr[rb] & 0x7f;

			ival = (signed long int) regs->gpr[rd];

			regs->gpr[ra] = ival >> (sh < 64 ? sh : 63);

			if (ival < 0 && (sh >= 64 || (ival & ((1 << sh) - 1)) != 0))

			if (ival < 0 && (sh >= 64 || (ival & ((1ul << sh) - 1)) != 0))

				regs->xer |= XER_CA;

			else

				regs->xer &= ~XER_CA;
@@ -1246,7 +1246,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) 
			sh = rb | ((instr & 2) << 4);

			ival = (signed long int) regs->gpr[rd];

			regs->gpr[ra] = ival >> sh;

			if (ival < 0 && (ival & ((1 << sh) - 1)) != 0)

			if (ival < 0 && (ival & ((1ul << sh) - 1)) != 0)

				regs->xer |= XER_CA;

			else

				regs->xer &= ~XER_CA;