Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

39eda2ab · Linus Torvalds <[email protected]> · 2013-09-06 10:49:42 -07:00

Pull powerpc updates from Ben Herrenschmidt:
 "Here's the powerpc batch for this merge window.  Some of the
  highlights are:

   - A bunch of endian fixes ! We don't have full LE support yet in that
     release but this contains a lot of fixes all over arch/powerpc to
     use the proper accessors, call the firmware with the right endian
     mode, etc...

   - A few updates to our "powernv" platform (non-virtualized, the one
     to run KVM on), among other, support for bridging the P8 LPC bus
     for UARTs, support and some EEH fixes.

   - Some mpc51xx clock API cleanups in preparation for a clock API
     overhaul

   - A pile of cleanups of our old math emulation code, including better
     support for using it to emulate optional FP instructions on
     embedded chips that otherwise have a HW FPU.

   - Some infrastructure in selftest, for powerpc now, but could be
     generalized, initially used by some tests for our perf instruction
     counting code.

   - A pile of fixes for hotplug on pseries (that was seriously
     bitrotting)

   - The usual slew of freescale embedded updates, new boards, 64-bit
     hiberation support, e6500 core PMU support, etc..."

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
  powerpc: Correct FSCR bit definitions
  powerpc/xmon: Fix printing of set of CPUs in xmon
  powerpc/pseries: Move lparcfg.c to platforms/pseries
  powerpc/powernv: Return secondary CPUs to firmware on kexec
  powerpc/btext: Fix CONFIG_PPC_EARLY_DEBUG_BOOTX on ppc32
  powerpc: Cleanup handling of the DSCR bit in the FSCR register
  powerpc/pseries: Child nodes are not detached by dlpar_detach_node
  powerpc/pseries: Add mising of_node_put in delete_dt_node
  powerpc/pseries: Make dlpar_configure_connector parent node aware
  powerpc/pseries: Do all node initialization in dlpar_parse_cc_node
  powerpc/pseries: Fix parsing of initial node path in update_dt_node
  powerpc/pseries: Pack update_props_workarea to map correctly to rtas buffer header
  powerpc/pseries: Fix over writing of rtas return code in update_dt_node
  powerpc/pseries: Fix creation of loop in device node property list
  powerpc: Skip emulating & leave interrupts off for kernel program checks
  powerpc: Add more exception trampolines for hypervisor exceptions
  powerpc: Fix location and rename exception trampolines
  powerpc: Add more trap names to xmon
  powerpc/pseries: Add a warning in the case of cross-cpu VPA registration
  powerpc: Update the 00-Index in Documentation/powerpc
  ...

Commit: 39eda2aba6be642b71f2e0ad623dcb09fd9d79cf
Parents: 2e515bf0 · 9f24b0c9

Merge commit. Changes below are compared with the first parent: 2e515bf0.

Changes

192 files changed · +4873 −1767

File	Status	Add	Del	Content
Documentation/devicetree/bindings/crypto/fsl-sec6.txt	added	+157	−0	View file
Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt	modified	+41	−12	View file
Documentation/powerpc/00-INDEX	modified	+11	−0	View file
arch/powerpc/Kconfig	modified	+20	−0	View file
arch/powerpc/Makefile	modified	+17	−1	View file
arch/powerpc/boot/.gitignore	modified	+1	−0	View file
arch/powerpc/boot/dts/ac14xx.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/b4420qds.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/b4860qds.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/b4qds.dts → arch/powerpc/boot/dts/b4qds.dtsi	renamed	+0	−0	View file
arch/powerpc/boot/dts/c293pcie.dts	added	+223	−0	View file
arch/powerpc/boot/dts/fsl/b4si-post.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/c293si-post.dtsi	added	+193	−0	View file
arch/powerpc/boot/dts/fsl/c293si-pre.dtsi	added	+63	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi	added	+149	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi	added	+56	−0	View file
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/include/dt-bindings	added	+1	−0	View file
arch/powerpc/boot/dts/mpc5121ads.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/p1020rdb-pd.dts	added	+280	−0	View file
arch/powerpc/boot/dts/p1023rdb.dts	added	+234	−0	View file
arch/powerpc/boot/dts/pdm360ng.dts	modified	+1	−1	View file
arch/powerpc/boot/ppc_asm.h	modified	+3	−0	View file
arch/powerpc/boot/util.S	modified	+5	−5	View file
arch/powerpc/configs/85xx/p1023rds_defconfig → arch/powerpc/configs/85xx/p1023_defconfig	renamed	+22	−3	View file
arch/powerpc/configs/corenet32_smp_defconfig	modified	+1	−0	View file
arch/powerpc/configs/corenet64_smp_defconfig	modified	+3	−0	View file
arch/powerpc/configs/mpc83xx_defconfig	modified	+1	−0	View file
arch/powerpc/configs/mpc85xx_defconfig	modified	+2	−0	View file
arch/powerpc/configs/mpc85xx_smp_defconfig	modified	+2	−0	View file
arch/powerpc/include/asm/asm-compat.h	modified	+9	−0	View file
arch/powerpc/include/asm/btext.h	modified	+1	−0	View file
arch/powerpc/include/asm/cacheflush.h	modified	+1	−7	View file
arch/powerpc/include/asm/cputable.h	modified	+7	−2	View file
arch/powerpc/include/asm/emulated_ops.h	modified	+0	−2	View file
arch/powerpc/include/asm/epapr_hcalls.h	modified	+6	−0	View file
arch/powerpc/include/asm/exception-64s.h	modified	+18	−17	View file
arch/powerpc/include/asm/io.h	modified	+23	−10	View file
arch/powerpc/include/asm/irqflags.h	modified	+4	−3	View file
arch/powerpc/include/asm/lppaca.h	modified	+39	−29	View file
arch/powerpc/include/asm/mpc5121.h	modified	+2	−16	View file
arch/powerpc/include/asm/mpc85xx.h	added	+92	−0	View file
arch/powerpc/include/asm/mpic.h	modified	+7	−0	View file
arch/powerpc/include/asm/opal.h	modified	+27	−0	View file
arch/powerpc/include/asm/paca.h	modified	+8	−3	View file
arch/powerpc/include/asm/pci-bridge.h	modified	+1	−1	View file
arch/powerpc/include/asm/perf_event_fsl_emb.h	modified	+1	−1	View file
arch/powerpc/platforms/pseries/plpar_wrappers.h → arch/powerpc/include/asm/plpar_wrappers.h	renamed	+3	−27	View file
arch/powerpc/include/asm/ppc-opcode.h	modified	+47	−0	View file
arch/powerpc/include/asm/ppc_asm.h	modified	+5	−17	View file
arch/powerpc/include/asm/prom.h	modified	+5	−2	View file
arch/powerpc/include/asm/reg.h	modified	+17	−12	View file
arch/powerpc/include/asm/reg_booke.h	modified	+4	−4	View file
arch/powerpc/include/asm/reg_fsl_emb.h	modified	+19	−5	View file
arch/powerpc/include/asm/rtas.h	modified	+4	−4	View file
arch/powerpc/include/asm/smp.h	modified	+3	−0	View file
arch/powerpc/include/asm/spinlock.h	modified	+5	−1	View file
arch/powerpc/include/asm/switch_to.h	modified	+8	−3	View file
arch/powerpc/include/asm/timex.h	modified	+2	−2	View file
arch/powerpc/include/asm/topology.h	modified	+1	−0	View file
arch/powerpc/include/asm/udbg.h	modified	+5	−4	View file
arch/powerpc/include/uapi/asm/elf.h	modified	+10	−11	View file
arch/powerpc/kernel/Makefile	modified	+1	−4	View file
arch/powerpc/kernel/align.c	modified	+14	−0	View file
arch/powerpc/kernel/btext.c	modified	+139	−115	View file
arch/powerpc/kernel/cacheinfo.c	modified	+6	−6	View file
arch/powerpc/kernel/cpu_setup_fsl_booke.S	modified	+1	−1	View file
arch/powerpc/kernel/cputable.c	modified	+1	−1	View file
arch/powerpc/kernel/entry_64.S	modified	+15	−31	View file
arch/powerpc/kernel/epapr_paravirt.c	modified	+16	−12	View file
arch/powerpc/kernel/exceptions-64e.S	modified	+2	−2	View file
arch/powerpc/kernel/exceptions-64s.S	modified	+23	−16	View file
arch/powerpc/kernel/head_40x.S	modified	+0	−8	View file
arch/powerpc/kernel/head_44x.S	modified	+0	−10	View file
arch/powerpc/kernel/head_64.S	modified	+1	−0	View file
arch/powerpc/kernel/head_8xx.S	modified	+0	−4	View file
arch/powerpc/kernel/head_fsl_booke.S	modified	+0	−10	View file
arch/powerpc/kernel/io-workarounds.c	modified	+18	−1	View file
arch/powerpc/kernel/io.c	modified	+3	−0	View file
arch/powerpc/kernel/legacy_serial.c	modified	+41	−21	View file
arch/powerpc/kernel/misc_32.S	modified	+2	−1	View file
arch/powerpc/kernel/misc_64.S	modified	+35	−15	View file
arch/powerpc/kernel/paca.c	modified	+5	−5	View file
arch/powerpc/kernel/pci-common.c	modified	+6	−7	View file
arch/powerpc/kernel/pci_64.c	modified	+2	−2	View file
arch/powerpc/kernel/pci_dn.c	modified	+11	−9	View file
arch/powerpc/kernel/pci_of_scan.c	modified	+13	−10	View file
arch/powerpc/kernel/ppc_ksyms.c	modified	+2	−1	View file
arch/powerpc/kernel/process.c	modified	+2	−0	View file
arch/powerpc/kernel/prom.c	modified	+55	−27	View file
arch/powerpc/kernel/prom_init.c	modified	+163	−106	View file
arch/powerpc/kernel/prom_init_check.sh	modified	+2	−1	View file
arch/powerpc/kernel/prom_parse.c	modified	+8	−9	View file
arch/powerpc/kernel/rtas.c	modified	+33	−33	View file
arch/powerpc/kernel/setup-common.c	modified	+8	−5	View file
arch/powerpc/kernel/setup_32.c	modified	+3	−1	View file
arch/powerpc/kernel/setup_64.c	modified	+25	−11	View file
arch/powerpc/kernel/signal_32.c	modified	+9	−0	View file
arch/powerpc/kernel/signal_64.c	modified	+12	−6	View file
arch/powerpc/kernel/smp.c	modified	+118	−38	View file
arch/powerpc/kernel/softemu8xx.c	deleted	+0	−199	View before deletion
arch/powerpc/kernel/swsusp_asm64.S	modified	+43	−2	View file
arch/powerpc/kernel/swsusp_booke.S	modified	+8	−0	View file
arch/powerpc/kernel/time.c	modified	+9	−9	View file
arch/powerpc/kernel/tm.S	modified	+2	−2	View file
arch/powerpc/kernel/traps.c	modified	+51	−60	View file
arch/powerpc/kernel/udbg_16550.c	modified	+164	−206	View file
arch/powerpc/kernel/vdso32/gettimeofday.S	modified	+3	−3	View file
arch/powerpc/kernel/vio.c	modified	+18	−15	View file
arch/powerpc/kvm/book3s_64_slb.S	modified	+4	−0	View file
arch/powerpc/kvm/book3s_hv.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_hv_rm_mmu.c	modified	+4	−0	View file
arch/powerpc/kvm/book3s_hv_rmhandlers.S	modified	+12	−0	View file
arch/powerpc/kvm/emulate.c	modified	+1	−44	View file
arch/powerpc/lib/locks.c	modified	+2	−2	View file
arch/powerpc/lib/sstep.c	modified	+5	−3	View file
arch/powerpc/math-emu/Makefile	modified	+12	−12	View file
arch/powerpc/math-emu/math.c	modified	+27	−62	View file
arch/powerpc/mm/fault.c	modified	+5	−1	View file
arch/powerpc/mm/gup.c	modified	+21	−16	View file
arch/powerpc/mm/hash_utils_64.c	modified	+1	−1	View file
arch/powerpc/mm/mem.c	modified	+1	−1	View file
arch/powerpc/mm/numa.c	modified	+53	−49	View file
arch/powerpc/mm/slb.c	modified	+6	−3	View file
arch/powerpc/mm/subpage-prot.c	modified	+2	−2	View file
arch/powerpc/oprofile/op_model_fsl_emb.c	modified	+30	−0	View file
arch/powerpc/perf/Makefile	modified	+1	−1	View file
arch/powerpc/perf/core-book3s.c	modified	+1	−1	View file
arch/powerpc/perf/core-fsl-emb.c	modified	+30	−0	View file
arch/powerpc/perf/e6500-pmu.c	added	+121	−0	View file
arch/powerpc/platforms/52xx/mpc52xx_pic.c	modified	+2	−1	View file
arch/powerpc/platforms/85xx/Kconfig	modified	+8	−2	View file
arch/powerpc/platforms/85xx/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/85xx/c293pcie.c	added	+75	−0	View file
arch/powerpc/platforms/85xx/corenet_ds.c	modified	+0	−6	View file
arch/powerpc/platforms/85xx/mpc85xx_rdb.c	modified	+22	−0	View file
arch/powerpc/platforms/85xx/p1023_rds.c	modified	+23	−1	View file
arch/powerpc/platforms/85xx/smp.c	modified	+26	−0	View file
arch/powerpc/platforms/Kconfig	modified	+1	−6	View file
arch/powerpc/platforms/Kconfig.cputype	modified	+13	−0	View file
arch/powerpc/platforms/cell/iommu.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/smp.c	modified	+1	−14	View file
arch/powerpc/platforms/powernv/Kconfig	modified	+2	−0	View file
arch/powerpc/platforms/powernv/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/powernv/eeh-ioda.c	modified	+8	−14	View file
arch/powerpc/platforms/powernv/opal-lpc.c	added	+203	−0	View file
arch/powerpc/platforms/powernv/opal-wrappers.S	modified	+5	−0	View file
arch/powerpc/platforms/powernv/opal.c	modified	+10	−8	View file
arch/powerpc/platforms/powernv/pci-ioda.c	modified	+29	−18	View file
arch/powerpc/platforms/powernv/powernv.h	modified	+2	−0	View file
arch/powerpc/platforms/powernv/setup.c	modified	+17	−0	View file
arch/powerpc/platforms/powernv/smp.c	modified	+1	−17	View file
arch/powerpc/platforms/pseries/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/pseries/cmm.c	modified	+1	−2	View file
arch/powerpc/platforms/pseries/dlpar.c	modified	+39	−28	View file
arch/powerpc/platforms/pseries/dtl.c	modified	+2	−3	View file
arch/powerpc/platforms/pseries/hotplug-cpu.c	modified	+4	−3	View file
arch/powerpc/platforms/pseries/hvconsole.c	modified	+13	−6	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+5	−6	View file
arch/powerpc/platforms/pseries/kexec.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+9	−3	View file
arch/powerpc/kernel/lparcfg.c → arch/powerpc/platforms/pseries/lparcfg.c	renamed	+8	−6	View file
arch/powerpc/platforms/pseries/mobility.c	modified	+22	−23	View file
arch/powerpc/platforms/pseries/processor_idle.c	modified	+7	−5	View file
arch/powerpc/platforms/pseries/pseries.h	modified	+1	−4	View file
arch/powerpc/platforms/pseries/pseries_energy.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/setup.c	modified	+3	−3	View file
arch/powerpc/platforms/pseries/smp.c	modified	+2	−18	View file
arch/powerpc/platforms/wsp/wsp.h	modified	+0	−1	View file
arch/powerpc/sysdev/fsl_msi.c	modified	+96	−41	View file
arch/powerpc/sysdev/fsl_msi.h	modified	+7	−3	View file
arch/powerpc/sysdev/fsl_pci.c	modified	+163	−21	View file
arch/powerpc/sysdev/fsl_pci.h	modified	+6	−0	View file
arch/powerpc/sysdev/xics/icp-native.c	modified	+1	−1	View file
arch/powerpc/sysdev/xics/xics-common.c	modified	+5	−5	View file
arch/powerpc/xmon/xmon.c	modified	+19	−12	View file
drivers/macintosh/ams/ams-input.c	modified	+5	−1	View file
drivers/media/platform/fsl-viu.c	modified	+13	−10	View file
drivers/mtd/nand/mpc5121_nfc.c	modified	+12	−9	View file
drivers/tty/hvc/hvc_vio.c	modified	+2	−2	View file
drivers/tty/serial/mpc52xx_uart.c	modified	+81	−17	View file
drivers/usb/host/fsl-mph-dr-of.c	modified	+9	−7	View file
tools/testing/selftests/Makefile	modified	+1	−0	View file
tools/testing/selftests/powerpc/Makefile	added	+39	−0	View file
tools/testing/selftests/powerpc/harness.c	added	+105	−0	View file
tools/testing/selftests/powerpc/pmu/Makefile	added	+23	−0	View file
tools/testing/selftests/powerpc/pmu/count_instructions.c	added	+135	−0	View file
tools/testing/selftests/powerpc/pmu/event.c	added	+105	−0	View file
tools/testing/selftests/powerpc/pmu/event.h	added	+39	−0	View file
tools/testing/selftests/powerpc/pmu/loop.S	added	+46	−0	View file
tools/testing/selftests/powerpc/subunit.h	added	+47	−0	View file
tools/testing/selftests/powerpc/utils.h	added	+34	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/crypto/fsl-sec6.txt

View file

diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec6.txt b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
new file mode 100644
index 0000000..c0a20cd
--- /dev/null
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
@@ -0,0 +1,157 @@
+SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM).
+Currently Freescale powerpc chip C29X is embeded with SEC 6.
+SEC 6 device tree binding include:
+   -SEC 6 Node
+   -Job Ring Node
+   -Full Example
+
+=====================================================================
+SEC 6 Node
+
+Description
+
+    Node defines the base address of the SEC 6 block.
+    This block specifies the address range of all global
+    configuration registers for the SEC 6 block.
+    For example, In C293, we could see three SEC 6 node.
+
+PROPERTIES
+
+   - compatible
+      Usage: required
+      Value type: <string>
+      Definition: Must include "fsl,sec-v6.0".
+
+   - fsl,sec-era
+      Usage: optional
+      Value type: <u32>
+      Definition: A standard property. Define the 'ERA' of the SEC
+          device.
+
+   - #address-cells
+       Usage: required
+       Value type: <u32>
+       Definition: A standard property.  Defines the number of cells
+           for representing physical addresses in child nodes.
+
+   - #size-cells
+       Usage: required
+       Value type: <u32>
+       Definition: A standard property.  Defines the number of cells
+           for representing the size of physical addresses in
+           child nodes.
+
+   - reg
+      Usage: required
+      Value type: <prop-encoded-array>
+      Definition: A standard property.  Specifies the physical
+          address and length of the SEC 6 configuration registers.
+
+   - ranges
+       Usage: required
+       Value type: <prop-encoded-array>
+       Definition: A standard property.  Specifies the physical address
+           range of the SEC 6.0 register space (-SNVS not included).  A
+           triplet that includes the child address, parent address, &
+           length.
+
+   Note: All other standard properties (see the ePAPR) are allowed
+   but are optional.
+
+EXAMPLE
+	crypto@a0000 {
+		compatible = "fsl,sec-v6.0";
+		fsl,sec-era = <6>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0xa0000 0x20000>;
+		ranges = <0 0xa0000 0x20000>;
+	};
+
+=====================================================================
+Job Ring (JR) Node
+
+    Child of the crypto node defines data processing interface to SEC 6
+    across the peripheral bus for purposes of processing
+    cryptographic descriptors. The specified address
+    range can be made visible to one (or more) cores.
+    The interrupt defined for this node is controlled within
+    the address range of this node.
+
+  - compatible
+      Usage: required
+      Value type: <string>
+      Definition: Must include "fsl,sec-v6.0-job-ring".
+
+  - reg
+      Usage: required
+      Value type: <prop-encoded-array>
+      Definition: Specifies a two JR parameters:  an offset from
+           the parent physical address and the length the JR registers.
+
+   - interrupts
+      Usage: required
+      Value type: <prop_encoded-array>
+      Definition:  Specifies the interrupts generated by this
+           device.  The value of the interrupts property
+           consists of one interrupt specifier. The format
+           of the specifier is defined by the binding document
+           describing the node's interrupt parent.
+
+EXAMPLE
+	jr@1000 {
+		compatible = "fsl,sec-v6.0-job-ring";
+		reg = <0x1000 0x1000>;
+		interrupts = <49 2 0 0>;
+	};
+
+===================================================================
+Full Example
+
+Since some chips may contain more than one SEC, the dtsi contains
+only the node contents, not the node itself.  A chip using the SEC
+should include the dtsi inside each SEC node.  Example:
+
+In qoriq-sec6.0.dtsi:
+
+	compatible = "fsl,sec-v6.0";
+	fsl,sec-era = <6>;
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	jr@1000 {
+		compatible = "fsl,sec-v6.0-job-ring",
+			     "fsl,sec-v5.2-job-ring",
+			     "fsl,sec-v5.0-job-ring",
+			     "fsl,sec-v4.4-job-ring",
+			     "fsl,sec-v4.0-job-ring";
+		reg	   = <0x1000 0x1000>;
+	};
+
+	jr@2000 {
+		compatible = "fsl,sec-v6.0-job-ring",
+			     "fsl,sec-v5.2-job-ring",
+			     "fsl,sec-v5.0-job-ring",
+			     "fsl,sec-v4.4-job-ring",
+			     "fsl,sec-v4.0-job-ring";
+		reg	   = <0x2000 0x1000>;
+	};
+
+In the C293 device tree, we add the include of public property:
+
+	crypto@a0000 {
+		/include/ "qoriq-sec6.0.dtsi"
+	}
+
+	crypto@a0000 {
+		reg = <0xa0000 0x20000>;
+		ranges = <0 0xa0000 0x20000>;
+
+		jr@1000 {
+			interrupts = <49 2 0 0>;
+		};
+
+		jr@2000 {
+			interrupts = <50 2 0 0>;
+		};
+	};

Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt

View file

diff --git a/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt b/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt
index 5693877..82dd5b6 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt
@@ -1,21 +1,20 @@
 * Freescale MSI interrupt controller
 
 Required properties:
-- compatible : compatible list, contains 2 entries,
-  first is "fsl,CHIP-msi", where CHIP is the processor(mpc8610, mpc8572,
-  etc.) and the second is "fsl,mpic-msi" or "fsl,ipic-msi" depending on
-  the parent type.
+- compatible : compatible list, may contain one or two entries
+  The first is "fsl,CHIP-msi", where CHIP is the processor(mpc8610, mpc8572,
+  etc.) and the second is "fsl,mpic-msi" or "fsl,ipic-msi" or
+  "fsl,mpic-msi-v4.3" depending on the parent type and version. If mpic
+  version is 4.3, the number of MSI registers is increased to 16, MSIIR1 is
+  provided to access these 16 registers, and compatible "fsl,mpic-msi-v4.3"
+  should be used. The first entry is optional; the second entry is
+  required.
 
 - reg : It may contain one or two regions. The first region should contain
   the address and the length of the shared message interrupt register set.
-  The second region should contain the address of aliased MSIIR register for
-  platforms that have such an alias.
-
-- msi-available-ranges: use <start count> style section to define which
-  msi interrupt can be used in the 256 msi interrupts. This property is
-  optional, without this, all the 256 MSI interrupts can be used.
-  Each available range must begin and end on a multiple of 32 (i.e.
-  no splitting an individual MSI register or the associated PIC interrupt).
+  The second region should contain the address of aliased MSIIR or MSIIR1
+  register for platforms that have such an alias, if using MSIIR1, the second
+  region must be added because different MSI group has different MSIIR1 offset.
 
 - interrupts : each one of the interrupts here is one entry per 32 MSIs,
   and routed to the host interrupt controller. the interrupts should
@@ -28,6 +27,14 @@ Required properties:
   to MPIC.
 
 Optional properties:
+- msi-available-ranges: use <start count> style section to define which
+  msi interrupt can be used in the 256 msi interrupts. This property is
+  optional, without this, all the MSI interrupts can be used.
+  Each available range must begin and end on a multiple of 32 (i.e.
+  no splitting an individual MSI register or the associated PIC interrupt).
+  MPIC v4.3 does not support this property because the 32 interrupts of an
+  individual register are not continuous when using MSIIR1.
+
 - msi-address-64: 64-bit PCI address of the MSIIR register. The MSIIR register
   is used for MSI messaging.  The address of MSIIR in PCI address space is
   the MSI message address.
@@ -54,6 +61,28 @@ Example:
 		interrupt-parent = <&mpic>;
 	};
 
+	msi@41600 {
+		compatible = "fsl,mpic-msi-v4.3";
+		reg = <0x41600 0x200 0x44148 4>;
+		interrupts = <
+			0xe0 0 0 0
+			0xe1 0 0 0
+			0xe2 0 0 0
+			0xe3 0 0 0
+			0xe4 0 0 0
+			0xe5 0 0 0
+			0xe6 0 0 0
+			0xe7 0 0 0
+			0x100 0 0 0
+			0x101 0 0 0
+			0x102 0 0 0
+			0x103 0 0 0
+			0x104 0 0 0
+			0x105 0 0 0
+			0x106 0 0 0
+			0x107 0 0 0>;
+	};
+
 The Freescale hypervisor and msi-address-64
 -------------------------------------------
 Normally, PCI devices have access to all of CCSR via an ATMU mapping.  The

Documentation/powerpc/00-INDEX

View file

diff --git a/Documentation/powerpc/00-INDEX b/Documentation/powerpc/00-INDEX
index 05026ce..6db73df 100644
--- a/Documentation/powerpc/00-INDEX
+++ b/Documentation/powerpc/00-INDEX
@@ -5,13 +5,20 @@ please mail me.
 
 00-INDEX
 	- this file
+bootwrapper.txt
+	- Information on how the powerpc kernel is wrapped for boot on various
+	  different platforms.
 cpu_features.txt
 	- info on how we support a variety of CPUs with minimal compile-time
 	options.
 eeh-pci-error-recovery.txt
 	- info on PCI Bus EEH Error Recovery
+firmware-assisted-dump.txt
+	- Documentation on the firmware assisted dump mechanism "fadump".
 hvcs.txt
 	- IBM "Hypervisor Virtual Console Server" Installation Guide
+kvm_440.txt
+	- Various notes on the implementation of KVM for PowerPC 440.
 mpc52xx.txt
 	- Linux 2.6.x on MPC52xx family
 pmu-ebb.txt
@@ -19,3 +26,7 @@ pmu-ebb.txt
 qe_firmware.txt
 	- describes the layout of firmware binaries for the Freescale QUICC
 	  Engine and the code that parses and uploads the microcode therein.
+ptrace.txt
+	- Information on the ptrace interfaces for hardware debug registers.
+transactional_memory.txt
+	- Overview of the Power8 transactional memory support.

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5aecda0..a4e3a93 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -312,6 +312,26 @@ config MATH_EMULATION
 	  such as fsqrt on cores that do have an FPU but do not implement
 	  them (such as Freescale BookE).
 
+choice
+	prompt "Math emulation options"
+	default MATH_EMULATION_FULL
+	depends on MATH_EMULATION
+
+config	MATH_EMULATION_FULL
+	bool "Emulate all the floating point instructions"
+	---help---
+	  Select this option will enable the kernel to support to emulate
+	  all the floating point instructions. If your SoC doesn't have
+	  a FPU, you should select this.
+
+config MATH_EMULATION_HW_UNIMPLEMENTED
+	bool "Just emulate the FPU unimplemented instructions"
+	---help---
+	  Select this if you know there does have a hardware FPU on your
+	  SoC, but some floating point instructions are not implemented by that.
+
+endchoice
+
 config PPC_TRANSACTIONAL_MEM
        bool "Transactional Memory support for POWERPC"
        depends on PPC_BOOK3S_64

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 967fd23..51cfb78 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -88,13 +88,30 @@ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,-mminimal-toc)
 CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)
 CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple
 
+ifeq ($(CONFIG_PPC_BOOK3S_64),y)
 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4)
+else
+CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
+endif
+
 CFLAGS-$(CONFIG_CELL_CPU) += $(call cc-option,-mcpu=cell)
 CFLAGS-$(CONFIG_POWER4_CPU) += $(call cc-option,-mcpu=power4)
 CFLAGS-$(CONFIG_POWER5_CPU) += $(call cc-option,-mcpu=power5)
 CFLAGS-$(CONFIG_POWER6_CPU) += $(call cc-option,-mcpu=power6)
 CFLAGS-$(CONFIG_POWER7_CPU) += $(call cc-option,-mcpu=power7)
 
+E5500_CPU := $(call cc-option,-mcpu=e500mc64,-mcpu=powerpc64)
+CFLAGS-$(CONFIG_E5500_CPU) += $(E5500_CPU)
+CFLAGS-$(CONFIG_E6500_CPU) += $(call cc-option,-mcpu=e6500,$(E5500_CPU))
+
+ifeq ($(CONFIG_PPC32),y)
+ifeq ($(CONFIG_PPC_E500MC),y)
+CFLAGS-y += $(call cc-option,-mcpu=e500mc,-mcpu=powerpc)
+else
+CFLAGS-$(CONFIG_E500) += $(call cc-option,-mcpu=8540 -msoft-float,-mcpu=powerpc)
+endif
+endif
+
 CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)
 
 KBUILD_CPPFLAGS	+= -Iarch/$(ARCH)
@@ -139,7 +156,6 @@ endif
 
 cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
 cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec
-cpu-as-$(CONFIG_E500)		+= -Wa,-me500
 cpu-as-$(CONFIG_E200)		+= -Wa,-me200
 
 KBUILD_AFLAGS += $(cpu-as-y)

arch/powerpc/boot/.gitignore

View file

diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index c32ae5c..554734f 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -22,6 +22,7 @@ zImage.initrd
 zImage.bin.*
 zImage.chrp
 zImage.coff
+zImage.epapr
 zImage.holly
 zImage.*lds
 zImage.miboot

arch/powerpc/boot/dts/ac14xx.dts

View file

diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
index a27a460..a543c40 100644
--- a/arch/powerpc/boot/dts/ac14xx.dts
+++ b/arch/powerpc/boot/dts/ac14xx.dts
@@ -10,7 +10,7 @@
  */
 
 
-/include/ "mpc5121.dtsi"
+#include <mpc5121.dtsi>
 
 / {
 	model = "ac14xx";

arch/powerpc/boot/dts/b4420qds.dts

View file

diff --git a/arch/powerpc/boot/dts/b4420qds.dts b/arch/powerpc/boot/dts/b4420qds.dts
index 923156d..508dbdf 100644
--- a/arch/powerpc/boot/dts/b4420qds.dts
+++ b/arch/powerpc/boot/dts/b4420qds.dts
@@ -33,7 +33,7 @@
  */
 
 /include/ "fsl/b4420si-pre.dtsi"
-/include/ "b4qds.dts"
+/include/ "b4qds.dtsi"
 
 / {
 	model = "fsl,B4420QDS";

arch/powerpc/boot/dts/b4860qds.dts

View file

diff --git a/arch/powerpc/boot/dts/b4860qds.dts b/arch/powerpc/boot/dts/b4860qds.dts
index 78907f3..6bb3707 100644
--- a/arch/powerpc/boot/dts/b4860qds.dts
+++ b/arch/powerpc/boot/dts/b4860qds.dts
@@ -33,7 +33,7 @@
  */
 
 /include/ "fsl/b4860si-pre.dtsi"
-/include/ "b4qds.dts"
+/include/ "b4qds.dtsi"
 
 / {
 	model = "fsl,B4860QDS";

arch/powerpc/boot/dts/b4qds.dtsi

View file

diff --git a/arch/powerpc/boot/dts/b4qds.dts b/arch/powerpc/boot/dts/b4qds.dtsi
similarity index 100%
rename from arch/powerpc/boot/dts/b4qds.dts
rename to arch/powerpc/boot/dts/b4qds.dtsi

arch/powerpc/boot/dts/c293pcie.dts

View file

diff --git a/arch/powerpc/boot/dts/c293pcie.dts b/arch/powerpc/boot/dts/c293pcie.dts
new file mode 100644
index 0000000..1238bda
--- /dev/null
+++ b/arch/powerpc/boot/dts/c293pcie.dts
@@ -0,0 +1,223 @@
+/*
+ * C293 PCIE Device Tree Source
+ *
+ * Copyright 2013 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/include/ "fsl/c293si-pre.dtsi"
+
+/ {
+	model = "fsl,C293PCIE";
+	compatible = "fsl,C293PCIE";
+
+	memory {
+		device_type = "memory";
+	};
+
+	ifc: ifc@fffe1e000 {
+		reg = <0xf 0xffe1e000 0 0x2000>;
+		ranges = <0x0 0x0 0xf 0xec000000 0x04000000
+			  0x2 0x0 0xf 0xffdf0000 0x00010000>;
+
+	};
+
+	soc: soc@fffe00000 {
+		ranges = <0x0 0xf 0xffe00000 0x100000>;
+	};
+
+	pci0: pcie@fffe0a000 {
+		reg = <0xf 0xffe0a000 0 0x1000>;
+		ranges = <0x2000000 0x0 0x80000000 0xc 0x00000000 0x0 0x20000000
+			  0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>;
+		pcie@0 {
+			ranges = <0x2000000 0x0 0x80000000
+				  0x2000000 0x0 0x80000000
+				  0x0 0x20000000
+
+				  0x1000000 0x0 0x0
+				  0x1000000 0x0 0x0
+				  0x0 0x100000>;
+		};
+	};
+};
+
+&ifc {
+	nor@0,0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "cfi-flash";
+		reg = <0x0 0x0 0x4000000>;
+		bank-width = <2>;
+		device-width = <1>;
+
+		partition@0 {
+			/* 1MB for DTB Image */
+			reg = <0x0 0x00100000>;
+			label = "NOR DTB Image";
+		};
+
+		partition@100000 {
+			/* 8 MB for Linux Kernel Image */
+			reg = <0x00100000 0x00800000>;
+			label = "NOR Linux Kernel Image";
+		};
+
+		partition@900000 {
+			/* 53MB for rootfs */
+			reg = <0x00900000 0x03500000>;
+			label = "NOR Rootfs Image";
+		};
+
+		partition@3e00000 {
+			/* 1MB for blob encrypted key */
+			reg = <0x03e00000 0x00100000>;
+			label = "NOR blob encrypted key";
+		};
+
+		partition@3f00000 {
+			/* 512KB for u-boot Bootloader Image and evn */
+			reg = <0x03f00000 0x00100000>;
+			label = "NOR U-Boot Image";
+			read-only;
+		};
+	};
+
+	nand@1,0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "fsl,ifc-nand";
+		reg = <0x1 0x0 0x10000>;
+
+		partition@0 {
+			/* This location must not be altered  */
+			/* 1MB for u-boot Bootloader Image */
+			reg = <0x0 0x00100000>;
+			label = "NAND U-Boot Image";
+			read-only;
+		};
+
+		partition@100000 {
+			/* 1MB for DTB Image */
+			reg = <0x00100000 0x00100000>;
+			label = "NAND DTB Image";
+		};
+
+		partition@200000 {
+			/* 16MB for Linux Kernel Image */
+			reg = <0x00200000 0x01000000>;
+			label = "NAND Linux Kernel Image";
+		};
+
+		partition@1200000 {
+			/* 4078MB for Root file System Image */
+			reg = <0x00600000 0xfee00000>;
+			label = "NAND RFS Image";
+		};
+	};
+
+	cpld@2,0 {
+		compatible = "fsl,c293pcie-cpld";
+		reg = <0x2 0x0 0x20>;
+	};
+};
+
+&soc {
+	i2c@3000 {
+		eeprom@50 {
+			compatible = "st,24c1024";
+			reg = <0x50>;
+		};
+
+		adt7461@4c {
+			compatible = "adi,adt7461";
+			reg = <0x4c>;
+		};
+	};
+
+	spi@7000 {
+		flash@0 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "spansion,s25sl12801";
+			reg = <0>;
+			spi-max-frequency = <50000000>;
+
+			partition@0 {
+				/* 1MB for u-boot Bootloader Image */
+				/* 1MB for Environment */
+				reg = <0x0 0x00100000>;
+				label = "SPI Flash U-Boot Image";
+				read-only;
+			};
+
+			partition@100000 {
+				/* 512KB for DTB Image */
+				reg = <0x00100000 0x00080000>;
+				label = "SPI Flash DTB Image";
+			};
+
+			partition@180000 {
+				/* 4MB for Linux Kernel Image */