Commit 79c45812 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 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (92 commits)
  powerpc: Remove unused 'protect4gb' boot parameter
  powerpc: Build-in e1000e for pseries & ppc64_defconfig
  powerpc/pseries: Make request_ras_irqs() available to other pseries code
  powerpc/numa: Use ibm,architecture-vec-5 to detect form 1 affinity
  powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim
  powerpc: Use smt_snooze_delay=-1 to always busy loop
  powerpc: Remove check of ibm,smt-snooze-delay OF property
  powerpc/kdump: Fix race in kdump shutdown
  powerpc/kexec: Fix race in kexec shutdown
  powerpc/kexec: Speedup kexec hash PTE tear down
  powerpc/pseries: Add hcall to read 4 ptes at a time in real mode
  powerpc: Use more accurate limit for first segment memory allocations
  powerpc/kdump: Use chip->shutdown to disable IRQs
  powerpc/kdump: CPUs assume the context of the oopsing CPU
  powerpc/crashdump: Do not fail on NULL pointer dereferencing
  powerpc/eeh: Fix oops when probing in early boot
  powerpc/pci: Check devices status property when scanning OF tree
  powerpc/vio: Switch VIO Bus PM to use generic helpers
  powerpc: Avoid bad relocations in iSeries code
  powerpc: Use common cpu_die (fixes SMP+SUSPEND build)
  ...
parents 59534f72 99ec28f1

Documentation/powerpc/dts-bindings/4xx/reboot.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Reboot property to control system reboot on PPC4xx systems:



By setting "reset_type" to one of the following values, the default

software reset mechanism may be overidden. Here the possible values of

"reset_type":



      1 - PPC4xx core reset

      2 - PPC4xx chip reset

      3 - PPC4xx system reset (default)



Example:



		cpu@0 {

			device_type = "cpu";

			model = "PowerPC,440SPe";

			...

			reset-type = <2>;	/* Use chip-reset */

		};

Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt

+21 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Required properties: 
  83xx, "fsl,mpc8572-gpio" for 85xx and "fsl,mpc8610-gpio" for 86xx.

- #gpio-cells : Should be two. The first cell is the pin number and the

  second cell is used to specify optional parameters (currently unused).

 - interrupts : Interrupt mapping for GPIO IRQ (currently unused).

 - interrupts : Interrupt mapping for GPIO IRQ.

 - interrupt-parent : Phandle for the interrupt controller that

   services interrupts for this device.

- gpio-controller : Marks the port as GPIO controller.
@@ -38,3 +38,23 @@ Example of gpio-controller nodes for a MPC8347 SoC: 


See booting-without-of.txt for details of how to specify GPIO

information for devices.



To use GPIO pins as interrupt sources for peripherals, specify the

GPIO controller as the interrupt parent and define GPIO number +

trigger mode using the interrupts property, which is defined like

this:



interrupts = <number trigger>, where:

 - number: GPIO pin (0..31)

 - trigger: trigger mode:

	2 = trigger on falling edge

	3 = trigger on both edges



Example of device using this is:



	funkyfpga@0 {

		compatible = "funky-fpga";

		...

		interrupts = <4 3>;

		interrupt-parent = <&gpio1>;

	};

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ config PPC 
	select HAVE_SYSCALL_WRAPPERS if PPC64

	select GENERIC_ATOMIC64 if PPC32

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API



config EARLY_PRINTK

	bool

arch/powerpc/Kconfig.debug

+12 −0
Original line number Diff line number Diff line
@@ -44,6 +44,18 @@ config DEBUG_STACK_USAGE 


	  This option will slow down process creation somewhat.



config DEBUG_PER_CPU_MAPS

	bool "Debug access to per_cpu maps"

	depends on DEBUG_KERNEL

	depends on SMP

	default n

	---help---

	  Say Y to verify that the per_cpu map being accessed has

	  been setup.  Adds a fair amount of code to kernel memory

	  and decreases performance.



	  Say N if unsure.



config HCALL_STATS

	bool "Hypervisor call instrumentation"

	depends on PPC_PSERIES && DEBUG_FS && TRACEPOINTS

arch/powerpc/boot/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 
$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405

$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405

$(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405

$(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
@@ -77,7 +78,7 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c 
		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \

		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \

		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \

		gamecube-head.S gamecube.c wii-head.S wii.c

		gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c

src-boot := $(src-wlib) $(src-plat) empty.c



src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -169,7 +170,7 @@ quiet_cmd_wrap = WRAP $@ 
		$(if $3, -s $3)$(if $4, -d $4)$(if $5, -i $5) vmlinux



image-$(CONFIG_PPC_PSERIES)		+= zImage.pseries

image-$(CONFIG_PPC_MAPLE)		+= zImage.pseries

image-$(CONFIG_PPC_MAPLE)		+= zImage.maple

image-$(CONFIG_PPC_IBM_CELL_BLADE)	+= zImage.pseries

image-$(CONFIG_PPC_PS3)			+= dtbImage.ps3

image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries
@@ -206,6 +207,8 @@ image-$(CONFIG_TAISHAN) += cuImage.taishan 
image-$(CONFIG_KATMAI)			+= cuImage.katmai

image-$(CONFIG_WARP)			+= cuImage.warp

image-$(CONFIG_YOSEMITE)		+= cuImage.yosemite

image-$(CONFIG_ISS4xx)			+= treeImage.iss4xx \

					   treeImage.iss4xx-mpic



# Board ports in arch/powerpc/platform/8xx/Kconfig

image-$(CONFIG_MPC86XADS)		+= cuImage.mpc866ads
@@ -351,7 +354,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) 
clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \

	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \

	zImage.iseries zImage.miboot zImage.pmac zImage.pseries \

	simpleImage.* otheros.bld *.dtb

	zImage.maple simpleImage.* otheros.bld *.dtb



# clean up files cached by wrapper

clean-kernel := vmlinux.strip vmlinux.bin

CRA Git | Maintained and supported by SUSTech CRA and CCSE