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

8d697332 · Linus Torvalds <[email protected]> · 2018-12-27 10:43:24 -08:00

Pull powerpc updates from Michael Ellerman:
 "Notable changes:

   - Mitigations for Spectre v2 on some Freescale (NXP) CPUs.

   - A large series adding support for pass-through of Nvidia V100 GPUs
     to guests on Power9.

   - Another large series to enable hardware assistance for TLB table
     walk on MPC8xx CPUs.

   - Some preparatory changes to our DMA code, to make way for further
     cleanups from Christoph.

   - Several fixes for our Transactional Memory handling discovered by
     fuzzing the signal return path.

   - Support for generating our system call table(s) from a text file
     like other architectures.

   - A fix to our page fault handler so that instead of generating a
     WARN_ON_ONCE, user accesses of kernel addresses instead print a
     ratelimited and appropriately scary warning.

   - A cosmetic change to make our unhandled page fault messages more
     similar to other arches and also more compact and informative.

   - Freescale updates from Scott:
       "Highlights include elimination of legacy clock bindings use from
        dts files, an 83xx watchdog handler, fixes to old dts interrupt
        errors, and some minor cleanup."

  And many clean-ups, reworks and minor fixes etc.

  Thanks to: Alexandre Belloni, Alexey Kardashevskiy, Andrew Donnellan,
  Aneesh Kumar K.V, Arnd Bergmann, Benjamin Herrenschmidt, Breno Leitao,
  Christian Lamparter, Christophe Leroy, Christoph Hellwig, Daniel
  Axtens, Darren Stevens, David Gibson, Diana Craciun, Dmitry V. Levin,
  Firoz Khan, Geert Uytterhoeven, Greg Kurz, Gustavo Romero, Hari
  Bathini, Joel Stanley, Kees Cook, Madhavan Srinivasan, Mahesh
  Salgaonkar, Markus Elfring, Mathieu Malaterre, Michal Suchánek, Naveen
  N. Rao, Nick Desaulniers, Oliver O'Halloran, Paul Mackerras, Ram Pai,
  Ravi Bangoria, Rob Herring, Russell Currey, Sabyasachi Gupta, Sam
  Bobroff, Satheesh Rajendran, Scott Wood, Segher Boessenkool, Stephen
  Rothwell, Tang Yuantian, Thiago Jung Bauermann, Yangtao Li, Yuantian
  Tang, Yue Haibing"

* tag 'powerpc-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (201 commits)
  Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask"
  powerpc/zImage: Also check for stdout-path
  powerpc: Fix HMIs on big-endian with CONFIG_RELOCATABLE=y
  macintosh: Use of_node_name_{eq, prefix} for node name comparisons
  ide: Use of_node_name_eq for node name comparisons
  powerpc: Use of_node_name_eq for node name comparisons
  powerpc/pseries/pmem: Convert to %pOFn instead of device_node.name
  powerpc/mm: Remove very old comment in hash-4k.h
  powerpc/pseries: Fix node leak in update_lmb_associativity_index()
  powerpc/configs/85xx: Enable CONFIG_DEBUG_KERNEL
  powerpc/dts/fsl: Fix dtc-flagged interrupt errors
  clk: qoriq: add more compatibles strings
  powerpc/fsl: Use new clockgen binding
  powerpc/83xx: handle machine check caused by watchdog timer
  powerpc/fsl-rio: fix spelling mistake "reserverd" -> "reserved"
  powerpc/fsl_pci: simplify fsl_pci_dma_set_mask
  arch/powerpc/fsl_rmu: Use dma_zalloc_coherent
  vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] subdriver
  vfio_pci: Allow regions to add own capabilities
  vfio_pci: Allow mapping extra regions
  ...

Commit: 8d6973327ee84c2f40dd9efd8928d4a1186c96e2
Parents: 6d101ba6 · 12526b0d

Merge commit. Changes below are compared with the first parent: 6d101ba6.

Changes

296 files changed · +4689 −3411

File	Status	Add	Del	Content
Documentation/admin-guide/kernel-parameters.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/clock/qoriq-clock.txt	modified	+6	−0	View file
Documentation/powerpc/firmware-assisted-dump.txt	modified	+16	−1	View file
Documentation/powerpc/isa-versions.rst	added	+74	−0	View file
arch/powerpc/Kconfig	modified	+6	−9	View file
arch/powerpc/Makefile	modified	+23	−5	View file
arch/powerpc/boot/dts/bamboo.dts	modified	+3	−1	View file
arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi	modified	+2	−2	View file
arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi	modified	+4	−4	View file
arch/powerpc/boot/dts/fsl/b4si-post.dtsi	modified	+0	−15	View file
arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts	modified	+64	−64	View file
arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts	modified	+64	−64	View file
arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi	modified	+2	−0	View file
arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi	modified	+2	−2	View file
arch/powerpc/boot/dts/fsl/p2041si-post.dtsi	modified	+0	−18	View file
arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi	modified	+4	−4	View file
arch/powerpc/boot/dts/fsl/p3041si-post.dtsi	modified	+0	−18	View file
arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi	modified	+4	−4	View file
arch/powerpc/boot/dts/fsl/p4080si-post.dtsi	modified	+0	−70	View file
arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi	modified	+8	−8	View file
arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi	modified	+2	−2	View file
arch/powerpc/boot/dts/fsl/p5040si-post.dtsi	modified	+0	−18	View file
arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi	modified	+4	−4	View file
arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi	modified	+0	−47	View file
arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi	modified	+0	−30	View file
arch/powerpc/boot/dts/fsl/t1023si-post.dtsi	modified	+0	−16	View file
arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi	modified	+2	−2	View file
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi	modified	+0	−44	View file
arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi	modified	+4	−4	View file
arch/powerpc/boot/dts/fsl/t2081si-post.dtsi	modified	+0	−22	View file
arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi	modified	+4	−4	View file
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi	modified	+0	−61	View file
arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi	modified	+12	−12	View file
arch/powerpc/boot/dts/mpc832x_rdb.dts	modified	+0	−4	View file
arch/powerpc/boot/serial.c	modified	+2	−1	View file
arch/powerpc/configs/fsl-emb-nonhw.config	modified	+1	−0	View file
arch/powerpc/configs/g5_defconfig	modified	+0	−1	View file
arch/powerpc/configs/guest.config	added	+13	−0	View file
arch/powerpc/configs/maple_defconfig	modified	+0	−1	View file
arch/powerpc/configs/pmac32_defconfig	modified	+0	−1	View file
arch/powerpc/configs/ppc64_defconfig	modified	+44	−37	View file
arch/powerpc/configs/ppc6xx_defconfig	modified	+0	−1	View file
arch/powerpc/configs/pseries_defconfig	modified	+0	−2	View file
arch/powerpc/include/asm/Kbuild	modified	+4	−0	View file
arch/powerpc/include/asm/asm-prototypes.h	modified	+0	−1	View file
arch/powerpc/include/asm/book3s/32/hash.h	modified	+1	−0	View file
arch/powerpc/include/asm/book3s/32/mmu-hash.h	modified	+15	−0	View file
arch/powerpc/include/asm/book3s/32/pgalloc.h	modified	+10	−30	View file
arch/powerpc/include/asm/book3s/32/pgtable.h	modified	+15	−31	View file
arch/powerpc/include/asm/book3s/64/hash-4k.h	modified	+1	−5	View file
arch/powerpc/include/asm/book3s/64/mmu.h	modified	+9	−0	View file
arch/powerpc/include/asm/book3s/64/pgalloc.h	modified	+2	−4	View file
arch/powerpc/include/asm/book3s/64/pgtable.h	modified	+1	−1	View file
arch/powerpc/include/asm/cache.h	modified	+1	−1	View file
arch/powerpc/include/asm/code-patching.h	modified	+21	−2	View file
arch/powerpc/include/asm/cputable.h	modified	+5	−4	View file
arch/powerpc/include/asm/dma-mapping.h	modified	+0	−7	View file
arch/powerpc/include/asm/fadump.h	modified	+6	−1	View file
arch/powerpc/include/asm/feature-fixups.h	modified	+12	−0	View file
arch/powerpc/include/asm/hugetlb.h	modified	+7	−8	View file
arch/powerpc/include/asm/io.h	modified	+12	−1	View file
arch/powerpc/include/asm/iommu.h	modified	+7	−10	View file
arch/powerpc/include/asm/ipic.h	modified	+0	−1	View file
arch/powerpc/include/asm/mmu.h	modified	+30	−19	View file
arch/powerpc/include/asm/mmu_context.h	modified	+23	−9	View file
arch/powerpc/include/asm/mmu-40x.h → arch/powerpc/include/asm/nohash/32/mmu-40x.h	renamed	+0	−0	View file
arch/powerpc/include/asm/mmu-44x.h → arch/powerpc/include/asm/nohash/32/mmu-44x.h	renamed	+3	−0	View file
arch/powerpc/include/asm/mmu-8xx.h → arch/powerpc/include/asm/nohash/32/mmu-8xx.h	renamed	+4	−0	View file
arch/powerpc/include/asm/nohash/32/mmu.h	added	+25	−0	View file
arch/powerpc/include/asm/nohash/32/pgalloc.h	modified	+12	−15	View file
arch/powerpc/include/asm/nohash/32/pgtable.h	modified	+11	−4	View file
arch/powerpc/include/asm/nohash/32/pte-40x.h	modified	+1	−1	View file
arch/powerpc/include/asm/nohash/32/pte-8xx.h	modified	+0	−3	View file
arch/powerpc/include/asm/nohash/64/mmu.h	added	+12	−0	View file
arch/powerpc/include/asm/nohash/64/pgalloc.h	modified	+1	−4	View file
arch/powerpc/include/asm/mmu-book3e.h → arch/powerpc/include/asm/nohash/mmu-book3e.h	renamed	+0	−0	View file
arch/powerpc/include/asm/nohash/mmu.h	added	+11	−0	View file
arch/powerpc/include/asm/nohash/pgtable.h	modified	+4	−0	View file
arch/powerpc/include/asm/opal.h	modified	+1	−0	View file
arch/powerpc/include/asm/page.h	modified	+3	−15	View file
arch/powerpc/include/asm/page_32.h	modified	+2	−1	View file
arch/powerpc/include/asm/pci-bridge.h	modified	+1	−0	View file
arch/powerpc/include/asm/pci.h	modified	+4	−0	View file
arch/powerpc/include/asm/perf_event.h	modified	+3	−0	View file
arch/powerpc/include/asm/perf_event_server.h	modified	+2	−0	View file
arch/powerpc/include/asm/pgtable-types.h	modified	+4	−0	View file
arch/powerpc/include/asm/pgtable.h	modified	+30	−2	View file
arch/powerpc/include/asm/ppc-opcode.h	modified	+1	−0	View file
arch/powerpc/include/asm/ppc_asm.h	modified	+12	−17	View file
arch/powerpc/include/asm/reg.h	modified	+3	−1	View file
arch/powerpc/include/asm/setup.h	modified	+7	−0	View file
arch/powerpc/include/asm/sfp-machine.h	modified	+29	−63	View file
arch/powerpc/include/asm/slice.h	modified	+9	−5	View file
arch/powerpc/include/asm/syscall.h	modified	+1	−2	View file
arch/powerpc/include/asm/systbl.h	deleted	+0	−396	View before deletion
arch/powerpc/include/asm/time.h	modified	+1	−1	View file
arch/powerpc/include/asm/tlb.h	modified	+1	−1	View file
arch/powerpc/include/asm/uaccess.h	modified	+1	−1	View file
arch/powerpc/include/asm/unistd.h	modified	+1	−2	View file
arch/powerpc/include/uapi/asm/Kbuild	modified	+2	−0	View file
arch/powerpc/include/uapi/asm/perf_regs.h	modified	+1	−0	View file
arch/powerpc/include/uapi/asm/unistd.h	modified	+2	−387	View file
arch/powerpc/kernel/Makefile	modified	+1	−11	View file
arch/powerpc/kernel/btext.c	modified	+4	−12	View file
arch/powerpc/kernel/cacheinfo.c	modified	+1	−1	View file
arch/powerpc/kernel/cpu_setup_6xx.S	modified	+1	−1	View file
arch/powerpc/kernel/cpu_setup_fsl_booke.S	modified	+1	−1	View file
arch/powerpc/kernel/cputable.c	modified	+6	−4	View file
arch/powerpc/kernel/dma-iommu.c	modified	+0	−2	View file
arch/powerpc/kernel/dma-swiotlb.c	modified	+1	−5	View file
arch/powerpc/kernel/dma.c	modified	+13	−18	View file
arch/powerpc/kernel/eeh.c	modified	+10	−10	View file
arch/powerpc/kernel/eeh_driver.c	modified	+1	−1	View file
arch/powerpc/kernel/eeh_event.c	modified	+3	−6	View file
arch/powerpc/kernel/entry_32.S	modified	+5	−5	View file
arch/powerpc/kernel/entry_64.S	modified	+14	−2	View file
arch/powerpc/kernel/exceptions-64e.S	modified	+25	−1	View file
arch/powerpc/kernel/exceptions-64s.S	modified	+1	−1	View file
arch/powerpc/kernel/fadump.c	modified	+129	−25	View file
arch/powerpc/kernel/head_32.S	modified	+12	−8	View file
arch/powerpc/kernel/head_44x.S	modified	+5	−6	View file
arch/powerpc/kernel/head_8xx.S	modified	+140	−229	View file
arch/powerpc/kernel/head_booke.h	modified	+6	−0	View file
arch/powerpc/kernel/head_fsl_booke.S	modified	+15	−0	View file
arch/powerpc/kernel/iommu.c	modified	+11	−58	View file
arch/powerpc/kernel/isa-bridge.c	modified	+1	−2	View file
arch/powerpc/kernel/legacy_serial.c	modified	+5	−5	View file
arch/powerpc/kernel/misc_32.S	modified	+2	−2	View file
arch/powerpc/kernel/nvram_64.c	modified	+1	−0	View file
arch/powerpc/kernel/pci_of_scan.c	modified	+4	−7	View file
arch/powerpc/kernel/pmc.c	modified	+1	−1	View file
arch/powerpc/kernel/prom.c	modified	+5	−5	View file
arch/powerpc/kernel/ptrace.c	modified	+31	−23	View file
arch/powerpc/kernel/security.c	modified	+27	−2	View file
arch/powerpc/kernel/setup-common.c	modified	+4	−3	View file
arch/powerpc/kernel/setup_32.c	modified	+2	−4	View file
arch/powerpc/kernel/signal_32.c	modified	+38	−12	View file
arch/powerpc/kernel/signal_64.c	modified	+50	−21	View file
arch/powerpc/kernel/syscalls/Makefile	added	+63	−0	View file
arch/powerpc/kernel/syscalls/syscall.tbl	added	+427	−0	View file
arch/powerpc/kernel/syscalls/syscallhdr.sh	added	+37	−0	View file
arch/powerpc/kernel/syscalls/syscalltbl.sh	added	+36	−0	View file
arch/powerpc/kernel/sysfs.c	modified	+1	−1	View file
arch/powerpc/kernel/systbl.S	modified	+17	−23	View file
arch/powerpc/kernel/systbl_chk.c	deleted	+0	−60	View before deletion
arch/powerpc/kernel/trace/ftrace.c	modified	+1	−1	View file
arch/powerpc/kernel/traps.c	modified	+2	−1	View file
arch/powerpc/kernel/vdso.c	modified	+5	−2	View file
arch/powerpc/kernel/vmlinux.lds.S	modified	+12	−6	View file
arch/powerpc/kvm/book3s_64_vio.c	modified	+10	−8	View file
arch/powerpc/kvm/bookehv_interrupts.S	modified	+4	−0	View file
arch/powerpc/kvm/e500.h	modified	+1	−1	View file
arch/powerpc/kvm/e500_emulate.c	modified	+7	−0	View file
arch/powerpc/lib/code-patching.c	modified	+0	−16	View file
arch/powerpc/lib/feature-fixups.c	modified	+25	−2	View file
arch/powerpc/mm/44x_mmu.c	modified	+3	−11	View file
arch/powerpc/mm/8xx_mmu.c	modified	+3	−7	View file
arch/powerpc/mm/Makefile	modified	+7	−4	View file
arch/powerpc/mm/dma-noncoherent.c	modified	+7	−8	View file
arch/powerpc/mm/dump_bats.c	added	+173	−0	View file
arch/powerpc/mm/dump_linuxpagetables-generic.c	modified	+0	−2	View file
arch/powerpc/mm/dump_sr.c	added	+64	−0	View file
arch/powerpc/mm/fault.c	modified	+33	−16	View file
arch/powerpc/mm/hash_low_32.S	modified	+19	−14	View file
arch/powerpc/mm/hugetlbpage.c	modified	+18	−22	View file
arch/powerpc/mm/init-common.c	modified	+37	−19	View file
arch/powerpc/mm/mem.c	modified	+19	−32	View file
arch/powerpc/mm/mmu_context.c	modified	+10	−0	View file
arch/powerpc/mm/mmu_context_book3s64.c	modified	+0	−15	View file
arch/powerpc/mm/mmu_context_iommu.c	modified	+92	−18	View file
arch/powerpc/mm/mmu_context_nohash.c	modified	+1	−3	View file
arch/powerpc/mm/mmu_decl.h	modified	+1	−1	View file
arch/powerpc/mm/numa.c	modified	+1	−1	View file
arch/powerpc/mm/pgtable-book3s64.c	modified	+3	−85	View file
arch/powerpc/mm/pgtable-frag.c	added	+119	−0	View file
arch/powerpc/mm/pgtable.c	modified	+14	−12	View file
arch/powerpc/mm/pgtable_32.c	modified	+6	−23	View file
arch/powerpc/mm/pkeys.c	modified	+18	−7	View file
arch/powerpc/mm/ppc_mmu_32.c	modified	+13	−38	View file
arch/powerpc/mm/tlb_low_64e.S	modified	+7	−0	View file
arch/powerpc/oprofile/Makefile	modified	+1	−1	View file
arch/powerpc/oprofile/common.c	modified	+1	−1	View file
arch/powerpc/perf/core-book3s.c	modified	+33	−6	View file
arch/powerpc/perf/imc-pmu.c	modified	+3	−3	View file
arch/powerpc/perf/isa207-common.c	modified	+41	−17	View file
arch/powerpc/perf/isa207-common.h	modified	+7	−2	View file
arch/powerpc/perf/perf_regs.c	modified	+7	−0	View file
arch/powerpc/perf/power9-pmu.c	modified	+6	−16	View file
arch/powerpc/platforms/44x/warp.c	modified	+3	−3	View file
arch/powerpc/platforms/4xx/ocm.c	modified	+4	−13	View file
arch/powerpc/platforms/4xx/pci.c	modified	+2	−5	View file
arch/powerpc/platforms/512x/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/52xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/52xx/efika.c	modified	+2	−4	View file
arch/powerpc/platforms/82xx/Kconfig	modified	+2	−2	View file
arch/powerpc/platforms/83xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/83xx/misc.c	modified	+17	−0	View file
arch/powerpc/platforms/85xx/corenet_generic.c	modified	+0	−10	View file
arch/powerpc/platforms/85xx/qemu_e500.c	modified	+0	−9	View file
arch/powerpc/platforms/85xx/t1042rdb_diu.c	modified	+1	−1	View file
arch/powerpc/platforms/86xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/86xx/mpc86xx_smp.c	modified	+1	−2	View file
arch/powerpc/platforms/Kconfig	modified	+4	−4	View file
arch/powerpc/platforms/Kconfig.cputype	modified	+5	−16	View file
arch/powerpc/platforms/amigaone/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/cell/cbe_regs.c	modified	+3	−3	View file
arch/powerpc/platforms/cell/setup.c	modified	+2	−3	View file
arch/powerpc/platforms/cell/spu_callbacks.c	modified	+3	−14	View file
arch/powerpc/platforms/cell/spu_manage.c	modified	+2	−8	View file
arch/powerpc/platforms/chrp/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/chrp/pci.c	modified	+2	−2	View file
arch/powerpc/platforms/chrp/setup.c	modified	+2	−8	View file
arch/powerpc/platforms/embedded6xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/maple/pci.c	modified	+2	−4	View file
arch/powerpc/platforms/pasemi/dma_lib.c	modified	+1	−3	View file
arch/powerpc/platforms/pasemi/pci.c	modified	+66	−0	View file
arch/powerpc/platforms/pasemi/setup.c	modified	+86	−0	View file
arch/powerpc/platforms/powermac/cache.S	modified	+2	−2	View file
arch/powerpc/platforms/powermac/feature.c	modified	+7	−7	View file
arch/powerpc/platforms/powermac/low_i2c.c	modified	+5	−6	View file
arch/powerpc/platforms/powermac/pci.c	modified	+11	−16	View file
arch/powerpc/platforms/powermac/pfunc_base.c	modified	+3	−4	View file
arch/powerpc/platforms/powermac/pic.c	modified	+3	−3	View file
arch/powerpc/platforms/powermac/setup.c	modified	+2	−8	View file
arch/powerpc/platforms/powermac/sleep.S	modified	+2	−2	View file
arch/powerpc/platforms/powermac/smp.c	modified	+1	−2	View file
arch/powerpc/platforms/powermac/udbg_adb.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/udbg_scc.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/eeh-powernv.c	modified	+4	−4	View file
arch/powerpc/platforms/powernv/npu-dma.c	modified	+461	−103	View file
arch/powerpc/platforms/powernv/opal-power.c	modified	+1	−2	View file
arch/powerpc/platforms/powernv/opal.c	modified	+4	−1	View file
arch/powerpc/platforms/powernv/pci-ioda-tce.c	modified	+3	−2	View file
arch/powerpc/platforms/powernv/pci-ioda.c	modified	+111	−154	View file
arch/powerpc/platforms/powernv/pci.c	modified	+44	−5	View file
arch/powerpc/platforms/powernv/pci.h	modified	+8	−28	View file
arch/powerpc/platforms/powernv/vas-debug.c	modified	+4	−24	View file
arch/powerpc/platforms/pseries/hotplug-memory.c	modified	+8	−8	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+58	−30	View file
arch/powerpc/platforms/pseries/pci.c	modified	+22	−0	View file
arch/powerpc/platforms/pseries/pmem.c	modified	+4	−4	View file
arch/powerpc/platforms/pseries/setup.c	modified	+4	−8	View file
arch/powerpc/platforms/pseries/vio.c	modified	+12	−15	View file
arch/powerpc/sysdev/Makefile	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_rio.h	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_rmu.c	modified	+1	−3	View file
arch/powerpc/sysdev/ipic.c	modified	+0	−28	View file
arch/powerpc/sysdev/scom.c	modified	+2	−2	View file
arch/powerpc/sysdev/xive/common.c	modified	+1	−1	View file
arch/powerpc/tools/checkpatch.sh	modified	+1	−0	View file
arch/powerpc/xmon/xmon.c	modified	+22	−11	View file
drivers/cpufreq/pmac32-cpufreq.c	modified	+2	−2	View file
drivers/cpuidle/cpuidle-pseries.c	modified	+7	−1	View file
drivers/crypto/amcc/crypto4xx_core.c	modified	+1	−1	View file
drivers/ide/pmac.c	modified	+1	−1	View file
drivers/macintosh/ans-lcd.c	modified	+1	−1	View file
drivers/macintosh/macio_asic.c	modified	+16	−19	View file
drivers/macintosh/macio_sysfs.c	modified	+6	−12	View file
drivers/macintosh/rack-meter.c	modified	+7	−6	View file
drivers/macintosh/via-pmu.c	modified	+2	−2	View file
drivers/macintosh/windfarm_fcu_controls.c	modified	+7	−7	View file
drivers/macintosh/windfarm_lm87_sensor.c	modified	+2	−2	View file
drivers/macintosh/windfarm_smu_controls.c	modified	+2	−2	View file
drivers/macintosh/windfarm_smu_sat.c	modified	+4	−5	View file
drivers/macintosh/windfarm_smu_sensors.c	modified	+7	−8	View file
drivers/misc/cxl/pci.c	modified	+1	−3	View file
drivers/misc/cxl/vphb.c	modified	+0	−12	View file
drivers/misc/ocxl/afu_irq.c	modified	+0	−1	View file
drivers/misc/ocxl/config.c	modified	+1	−1	View file
drivers/misc/ocxl/link.c	modified	+15	−10	View file
drivers/vfio/pci/Kconfig	modified	+6	−0	View file
drivers/vfio/pci/Makefile	modified	+1	−0	View file
drivers/vfio/pci/trace.h	added	+102	−0	View file
drivers/vfio/pci/vfio_pci.c	modified	+40	−2	View file
drivers/vfio/pci/vfio_pci_nvlink2.c	added	+482	−0	View file
drivers/vfio/pci/vfio_pci_private.h	modified	+20	−0	View file
drivers/vfio/vfio_iommu_spapr_tce.c	modified	+45	−29	View file
include/linux/mmzone.h	modified	+1	−1	View file
include/uapi/linux/vfio.h	modified	+42	−0	View file
lib/raid6/Makefile	modified	+15	−0	View file
lib/test_debug_virtual.c	modified	+1	−0	View file
tools/arch/powerpc/include/uapi/asm/perf_regs.h	modified	+1	−0	View file
tools/perf/arch/powerpc/include/perf_regs.h	modified	+2	−1	View file
tools/perf/arch/powerpc/util/perf_regs.c	modified	+1	−0	View file
tools/testing/selftests/powerpc/include/utils.h	modified	+10	−0	View file
tools/testing/selftests/powerpc/ptrace/core-pkey.c	modified	+1	−4	View file
tools/testing/selftests/powerpc/ptrace/ptrace-gpr.c	modified	+1	−1	View file
tools/testing/selftests/powerpc/ptrace/ptrace-tm-gpr.c	modified	+2	−2	View file
tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-tar.c	modified	+1	−1	View file
tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c	modified	+1	−2	View file
tools/testing/selftests/powerpc/ptrace/ptrace-tm-spr.c	modified	+1	−1	View file
tools/testing/selftests/powerpc/ptrace/ptrace-tm-tar.c	modified	+1	−1	View file
tools/testing/selftests/powerpc/ptrace/ptrace-tm-vsx.c	modified	+1	−2	View file
tools/testing/selftests/powerpc/tm/.gitignore	modified	+1	−0	View file
tools/testing/selftests/powerpc/tm/Makefile	modified	+1	−1	View file
tools/testing/selftests/powerpc/tm/tm-signal-sigreturn-nt.c	added	+46	−0	View file

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

Documentation/admin-guide/kernel-parameters.txt

View file

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 6053677..ff4daa7 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2833,7 +2833,7 @@
 			check bypass). With this option data leaks are possible
 			in the system.
 
-	nospectre_v2	[X86] Disable all mitigations for the Spectre variant 2
+	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2
 			(indirect branch prediction) vulnerability. System may
 			allow data leaks with this option, which is equivalent
 			to spectre_v2=off.

Documentation/devicetree/bindings/clock/qoriq-clock.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
index 97f46ad..c655f28 100644
--- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt
+++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
@@ -28,6 +28,12 @@ Required properties:
 	* "fsl,p4080-clockgen"
 	* "fsl,p5020-clockgen"
 	* "fsl,p5040-clockgen"
+	* "fsl,t1023-clockgen"
+	* "fsl,t1024-clockgen"
+	* "fsl,t1040-clockgen"
+	* "fsl,t1042-clockgen"
+	* "fsl,t2080-clockgen"
+	* "fsl,t2081-clockgen"
 	* "fsl,t4240-clockgen"
 	* "fsl,b4420-clockgen"
 	* "fsl,b4860-clockgen"

Documentation/powerpc/firmware-assisted-dump.txt

View file

diff --git a/Documentation/powerpc/firmware-assisted-dump.txt b/Documentation/powerpc/firmware-assisted-dump.txt
index bdd344a..18c5fee 100644
--- a/Documentation/powerpc/firmware-assisted-dump.txt
+++ b/Documentation/powerpc/firmware-assisted-dump.txt
@@ -113,7 +113,15 @@ header, is usually reserved at an offset greater than boot memory
 size (see Fig. 1). This area is *not* released: this region will
 be kept permanently reserved, so that it can act as a receptacle
 for a copy of the boot memory content in addition to CPU state
-and HPTE region, in the case a crash does occur.
+and HPTE region, in the case a crash does occur. Since this reserved
+memory area is used only after the system crash, there is no point in
+blocking this significant chunk of memory from production kernel.
+Hence, the implementation uses the Linux kernel's Contiguous Memory
+Allocator (CMA) for memory reservation if CMA is configured for kernel.
+With CMA reservation this memory will be available for applications to
+use it, while kernel is prevented from using it. With this fadump will
+still be able to capture all of the kernel memory and most of the user
+space memory except the user pages that were present in CMA region.
 
   o Memory Reservation during first kernel
 
@@ -162,6 +170,9 @@ How to enable firmware-assisted dump (fadump):
 
 1. Set config option CONFIG_FA_DUMP=y and build kernel.
 2. Boot into linux kernel with 'fadump=on' kernel cmdline option.
+   By default, fadump reserved memory will be initialized as CMA area.
+   Alternatively, user can boot linux kernel with 'fadump=nocma' to
+   prevent fadump to use CMA.
 3. Optionally, user can also set 'crashkernel=' kernel cmdline
    to specify size of the memory to reserve for boot memory dump
    preservation.
@@ -172,6 +183,10 @@ NOTE: 1. 'fadump_reserve_mem=' parameter has been deprecated. Instead
       2. If firmware-assisted dump fails to reserve memory then it
          will fallback to existing kdump mechanism if 'crashkernel='
          option is set at kernel cmdline.
+      3. if user wants to capture all of user space memory and ok with
+         reserved memory not available to production system, then
+         'fadump=nocma' kernel parameter can be used to fallback to
+         old behaviour.
 
 Sysfs/debugfs files:
 ------------

Documentation/powerpc/isa-versions.rst

View file

diff --git a/Documentation/powerpc/isa-versions.rst b/Documentation/powerpc/isa-versions.rst
new file mode 100644
index 0000000..812e20c
--- /dev/null
+++ b/Documentation/powerpc/isa-versions.rst
@@ -0,0 +1,74 @@
+CPU to ISA Version Mapping
+==========================
+
+Mapping of some CPU versions to relevant ISA versions.
+
+========= ====================
+CPU       Architecture version
+========= ====================
+Power9    Power ISA v3.0B
+Power8    Power ISA v2.07
+Power7    Power ISA v2.06
+Power6    Power ISA v2.05
+PA6T      Power ISA v2.04
+Cell PPU  - Power ISA v2.02 with some minor exceptions
+          - Plus Altivec/VMX ~= 2.03
+Power5++  Power ISA v2.04 (no VMX)
+Power5+   Power ISA v2.03
+Power5    - PowerPC User Instruction Set Architecture Book I v2.02
+          - PowerPC Virtual Environment Architecture Book II v2.02
+          - PowerPC Operating Environment Architecture Book III v2.02
+PPC970    - PowerPC User Instruction Set Architecture Book I v2.01
+          - PowerPC Virtual Environment Architecture Book II v2.01
+          - PowerPC Operating Environment Architecture Book III v2.01
+          - Plus Altivec/VMX ~= 2.03
+========= ====================
+
+
+Key Features
+------------
+
+========== ==================
+CPU        VMX (aka. Altivec)
+========== ==================
+Power9     Yes
+Power8     Yes
+Power7     Yes
+Power6     Yes
+PA6T       Yes
+Cell PPU   Yes
+Power5++   No
+Power5+    No
+Power5     No
+PPC970     Yes
+========== ==================
+
+========== ====
+CPU        VSX
+========== ====
+Power9     Yes
+Power8     Yes
+Power7     Yes
+Power6     No
+PA6T       No
+Cell PPU   No
+Power5++   No
+Power5+    No
+Power5     No
+PPC970     No
+========== ====
+
+========== ====================
+CPU        Transactional Memory
+========== ====================
+Power9     Yes (* see transactional_memory.txt)
+Power8     Yes
+Power7     No
+Power6     No
+PA6T       No
+Cell PPU   No
+Power5++   No
+Power5+    No
+Power5     No
+PPC970     No
+========== ====================

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8be3126..a1e858e 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -128,6 +128,7 @@ config PPC
 	#
 	# Please keep this list sorted alphabetically.
 	#
+	select ARCH_HAS_DEBUG_VIRTUAL
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 	select ARCH_HAS_DMA_SET_COHERENT_MASK
 	select ARCH_HAS_ELF_RANDOMIZE
@@ -374,9 +375,9 @@ config PPC_ADV_DEBUG_DAC_RANGE
 	depends on PPC_ADV_DEBUG_REGS && 44x
 	default y
 
-config ZONE_DMA32
+config ZONE_DMA
 	bool
-	default y if PPC64
+	default y if PPC_BOOK3E_64
 
 config PGTABLE_LEVELS
 	int
@@ -556,7 +557,7 @@ config RELOCATABLE_TEST
 
 config CRASH_DUMP
 	bool "Build a dump capture kernel"
-	depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
+	depends on PPC64 || PPC_BOOK3S_32 || FSL_BOOKE || (44x && !SMP)
 	select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
 	help
 	  Build a kernel suitable for use as a dump capture kernel.
@@ -869,10 +870,6 @@ config ISA
 	  have an IBM RS/6000 or pSeries machine, say Y.  If you have an
 	  embedded board, consult your board documentation.
 
-config ZONE_DMA
-	bool
-	default y
-
 config GENERIC_ISA_DMA
 	bool
 	depends on ISA_DMA_API
@@ -1096,7 +1093,7 @@ config PHYSICAL_START_BOOL
 
 config PHYSICAL_START
 	hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL
-	default "0x02000000" if PPC_STD_MMU && CRASH_DUMP && !NONSTATIC_KERNEL
+	default "0x02000000" if PPC_BOOK3S && CRASH_DUMP && !NONSTATIC_KERNEL
 	default "0x00000000"
 
 config PHYSICAL_ALIGN
@@ -1146,7 +1143,7 @@ config PIN_TLB_DATA
 
 config PIN_TLB_IMMR
 	bool "Pinned TLB for IMMR"
-	depends on PIN_TLB
+	depends on PIN_TLB || PPC_EARLY_DEBUG_CPM
 	default y
 
 config PIN_TLB_TEXT

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 854199c..488c9ed 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -30,6 +30,10 @@ endif
 endif
 endif
 
+ifdef CONFIG_PPC_BOOK3S_32
+KBUILD_CFLAGS		+= -mcpu=powerpc
+endif
+
 ifeq ($(CROSS_COMPILE),)
 KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
 else
@@ -152,7 +156,14 @@ endif
 CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc))
 CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)
 
-CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 $(MULTIPLEWORD)
+# Clang unconditionally reserves r2 on ppc32 and does not support the flag
+# https://bugs.llvm.org/show_bug.cgi?id=39555
+CFLAGS-$(CONFIG_PPC32)	:= $(call cc-option, -ffixed-r2)
+
+# Clang doesn't support -mmultiple / -mno-multiple
+# https://bugs.llvm.org/show_bug.cgi?id=39556
+CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option, $(MULTIPLEWORD))
+
 CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option,-mno-readonly-in-sdata)
 
 ifdef CONFIG_PPC_BOOK3S_64
@@ -237,10 +248,6 @@ KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
 # often slow when they are implemented at all
 KBUILD_CFLAGS		+= $(call cc-option,-mno-string)
 
-ifdef CONFIG_6xx
-KBUILD_CFLAGS		+= -mcpu=powerpc
-endif
-
 cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
 cpu-as-$(CONFIG_ALTIVEC)	+= $(call as-option,-Wa$(comma)-maltivec)
 cpu-as-$(CONFIG_E200)		+= -Wa,-me200
@@ -313,6 +320,14 @@ PHONY += ppc64le_defconfig
 ppc64le_defconfig:
 	$(call merge_into_defconfig,ppc64_defconfig,le)
 
+PHONY += ppc64le_guest_defconfig
+ppc64le_guest_defconfig:
+	$(call merge_into_defconfig,ppc64_defconfig,le guest)
+
+PHONY += ppc64_guest_defconfig
+ppc64_guest_defconfig:
+	$(call merge_into_defconfig,ppc64_defconfig,be guest)
+
 PHONY += powernv_be_defconfig
 powernv_be_defconfig:
 	$(call merge_into_defconfig,powernv_defconfig,be)
@@ -398,6 +413,9 @@ archclean:
 
 archprepare: checkbin
 
+archheaders:
+	$(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all
+
 ifdef CONFIG_STACKPROTECTOR
 prepare: stack_protector_prepare
 

arch/powerpc/boot/dts/bamboo.dts

View file

diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index 538e42b..b5861fa 100644
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -268,8 +268,10 @@
 			/* Outbound ranges, one memory and one IO,
 			 * later cannot be changed. Chip supports a second
 			 * IO range but we don't use it for now
+			 * The chip also supports a larger memory range but
+			 * it's not naturally aligned, so our code will break
 			 */
-			ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x40000000
+			ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x20000000
 				  0x02000000 0x00000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00100000
 				  0x01000000 0x00000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
 

arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
index 88d8423..bb7b9b9 100644
--- a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
@@ -70,14 +70,14 @@
 		cpu0: PowerPC,e6500@0 {
 			device_type = "cpu";
 			reg = <0 1>;
-			clocks = <&mux0>;
+			clocks = <&clockgen 1 0>;
 			next-level-cache = <&L2_1>;
 			fsl,portid-mapping = <0x80000000>;
 		};
 		cpu1: PowerPC,e6500@2 {
 			device_type = "cpu";
 			reg = <2 3>;
-			clocks = <&mux0>;
+			clocks = <&clockgen 1 0>;
 			next-level-cache = <&L2_1>;
 			fsl,portid-mapping = <0x80000000>;
 		};

arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
index f3f968c..388ba1b 100644
--- a/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
@@ -75,28 +75,28 @@
 		cpu0: PowerPC,e6500@0 {
 			device_type = "cpu";
 			reg = <0 1>;
-			clocks = <&mux0>;
+			clocks = <&clockgen 1 0>;
 			next-level-cache = <&L2_1>;
 			fsl,portid-mapping = <0x80000000>;
 		};
 		cpu1: PowerPC,e6500@2 {
 			device_type = "cpu";
 			reg = <2 3>;
-			clocks = <&mux0>;
+			clocks = <&clockgen 1 0>;
 			next-level-cache = <&L2_1>;
 			fsl,portid-mapping = <0x80000000>;
 		};
 		cpu2: PowerPC,e6500@4 {
 			device_type = "cpu";
 			reg = <4 5>;
-			clocks = <&mux0>;
+			clocks = <&clockgen 1 0>;
 			next-level-cache = <&L2_1>;
 			fsl,portid-mapping = <0x80000000>;
 		};
 		cpu3: PowerPC,e6500@6 {
 			device_type = "cpu";
 			reg = <6 7>;
-			clocks = <&mux0>;
+			clocks = <&clockgen 1 0>;
 			next-level-cache = <&L2_1>;
 			fsl,portid-mapping = <0x80000000>;
 		};

arch/powerpc/boot/dts/fsl/b4si-post.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
index 1b33f51..4f044b4 100644
--- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
@@ -398,21 +398,6 @@
 	};
 
 /include/ "qoriq-clockgen2.dtsi"
-	clockgen: global-utilities@e1000 {
-		compatible = "fsl,b4-clockgen", "fsl,qoriq-clockgen-2.0";
-		reg = <0xe1000 0x1000>;
-
-		mux0: mux0@0 {
-			#clock-cells = <0>;
-			reg = <0x0 0x4>;
-			compatible = "fsl,qoriq-core-mux-2.0";
-			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
-				<&pll1 0>, <&pll1 1>, <&pll1 2>;
-			clock-names = "pll0", "pll0-div2", "pll0-div4",
-				"pll1", "pll1-div2", "pll1-div4";
-			clock-output-names = "cmux0";
-		};
-	};
 
 	rcpm: global-utilities@e2000 {
 		compatible = "fsl,b4-rcpm", "fsl,qoriq-rcpm-2.0";

arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
index 11bea3e..58ac174 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
@@ -169,100 +169,100 @@
 		interrupt-map-mask = <0xff00 0 0 7>;
 		interrupt-map = <
 			/* IDSEL 0x11 func 0 - PCI slot 1 */
-			0x8800 0 0 1 &mpic 2 1
-			0x8800 0 0 2 &mpic 3 1
-			0x8800 0 0 3 &mpic 4 1
-			0x8800 0 0 4 &mpic 1 1
+			0x8800 0 0 1 &mpic 2 1 0 0
+			0x8800 0 0 2 &mpic 3 1 0 0
+			0x8800 0 0 3 &mpic 4 1 0 0
+			0x8800 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 1 - PCI slot 1 */
-			0x8900 0 0 1 &mpic 2 1
-			0x8900 0 0 2 &mpic 3 1
-			0x8900 0 0 3 &mpic 4 1
-			0x8900 0 0 4 &mpic 1 1
+			0x8900 0 0 1 &mpic 2 1 0 0
+			0x8900 0 0 2 &mpic 3 1 0 0
+			0x8900 0 0 3 &mpic 4 1 0 0
+			0x8900 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 2 - PCI slot 1 */
-			0x8a00 0 0 1 &mpic 2 1
-			0x8a00 0 0 2 &mpic 3 1
-			0x8a00 0 0 3 &mpic 4 1
-			0x8a00 0 0 4 &mpic 1 1
+			0x8a00 0 0 1 &mpic 2 1 0 0
+			0x8a00 0 0 2 &mpic 3 1 0 0
+			0x8a00 0 0 3 &mpic 4 1 0 0
+			0x8a00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 3 - PCI slot 1 */
-			0x8b00 0 0 1 &mpic 2 1
-			0x8b00 0 0 2 &mpic 3 1
-			0x8b00 0 0 3 &mpic 4 1
-			0x8b00 0 0 4 &mpic 1 1
+			0x8b00 0 0 1 &mpic 2 1 0 0
+			0x8b00 0 0 2 &mpic 3 1 0 0
+			0x8b00 0 0 3 &mpic 4 1 0 0
+			0x8b00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 4 - PCI slot 1 */
-			0x8c00 0 0 1 &mpic 2 1
-			0x8c00 0 0 2 &mpic 3 1
-			0x8c00 0 0 3 &mpic 4 1
-			0x8c00 0 0 4 &mpic 1 1
+			0x8c00 0 0 1 &mpic 2 1 0 0
+			0x8c00 0 0 2 &mpic 3 1 0 0
+			0x8c00 0 0 3 &mpic 4 1 0 0
+			0x8c00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 5 - PCI slot 1 */
-			0x8d00 0 0 1 &mpic 2 1
-			0x8d00 0 0 2 &mpic 3 1
-			0x8d00 0 0 3 &mpic 4 1
-			0x8d00 0 0 4 &mpic 1 1
+			0x8d00 0 0 1 &mpic 2 1 0 0
+			0x8d00 0 0 2 &mpic 3 1 0 0
+			0x8d00 0 0 3 &mpic 4 1 0 0
+			0x8d00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 6 - PCI slot 1 */
-			0x8e00 0 0 1 &mpic 2 1
-			0x8e00 0 0 2 &mpic 3 1
-			0x8e00 0 0 3 &mpic 4 1
-			0x8e00 0 0 4 &mpic 1 1
+			0x8e00 0 0 1 &mpic 2 1 0 0
+			0x8e00 0 0 2 &mpic 3 1 0 0
+			0x8e00 0 0 3 &mpic 4 1 0 0
+			0x8e00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 7 - PCI slot 1 */
-			0x8f00 0 0 1 &mpic 2 1
-			0x8f00 0 0 2 &mpic 3 1
-			0x8f00 0 0 3 &mpic 4 1
-			0x8f00 0 0 4 &mpic 1 1
+			0x8f00 0 0 1 &mpic 2 1 0 0
+			0x8f00 0 0 2 &mpic 3 1 0 0
+			0x8f00 0 0 3 &mpic 4 1 0 0
+			0x8f00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x12 func 0 - PCI slot 2 */
-			0x9000 0 0 1 &mpic 3 1
-			0x9000 0 0 2 &mpic 4 1
-			0x9000 0 0 3 &mpic 1 1
-			0x9000 0 0 4 &mpic 2 1
+			0x9000 0 0 1 &mpic 3 1 0 0
+			0x9000 0 0 2 &mpic 4 1 0 0
+			0x9000 0 0 3 &mpic 1 1 0 0
+			0x9000 0 0 4 &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 1 - PCI slot 2 */
-			0x9100 0 0 1 &mpic 3 1
-			0x9100 0 0 2 &mpic 4 1
-			0x9100 0 0 3 &mpic 1 1
-			0x9100 0 0 4 &mpic 2 1
+			0x9100 0 0 1 &mpic 3 1 0 0
+			0x9100 0 0 2 &mpic 4 1 0 0
+			0x9100 0 0 3 &mpic 1 1 0 0
+			0x9100 0 0 4 &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 2 - PCI slot 2 */
-			0x9200 0 0 1 &mpic 3 1
-			0x9200 0 0 2 &mpic 4 1
-			0x9200 0 0 3 &mpic 1 1
-			0x9200 0 0 4 &mpic 2 1
+			0x9200 0 0 1 &mpic 3 1 0 0
+			0x9200 0 0 2 &mpic 4 1 0 0
+			0x9200 0 0 3 &mpic 1 1 0 0
+			0x9200 0 0 4 &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 3 - PCI slot 2 */
-			0x9300 0 0 1 &mpic 3 1
-			0x9300 0 0 2 &mpic 4 1
-			0x9300 0 0 3 &mpic 1 1
-			0x9300 0 0 4 &mpic 2 1
+			0x9300 0 0 1 &mpic 3 1 0 0
+			0x9300 0 0 2 &mpic 4 1 0 0
+			0x9300 0 0 3 &mpic 1 1 0 0
+			0x9300 0 0 4 &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 4 - PCI slot 2 */
-			0x9400 0 0 1 &mpic 3 1
-			0x9400 0 0 2 &mpic 4 1
-			0x9400 0 0 3 &mpic 1 1
-			0x9400 0 0 4 &mpic 2 1
+			0x9400 0 0 1 &mpic 3 1 0 0
+			0x9400 0 0 2 &mpic 4 1 0 0
+			0x9400 0 0 3 &mpic 1 1 0 0
+			0x9400 0 0 4 &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 5 - PCI slot 2 */
-			0x9500 0 0 1 &mpic 3 1
-			0x9500 0 0 2 &mpic 4 1
-			0x9500 0 0 3 &mpic 1 1
-			0x9500 0 0 4 &mpic 2 1
+			0x9500 0 0 1 &mpic 3 1 0 0
+			0x9500 0 0 2 &mpic 4 1 0 0
+			0x9500 0 0 3 &mpic 1 1 0 0
+			0x9500 0 0 4 &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 6 - PCI slot 2 */
-			0x9600 0 0 1 &mpic 3 1
-			0x9600 0 0 2 &mpic 4 1
-			0x9600 0 0 3 &mpic 1 1
-			0x9600 0 0 4 &mpic 2 1
+			0x9600 0 0 1 &mpic 3 1 0 0
+			0x9600 0 0 2 &mpic 4 1 0 0
+			0x9600 0 0 3 &mpic 1 1 0 0
+			0x9600 0 0 4 &mpic 2 1 0 0
 
 			/* IDSEL 0x12 func 7 - PCI slot 2 */
-			0x9700 0 0 1 &mpic 3 1
-			0x9700 0 0 2 &mpic 4 1
-			0x9700 0 0 3 &mpic 1 1
-			0x9700 0 0 4 &mpic 2 1
+			0x9700 0 0 1 &mpic 3 1 0 0
+			0x9700 0 0 2 &mpic 4 1 0 0
+			0x9700 0 0 3 &mpic 1 1 0 0
+			0x9700 0 0 4 &mpic 2 1 0 0
 
 			// IDSEL 0x1c  USB
 			0xe000 0 0 1 &i8259 12 2

arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
index 7ff6204..e64b91e 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
@@ -136,100 +136,100 @@
 		interrupt-map-mask = <0xff00 0 0 7>;
 		interrupt-map = <
 			/* IDSEL 0x11 func 0 - PCI slot 1 */
-			0x8800 0 0 1 &mpic 2 1
-			0x8800 0 0 2 &mpic 3 1
-			0x8800 0 0 3 &mpic 4 1
-			0x8800 0 0 4 &mpic 1 1
+			0x8800 0 0 1 &mpic 2 1 0 0
+			0x8800 0 0 2 &mpic 3 1 0 0
+			0x8800 0 0 3 &mpic 4 1 0 0
+			0x8800 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 1 - PCI slot 1 */
-			0x8900 0 0 1 &mpic 2 1
-			0x8900 0 0 2 &mpic 3 1
-			0x8900 0 0 3 &mpic 4 1
-			0x8900 0 0 4 &mpic 1 1
+			0x8900 0 0 1 &mpic 2 1 0 0
+			0x8900 0 0 2 &mpic 3 1 0 0
+			0x8900 0 0 3 &mpic 4 1 0 0
+			0x8900 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 2 - PCI slot 1 */
-			0x8a00 0 0 1 &mpic 2 1
-			0x8a00 0 0 2 &mpic 3 1
-			0x8a00 0 0 3 &mpic 4 1
-			0x8a00 0 0 4 &mpic 1 1
+			0x8a00 0 0 1 &mpic 2 1 0 0
+			0x8a00 0 0 2 &mpic 3 1 0 0
+			0x8a00 0 0 3 &mpic 4 1 0 0
+			0x8a00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 3 - PCI slot 1 */
-			0x8b00 0 0 1 &mpic 2 1
-			0x8b00 0 0 2 &mpic 3 1
-			0x8b00 0 0 3 &mpic 4 1
-			0x8b00 0 0 4 &mpic 1 1
+			0x8b00 0 0 1 &mpic 2 1 0 0
+			0x8b00 0 0 2 &mpic 3 1 0 0
+			0x8b00 0 0 3 &mpic 4 1 0 0
+			0x8b00 0 0 4 &mpic 1 1 0 0
 
 			/* IDSEL 0x11 func 4 - PCI slot 1 */
-			0x8c00 0 0 1 &mpic 2 1
-			0x8c00 0 0 2 &mpic 3 1