Commit 14d1adfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)
  [POWERPC] Fix ohare IDE irq workaround on old powermacs
  [POWERPC] EEH: Power4 systems sometimes need multiple resets.
  [POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.
  [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c
  [POWERPC] Maple U3 HT - reject inappropriate config space access
  [POWERPC] Fix IPIC pending register assignments
  [POWERPC] powerpc: fix building gdb against asm/ptrace.h
  [POWERPC] Remove DISCONTIGMEM cruft from page.h
  [POWERPC] Merge iSeries i/o operations with the rest
  [POWERPC] 40x: Fix debug status register defines
  [POWERPC] Fix compile error in sbc8560
  [POWERPC] EEH: support MMIO enable recovery step
  [POWERPC] EEH: enable MMIO/DMA on frozen slot
  [POWERPC] EEH: code comment cleanup
  [POWERPC] EEH: balance pcidev_get/put calls
  [POWERPC] PPC: Fix xmon stack frame address in backtrace
  [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX
  [POWERPC] Start arch/powerpc/boot code reorganization
  [POWERPC] Define of_read_ulong helper
  [POWERPC] iseries: eliminate a couple of warnings
  ...
parents e478bec0 69917c26

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1783,6 +1783,13 @@ W: http://www.penguinppc.org/ 
L:     linuxppc-embedded@ozlabs.org

S:     Maintained



LINUX FOR POWERPC PA SEMI PWRFICIENT

P:	Olof Johansson

M:	olof@lixom.net

W:	http://www.pasemi.com/

L:	linuxppc-dev@ozlabs.org

S:	Supported



LLC (802.2)

P:	Arnaldo Carvalho de Melo

M:	acme@conectiva.com.br

arch/powerpc/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -417,6 +417,17 @@ config PPC_MAPLE 
          This option enables support for the Maple 970FX Evaluation Board.

	  For more informations, refer to <http://www.970eval.com>



config PPC_PASEMI

	depends on PPC_MULTIPLATFORM && PPC64

	bool "PA Semi SoC-based platforms"

	default n

	select MPIC

	select PPC_UDBG_16550

	select GENERIC_TBSYNC

	help

	  This option enables support for PA Semi's PWRficient line

	  of SoC processors, including PA6T-1682M



config PPC_CELL

	bool

	default n
@@ -436,7 +447,8 @@ config PPC_IBM_CELL_BLADE 
	select UDBG_RTAS_CONSOLE



config UDBG_RTAS_CONSOLE

	bool

	bool "RTAS based debug console"

	depends on PPC_RTAS

	default n



config XICS

arch/powerpc/Kconfig.debug

+16 −0
Original line number Diff line number Diff line
@@ -18,6 +18,20 @@ config DEBUG_STACK_USAGE 


	  This option will slow down process creation somewhat.



config HCALL_STATS

	bool "Hypervisor call instrumentation"

	depends on PPC_PSERIES && DEBUG_FS

	help

	  Adds code to keep track of the number of hypervisor calls made and

	  the amount of time spent in hypervisor callsr.  Wall time spent in

	  each call is always calculated, and if available CPU cycles spent

	  are also calculated.  A directory named hcall_inst is added at the

	  root of the debugfs filesystem.  Within the hcall_inst directory

	  are files that contain CPU specific call statistics.



	  This option will add a small amount of overhead to all hypervisor

	  calls.



config DEBUGGER

	bool "Enable debugger hooks"

	depends on DEBUG_KERNEL
@@ -74,6 +88,8 @@ config XMON 
	  very early during boot. 'xmon=on' will just enable the xmon

	  debugger hooks.  'xmon=off' will disable the debugger hooks

	  if CONFIG_XMON_DEFAULT is set.

	  xmon will print a backtrace on the very first invocation.

	  'xmon=nobt' will disable this autobacktrace.



config XMON_DEFAULT

	bool "Enable xmon by default"

arch/powerpc/boot/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -36,11 +36,16 @@ zliblinuxheader := zlib.h zconf.h zutil.h 
$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))

#$(addprefix $(obj)/,main.o): $(addprefix $(obj)/,zlib.h)



src-boot := crt0.S string.S prom.c stdio.c main.c div64.S

src-boot-$(CONFIG_PPC_MULTIPLATFORM) := of.c

src-boot := crt0.S string.S stdio.c main.c div64.S $(src-boot-y)

src-boot += $(zlib)

src-boot := $(addprefix $(obj)/, $(src-boot))

obj-boot := $(addsuffix .o, $(basename $(src-boot)))



ifeq ($(call cc-option-yn, -fstack-protector),y)

BOOTCFLAGS	+= -fno-stack-protector

endif



BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)



quiet_cmd_copy_zlib = COPY    $@

arch/powerpc/boot/dts/mpc8349emds.dts

+8 −8
Original line number Diff line number Diff line
@@ -214,10 +214,10 @@ 
					 b800 0 0 4 700 15 8



					/* IDSEL 0x18 */

					 b000 0 0 1 700 15 8

					 b000 0 0 2 700 16 8

					 b000 0 0 3 700 17 8

					 b000 0 0 4 700 14 8>;

					 c000 0 0 1 700 15 8

					 c000 0 0 2 700 16 8

					 c000 0 0 3 700 17 8

					 c000 0 0 4 700 14 8>;

			interrupt-parent = <700>;

			interrupts = <42 8>;

			bus-range = <0 0>;
@@ -274,10 +274,10 @@ 
					 b800 0 0 4 700 15 8



					/* IDSEL 0x18 */

					 b000 0 0 1 700 15 8

					 b000 0 0 2 700 16 8

					 b000 0 0 3 700 17 8

					 b000 0 0 4 700 14 8>;

					 c000 0 0 1 700 15 8

					 c000 0 0 2 700 16 8

					 c000 0 0 3 700 17 8

					 c000 0 0 4 700 14 8>;

			interrupt-parent = <700>;

			interrupts = <42 8>;

			bus-range = <0 0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE