Commit 489de302 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..
parents 1f1c2881 bf22f6fe

Documentation/cachetlb.txt

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ Here are the routines, one by one: 


	The first of these two routines is invoked after map_vm_area()

	has installed the page table entries.  The second is invoked

	before unmap_vm_area() deletes the page table entries.

	before unmap_kernel_range() deletes the page table entries.



There exists another whole class of cpu cache issues which currently

require a whole different set of interfaces to handle properly.

Documentation/feature-removal-schedule.txt

+13 −0
Original line number Diff line number Diff line
@@ -297,3 +297,16 @@ Why: Obsolete for multiple years now, NAT core provides the same behaviour. 
Who:	Patrick McHardy <kaber@trash.net>



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



What: The arch/ppc and include/asm-ppc directories

When: Jun 2008

Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64

      platforms.  Currently there are efforts underway to port the remaining

      arch/ppc platforms to the merged tree.  New submissions to the arch/ppc

      tree have been frozen with the 2.6.22 kernel release and that tree will

      remain in bug-fix only mode until its scheduled removal.  Platforms

      that are not ported by June 2008 will be removed due to the lack of an

      interested maintainer.

Who:  linuxppc-dev@ozlabs.org



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

Documentation/powerpc/booting-without-of.txt

+38 −2
Original line number Diff line number Diff line
@@ -42,15 +42,16 @@ Table of Contents 
    1) Defining child nodes of an SOC

    2) Representing devices without a current OF specification

      a) MDIO IO device

      c) PHY nodes

      b) Gianfar-compatible ethernet nodes

      c) PHY nodes

      d) Interrupt controllers

      e) I2C

      f) Freescale SOC USB controllers

      g) Freescale SOC SEC Security Engines

      h) Board Control and Status (BCSR)

      i) Freescale QUICC Engine module (QE)

      g) Flash chip nodes

      j) Flash chip nodes

      k) Global Utilities Block



  VII - Specifying interrupt information for devices

    1) interrupts property
@@ -626,6 +627,14 @@ So the node content can be summarized as a start token, a full path, 
a list of properties, a list of child nodes, and an end token. Every

child node is a full node structure itself as defined above.



NOTE: The above definition requires that all property definitions for

a particular node MUST precede any subnode definitions for that node.

Although the structure would not be ambiguous if properties and

subnodes were intermingled, the kernel parser requires that the

properties come first (up until at least 2.6.22).  Any tools

manipulating a flattened tree must take care to preserve this

constraint.



4) Device tree "strings" block



In order to save space, property names, which are generally redundant,
@@ -1782,6 +1791,33 @@ platforms are moved over to use the flattened-device-tree model. 
 		partition-names = "fs\0firmware";

 	};



   k) Global Utilities Block



   The global utilities block controls power management, I/O device

   enabling, power-on-reset configuration monitoring, general-purpose

   I/O signal configuration, alternate function selection for multiplexed

   signals, and clock control.



   Required properties:



    - compatible : Should define the compatible device type for

      global-utilities.

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



  Recommended properties:



    - fsl,has-rstcr : Indicates that the global utilities register set

      contains a functioning "reset control register" (i.e. the board

      is wired to reset upon setting the HRESET_REQ bit in this register).



    Example:



	global-utilities@e0000 {	/* global utilities block */

		compatible = "fsl,mpc8548-guts";

		reg = <e0000 1000>;

		fsl,has-rstcr;

	};



   More devices will be defined as this spec matures.



VII - Specifying interrupt information for devices

arch/powerpc/Kconfig

+4 −263
Original line number Diff line number Diff line
@@ -4,17 +4,7 @@ 


mainmenu "Linux/PowerPC Kernel Configuration"



config PPC64

	bool "64-bit kernel"

	default n

	help

	  This option selects whether a 32-bit or a 64-bit kernel

	  will be built.



config PPC_PM_NEEDS_RTC_LIB

	bool

	select RTC_LIB

	default y if PM

