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

Commit d8bfb96a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull more powerpc updates from Michael Ellerman:
 "Some more powerpc updates for 4.9:

  Freescale updates from Scott Wood:
   - qbman support (a prerequisite for datapath drivers such as ethernet)
   - a PCI DMA fix+improvement
   - reset handler changes
   - more 8xx optimizations
   - some cleanups and fixes.'

  Fixes:
   - selftests/powerpc: Add missing binaries to .gitignores (Michael Ellerman)
   - selftests/powerpc: Fix build break caused by EXPORT_SYMBOL changes (Michael Ellerman)
   - powerpc/pseries: Fix stack corruption in htpe code (Laurent Dufour)
   - powerpc/64s: Fix power4_fixup_nap placement (Nicholas Piggin)
   - powerpc/64: Fix incorrect return value from __copy_tofrom_user (Paul Mackerras)
   - powerpc/mm/hash64: Fix might_have_hea() check (Michael Ellerman)

  Other:
   - MAINTAINERS: Remove myself from PA Semi entries (Olof Johansson)
   - MAINTAINERS: Drop separate pseries entry (Michael Ellerman)
   - MAINTAINERS: Update powerpc website & add selftests (Michael Ellerman):

* tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (35 commits)
  powerpc/mm/hash64: Fix might_have_hea() check
  powerpc/64: Fix incorrect return value from __copy_tofrom_user
  powerpc/64s: Fix power4_fixup_nap placement
  powerpc/pseries: Fix stack corruption in htpe code
  selftests/powerpc: Fix build break caused by EXPORT_SYMBOL changes
  MAINTAINERS: Update powerpc website & add selftests
  MAINTAINERS: Drop separate pseries entry
  MAINTAINERS: Remove myself from PA Semi entries
  selftests/powerpc: Add missing binaries to .gitignores
  arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig
  soc/qman: Add self-test for QMan driver
  soc/bman: Add self-test for BMan driver
  soc/fsl: Introduce DPAA 1.x QMan device driver
  soc/fsl: Introduce DPAA 1.x BMan device driver
  powerpc/8xx: make user addr DTLB miss the short path
  powerpc/8xx: Move additional DTLBMiss handlers out of exception area
  powerpc/8xx: use r3 to scratch CR in ITLBmiss
  soc/fsl/qe: fix gpio save_regs functions
  powerpc/8xx: add dedicated machine check handler
  powerpc/8xx: add system_reset_exception
  ...
parents 11ed3e0e 08bf75ba

MAINTAINERS

+5 −13
Original line number Diff line number Diff line
@@ -7201,17 +7201,11 @@ F: drivers/lightnvm/ 
F:	include/linux/lightnvm.h

F:	include/uapi/linux/lightnvm.h



LINUX FOR IBM pSERIES (RS/6000)

M:	Paul Mackerras <paulus@au.ibm.com>

W:	http://www.ibm.com/linux/ltc/projects/ppc

S:	Supported

F:	arch/powerpc/boot/rs6000.h



LINUX FOR POWERPC (32-BIT AND 64-BIT)

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

M:	Paul Mackerras <paulus@samba.org>

M:	Michael Ellerman <mpe@ellerman.id.au>

W:	http://www.penguinppc.org/

W:	https://github.com/linuxppc/linux/wiki

L:	linuxppc-dev@lists.ozlabs.org

Q:	http://patchwork.ozlabs.org/project/linuxppc-dev/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
@@ -7226,6 +7220,7 @@ F: drivers/net/ethernet/ibm/ibmvnic.* 
F:	drivers/pci/hotplug/pnv_php.c

F:	drivers/pci/hotplug/rpa*

F:	drivers/scsi/ibmvscsi/

F:	tools/testing/selftests/powerpc

N:	opal

N:	/pmac

N:	powermac
@@ -7282,9 +7277,8 @@ F: arch/powerpc/platforms/83xx/ 
F:	arch/powerpc/platforms/85xx/



LINUX FOR POWERPC PA SEMI PWRFICIENT

M:	Olof Johansson <olof@lixom.net>

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained

S:	Orphan

F:	arch/powerpc/platforms/pasemi/

F:	drivers/*/*pasemi*

F:	drivers/*/*/*pasemi*
@@ -9019,15 +9013,13 @@ S: Maintained 
F:	drivers/net/wireless/intersil/p54/



PA SEMI ETHERNET DRIVER

M:	Olof Johansson <olof@lixom.net>

L:	netdev@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/net/ethernet/pasemi/*



PA SEMI SMBUS DRIVER

M:	Olof Johansson <olof@lixom.net>

L:	linux-i2c@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/i2c/busses/i2c-pasemi.c



PADATA PARALLEL EXECUTION MECHANISM

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);