Commit 9bf9b2f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (53 commits)
  powerpc: Support for relocatable kdump kernel
  powerpc: Don't use a 16G page if beyond mem= limits
  powerpc: Add del_node() for early boot code to prune inapplicable devices.
  powerpc: Further compile fixup for STRICT_MM_TYPECHECKS
  powerpc: Remove empty #else from signal_64.c
  powerpc: Move memory size print into common show_cpuinfo for 32-bit
  hvc_console: Remove __devexit annotation of hvc_remove()
  hvc_console: Add support for tty window resizing
  hvc_console: Fix loop if put_char() returns 0
  hvc_console: Add tty driver flag TTY_DRIVER_RESET_TERMIOS
  hvc_console: Add a hangup notifier for backends
  powerpc/83xx: Add DS1339 RTC support for MPC8349E-mITX boards .dts
  powerpc/83xx: Add support for MCU microcontroller in .dts files
  powerpc/85xx: Move mpc8572ds.dts to address-cells/size-cells = <2>
  of/spi: Support specifying chip select as active high via device tree
  powerpc: Remove device_type = "board_control" properties in .dts files
  i2c-cpm: Suppress autoprobing for devices
  powerpc/85xx: Fix mpc8536ds dma interrupt numbers
  powerpc/85xx: Enable enhanced functions for 8536 TSEC
  powerpc: Delete unused prom_strtoul and prom_memparse
  ...
parents 9779a832 54622f10

Documentation/kdump/kdump.txt

+11 −3
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ There are two possible methods of using Kdump. 
2) Or use the system kernel binary itself as dump-capture kernel and there is

   no need to build a separate dump-capture kernel. This is possible

   only with the architecutres which support a relocatable kernel. As

   of today, i386, x86_64 and ia64 architectures support relocatable kernel.

   of today, i386, x86_64, ppc64 and ia64 architectures support relocatable

   kernel.



Building a relocatable kernel is advantageous from the point of view that

one does not have to build a second kernel for capturing the dump. But
@@ -207,8 +208,15 @@ Dump-capture kernel config options (Arch Dependent, i386 and x86_64) 
Dump-capture kernel config options (Arch Dependent, ppc64)

----------------------------------------------------------



*  Make and install the kernel and its modules. DO NOT add this kernel

   to the boot loader configuration files.

1) Enable "Build a kdump crash kernel" support under "Kernel" options:



   CONFIG_CRASH_DUMP=y



2)   Enable "Build a relocatable kernel" support



   CONFIG_RELOCATABLE=y



   Make and install the kernel and its modules.



Dump-capture kernel config options (Arch Dependent, ia64)

----------------------------------------------------------

Documentation/powerpc/booting-without-of.txt

+2 −0
Original line number Diff line number Diff line
@@ -1917,6 +1917,8 @@ platforms are moved over to use the flattened-device-tree model. 
			inverse clock polarity (CPOL) mode

    - spi-cpha        - (optional) Empty property indicating device requires

			shifted clock phase (CPHA) mode

    - spi-cs-high     - (optional) Empty property indicating device requires

			chip select active high



    SPI example for an MPC5200 SPI bus:

		spi@f00 {

Documentation/powerpc/dts-bindings/fsl/board.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


Required properties:



 - device_type : Should be "board-control"

 - compatible : Should be "fsl,<board>-bcsr"

 - reg : Offset and length of the register set for the device



Example:



	bcsr@f8000000 {

		device_type = "board-control";

		compatible = "fsl,mpc8360mds-bcsr";

		reg = <f8000000 8000>;

	};

arch/powerpc/Kconfig

+3 −10
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ config WORD_SIZE 
	default 64 if PPC64

	default 32 if !PPC64



config PPC_MERGE

	def_bool y



config ARCH_PHYS_ADDR_T_64BIT

       def_bool PPC64 || PHYS_64BIT
@@ -326,13 +323,11 @@ config KEXEC 


config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC_MULTIPLATFORM && PPC64

	depends on PPC_MULTIPLATFORM && PPC64 && RELOCATABLE

	help

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

	  The kernel will be linked at a different address than normal, and

	  so can only be used for Kdump.



	  Don't change this unless you know what you are doing.

	  The same kernel binary can be used as production kernel and dump

	  capture kernel.



config PHYP_DUMP

	bool "Hypervisor-assisted dump (EXPERIMENTAL)"
@@ -832,11 +827,9 @@ config PAGE_OFFSET 
	default "0xc000000000000000"

config KERNEL_START

	hex

	default "0xc000000002000000" if CRASH_DUMP

	default "0xc000000000000000"

config PHYSICAL_START

	hex

	default "0x02000000" if CRASH_DUMP

	default "0x00000000"

endif

arch/powerpc/boot/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c 
		fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \

		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \

		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \

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

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

		cuboot-acadia.c

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



src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -211,6 +212,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImage 
# Board ports in arch/powerpc/platform/40x/Kconfig

image-$(CONFIG_EP405)			+= dtbImage.ep405

image-$(CONFIG_WALNUT)			+= treeImage.walnut

image-$(CONFIG_ACADIA)			+= cuImage.acadia



# Board ports in arch/powerpc/platform/44x/Kconfig

image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony
@@ -319,6 +321,9 @@ $(obj)/zImage.iseries: vmlinux 
$(obj)/uImage: vmlinux $(wrapperbits)

	$(call if_changed,wrap,uboot)



$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)

CRA Git | Maintained and supported by SUSTech CRA and CCSE