source "arch/powerpc/platforms/Kconfig.cputype"



config PPC32

	bool
@@ -135,123 +125,6 @@ config PPC64_SWSUSP 
	depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))

	default y



menu "Processor support"

choice

	prompt "Processor Type"

	depends on PPC32

	default 6xx



config CLASSIC32

	bool "52xx/6xx/7xx/74xx"

	select PPC_FPU

	select 6xx

	help

	  There are four families of PowerPC chips supported.  The more common

	  types (601, 603, 604, 740, 750, 7400), the Motorola embedded

	  versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC

	  embedded versions (403 and 405) and the high end 64 bit Power

	  processors (POWER 3, POWER4, and IBM PPC970 also known as G5).



	  This option is the catch-all for 6xx types, including some of the

	  embedded versions.  Unless there is see an option for the specific

	  chip family you are using, you want this option.

	  

	  You do not want this if you are building a kernel for a 64 bit

	  IBM RS/6000 or an Apple G5, choose 6xx.

	  

	  If unsure, select this option

	  

	  Note that the kernel runs in 32-bit mode even on 64-bit chips.



config PPC_82xx

	bool "Freescale 82xx"

	select 6xx

	select PPC_FPU



config PPC_83xx

	bool "Freescale 83xx"

	select 6xx

	select FSL_SOC

	select 83xx

	select PPC_FPU

	select WANT_DEVICE_TREE



config PPC_85xx

	bool "Freescale 85xx"

	select E500

	select FSL_SOC

	select 85xx

	select WANT_DEVICE_TREE



config PPC_86xx

	bool "Freescale 86xx"

	select 6xx

	select FSL_SOC

	select FSL_PCIE

	select PPC_FPU

	select ALTIVEC

	help

	  The Freescale E600 SoCs have 74xx cores.



config PPC_8xx

	bool "Freescale 8xx"

	select FSL_SOC

	select 8xx



config 40x

	bool "AMCC 40x"

	select PPC_DCR_NATIVE



config 44x

	bool "AMCC 44x"

	select PPC_DCR_NATIVE

	select WANT_DEVICE_TREE



config E200

	bool "Freescale e200"



endchoice



config POWER4_ONLY

	bool "Optimize for POWER4"

	depends on PPC64

	default n

	---help---

	  Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.

	  The resulting binary will not work on POWER3 or RS64 processors

	  when compiled with binutils 2.15 or later.



config POWER3

	bool

	depends on PPC64

	default y if !POWER4_ONLY



config POWER4

	depends on PPC64

	def_bool y



config 6xx

	bool



# this is temp to handle compat with arch=ppc

config 8xx

	bool



# this is temp to handle compat with arch=ppc

config 83xx

	bool



# this is temp to handle compat with arch=ppc

config 85xx

	bool



config E500

	bool



config PPC_FPU

	bool

	default y if PPC64



config PPC_DCR_NATIVE

	bool

	default n
@@ -270,134 +143,6 @@ config PPC_OF_PLATFORM_PCI 
	depends on PPC64 # not supported on 32 bits yet

	default n



config 4xx

	bool

	depends on 40x || 44x

	default y



config BOOKE

	bool

	depends on E200 || E500 || 44x

	default y



config FSL_BOOKE

	bool

	depends on E200 || E500

	default y



config PTE_64BIT

	bool

	depends on 44x || E500

	default y if 44x

	default y if E500 && PHYS_64BIT



config PHYS_64BIT

	bool 'Large physical address support' if E500

	depends on 44x || E500

	select RESOURCES_64BIT

	default y if 44x

	---help---

	  This option enables kernel support for larger than 32-bit physical

	  addresses.  This features is not be available on all e500 cores.



	  If in doubt, say N here.



config ALTIVEC

	bool "AltiVec Support"

	depends on CLASSIC32 || POWER4

	---help---

	  This option enables kernel support for the Altivec extensions to the

	  PowerPC processor. The kernel currently supports saving and restoring

	  altivec registers, and turning on the 'altivec enable' bit so user

	  processes can execute altivec instructions.



	  This option is only usefully if you have a processor that supports

	  altivec (G4, otherwise known as 74xx series), but does not have

	  any affect on a non-altivec cpu (it does, however add code to the

	  kernel).



	  If in doubt, say Y here.



config SPE

	bool "SPE Support"

	depends on E200 || E500

	default y

	---help---

	  This option enables kernel support for the Signal Processing

	  Extensions (SPE) to the PowerPC processor. The kernel currently

	  supports saving and restoring SPE registers, and turning on the

	  'spe enable' bit so user processes can execute SPE instructions.



	  This option is only useful if you have a processor that supports

	  SPE (e500, otherwise known as 85xx series), but does not have any

	  effect on a non-spe cpu (it does, however add code to the kernel).



	  If in doubt, say Y here.



config PPC_STD_MMU

	bool

	depends on 6xx || POWER3 || POWER4 || PPC64

	default y



config PPC_STD_MMU_32

	def_bool y

	depends on PPC_STD_MMU && PPC32



config PPC_MM_SLICES

	bool

	default y if HUGETLB_PAGE

	default n



config VIRT_CPU_ACCOUNTING

	bool "Deterministic task and CPU time accounting"

	depends on PPC64

	default y

	help

	  Select this option to enable more accurate task and CPU time

	  accounting.  This is done by reading a CPU counter on each

	  kernel entry and exit and on transitions within the kernel

	  between system, softirq and hardirq state, so there is a

	  small performance impact.  This also enables accounting of

	  stolen time on logically-partitioned systems running on

	  IBM POWER5-based machines.



	  If in doubt, say Y here.



config SMP

	depends on PPC_STD_MMU

	bool "Symmetric multi-processing support"

	---help---

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, say N. If you have a system with more

	  than one CPU, say Y.  Note that the kernel does not currently

	  support SMP machines with 603/603e/603ev or PPC750 ("G3") processors

	  since they have inadequate hardware support for multiprocessor

	  operation.



	  If you say N here, the kernel will run on single and multiprocessor

	  machines, but will use only one CPU of a multiprocessor machine. If

	  you say Y here, the kernel will run on single-processor machines.

	  On a single-processor machine, the kernel will run faster if you say

	  N here.



	  If you don't know what to do here, say N.



config NR_CPUS

	int "Maximum number of CPUs (2-128)"

	range 2 128

	depends on SMP

	default "32" if PPC64

	default "4"



config NOT_COHERENT_CACHE

	bool

	depends on 4xx || 8xx || E200

	default y



config CONFIG_CHECK_CACHE_COHERENCY

	bool

endmenu



source "init/Kconfig"



source "arch/powerpc/platforms/Kconfig"
@@ -677,10 +422,6 @@ config SBUS 
config FSL_SOC

	bool



config FSL_PCIE

	bool

	depends on PPC_86xx



# Yes MCA RS/6000s exist but Linux-PPC does not currently support any

config MCA

	bool
@@ -688,10 +429,10 @@ config MCA 
config PCI

	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \

		|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \

		|| MPC7448HPC2 || PPC_PS3 || PPC_HOLLY

	default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \

		|| PPC_PS3

	default y if !40x && !CPM2 && !8xx && !PPC_83xx \

		&& !PPC_85xx && !PPC_86xx

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx

	default PCI_QSPAN if !4xx && !CPM2 && 8xx

	select ARCH_SUPPORTS_MSI

	help

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ all: $(KBUILD_IMAGE) 


CPPFLAGS_vmlinux.lds	:= -Upowerpc



BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage

BOOT_TARGETS = zImage zImage.initrd uImage



PHONY += $(BOOT_TARGETS)

CRA Git | Maintained and supported by SUSTech CRA and CCSE