Commit 09cea96c 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: (151 commits)
  powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
  MAINTAINERS: Add PowerPC patterns
  powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
  powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
  powerpc: Make "intspec" pointers in irq_host->xlate() const
  powerpc/8xx: DTLB Miss cleanup
  powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
  powerpc/8xx: Start using dcbX instructions in various copy routines
  powerpc/8xx: Restore _PAGE_WRITETHRU
  powerpc/8xx: Add missing Guarded setting in DTLB Error.
  powerpc/8xx: Fixup DAR from buggy dcbX instructions.
  powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
  powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
  powerpc/8xx: Invalidate non present TLBs
  powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
  pseries/pseries: Add code to online/offline CPUs of a DLPAR node
  powerpc: stop_this_cpu: remove the cpu from the online map.
  powerpc/pseries: Add kernel based CPU DLPAR handling
  sysfs/cpu: Add probe/release files
  powerpc/pseries: Kernel DLPAR Infrastructure
  ...
parents 6eb7365d e090aa80

Documentation/ABI/testing/sysfs-devices-system-cpu

+15 −0
Original line number Diff line number Diff line
@@ -62,6 +62,21 @@ Description: CPU topology files that describe kernel limits related to 
		See Documentation/cputopology.txt for more information.





What:		/sys/devices/system/cpu/probe

		/sys/devices/system/cpu/release

Date:		November 2009

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Dynamic addition and removal of CPU's.  This is not hotplug

		removal, this is meant complete removal/addition of the CPU

		from the system.



		probe: writes to this file will dynamically add a CPU to the

		system.  Information written to the file to add CPU's is

		architecture specific.



		release: writes to this file dynamically remove a CPU from

		the system.  Information writtento the file to remove CPU's

		is architecture specific.



What:		/sys/devices/system/cpu/cpu#/node

Date:		October 2009

Documentation/cpu-hotplug.txt

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ maxcpus=n Restrict boot time cpus to n. Say if you have 4 cpus, using 
additional_cpus=n (*)	Use this to limit hotpluggable cpus. This option sets

  			cpu_possible_map = cpu_present_map + additional_cpus



cede_offline={"off","on"}  Use this option to disable/enable putting offlined

		            processors to an extended H_CEDE state on

			    supported pseries platforms.

			    If nothing is specified,

			    cede_offline is set to "on".



(*) Option valid only for following architectures

- ia64

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

+4 −0
Original line number Diff line number Diff line
@@ -20,12 +20,16 @@ Required properities: 
- compatible : should be "fsl,fpga-pixis".

- reg : should contain the address and the length of the FPPGA register

  set.

- interrupt-parent: should specify phandle for the interrupt controller.

- interrupts : should specify event (wakeup) IRQ.



Example (MPC8610HPCD):



	board-control@e8000000 {

		compatible = "fsl,fpga-pixis";

		reg = <0xe8000000 32>;

		interrupt-parent = <&mpic>;

		interrupts = <8 8>;

	};



* Freescale BCSR GPIO banks

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

+16 −1
Original line number Diff line number Diff line
@@ -103,7 +103,22 @@ fsl,mpc5200-gpt nodes 
---------------------

On the mpc5200 and 5200b, GPT0 has a watchdog timer function.  If the board

design supports the internal wdt, then the device node for GPT0 should

include the empty property 'fsl,has-wdt'.

include the empty property 'fsl,has-wdt'.  Note that this does not activate

the watchdog.  The timer will function as a GPT if the timer api is used, and

it will function as watchdog if the watchdog device is used.  The watchdog

mode has priority over the gpt mode, i.e. if the watchdog is activated, any

gpt api call to this timer will fail with -EBUSY.



If you add the property

	fsl,wdt-on-boot = <n>;

GPT0 will be marked as in-use watchdog, i.e. blocking every gpt access to it.

If n>0, the watchdog is started with a timeout of n seconds.  If n=0, the

configuration of the watchdog is not touched.  This is useful in two cases:

- just mark GPT0 as watchdog, blocking gpt accesses, and configure it later;

- do not touch a configuration assigned by the boot loader which supervises

  the boot process itself.



The watchdog will respect the CONFIG_WATCHDOG_NOWAYOUT option.



An mpc5200-gpt can be used as a single line GPIO controller.  To do so,

add the following properties to the gpt node:

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -3260,6 +3260,7 @@ 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>
@@ -3268,18 +3269,24 @@ W: http://www.penguinppc.org/ 
L:	linuxppc-dev@ozlabs.org

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

S:	Supported

F:	Documentation/powerpc/

F:	arch/powerpc/



LINUX FOR POWER MACINTOSH

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

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

L:	linuxppc-dev@ozlabs.org

S:	Maintained

F:	arch/powerpc/platforms/powermac/

F:	drivers/macintosh/



LINUX FOR POWERPC EMBEDDED MPC5XXX

M:	Grant Likely <grant.likely@secretlab.ca>

L:	linuxppc-dev@ozlabs.org

T:	git git://git.secretlab.ca/git/linux-2.6.git

S:	Maintained

F:	arch/powerpc/platforms/512x/

F:	arch/powerpc/platforms/52xx/



LINUX FOR POWERPC EMBEDDED PPC4XX

M:	Josh Boyer <jwboyer@linux.vnet.ibm.com>
@@ -3288,6 +3295,8 @@ W: http://www.penguinppc.org/ 
L:	linuxppc-dev@ozlabs.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git

S:	Maintained

F:	arch/powerpc/platforms/40x/

F:	arch/powerpc/platforms/44x/



LINUX FOR POWERPC EMBEDDED XILINX VIRTEX

M:	Grant Likely <grant.likely@secretlab.ca>
@@ -3295,6 +3304,8 @@ W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex 
L:	linuxppc-dev@ozlabs.org

T:	git git://git.secretlab.ca/git/linux-2.6.git

S:	Maintained

F:	arch/powerpc/*/*virtex*

F:	arch/powerpc/*/*/*virtex*



LINUX FOR POWERPC EMBEDDED PPC8XX

M:	Vitaly Bordug <vitb@kernel.crashing.org>
@@ -3308,12 +3319,16 @@ M: Kumar Gala <galak@kernel.crashing.org> 
W:	http://www.penguinppc.org/

L:	linuxppc-dev@ozlabs.org

S:	Maintained

F:	arch/powerpc/platforms/83xx/



LINUX FOR POWERPC PA SEMI PWRFICIENT

M:	Olof Johansson <olof@lixom.net>

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

L:	linuxppc-dev@ozlabs.org

S:	Supported

F:	arch/powerpc/platforms/pasemi/

F:	drivers/*/*pasemi*

F:	drivers/*/*/*pasemi*



LINUX SECURITY MODULE (LSM) FRAMEWORK

M:	Chris Wright <chrisw@sous-sol.org>

CRA Git | Maintained and supported by SUSTech CRA and CCSE