Commit 1b17366d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Ben Herrenschmidt:
 "So here's my next branch for powerpc.  A bit late as I was on vacation
  last week.  It's mostly the same stuff that was in next already, I
  just added two patches today which are the wiring up of lockref for
  powerpc, which for some reason fell through the cracks last time and
  is trivial.

  The highlights are, in addition to a bunch of bug fixes:

   - Reworked Machine Check handling on kernels running without a
     hypervisor (or acting as a hypervisor).  Provides hooks to handle
     some errors in real mode such as TLB errors, handle SLB errors,
     etc...

   - Support for retrieving memory error information from the service
     processor on IBM servers running without a hypervisor and routing
     them to the memory poison infrastructure.

   - _PAGE_NUMA support on server processors

   - 32-bit BookE relocatable kernel support

   - FSL e6500 hardware tablewalk support

   - A bunch of new/revived board support

   - FSL e6500 deeper idle states and altivec powerdown support

  You'll notice a generic mm change here, it has been acked by the
  relevant authorities and is a pre-req for our _PAGE_NUMA support"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (121 commits)
  powerpc: Implement arch_spin_is_locked() using arch_spin_value_unlocked()
  powerpc: Add support for the optimised lockref implementation
  powerpc/powernv: Call OPAL sync before kexec'ing
  powerpc/eeh: Escalate error on non-existing PE
  powerpc/eeh: Handle multiple EEH errors
  powerpc: Fix transactional FP/VMX/VSX unavailable handlers
  powerpc: Don't corrupt transactional state when using FP/VMX in kernel
  powerpc: Reclaim two unused thread_info flag bits
  powerpc: Fix races with irq_work
  Move precessing of MCE queued event out from syscall exit path.
  pseries/cpuidle: Remove redundant call to ppc64_runlatch_off() in cpu idle routines
  powerpc: Make add_system_ram_resources() __init
  powerpc: add SATA_MV to ppc64_defconfig
  powerpc/powernv: Increase candidate fw image size
  powerpc: Add debug checks to catch invalid cpu-to-node mappings
  powerpc: Fix the setup of CPU-to-Node mappings during CPU online
  powerpc/iommu: Don't detach device without IOMMU group
  powerpc/eeh: Hotplug improvement
  powerpc/eeh: Call opal_pci_reinit() on powernv for restoring config space
  powerpc/eeh: Add restore_config operation
  ...
parents d12de1ef 7179ba52

Documentation/devicetree/bindings/video/ssd1289fb.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
* Solomon SSD1289 Framebuffer Driver



Required properties:

  - compatible: Should be "solomon,ssd1289fb". The only supported bus for

    now is lbc.

  - reg: Should contain address of the controller on the LBC bus. The detail

    was described in Documentation/devicetree/bindings/powerpc/fsl/lbc.txt



Examples:

display@2,0 {

	compatible = "solomon,ssd1289fb";

	reg = <0x2 0x0000 0x0004>;

};

arch/powerpc/Kconfig

+9 −6
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ config PPC 
	select OLD_SIGACTION if PPC32

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select ARCH_USE_CMPXCHG_LOCKREF if PPC64



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN
@@ -214,9 +215,6 @@ config DEFAULT_UIMAGE 
	  Used to allow a board to specify it wants a uImage built by default

	default n



config REDBOOT

	bool



config ARCH_HIBERNATION_POSSIBLE

	bool

	default y
@@ -384,6 +382,12 @@ config ARCH_HAS_WALK_MEMORY 
config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y



config PPC64_SUPPORTS_MEMORY_FAILURE

	bool "Add support for memory hwpoison"

	depends on PPC_BOOK3S_64

	default "y" if PPC_POWERNV

	select ARCH_SUPPORTS_MEMORY_FAILURE



config KEXEC

	bool "kexec system call"

	depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
@@ -404,8 +408,7 @@ config KEXEC 
config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)

	select RELOCATABLE if PPC64 || 44x

	select DYNAMIC_MEMSTART if FSL_BOOKE

	select RELOCATABLE if PPC64 || 44x || FSL_BOOKE

	help

	  Build a kernel suitable for use as a kdump capture kernel.

	  The same kernel binary can be used as production kernel and dump
@@ -886,7 +889,7 @@ config DYNAMIC_MEMSTART 


config RELOCATABLE

	bool "Build a relocatable kernel"

	depends on ADVANCED_OPTIONS && FLATMEM && 44x

	depends on ADVANCED_OPTIONS && FLATMEM && (44x || FSL_BOOKE)

	select NONSTATIC_KERNEL

	help

	  This builds a kernel image that is capable of running at the

arch/powerpc/boot/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ mktree 
uImage

cuImage.*

dtbImage.*

*.dtb

treeImage.*

zImage

zImage.initrd

arch/powerpc/boot/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ src-wlib-y := string.S crt0.S crtsavres.S stdio.c main.c \ 
		uartlite.c mpc52xx-psc.c

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c

src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c

src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c



src-plat-y := of.c epapr.c

src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \
@@ -95,7 +95,7 @@ src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c 
src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \

					cuboot-c2k.c gamecube-head.S \

					gamecube.c wii-head.S wii.c holly.c \

					prpmc2800.c

					prpmc2800.c fixed-head.S mvme5100.c

src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c

src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c

src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c
@@ -286,6 +286,7 @@ image-$(CONFIG_MPC7448HPC2) += cuImage.mpc7448hpc2 
image-$(CONFIG_PPC_C2K)			+= cuImage.c2k

image-$(CONFIG_GAMECUBE)		+= dtbImage.gamecube

image-$(CONFIG_WII)			+= dtbImage.wii

image-$(CONFIG_MVME5100)		+= dtbImage.mvme5100



# Board port in arch/powerpc/platform/amigaone/Kconfig

image-$(CONFIG_AMIGAONE)		+= cuImage.amigaone

arch/powerpc/boot/dts/fsl/elo3-dma-2.dtsi

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*

 * QorIQ Elo3 DMA device tree stub [ controller @ offset 0x102300 ]

 *

 * Copyright 2013 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



dma2: dma@102300 {

	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "fsl,elo3-dma";

	reg = <0x102300 0x4>,

	      <0x102600 0x4>;

	ranges = <0x0 0x102100 0x500>;

	dma-channel@0 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x0 0x80>;

		interrupts = <464 2 0 0>;

	};

	dma-channel@80 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x80 0x80>;

		interrupts = <465 2 0 0>;

	};

	dma-channel@100 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x100 0x80>;

		interrupts = <466 2 0 0>;

	};

	dma-channel@180 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x180 0x80>;

		interrupts = <467 2 0 0>;

	};

	dma-channel@300 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x300 0x80>;

		interrupts = <468 2 0 0>;

	};

	dma-channel@380 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x380 0x80>;

		interrupts = <469 2 0 0>;

	};

	dma-channel@400 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x400 0x80>;

		interrupts = <470 2 0 0>;

	};

	dma-channel@480 {

		compatible = "fsl,eloplus-dma-channel";

		reg = <0x480 0x80>;

		interrupts = <471 2 0 0>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE