Merge tag 'powerpc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

d5e2d008 · Linus Torvalds <[email protected]> · 2016-03-19 15:38:41 -07:00

Pull powerpc updates from Michael Ellerman:
 "This was delayed a day or two by some build-breakage on old toolchains
  which we've now fixed.

  There's two PCI commits both acked by Bjorn.

  There's one commit to mm/hugepage.c which is (co)authored by Kirill.

  Highlights:
   - Restructure Linux PTE on Book3S/64 to Radix format from Paul
     Mackerras
   - Book3s 64 MMU cleanup in preparation for Radix MMU from Aneesh
     Kumar K.V
   - Add POWER9 cputable entry from Michael Neuling
   - FPU/Altivec/VSX save/restore optimisations from Cyril Bur
   - Add support for new ftrace ABI on ppc64le from Torsten Duwe

  Various cleanups & minor fixes from:
   - Adam Buchbinder, Andrew Donnellan, Balbir Singh, Christophe Leroy,
     Cyril Bur, Luis Henriques, Madhavan Srinivasan, Pan Xinhui, Russell
     Currey, Sukadev Bhattiprolu, Suraj Jitindar Singh.

  General:
   - atomics: Allow architectures to define their own __atomic_op_*
     helpers from Boqun Feng
   - Implement atomic{, 64}_*_return_* variants and acquire/release/
     relaxed variants for (cmp)xchg from Boqun Feng
   - Add powernv_defconfig from Jeremy Kerr
   - Fix BUG_ON() reporting in real mode from Balbir Singh
   - Add xmon command to dump OPAL msglog from Andrew Donnellan
   - Add xmon command to dump process/task similar to ps(1) from Douglas
     Miller
   - Clean up memory hotplug failure paths from David Gibson

  pci/eeh:
   - Redesign SR-IOV on PowerNV to give absolute isolation between VFs
     from Wei Yang.
   - EEH Support for SRIOV VFs from Wei Yang and Gavin Shan.
   - PCI/IOV: Rename and export virtfn_{add, remove} from Wei Yang
   - PCI: Add pcibios_bus_add_device() weak function from Wei Yang
   - MAINTAINERS: Update EEH details and maintainership from Russell
     Currey

  cxl:
   - Support added to the CXL driver for running on both bare-metal and
     hypervisor systems, from Christophe Lombard and Frederic Barrat.
   - Ignore probes for virtual afu pci devices from Vaibhav Jain

  perf:
   - Export Power8 generic and cache events to sysfs from Sukadev
     Bhattiprolu
   - hv-24x7: Fix usage with chip events, display change in counter
     values, display domain indices in sysfs, eliminate domain suffix in
     event names, from Sukadev Bhattiprolu

  Freescale:
   - Updates from Scott: "Highlights include 8xx optimizations, 32-bit
     checksum optimizations, 86xx consolidation, e5500/e6500 cpu
     hotplug, more fman and other dt bits, and minor fixes/cleanup"

* tag 'powerpc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (179 commits)
  powerpc: Fix unrecoverable SLB miss during restore_math()
  powerpc/8xx: Fix do_mtspr_cpu6() build on older compilers
  powerpc/rcpm: Fix build break when SMP=n
  powerpc/book3e-64: Use hardcoded mttmr opcode
  powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible
  powerpc/T104xRDB: add tdm riser card node to device tree
  powerpc32: PAGE_EXEC required for inittext
  powerpc/mpc85xx: Add pcsphy nodes to FManV3 device tree
  powerpc/mpc85xx: Add MDIO bus muxing support to the board device tree(s)
  powerpc/86xx: Introduce and use common dtsi
  powerpc/86xx: Update device tree
  powerpc/86xx: Move dts files to fsl directory
  powerpc/86xx: Switch to kconfig fragments approach
  powerpc/86xx: Update defconfigs
  powerpc/86xx: Consolidate common platform code
  powerpc32: Remove one insn in mulhdu
  powerpc32: small optimisation in flush_icache_range()
  powerpc: Simplify test in __dma_sync()
  powerpc32: move xxxxx_dcache_range() functions inline
  powerpc32: Remove clear_pages() and define clear_page() inline
  ...

Commit: d5e2d00898bdfed9586472679760fc81a2ca2d02
Parents: 31e18236 · 6e669f08

Merge commit. Changes below are compared with the first parent: 31e18236.

Changes

320 files changed · +14155 −6550

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-class-cxl	modified	+5	−5	View file
Documentation/devicetree/bindings/powerpc/fsl/fman.txt	modified	+40	−0	View file
Documentation/devicetree/bindings/soc/fsl/rcpm.txt	added	+63	−0	View file
Documentation/kernel-parameters.txt	modified	+1	−1	View file
Documentation/powerpc/cxl.txt	modified	+55	−0	View file
MAINTAINERS	modified	+9	−7	View file
arch/powerpc/Kconfig	modified	+21	−2	View file
arch/powerpc/Makefile	modified	+25	−0	View file
arch/powerpc/boot/dts/fsl/b4860qds.dts	modified	+58	−2	View file
arch/powerpc/boot/dts/fsl/b4qds.dtsi	modified	+50	−3	View file
arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/c293pcie.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/gef_ppc9a.dts → arch/powerpc/boot/dts/fsl/gef_ppc9a.dts	renamed	+35	−244	View file
arch/powerpc/boot/dts/gef_sbc310.dts → arch/powerpc/boot/dts/fsl/gef_sbc310.dts	renamed	+38	−237	View file
arch/powerpc/boot/dts/gef_sbc610.dts → arch/powerpc/boot/dts/fsl/gef_sbc610.dts	renamed	+35	−244	View file
arch/powerpc/boot/dts/fsl/kmcoge4.dts	modified	+2	−2	View file
arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi	modified	+4	−4	View file
arch/powerpc/boot/dts/mpc8641_hpcn.dts → arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts	renamed	+52	−295	View file
arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts → arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts	renamed	+44	−286	View file
arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi	added	+120	−0	View file
arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi	added	+58	−0	View file
arch/powerpc/boot/dts/fsl/mvme2500.dts	modified	+2	−2	View file
arch/powerpc/boot/dts/fsl/p1010rdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1020rdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1021mds.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1022ds.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1022rdk.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1024rdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p1025rdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p2020rdb.dts	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/p2041rdb.dts	modified	+92	−2	View file
arch/powerpc/boot/dts/fsl/p3041ds.dts	modified	+112	−2	View file
arch/powerpc/boot/dts/fsl/p4080ds.dts	modified	+184	−2	View file
arch/powerpc/boot/dts/fsl/p5020ds.dts	modified	+112	−2	View file
arch/powerpc/boot/dts/fsl/p5040ds.dts	modified	+234	−2	View file
arch/powerpc/boot/dts/fsl/p5040si-post.dtsi	modified	+1	−0	View file
arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi	modified	+6	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi	modified	+5	−0	View file
arch/powerpc/boot/dts/fsl/sbc8641d.dts	added	+203	−0	View file
arch/powerpc/boot/dts/fsl/t1023rdb.dts	modified	+42	−1	View file
arch/powerpc/boot/dts/fsl/t1024qds.dts	modified	+3	−3	View file
arch/powerpc/boot/dts/fsl/t1024rdb.dts	modified	+46	−1	View file
arch/powerpc/boot/dts/fsl/t1040rdb.dts	modified	+31	−1	View file
arch/powerpc/boot/dts/fsl/t1042rdb.dts	modified	+29	−1	View file
arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts	modified	+17	−1	View file
arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/t104xqds.dtsi	modified	+178	−2	View file
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi	modified	+38	−2	View file
arch/powerpc/boot/dts/fsl/t2080qds.dts	modified	+157	−1	View file
arch/powerpc/boot/dts/fsl/t2080rdb.dts	modified	+66	−1	View file
arch/powerpc/boot/dts/fsl/t2081qds.dts	modified	+220	−1	View file
arch/powerpc/boot/dts/fsl/t208xqds.dtsi	modified	+3	−3	View file
arch/powerpc/boot/dts/fsl/t208xrdb.dtsi	modified	+1	−1	View file
arch/powerpc/boot/dts/fsl/t4240qds.dts	modified	+400	−2	View file
arch/powerpc/boot/dts/fsl/t4240rdb.dts	modified	+149	−2	View file
arch/powerpc/boot/dts/sbc8641d.dts	deleted	+0	−447	View before deletion
arch/powerpc/boot/rs6000.h	modified	+1	−1	View file
arch/powerpc/boot/treeboot-akebono.c	modified	+1	−1	View file
arch/powerpc/boot/treeboot-currituck.c	modified	+1	−1	View file
arch/powerpc/boot/treeboot-iss4xx.c	modified	+1	−1	View file
arch/powerpc/configs/83xx/mpc834x_itx_defconfig	modified	+0	−1	View file
arch/powerpc/configs/85xx/ksi8560_defconfig	modified	+0	−1	View file
arch/powerpc/configs/85xx/stx_gp3_defconfig	modified	+0	−2	View file
arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig → arch/powerpc/configs/86xx-hw.config	renamed	+81	−133	View file
arch/powerpc/configs/86xx-smp.config	added	+2	−0	View file
arch/powerpc/configs/86xx/gef_ppc9a_defconfig	deleted	+0	−216	View before deletion
arch/powerpc/configs/86xx/gef_sbc310_defconfig	deleted	+0	−214	View before deletion
arch/powerpc/configs/86xx/gef_sbc610_defconfig	deleted	+0	−273	View before deletion
arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig	deleted	+0	−110	View before deletion
arch/powerpc/configs/86xx/sbc8641d_defconfig	deleted	+0	−246	View before deletion
arch/powerpc/configs/mpc86xx_basic_defconfig	added	+10	−0	View file
arch/powerpc/configs/mpc86xx_defconfig	deleted	+0	−162	View before deletion
arch/powerpc/configs/powernv_defconfig	added	+313	−0	View file
arch/powerpc/crypto/aes-spe-core.S	modified	+2	−2	View file
arch/powerpc/crypto/aes-spe-glue.c	modified	+1	−1	View file
arch/powerpc/include/asm/atomic.h	modified	+97	−62	View file
arch/powerpc/include/asm/mmu-hash32.h → arch/powerpc/include/asm/book3s/32/mmu-hash.h	renamed	+0	−0	View file
arch/powerpc/include/asm/book3s/64/hash-4k.h	modified	+3	−33	View file
arch/powerpc/include/asm/book3s/64/hash-64k.h	modified	+30	−27	View file
arch/powerpc/include/asm/book3s/64/hash.h	modified	+41	−27	View file
arch/powerpc/include/asm/mmu-hash64.h → arch/powerpc/include/asm/book3s/64/mmu-hash.h	renamed	+4	−0	View file
arch/powerpc/include/asm/book3s/64/pgtable.h	modified	+27	−9	View file
arch/powerpc/include/asm/book3s/64/tlbflush-hash.h	added	+94	−0	View file
arch/powerpc/include/asm/cache.h	modified	+19	−0	View file
arch/powerpc/include/asm/cacheflush.h	modified	+49	−5	View file
arch/powerpc/include/asm/checksum.h	modified	+101	−40	View file
arch/powerpc/include/asm/cmpxchg.h	modified	+183	−54	View file
arch/powerpc/include/asm/code-patching.h	modified	+21	−0	View file
arch/powerpc/include/asm/cputable.h	modified	+24	−4	View file
arch/powerpc/include/asm/cputhreads.h	modified	+15	−0	View file
arch/powerpc/include/asm/eeh.h	modified	+5	−0	View file
arch/powerpc/include/asm/fsl_pm.h	added	+51	−0	View file
arch/powerpc/include/asm/ftrace.h	modified	+5	−0	View file
arch/powerpc/include/asm/hugetlb.h	modified	+1	−1	View file
arch/powerpc/include/asm/hvcall.h	modified	+1	−0	View file
arch/powerpc/include/asm/hydra.h	modified	+1	−1	View file
arch/powerpc/include/asm/io.h	modified	+1	−1	View file
arch/powerpc/include/asm/machdep.h	modified	+3	−3	View file
arch/powerpc/include/asm/mmu-8xx.h	modified	+2	−2	View file
arch/powerpc/include/asm/mmu.h	modified	+3	−2	View file
arch/powerpc/include/asm/module.h	modified	+11	−3	View file
arch/powerpc/include/asm/nohash/32/pgtable.h	modified	+3	−2	View file
arch/powerpc/include/asm/nohash/64/pgtable.h	modified	+3	−0	View file
arch/powerpc/include/asm/opal.h	modified	+3	−0	View file
arch/powerpc/include/asm/page.h	modified	+8	−103	View file
arch/powerpc/include/asm/page_32.h	modified	+14	−3	View file
arch/powerpc/include/asm/pci-bridge.h	modified	+5	−4	View file
arch/powerpc/include/asm/perf_event_server.h	modified	+9	−1	View file
arch/powerpc/include/asm/pgalloc-64.h	modified	+32	−10	View file
arch/powerpc/include/asm/pgtable-types.h	added	+103	−0	View file
arch/powerpc/include/asm/pmac_feature.h	modified	+1	−1	View file
arch/powerpc/include/asm/processor.h	modified	+2	−0	View file
arch/powerpc/include/asm/reg.h	modified	+14	−4	View file
arch/powerpc/include/asm/reg_8xx.h	modified	+93	−0	View file
arch/powerpc/include/asm/reg_booke.h	modified	+1	−1	View file
arch/powerpc/include/asm/sections.h	modified	+12	−0	View file
arch/powerpc/include/asm/smp.h	modified	+4	−0	View file
arch/powerpc/include/asm/smu.h	modified	+1	−1	View file
arch/powerpc/include/asm/switch_to.h	modified	+9	−4	View file
arch/powerpc/include/asm/time.h	modified	+1	−5	View file
arch/powerpc/include/asm/tlbflush.h	modified	+1	−91	View file
arch/powerpc/include/asm/uninorth.h	modified	+1	−1	View file
arch/powerpc/include/asm/xics.h	modified	+1	−1	View file
arch/powerpc/include/uapi/asm/epapr_hcalls.h	modified	+2	−2	View file
arch/powerpc/kernel/Makefile	modified	+6	−6	View file
arch/powerpc/kernel/asm-offsets.c	modified	+3	−0	View file
arch/powerpc/kernel/cpu_setup_fsl_booke.S	modified	+112	−0	View file
arch/powerpc/kernel/cpu_setup_power.S	modified	+47	−2	View file
arch/powerpc/kernel/cputable.c	modified	+31	−0	View file
arch/powerpc/kernel/eeh.c	modified	+27	−12	View file
arch/powerpc/kernel/eeh_cache.c	modified	+5	−6	View file
arch/powerpc/kernel/eeh_dev.c	modified	+1	−0	View file
arch/powerpc/kernel/eeh_driver.c	modified	+120	−30	View file
arch/powerpc/kernel/eeh_pe.c	modified	+20	−18	View file
arch/powerpc/kernel/entry_64.S	modified	+192	−4	View file
arch/powerpc/kernel/fpu.S	modified	+8	−17	View file
arch/powerpc/kernel/ftrace.c	modified	+95	−37	View file
arch/powerpc/kernel/head_44x.S	modified	+1	−1	View file
arch/powerpc/kernel/head_64.S	modified	+98	−0	View file
arch/powerpc/kernel/head_8xx.S	modified	+36	−72	View file
arch/powerpc/kernel/head_fsl_booke.S	modified	+0	−74	View file
arch/powerpc/kernel/idle_power7.S	modified	+1	−1	View file
arch/powerpc/kernel/kgdb.c	modified	+4	−0	View file
arch/powerpc/kernel/mce_power.c	modified	+8	−9	View file
arch/powerpc/kernel/misc_32.S	modified	+11	−96	View file
arch/powerpc/kernel/module.c	modified	+5	−0	View file
arch/powerpc/kernel/module_32.c	modified	+14	−6	View file
arch/powerpc/kernel/module_64.c	modified	+152	−62	View file
arch/powerpc/kernel/paca.c	modified	+1	−10	View file
arch/powerpc/kernel/pci-hotplug.c	modified	+1	−1	View file
arch/powerpc/kernel/pci_dn.c	modified	+18	−1	View file
arch/powerpc/kernel/ppc_ksyms.c	modified	+2	−4	View file
arch/powerpc/kernel/ppc_ksyms_32.c	modified	+0	−1	View file
arch/powerpc/kernel/process.c	modified	+151	−17	View file
arch/powerpc/kernel/signal.c	modified	+2	−2	View file
arch/powerpc/kernel/signal.h	modified	+1	−1	View file
arch/powerpc/kernel/smp.c	modified	+6	−1	View file
arch/powerpc/kernel/traps.c	modified	+10	−2	View file
arch/powerpc/kernel/vector.S	modified	+8	−37	View file
arch/powerpc/kvm/book3s_32_mmu_host.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_64_mmu.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_64_mmu_host.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_64_mmu_hv.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_64_vio.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_64_vio_hv.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_hv_rm_mmu.c	modified	+1	−1	View file
arch/powerpc/kvm/book3s_hv_rmhandlers.S	modified	+1	−1	View file
arch/powerpc/kvm/book3s_xics.c	modified	+1	−1	View file
arch/powerpc/kvm/booke.c	modified	+1	−1	View file
arch/powerpc/kvm/e500mc.c	modified	+1	−1	View file
arch/powerpc/lib/Makefile	modified	+3	−4	View file
arch/powerpc/lib/checksum_32.S	modified	+243	−155	View file
arch/powerpc/lib/checksum_64.S	modified	+2	−29	View file
arch/powerpc/lib/checksum_wrappers_64.c → arch/powerpc/lib/checksum_wrappers.c	renamed	+0	−0	View file
arch/powerpc/lib/ppc_ksyms.c	modified	+1	−3	View file
arch/powerpc/mm/8xx_mmu.c	added	+141	−0	View file
arch/powerpc/mm/Makefile	modified	+1	−0	View file
arch/powerpc/mm/dma-noncoherent.c	modified	+1	−1	View file
arch/powerpc/mm/fsl_booke_mmu.c	modified	+4	−2	View file
arch/powerpc/mm/hash64_4k.c	modified	+2	−2	View file
arch/powerpc/mm/hash64_64k.c	modified	+3	−4	View file
arch/powerpc/mm/hash_utils_64.c	modified	+54	−33	View file
arch/powerpc/mm/hugetlbpage-hash64.c	modified	+3	−2	View file
arch/powerpc/mm/hugetlbpage.c	modified	+1	−2	View file
arch/powerpc/mm/init_32.c	modified	+0	−23	View file
arch/powerpc/mm/init_64.c	modified	+46	−22	View file
arch/powerpc/mm/mem.c	modified	+8	−2	View file
arch/powerpc/mm/mmu_decl.h	modified	+15	−14	View file
arch/powerpc/mm/pgtable_32.c	modified	+10	−42	View file
arch/powerpc/mm/pgtable_64.c	modified	+9	−2	View file
arch/powerpc/mm/ppc_mmu_32.c	modified	+2	−2	View file
arch/powerpc/mm/tlb_low_64e.S	modified	+1	−1	View file
arch/powerpc/mm/tlb_nohash.c	modified	+1	−3	View file
arch/powerpc/mm/tlb_nohash_low.S	modified	+2	−2	View file
arch/powerpc/oprofile/op_model_cell.c	modified	+2	−2	View file
arch/powerpc/perf/core-book3s.c	modified	+1	−1	View file
arch/powerpc/perf/hv-24x7.c	modified	+137	−88	View file
arch/powerpc/perf/hv-24x7.h	modified	+2	−1	View file
arch/powerpc/perf/hv-gpci.c	modified	+25	−18	View file
arch/powerpc/perf/power7-pmu.c	modified	+9	−9	View file
arch/powerpc/perf/power8-events-list.h	added	+51	−0	View file
arch/powerpc/perf/power8-pmu.c	modified	+73	−39	View file
arch/powerpc/platforms/52xx/mpc52xx_pci.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/Kconfig	modified	+1	−0	View file
arch/powerpc/platforms/85xx/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/85xx/common.c	modified	+3	−0	View file
arch/powerpc/platforms/85xx/mpc85xx_cds.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c	added	+106	−0	View file
arch/powerpc/platforms/85xx/smp.c	modified	+153	−159	View file
arch/powerpc/platforms/85xx/smp.h	modified	+1	−0	View file
arch/powerpc/platforms/86xx/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/86xx/common.c	added	+43	−0	View file
arch/powerpc/platforms/86xx/gef_ppc9a.c	modified	+1	−31	View file
arch/powerpc/platforms/86xx/gef_sbc310.c	modified	+1	−31	View file
arch/powerpc/platforms/86xx/gef_sbc610.c	modified	+1	−31	View file
arch/powerpc/platforms/86xx/mpc8610_hpcd.c	modified	+2	−18	View file
arch/powerpc/platforms/86xx/mpc86xx.h	modified	+2	−0	View file
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c	modified	+1	−20	View file
arch/powerpc/platforms/86xx/sbc8641d.c	modified	+1	−31	View file
arch/powerpc/platforms/embedded6xx/mpc10x.h	modified	+0	−10	View file
arch/powerpc/platforms/powermac/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/powermac/cache.S	modified	+1	−1	View file
arch/powerpc/platforms/powermac/feature.c	modified	+3	−3	View file
arch/powerpc/platforms/powernv/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/powernv/eeh-powernv.c	modified	+256	−42	View file
arch/powerpc/platforms/powernv/idle.c	modified	+3	−3	View file
arch/powerpc/platforms/powernv/npu-dma.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/opal-msglog.c	modified	+24	−10	View file
arch/powerpc/platforms/powernv/opal.c	modified	+5	−2	View file
arch/powerpc/platforms/powernv/pci-ioda.c	modified	+189	−158	View file
arch/powerpc/platforms/powernv/pci-p5ioc2.c	deleted	+0	−271	View before deletion
arch/powerpc/platforms/powernv/pci.c	modified	+2	−15	View file
arch/powerpc/platforms/powernv/pci.h	modified	+71	−81	View file
arch/powerpc/platforms/powernv/subcore.c	modified	+1	−1	View file
arch/powerpc/platforms/ps3/gelic_udbg.c	modified	+24	−48	View file
arch/powerpc/platforms/ps3/interrupt.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/hvconsole.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+6	−3	View file
arch/powerpc/platforms/pseries/setup.c	modified	+1	−1	View file
arch/powerpc/scripts/gcc-check-mprofile-kernel.sh	added	+23	−0	View file
arch/powerpc/sysdev/Kconfig	modified	+5	−0	View file
arch/powerpc/sysdev/Makefile	modified	+1	−0	View file
arch/powerpc/sysdev/cpm1.c	modified	+4	−1	View file
arch/powerpc/sysdev/fsl_lbc.c	modified	+38	−11	View file
arch/powerpc/sysdev/fsl_pci.c	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_rcpm.c	added	+386	−0	View file
arch/powerpc/sysdev/fsl_rmu.c	modified	+1	−1	View file
arch/powerpc/sysdev/i8259.c	modified	+1	−1	View file
arch/powerpc/sysdev/mpic.c	modified	+2	−2	View file
arch/powerpc/xmon/xmon.c	modified	+119	−1	View file
drivers/misc/cxl/Makefile	modified	+1	−0	View file
drivers/misc/cxl/api.c	modified	+52	−31	View file
drivers/misc/cxl/base.c	modified	+32	−0	View file
drivers/misc/cxl/context.c	modified	+8	−3	View file
drivers/misc/cxl/cxl.h	modified	+203	−85	View file
drivers/misc/cxl/debugfs.c	modified	+4	−0	View file
drivers/misc/cxl/fault.c	modified	+14	−11	View file
drivers/misc/cxl/file.c	modified	+16	−12	View file
drivers/misc/cxl/flash.c	added	+538	−0	View file
drivers/misc/cxl/guest.c	added	+1177	−0	View file
drivers/misc/cxl/hcalls.c	added	+647	−0	View file
drivers/misc/cxl/hcalls.h	added	+204	−0	View file
drivers/misc/cxl/irq.c	modified	+79	−230	View file
drivers/misc/cxl/main.c	modified	+114	−8	View file
drivers/misc/cxl/native.c	modified	+390	−79	View file
drivers/misc/cxl/of.c	added	+513	−0	View file
drivers/misc/cxl/pci.c	modified	+117	−150	View file
drivers/misc/cxl/sysfs.c	modified	+91	−32	View file
drivers/misc/cxl/trace.h	modified	+193	−0	View file
drivers/misc/cxl/vphb.c	modified	+76	−91	View file
drivers/pci/bus.c	modified	+3	−0	View file
drivers/pci/iov.c	modified	+5	−5	View file
drivers/scsi/cxlflash/common.h	modified	+0	−1	View file
drivers/scsi/cxlflash/main.c	modified	+2	−16	View file
drivers/soc/fsl/qe/qe_common.c	modified	+33	−33	View file
drivers/soc/fsl/qe/qe_ic.c	modified	+10	−1	View file
include/linux/atomic.h	modified	+10	−0	View file
include/linux/bug.h	modified	+9	−0	View file
include/linux/fsl/guts.h	modified	+105	−0	View file
include/linux/huge_mm.h	modified	+0	−3	View file
include/linux/pci.h	modified	+9	−0	View file
include/misc/cxl.h	modified	+5	−3	View file
include/soc/fsl/qe/qe.h	modified	+0	−2	View file
include/uapi/misc/cxl.h	modified	+24	−0	View file
mm/huge_memory.c	modified	+14	−3	View file
tools/testing/selftests/powerpc/Makefile	modified	+3	−2	View file
tools/testing/selftests/powerpc/basic_asm.h	added	+70	−0	View file
tools/testing/selftests/powerpc/math/.gitignore	added	+6	−0	View file
tools/testing/selftests/powerpc/math/Makefile	added	+19	−0	View file
tools/testing/selftests/powerpc/math/fpu_asm.S	added	+198	−0	View file
tools/testing/selftests/powerpc/math/fpu_preempt.c	added	+113	−0	View file
tools/testing/selftests/powerpc/math/fpu_signal.c	added	+135	−0	View file
tools/testing/selftests/powerpc/math/fpu_syscall.c	added	+90	−0	View file
tools/testing/selftests/powerpc/math/vmx_asm.S	added	+235	−0	View file
tools/testing/selftests/powerpc/math/vmx_preempt.c	added	+112	−0	View file
tools/testing/selftests/powerpc/math/vmx_signal.c	added	+156	−0	View file
tools/testing/selftests/powerpc/math/vmx_syscall.c	added	+91	−0	View file
tools/testing/selftests/powerpc/tm/tm-signal-msr-resv.c	modified	+1	−1	View file

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

Documentation/ABI/testing/sysfs-class-cxl

View file

diff --git a/Documentation/ABI/testing/sysfs-class-cxl b/Documentation/ABI/testing/sysfs-class-cxl
index b07e86d..7fd737e 100644
--- a/Documentation/ABI/testing/sysfs-class-cxl
+++ b/Documentation/ABI/testing/sysfs-class-cxl
@@ -159,7 +159,7 @@ Description:    read only
                 Decimal value of the Per Process MMIO space length.
 Users:		https://github.com/ibm-capi/libcxl
 
-What:           /sys/class/cxl/<afu>m/pp_mmio_off
+What:           /sys/class/cxl/<afu>m/pp_mmio_off (not in a guest)
 Date:           September 2014
 Contact:        [email protected]
 Description:    read only
@@ -183,7 +183,7 @@ Description:    read only
                 Identifies the revision level of the PSL.
 Users:		https://github.com/ibm-capi/libcxl
 
-What:           /sys/class/cxl/<card>/base_image
+What:           /sys/class/cxl/<card>/base_image (not in a guest)
 Date:           September 2014
 Contact:        [email protected]
 Description:    read only
@@ -193,7 +193,7 @@ Description:    read only
                 during the initial program load.
 Users:		https://github.com/ibm-capi/libcxl
 
-What:           /sys/class/cxl/<card>/image_loaded
+What:           /sys/class/cxl/<card>/image_loaded (not in a guest)
 Date:           September 2014
 Contact:        [email protected]
 Description:    read only
@@ -201,7 +201,7 @@ Description:    read only
                 onto the card.
 Users:		https://github.com/ibm-capi/libcxl
 
-What:           /sys/class/cxl/<card>/load_image_on_perst
+What:           /sys/class/cxl/<card>/load_image_on_perst (not in a guest)
 Date:           December 2014
 Contact:        [email protected]
 Description:    read/write
@@ -224,7 +224,7 @@ Description:    write only
                 to reload the FPGA depending on load_image_on_perst.
 Users:		https://github.com/ibm-capi/libcxl
 
-What:		/sys/class/cxl/<card>/perst_reloads_same_image
+What:		/sys/class/cxl/<card>/perst_reloads_same_image (not in a guest)
 Date:		July 2015
 Contact:	[email protected]
 Description:	read/write

Documentation/devicetree/bindings/powerpc/fsl/fman.txt

View file

diff --git a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
index 1fc5328..55c2c03 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
@@ -315,6 +315,16 @@ PROPERTIES
 		Value type: <phandle>
 		Definition: A phandle for 1EEE1588 timer.
 
+- pcsphy-handle
+		Usage required for "fsl,fman-memac" MACs
+		Value type: <phandle>
+		Definition: A phandle for pcsphy.
+
+- tbi-handle
+		Usage required for "fsl,fman-dtsec" MACs
+		Value type: <phandle>
+		Definition: A phandle for tbiphy.
+
 EXAMPLE
 
 fman1_tx28: port@a8000 {
@@ -340,6 +350,7 @@ ethernet@e0000 {
 	reg = <0xe0000 0x1000>;
 	fsl,fman-ports = <&fman1_rx8 &fman1_tx28>;
 	ptp-timer = <&ptp-timer>;
+	tbi-handle = <&tbi0>;
 };
 
 ============================================================================
@@ -415,6 +426,13 @@ PROPERTIES
 		The settings and programming routines for internal/external
 		MDIO are different. Must be included for internal MDIO.
 
+For internal PHY device on internal mdio bus, a PHY node should be created.
+See the definition of the PHY node in booting-without-of.txt for an
+example of how to define a PHY (Internal PHY has no interrupt line).
+- For "fsl,fman-mdio" compatible internal mdio bus, the PHY is TBI PHY.
+- For "fsl,fman-memac-mdio" compatible internal mdio bus, the PHY is PCS PHY,
+  PCS PHY addr must be '0'.
+
 EXAMPLE
 
 Example for FMan v2 external MDIO:
@@ -425,12 +443,29 @@ mdio@f1000 {
 	interrupts = <101 2 0 0>;
 };
 
+Example for FMan v2 internal MDIO:
+
+mdio@e3120 {
+	compatible = "fsl,fman-mdio";
+	reg = <0xe3120 0xee0>;
+	fsl,fman-internal-mdio;
+
+	tbi1: tbi-phy@8 {
+		reg = <0x8>;
+		device_type = "tbi-phy";
+	};
+};
+
 Example for FMan v3 internal MDIO:
 
 mdio@f1000 {
 	compatible = "fsl,fman-memac-mdio";
 	reg = <0xf1000 0x1000>;
 	fsl,fman-internal-mdio;
+
+	pcsphy6: ethernet-phy@0 {
+		reg = <0x0>;
+	};
 };
 
 =============================================================================
@@ -568,6 +603,7 @@ fman@400000 {
 		cell-index = <0>;
 		reg = <0xe0000 0x1000>;
 		fsl,fman-ports = <&fman1_rx_0x8 &fman1_tx_0x28>;
+		tbi-handle = <&tbi5>;
 	};
 
 	ethernet@e2000 {
@@ -575,6 +611,7 @@ fman@400000 {
 		cell-index = <1>;
 		reg = <0xe2000 0x1000>;
 		fsl,fman-ports = <&fman1_rx_0x9 &fman1_tx_0x29>;
+		tbi-handle = <&tbi6>;
 	};
 
 	ethernet@e4000 {
@@ -582,6 +619,7 @@ fman@400000 {
 		cell-index = <2>;
 		reg = <0xe4000 0x1000>;
 		fsl,fman-ports = <&fman1_rx_0xa &fman1_tx_0x2a>;
+		tbi-handle = <&tbi7>;
 	};
 
 	ethernet@e6000 {
@@ -589,6 +627,7 @@ fman@400000 {
 		cell-index = <3>;
 		reg = <0xe6000 0x1000>;
 		fsl,fman-ports = <&fman1_rx_0xb &fman1_tx_0x2b>;
+		tbi-handle = <&tbi8>;
 	};
 
 	ethernet@e8000 {
@@ -596,6 +635,7 @@ fman@400000 {
 		cell-index = <4>;
 		reg = <0xf0000 0x1000>;
 		fsl,fman-ports = <&fman1_rx_0xc &fman1_tx_0x2c>;
+		tbi-handle = <&tbi9>;
 
 	ethernet@f0000 {
 		cell-index = <8>;

Documentation/devicetree/bindings/soc/fsl/rcpm.txt

View file

diff --git a/Documentation/devicetree/bindings/soc/fsl/rcpm.txt b/Documentation/devicetree/bindings/soc/fsl/rcpm.txt
new file mode 100644
index 0000000..e284e4e
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/fsl/rcpm.txt
@@ -0,0 +1,63 @@
+* Run Control and Power Management
+-------------------------------------------
+The RCPM performs all device-level tasks associated with device run control
+and power management.
+
+Required properites:
+  - reg : Offset and length of the register set of the RCPM block.
+  - fsl,#rcpm-wakeup-cells : The number of IPPDEXPCR register cells in the
+	fsl,rcpm-wakeup property.
+  - compatible : Must contain a chip-specific RCPM block compatible string
+	and (if applicable) may contain a chassis-version RCPM compatible
+	string. Chip-specific strings are of the form "fsl,<chip>-rcpm",
+	such as:
+	* "fsl,p2041-rcpm"
+	* "fsl,p5020-rcpm"
+	* "fsl,t4240-rcpm"
+
+	Chassis-version strings are of the form "fsl,qoriq-rcpm-<version>",
+	such as:
+	* "fsl,qoriq-rcpm-1.0": for chassis 1.0 rcpm
+	* "fsl,qoriq-rcpm-2.0": for chassis 2.0 rcpm
+	* "fsl,qoriq-rcpm-2.1": for chassis 2.1 rcpm
+
+All references to "1.0" and "2.0" refer to the QorIQ chassis version to
+which the chip complies.
+Chassis Version		Example Chips
+---------------		-------------------------------
+1.0				p4080, p5020, p5040, p2041, p3041
+2.0				t4240, b4860, b4420
+2.1				t1040, ls1021
+
+Example:
+The RCPM node for T4240:
+	rcpm: global-utilities@e2000 {
+		compatible = "fsl,t4240-rcpm", "fsl,qoriq-rcpm-2.0";
+		reg = <0xe2000 0x1000>;
+		fsl,#rcpm-wakeup-cells = <2>;
+	};
+
+* Freescale RCPM Wakeup Source Device Tree Bindings
+-------------------------------------------
+Required fsl,rcpm-wakeup property should be added to a device node if the device
+can be used as a wakeup source.
+
+  - fsl,rcpm-wakeup: Consists of a phandle to the rcpm node and the IPPDEXPCR
+	register cells. The number of IPPDEXPCR register cells is defined in
+	"fsl,#rcpm-wakeup-cells" in the rcpm node. The first register cell is
+	the bit mask that should be set in IPPDEXPCR0, and the second register
+	cell is for IPPDEXPCR1, and so on.
+
+	Note: IPPDEXPCR(IP Powerdown Exception Control Register) provides a
+	mechanism for keeping certain blocks awake during STANDBY and MEM, in
+	order to use them as wake-up sources.
+
+Example:
+	lpuart0: serial@2950000 {
+		compatible = "fsl,ls1021a-lpuart";
+		reg = <0x0 0x2950000 0x0 0x1000>;
+		interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&sysclk>;
+		clock-names = "ipg";
+		fsl,rcpm-wakeup = <&rcpm 0x0 0x40000000>;
+	};

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index eef242e..1f780d9 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2620,7 +2620,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.
 
 	noltlbs		[PPC] Do not use large page/tlb entries for kernel
-			lowmem mapping on PPC40x.
+			lowmem mapping on PPC40x and PPC8xx
 
 	nomca		[IA-64] Disable machine check abort handling
 

Documentation/powerpc/cxl.txt

View file

diff --git a/Documentation/powerpc/cxl.txt b/Documentation/powerpc/cxl.txt
index 205c1b8..d5506ba 100644
--- a/Documentation/powerpc/cxl.txt
+++ b/Documentation/powerpc/cxl.txt
@@ -116,6 +116,8 @@ Work Element Descriptor (WED)
 User API
 ========
 
+1. AFU character devices
+
     For AFUs operating in AFU directed mode, two character device
     files will be created. /dev/cxl/afu0.0m will correspond to a
     master context and /dev/cxl/afu0.0s will correspond to a slave
@@ -362,6 +364,59 @@ read
         reserved fields:
             For future extensions and padding
 
+
+2. Card character device (powerVM guest only)
+
+    In a powerVM guest, an extra character device is created for the
+    card. The device is only used to write (flash) a new image on the
+    FPGA accelerator. Once the image is written and verified, the
+    device tree is updated and the card is reset to reload the updated
+    image.
+
+open
+----
+
+    Opens the device and allocates a file descriptor to be used with
+    the rest of the API. The device can only be opened once.
+
+ioctl
+-----
+
+CXL_IOCTL_DOWNLOAD_IMAGE:
+CXL_IOCTL_VALIDATE_IMAGE:
+    Starts and controls flashing a new FPGA image. Partial
+    reconfiguration is not supported (yet), so the image must contain
+    a copy of the PSL and AFU(s). Since an image can be quite large,
+    the caller may have to iterate, splitting the image in smaller
+    chunks.
+
+    Takes a pointer to a struct cxl_adapter_image:
+        struct cxl_adapter_image {
+            __u64 flags;
+            __u64 data;
+            __u64 len_data;
+            __u64 len_image;
+            __u64 reserved1;
+            __u64 reserved2;
+            __u64 reserved3;
+            __u64 reserved4;
+        };
+
+    flags:
+        These flags indicate which optional fields are present in
+        this struct. Currently all fields are mandatory.
+
+    data:
+        Pointer to a buffer with part of the image to write to the
+        card.
+
+    len_data:
+        Size of the buffer pointed to by data.
+
+    len_image:
+        Full size of the image.
+
+
 Sysfs Class
 ===========
 

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 74acd99..0cbfc69 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4250,13 +4250,6 @@ M:	Maxim Levitsky <[email protected]>
 S:	Maintained
 F:	drivers/media/rc/ene_ir.*
 
-ENHANCED ERROR HANDLING (EEH)
-M:	Gavin Shan <[email protected]>
-L:	[email protected]
-S:	Supported
-F:	Documentation/powerpc/eeh-pci-error-recovery.txt
-F:	arch/powerpc/kernel/eeh*.c
-
 EPSON S1D13XXX FRAMEBUFFER DRIVER
 M:	Kristoffer Ericson <[email protected]>
 S:	Maintained
@@ -8315,6 +8308,15 @@ L:	[email protected]
 S:	Supported
 F:	Documentation/PCI/pci-error-recovery.txt
 
+PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
+M:	Russell Currey <[email protected]>
+L:	[email protected]
+S:	Supported
+F:	Documentation/powerpc/eeh-pci-error-recovery.txt
+F:	arch/powerpc/kernel/eeh*.c
+F:	arch/powerpc/platforms/*/eeh*.c
+F:	arch/powerpc/include/*/eeh*.h
+
 PCI SUBSYSTEM
 M:	Bjorn Helgaas <[email protected]>
 L:	[email protected]

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a030e5e..7cd32c0 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -94,6 +94,7 @@ config PPC
 	select OF_RESERVED_MEM
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_DYNAMIC_FTRACE
+	select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
 	select HAVE_FUNCTION_TRACER
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select SYSCTL_EXCEPTION_TRACE
@@ -304,7 +305,7 @@ config ZONE_DMA32
 config PGTABLE_LEVELS
 	int
 	default 2 if !PPC64
-	default 3 if PPC_64K_PAGES
+	default 3 if PPC_64K_PAGES && !PPC_BOOK3S_64
 	default 4
 
 source "init/Kconfig"
@@ -374,6 +375,24 @@ config PPC_TRANSACTIONAL_MEM
        ---help---
          Support user-mode Transactional Memory on POWERPC.
 
+config DISABLE_MPROFILE_KERNEL
+	bool "Disable use of mprofile-kernel for kernel tracing"
+	depends on PPC64 && CPU_LITTLE_ENDIAN
+	default y
+	help
+	  Selecting this options disables use of the mprofile-kernel ABI for
+	  kernel tracing. That will cause options such as live patching
+	  (CONFIG_LIVEPATCH) which depend on CONFIG_DYNAMIC_FTRACE_WITH_REGS to
+	  be disabled also.
+
+	  If you have a toolchain which supports mprofile-kernel, then you can
+	  enable this. Otherwise leave it disabled. If you're not sure, say
+	  "N".
+
+config MPROFILE_KERNEL
+	depends on PPC64 && CPU_LITTLE_ENDIAN
+	def_bool !DISABLE_MPROFILE_KERNEL
+
 config IOMMU_HELPER
 	def_bool PPC64
 
@@ -390,7 +409,7 @@ config SWIOTLB
 config HOTPLUG_CPU
 	bool "Support for enabling/disabling CPUs"
 	depends on SMP && (PPC_PSERIES || \
-	PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
+	PPC_PMAC || PPC_POWERNV || FSL_SOC_BOOKE)
 	---help---
 	  Say Y here to be able to disable and re-enable individual
 	  CPUs at runtime on SMP machines.

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 96efd82..709a22a 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -133,6 +133,21 @@ else
 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
 endif
 
+ifdef CONFIG_MPROFILE_KERNEL
+    ifeq ($(shell $(srctree)/arch/powerpc/scripts/gcc-check-mprofile-kernel.sh $(CC) -I$(srctree)/include -D__KERNEL__),OK)
+        CC_FLAGS_FTRACE := -pg -mprofile-kernel
+        KBUILD_CPPFLAGS += -DCC_USING_MPROFILE_KERNEL
+    else
+        # If the user asked for mprofile-kernel but the toolchain doesn't
+        # support it, emit a warning and deliberately break the build later
+        # with mprofile-kernel-not-supported. We would prefer to make this an
+        # error right here, but then the user would never be able to run
+        # oldconfig to change their configuration.
+        $(warning Compiler does not support mprofile-kernel, set CONFIG_DISABLE_MPROFILE_KERNEL)
+        CC_FLAGS_FTRACE := -mprofile-kernel-not-supported
+    endif
+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)
@@ -310,6 +325,16 @@ corenet64_smp_defconfig:
 	$(call merge_into_defconfig,corenet_basic_defconfig,\
 		85xx-64bit 85xx-smp altivec 85xx-hw fsl-emb-nonhw)
 
+PHONY += mpc86xx_defconfig
+mpc86xx_defconfig:
+	$(call merge_into_defconfig,mpc86xx_basic_defconfig,\
+		86xx-hw fsl-emb-nonhw)
+
+PHONY += mpc86xx_smp_defconfig
+mpc86xx_smp_defconfig:
+	$(call merge_into_defconfig,mpc86xx_basic_defconfig,\
+		86xx-smp 86xx-hw fsl-emb-nonhw)
+
 define archhelp
   @echo '* zImage          - Build default images selected by kernel config'
   @echo '  zImage.*        - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'

arch/powerpc/boot/dts/fsl/b4860qds.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/b4860qds.dts b/arch/powerpc/boot/dts/fsl/b4860qds.dts
index ba8c9be..a8bc419 100644
--- a/arch/powerpc/boot/dts/fsl/b4860qds.dts
+++ b/arch/powerpc/boot/dts/fsl/b4860qds.dts
@@ -1,7 +1,7 @@
 /*
  * B4860DS Device Tree Source
  *
- * Copyright 2012 Freescale Semiconductor Inc.
+ * Copyright 2012 - 2015 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -39,12 +39,69 @@
 	model = "fsl,B4860QDS";
 	compatible = "fsl,B4860QDS";
 
+	aliases {
+		phy_sgmii_1e = &phy_sgmii_1e;
+		phy_sgmii_1f = &phy_sgmii_1f;
+		phy_xaui_slot1 = &phy_xaui_slot1;
+		phy_xaui_slot2 = &phy_xaui_slot2;
+	};
+
 	ifc: localbus@ffe124000 {
 		board-control@3,0 {
 			compatible = "fsl,b4860qds-fpga", "fsl,fpga-qixis";
 		};
 	};
 
+	soc@ffe000000 {
+		fman@400000 {
+			ethernet@e8000 {
+				phy-handle = <&phy_sgmii_1e>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@ea000 {
+				phy-handle = <&phy_sgmii_1f>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@f0000 {
+				phy-handle = <&phy_xaui_slot1>;
+				phy-connection-type = "xgmii";
+			};
+
+			ethernet@f2000 {
+				phy-handle = <&phy_xaui_slot2>;
+				phy-connection-type = "xgmii";
+			};
+
+			mdio@fc000 {
+				phy_sgmii_1e: ethernet-phy@1e {
+					reg = <0x1e>;
+					status = "disabled";
+				};
+
+				phy_sgmii_1f: ethernet-phy@1f {
+					reg = <0x1f>;
+					status = "disabled";
+				};
+			};
+
+			mdio@fd000 {
+				phy_xaui_slot1: xaui-phy@slot1 {
+					compatible = "ethernet-phy-ieee802.3-c45";
+					reg = <0x7>;
+					status = "disabled";
+				};
+
+				phy_xaui_slot2: xaui-phy@slot2 {
+					compatible = "ethernet-phy-ieee802.3-c45";
+					reg = <0x6>;
+					status = "disabled";
+				};
+			};
+		};
+	};
+
 	rio: rapidio@ffe0c0000 {
 		reg = <0xf 0xfe0c0000 0 0x11000>;
 
@@ -55,7 +112,6 @@
 			ranges = <0 0 0xc 0x30000000 0 0x10000000>;
 		};
 	};
-
 };
 
 /include/ "b4860si-post.dtsi"

arch/powerpc/boot/dts/fsl/b4qds.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/b4qds.dtsi b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
index 6455774..3785ef8 100644
--- a/arch/powerpc/boot/dts/fsl/b4qds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
@@ -1,7 +1,7 @@
 /*
  * B4420DS Device Tree Source
  *
- * Copyright 2012 - 2014 Freescale Semiconductor, Inc.
+ * Copyright 2012 - 2015 Freescale Semiconductor, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -39,6 +39,13 @@
 	#size-cells = <2>;
 	interrupt-parent = <&mpic>;
 
+	aliases {
+		phy_sgmii_10 = &phy_sgmii_10;
+		phy_sgmii_11 = &phy_sgmii_11;
+		phy_sgmii_1c = &phy_sgmii_1c;
+		phy_sgmii_1d = &phy_sgmii_1d;
+	};
+
 	ifc: localbus@ffe124000 {
 		reg = <0xf 0xfe124000 0 0x2000>;
 		ranges = <0 0 0xf 0xe8000000 0x08000000
@@ -135,7 +142,7 @@
 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "sst,sst25wf040";
+				compatible = "sst,sst25wf040", "jedec,spi-nor";
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 			};
@@ -210,6 +217,47 @@
 			phy_type = "ulpi";
 		};
 
+		fman@400000 {
+			ethernet@e0000 {
+				phy-handle = <&phy_sgmii_10>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@e2000 {
+				phy-handle = <&phy_sgmii_11>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@e4000 {
+				phy-handle = <&phy_sgmii_1c>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@e6000 {
+				phy-handle = <&phy_sgmii_1d>;
+				phy-connection-type = "sgmii";
+			};