Commit 065397a9 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next 

Freescale updates from Scott:

"Highlights include qbman support (a prerequisite for datapath drivers
such as ethernet), a PCI DMA fix+improvement, reset handler changes, more
8xx optimizations, and some cleanups and fixes."
parents 8321564a e0b80f00

arch/powerpc/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -318,12 +318,12 @@ mpc85xx_smp_defconfig: 
PHONY += corenet32_smp_defconfig

corenet32_smp_defconfig:

	$(call merge_into_defconfig,corenet_basic_defconfig,\

		85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw)

		85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw dpaa)



PHONY += corenet64_smp_defconfig

corenet64_smp_defconfig:

	$(call merge_into_defconfig,corenet_basic_defconfig,\

		85xx-64bit 85xx-smp altivec 85xx-hw fsl-emb-nonhw)

		85xx-64bit 85xx-smp altivec 85xx-hw fsl-emb-nonhw dpaa)



PHONY += mpc86xx_defconfig

mpc86xx_defconfig:

arch/powerpc/configs/dpaa.config

0 → 100644
+1 −0
Original line number Diff line number Diff line 
CONFIG_FSL_DPAA=y

arch/powerpc/include/asm/cputable.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ extern int machine_check_e500mc(struct pt_regs *regs); 
extern int machine_check_e500(struct pt_regs *regs);

extern int machine_check_e200(struct pt_regs *regs);

extern int machine_check_47x(struct pt_regs *regs);

int machine_check_8xx(struct pt_regs *regs);



extern void cpu_down_flush_e500v2(void);

extern void cpu_down_flush_e500mc(void);

arch/powerpc/include/asm/hw_irq.h

+6 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ static inline unsigned long arch_local_irq_save(void) 
	unsigned long flags = arch_local_save_flags();

#ifdef CONFIG_BOOKE

	asm volatile("wrteei 0" : : : "memory");

#elif defined(CONFIG_PPC_8xx)

	wrtspr(SPRN_EID);

#else

	SET_MSR_EE(flags & ~MSR_EE);

#endif
@@ -165,6 +167,8 @@ static inline void arch_local_irq_disable(void) 
{

#ifdef CONFIG_BOOKE

	asm volatile("wrteei 0" : : : "memory");

#elif defined(CONFIG_PPC_8xx)

	wrtspr(SPRN_EID);

#else

	arch_local_irq_save();

#endif
@@ -174,6 +178,8 @@ static inline void arch_local_irq_enable(void) 
{

#ifdef CONFIG_BOOKE

	asm volatile("wrteei 1" : : : "memory");

#elif defined(CONFIG_PPC_8xx)

	wrtspr(SPRN_EIE);

#else

	unsigned long msr = mfmsr();

	SET_MSR_EE(msr | MSR_EE);

arch/powerpc/include/asm/ppc-opcode.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
#define PPC_INST_LWSYNC			0x7c2004ac

#define PPC_INST_SYNC			0x7c0004ac

#define PPC_INST_SYNC_MASK		0xfc0007fe

#define PPC_INST_ISYNC			0x4c00012c

#define PPC_INST_LXVD2X			0x7c000698

#define PPC_INST_MCRXR			0x7c000400

#define PPC_INST_MCRXR_MASK		0xfc0007fe