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

29ec39fc · Linus Torvalds <[email protected]> · 2022-01-14 15:17:26 +01:00

Pull powerpc updates from Michael Ellerman:

 - Optimise radix KVM guest entry/exit by 2x on Power9/Power10.

 - Allow firmware to tell us whether to disable the entry and uaccess
   flushes on Power10 or later CPUs.

 - Add BPF_PROBE_MEM support for 32 and 64-bit BPF jits.

 - Several fixes and improvements to our hard lockup watchdog.

 - Activate HAVE_DYNAMIC_FTRACE_WITH_REGS on 32-bit.

 - Allow building the 64-bit Book3S kernel without hash MMU support, ie.
   Radix only.

 - Add KUAP (SMAP) support for 40x, 44x, 8xx, Book3E (64-bit).

 - Add new encodings for perf_mem_data_src.mem_hops field, and use them
   on Power10.

 - A series of small performance improvements to 64-bit interrupt entry.

 - Several commits fixing issues when building with the clang integrated
   assembler.

 - Many other small features and fixes.

Thanks to Alan Modra, Alexey Kardashevskiy, Ammar Faizi, Anders Roxell,
Arnd Bergmann, Athira Rajeev, Cédric Le Goater, Christophe JAILLET,
Christophe Leroy, Christoph Hellwig, Daniel Axtens, David Yang, Erhard
Furtner, Fabiano Rosas, Greg Kroah-Hartman, Guo Ren, Hari Bathini, Jason
Wang, Joel Stanley, Julia Lawall, Kajol Jain, Kees Cook, Laurent Dufour,
Madhavan Srinivasan, Mark Brown, Minghao Chi, Nageswara R Sastry, Naresh
Kamboju, Nathan Chancellor, Nathan Lynch, Nicholas Piggin, Nick Child,
Oliver O'Halloran, Peiwei Hu, Randy Dunlap, Ravi Bangoria, Rob Herring,
Russell Currey, Sachin Sant, Sean Christopherson, Segher Boessenkool,
Thadeu Lima de Souza Cascardo, Tyrel Datwyler, Xiang wangx, and Yang
Guang.

* tag 'powerpc-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (240 commits)
  powerpc/xmon: Dump XIVE information for online-only processors.
  powerpc/opal: use default_groups in kobj_type
  powerpc/cacheinfo: use default_groups in kobj_type
  powerpc/sched: Remove unused TASK_SIZE_OF
  powerpc/xive: Add missing null check after calling kmalloc
  powerpc/floppy: Remove usage of the deprecated "pci-dma-compat.h" API
  selftests/powerpc: Add a test of sigreturning to an unaligned address
  powerpc/64s: Use EMIT_WARN_ENTRY for SRR debug warnings
  powerpc/64s: Mask NIP before checking against SRR0
  powerpc/perf: Fix spelling of "its"
  powerpc/32: Fix boot failure with GCC latent entropy plugin
  powerpc/code-patching: Replace patch_instruction() by ppc_inst_write() in selftests
  powerpc/code-patching: Move code patching selftests in its own file
  powerpc/code-patching: Move instr_is_branch_{i/b}form() in code-patching.h
  powerpc/code-patching: Move patch_exception() outside code-patching.c
  powerpc/code-patching: Use test_trampoline for prefixed patch test
  powerpc/code-patching: Fix patch_branch() return on out-of-range failure
  powerpc/code-patching: Reorganise do_patch_instruction() to ease error handling
  powerpc/code-patching: Fix unmap_patch_area() error handling
  powerpc/code-patching: Fix error handling in do_patch_instruction()
  ...

Commit: 29ec39fcf11e4583eb8d5174f756ea109c77cc44
Parents: 3fb561b1 · f1aa0e47

Merge commit. Changes below are compared with the first parent: 3fb561b1.

Changes

370 files changed · +5618 −3431

File	Status	Add	Del	Content
Documentation/admin-guide/kernel-parameters.txt	modified	+15	−1	View file
arch/powerpc/Kconfig	modified	+6	−4	View file
arch/powerpc/Makefile	modified	+6	−3	View file
arch/powerpc/boot/crt0.S	modified	+16	−17	View file
arch/powerpc/boot/dts/digsy_mtc.dts	modified	+0	−8	View file
arch/powerpc/boot/dts/o2d.dtsi	modified	+0	−6	View file
arch/powerpc/boot/zImage.lds.S	modified	+2	−5	View file
arch/powerpc/configs/microwatt_defconfig	modified	+2	−1	View file
arch/powerpc/configs/ppc64_defconfig	modified	+0	−1	View file
arch/powerpc/configs/pseries_defconfig	modified	+0	−1	View file
arch/powerpc/crypto/md5-asm.S	modified	+3	−7	View file
arch/powerpc/crypto/sha1-powerpc-asm.S	modified	+2	−4	View file
arch/powerpc/include/asm/asm-prototypes.h	modified	+0	−5	View file
arch/powerpc/include/asm/atomic.h	modified	+28	−123	View file
arch/powerpc/include/asm/bitops.h	modified	+81	−8	View file
arch/powerpc/include/asm/book3s/32/kup.h	modified	+24	−84	View file
arch/powerpc/include/asm/book3s/32/mmu-hash.h	modified	+81	−1	View file
arch/powerpc/include/asm/book3s/64/hash.h	modified	+0	−4	View file
arch/powerpc/include/asm/book3s/64/kup.h	modified	+28	−28	View file
arch/powerpc/include/asm/book3s/64/mmu-hash.h	modified	+7	−1	View file
arch/powerpc/include/asm/book3s/64/mmu.h	modified	+30	−8	View file
arch/powerpc/include/asm/book3s/64/tlbflush-hash.h	modified	+6	−0	View file
arch/powerpc/include/asm/book3s/64/tlbflush.h	modified	+0	−4	View file
arch/powerpc/include/asm/book3s/pgtable.h	modified	+4	−0	View file
arch/powerpc/include/asm/btext.h	modified	+5	−5	View file
arch/powerpc/include/asm/code-patching.h	modified	+24	−16	View file
arch/powerpc/include/asm/cpm2.h	modified	+3	−3	View file
arch/powerpc/include/asm/cpuidle.h	modified	+1	−1	View file
arch/powerpc/include/asm/cputhreads.h	modified	+0	−33	View file
arch/powerpc/include/asm/eeh.h	modified	+1	−1	View file
arch/powerpc/include/asm/exception-64e.h	modified	+4	−0	View file
arch/powerpc/include/asm/fadump-internal.h	modified	+3	−3	View file
arch/powerpc/include/asm/firmware.h	modified	+0	−8	View file
arch/powerpc/include/asm/floppy.h	modified	+5	−3	View file
arch/powerpc/include/asm/head-64.h	modified	+5	−7	View file
arch/powerpc/include/asm/hugetlb.h	modified	+1	−1	View file
arch/powerpc/include/asm/hw_breakpoint.h	modified	+2	−3	View file
arch/powerpc/include/asm/hw_irq.h	modified	+93	−14	View file
arch/powerpc/include/asm/i8259.h	modified	+1	−1	View file
arch/powerpc/include/asm/inst.h	modified	+60	−35	View file
arch/powerpc/include/asm/interrupt.h	modified	+59	−14	View file
arch/powerpc/include/asm/iommu.h	modified	+1	−1	View file
arch/powerpc/include/asm/ipic.h	modified	+1	−1	View file
arch/powerpc/include/asm/irq.h	modified	+1	−1	View file
arch/powerpc/include/asm/kexec.h	modified	+1	−1	View file
arch/powerpc/include/asm/kup.h	modified	+100	−22	View file
arch/powerpc/include/asm/kvm_asm.h	modified	+1	−0	View file
arch/powerpc/include/asm/kvm_book3s.h	modified	+6	−0	View file
arch/powerpc/include/asm/kvm_book3s_64.h	modified	+3	−2	View file
arch/powerpc/include/asm/kvm_guest.h	modified	+1	−1	View file
arch/powerpc/include/asm/kvm_host.h	modified	+5	−2	View file
arch/powerpc/include/asm/kvm_ppc.h	modified	+2	−2	View file
arch/powerpc/include/asm/machdep.h	modified	+0	−2	View file
arch/powerpc/include/asm/mmu.h	modified	+13	−3	View file
arch/powerpc/include/asm/mmu_context.h	modified	+3	−1	View file
arch/powerpc/include/asm/mpic.h	modified	+1	−1	View file
arch/powerpc/include/asm/nohash/32/kup-8xx.h	modified	+12	−38	View file
arch/powerpc/include/asm/nohash/32/mmu-44x.h	modified	+0	−1	View file
arch/powerpc/include/asm/nohash/32/mmu-8xx.h	modified	+2	−4	View file
arch/powerpc/include/asm/nohash/64/pgtable.h	modified	+6	−0	View file
arch/powerpc/include/asm/nohash/kup-booke.h	added	+110	−0	View file
arch/powerpc/include/asm/opal-api.h	modified	+1	−0	View file
arch/powerpc/include/asm/opal.h	modified	+1	−1	View file
arch/powerpc/include/asm/paca.h	modified	+8	−0	View file
arch/powerpc/include/asm/pci.h	modified	+1	−1	View file
arch/powerpc/include/asm/perf_event_server.h	modified	+1	−1	View file
arch/powerpc/include/asm/ppc-opcode.h	modified	+6	−0	View file
arch/powerpc/include/asm/ppc_asm.h	modified	+27	−16	View file
arch/powerpc/include/asm/processor.h	modified	+16	−2	View file
arch/powerpc/include/asm/ptrace.h	modified	+1	−1	View file
arch/powerpc/include/asm/reg.h	modified	+14	−2	View file
arch/powerpc/include/asm/rtas.h	modified	+1	−1	View file
arch/powerpc/include/asm/sections.h	modified	+8	−8	View file
arch/powerpc/include/asm/setup.h	modified	+4	−5	View file
arch/powerpc/include/asm/smu.h	modified	+1	−1	View file
arch/powerpc/include/asm/sstep.h	modified	+2	−2	View file
arch/powerpc/include/asm/switch_to.h	modified	+3	−0	View file
arch/powerpc/include/asm/task_size_64.h	modified	+1	−5	View file
arch/powerpc/include/asm/time.h	modified	+9	−10	View file
arch/powerpc/include/asm/udbg.h	modified	+5	−5	View file
arch/powerpc/include/asm/uprobes.h	modified	+0	−1	View file
arch/powerpc/include/asm/xics.h	modified	+2	−2	View file
arch/powerpc/include/asm/xmon.h	modified	+1	−1	View file
arch/powerpc/kernel/Makefile	modified	+1	−0	View file
arch/powerpc/kernel/align.c	modified	+2	−2	View file
arch/powerpc/kernel/asm-offsets.c	modified	+4	−1	View file
arch/powerpc/kernel/btext.c	modified	+9	−7	View file
arch/powerpc/kernel/cacheinfo.c	modified	+3	−2	View file
arch/powerpc/kernel/cpu_setup_power.c	modified	+10	−2	View file
arch/powerpc/kernel/dbell.c	modified	+2	−1	View file
arch/powerpc/kernel/dt_cpu_ftrs.c	modified	+16	−8	View file
arch/powerpc/kernel/eeh_cache.c	modified	+1	−1	View file
arch/powerpc/kernel/eeh_driver.c	modified	+80	−82	View file
arch/powerpc/kernel/entry_32.S	modified	+39	−15	View file
arch/powerpc/kernel/entry_64.S	modified	+2	−2	View file
arch/powerpc/kernel/epapr_paravirt.c	modified	+1	−1	View file
arch/powerpc/kernel/exceptions-64e.S	modified	+4	−10	View file
arch/powerpc/kernel/exceptions-64s.S	modified	+105	−69	View file
arch/powerpc/kernel/fadump.c	modified	+17	−9	View file
arch/powerpc/kernel/fpu.S	modified	+5	−0	View file
arch/powerpc/kernel/head_32.h	modified	+7	−2	View file
arch/powerpc/kernel/head_40x.S	modified	+16	−1	View file
arch/powerpc/kernel/head_44x.S	modified	+18	−8	View file
arch/powerpc/kernel/head_64.S	modified	+10	−10	View file
arch/powerpc/kernel/head_book3s_32.S	modified	+4	−0	View file
arch/powerpc/kernel/head_booke.h	modified	+1	−2	View file
arch/powerpc/kernel/head_fsl_booke.S	modified	+13	−0	View file
arch/powerpc/kernel/hw_breakpoint.c	modified	+2	−2	View file
arch/powerpc/kernel/hw_breakpoint_constraints.c	modified	+2	−2	View file
arch/powerpc/kernel/idle.c	modified	+1	−1	View file
arch/powerpc/kernel/idle_6xx.S	modified	+1	−1	View file
arch/powerpc/kernel/interrupt.c	modified	+1	−2	View file
arch/powerpc/kernel/interrupt_64.S	modified	+20	−26	View file
arch/powerpc/kernel/irq.c	modified	+3	−2	View file
arch/powerpc/kernel/kgdb.c	modified	+2	−2	View file
arch/powerpc/kernel/kprobes.c	modified	+2	−2	View file
arch/powerpc/kernel/l2cr_6xx.S	modified	+3	−3	View file
arch/powerpc/kernel/mce.c	modified	+1	−1	View file
arch/powerpc/kernel/mce_power.c	modified	+11	−7	View file
arch/powerpc/kernel/module.c	modified	+6	−5	View file
arch/powerpc/kernel/module_32.c	modified	+33	−0	View file
arch/powerpc/kernel/nvram_64.c	modified	+3	−3	View file
arch/powerpc/kernel/optprobes.c	modified	+4	−8	View file
arch/powerpc/kernel/optprobes_head.S	modified	+2	−2	View file
arch/powerpc/kernel/paca.c	modified	+7	−11	View file
arch/powerpc/kernel/pci-common.c	modified	+1	−1	View file
arch/powerpc/kernel/pci_32.c	modified	+2	−2	View file
arch/powerpc/kernel/process.c	modified	+48	−10	View file
arch/powerpc/kernel/prom.c	modified	+3	−3	View file
arch/powerpc/kernel/prom_init.c	modified	+7	−7	View file
arch/powerpc/kernel/rtas.c	modified	+91	−13	View file
arch/powerpc/kernel/rtasd.c	modified	+3	−3	View file
arch/powerpc/kernel/security.c	modified	+2	−2	View file
arch/powerpc/kernel/setup-common.c	modified	+1	−1	View file
arch/powerpc/kernel/setup.h	modified	+1	−1	View file
arch/powerpc/kernel/setup_32.c	modified	+2	−2	View file
arch/powerpc/kernel/setup_64.c	modified	+16	−7	View file
arch/powerpc/kernel/signal_32.c	modified	+9	−5	View file
arch/powerpc/kernel/smp.c	modified	+45	−2	View file
arch/powerpc/kernel/swsusp_32.S	modified	+1	−1	View file
arch/powerpc/kernel/swsusp_asm64.S	modified	+1	−1	View file
arch/powerpc/kernel/sysfs.c	modified	+5	−5	View file
arch/powerpc/kernel/time.c	modified	+62	−25	View file
arch/powerpc/kernel/tm.S	modified	+4	−11	View file
arch/powerpc/kernel/trace/ftrace.c	modified	+45	−62	View file
arch/powerpc/kernel/trace/ftrace_32.S	modified	+105	−13	View file
arch/powerpc/kernel/trace/ftrace_64_mprofile.S	modified	+6	−9	View file
arch/powerpc/kernel/udbg_16550.c	modified	+5	−5	View file
arch/powerpc/kernel/vecemu.c	modified	+1	−1	View file
arch/powerpc/kernel/vector.S	modified	+10	−0	View file
arch/powerpc/kernel/vmlinux.lds.S	modified	+3	−13	View file
arch/powerpc/kernel/watchdog.c	modified	+180	−43	View file
arch/powerpc/kexec/core.c	modified	+1	−1	View file
arch/powerpc/kexec/core_64.c	modified	+2	−2	View file
arch/powerpc/kexec/ranges.c	modified	+1	−1	View file
arch/powerpc/kvm/Kconfig	modified	+16	−0	View file
arch/powerpc/kvm/book3s_64_entry.S	modified	+9	−2	View file
arch/powerpc/kvm/book3s_64_mmu_radix.c	modified	+4	−0	View file
arch/powerpc/kvm/book3s_hv.c	modified	+451	−409	View file
arch/powerpc/kvm/book3s_hv.h	added	+42	−0	View file
arch/powerpc/kvm/book3s_hv_builtin.c	modified	+10	−45	View file
arch/powerpc/kvm/book3s_hv_hmi.c	modified	+6	−1	View file
arch/powerpc/kvm/book3s_hv_interrupts.S	modified	+4	−9	View file
arch/powerpc/kvm/book3s_hv_nested.c	modified	+4	−6	View file
arch/powerpc/kvm/book3s_hv_p9_entry.c	modified	+775	−136	View file
arch/powerpc/kvm/book3s_hv_ras.c	modified	+54	−0	View file
arch/powerpc/kvm/book3s_hv_rm_mmu.c	modified	+0	−6	View file
arch/powerpc/kvm/book3s_hv_rmhandlers.S	modified	+17	−61	View file
arch/powerpc/lib/Makefile	modified	+6	−1	View file
arch/powerpc/lib/code-patching.c	modified	+49	−448	View file
arch/powerpc/lib/feature-fixups.c	modified	+15	−15	View file
arch/powerpc/lib/sstep.c	modified	+2	−2	View file
arch/powerpc/lib/test-code-patching.c	added	+362	−0	View file
arch/powerpc/lib/test_code-patching.S	deleted	+0	−20	View before deletion
arch/powerpc/lib/test_emulate_step.c	modified	+5	−5	View file
arch/powerpc/lib/test_emulate_step_exec_instr.S	modified	+3	−5	View file
arch/powerpc/mm/book3s32/Makefile	modified	+0	−1	View file
arch/powerpc/mm/book3s32/kuap.c	modified	+4	−1	View file
arch/powerpc/mm/book3s32/kuep.c	deleted	+0	−20	View before deletion
arch/powerpc/mm/book3s32/mmu.c	modified	+3	−4	View file
arch/powerpc/mm/book3s32/mmu_context.c	modified	+7	−8	View file
arch/powerpc/mm/book3s64/Makefile	modified	+11	−8	View file
arch/powerpc/mm/book3s64/hash_native.c	modified	+2	−106	View file
arch/powerpc/mm/book3s64/hash_pgtable.c	modified	+0	−1	View file
arch/powerpc/mm/book3s64/hash_utils.c	modified	+108	−9	View file
arch/powerpc/mm/book3s64/hash_hugetlbpage.c → arch/powerpc/mm/book3s64/hugetlbpage.c	renamed	+3	−1	View file
arch/powerpc/mm/book3s64/mmu_context.c	modified	+27	−7	View file
arch/powerpc/mm/book3s64/pgtable.c	modified	+27	−5	View file
arch/powerpc/mm/book3s64/pkeys.c	modified	+1	−1	View file
arch/powerpc/mm/book3s64/radix_pgtable.c	modified	+8	−32	View file
arch/powerpc/mm/book3s64/slb.c	modified	+0	−16	View file
arch/powerpc/mm/book3s64/trace.c	added	+8	−0	View file
arch/powerpc/mm/copro_fault.c	modified	+2	−0	View file
arch/powerpc/mm/fault.c	modified	+24	−0	View file
arch/powerpc/mm/hugetlbpage.c	modified	+11	−5	View file
arch/powerpc/mm/init-common.c	modified	+21	−0	View file
arch/powerpc/mm/init_64.c	modified	+56	−3	View file
arch/powerpc/mm/ioremap.c	modified	+0	−20	View file
arch/powerpc/mm/kasan/book3s_32.c	modified	+2	−1	View file
arch/powerpc/mm/maccess.c	modified	+0	−17	View file
arch/powerpc/mm/mem.c	modified	+0	−2	View file
arch/powerpc/mm/mmap.c	modified	+34	−6	View file
arch/powerpc/mm/mmu_context.c	modified	+10	−1	View file
arch/powerpc/mm/nohash/44x.c	modified	+2	−18	View file
arch/powerpc/mm/nohash/8xx.c	modified	+0	−33	View file
arch/powerpc/mm/nohash/Makefile	modified	+1	−1	View file
arch/powerpc/mm/nohash/book3e_pgtable.c	modified	+15	−0	View file
arch/powerpc/mm/nohash/fsl_book3e.c	modified	+5	−5	View file
arch/powerpc/mm/nohash/kup.c	added	+33	−0	View file
arch/powerpc/mm/nohash/mmu_context.c	modified	+5	−1	View file
arch/powerpc/mm/nohash/tlb.c	modified	+2	−11	View file
arch/powerpc/mm/nohash/tlb_low_64e.S	modified	+34	−6	View file
arch/powerpc/mm/numa.c	modified	+3	−3	View file
arch/powerpc/mm/pgtable.c	modified	+6	−3	View file
arch/powerpc/mm/pgtable_64.c	modified	+11	−3	View file
arch/powerpc/mm/ptdump/Makefile	modified	+1	−1	View file
arch/powerpc/mm/ptdump/ptdump.c	modified	+3	−3	View file
arch/powerpc/mm/slice.c	modified	+0	−20	View file
arch/powerpc/net/bpf_jit.h	modified	+13	−4	View file
arch/powerpc/net/bpf_jit_comp.c	modified	+62	−6	View file
arch/powerpc/net/bpf_jit_comp32.c	modified	+85	−16	View file
arch/powerpc/net/bpf_jit_comp64.c	modified	+57	−15	View file
arch/powerpc/perf/8xx-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/core-book3s.c	modified	+124	−2	View file
arch/powerpc/perf/generic-compat-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/hv-24x7.c	modified	+1	−1	View file
arch/powerpc/perf/internal.h	modified	+9	−9	View file
arch/powerpc/perf/isa207-common.c	modified	+45	−15	View file
arch/powerpc/perf/power10-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/power5+-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/power5-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/power6-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/power7-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/power8-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/power9-pmu.c	modified	+1	−1	View file
arch/powerpc/perf/ppc970-pmu.c	modified	+1	−1	View file
arch/powerpc/platforms/44x/fsp2.c	modified	+2	−2	View file
arch/powerpc/platforms/4xx/cpm.c	modified	+2	−2	View file
arch/powerpc/platforms/4xx/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/512x/clock-commonclk.c	modified	+26	−26	View file
arch/powerpc/platforms/512x/mpc512x.h	modified	+2	−2	View file
arch/powerpc/platforms/512x/mpc512x_shared.c	modified	+2	−2	View file
arch/powerpc/platforms/52xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/83xx/km83xx.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc834x_mds.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc837x_mds.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc837x_rdb.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc83xx.h	modified	+3	−3	View file
arch/powerpc/platforms/83xx/usb.c	modified	+3	−3	View file
arch/powerpc/platforms/85xx/c293pcie.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/ge_imp3a.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/mpc85xx_cds.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c	modified	+2	−0	View file
arch/powerpc/platforms/85xx/smp.c	modified	+2	−2	View file
arch/powerpc/platforms/85xx/socrates_fpga_pic.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/socrates_fpga_pic.h	modified	+1	−1	View file
arch/powerpc/platforms/85xx/xes_mpc85xx.c	modified	+2	−2	View file
arch/powerpc/platforms/Kconfig	modified	+2	−2	View file
arch/powerpc/platforms/Kconfig.cputype	modified	+38	−20	View file
arch/powerpc/platforms/cell/Kconfig	modified	+2	−1	View file
arch/powerpc/platforms/cell/cbe_regs.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/iommu.c	modified	+8	−7	View file
arch/powerpc/platforms/cell/pervasive.c	modified	+1	−0	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+3	−3	View file
arch/powerpc/platforms/cell/spu_manage.c	modified	+8	−8	View file
arch/powerpc/platforms/cell/spufs/inode.c	modified	+1	−1	View file
arch/powerpc/platforms/chrp/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/chrp/pegasos_eth.c	modified	+1	−1	View file
arch/powerpc/platforms/embedded6xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/embedded6xx/hlwd-pic.c	modified	+3	−2	View file
arch/powerpc/platforms/embedded6xx/hlwd-pic.h	modified	+1	−1	View file
arch/powerpc/platforms/embedded6xx/holly.c	modified	+1	−1	View file
arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c	modified	+2	−2	View file
arch/powerpc/platforms/embedded6xx/wii.c	modified	+1	−1	View file
arch/powerpc/platforms/maple/Kconfig	modified	+2	−1	View file
arch/powerpc/platforms/microwatt/Kconfig	modified	+0	−1	View file
arch/powerpc/platforms/microwatt/rng.c	modified	+1	−1	View file
arch/powerpc/platforms/pasemi/Kconfig	modified	+2	−1	View file
arch/powerpc/platforms/pasemi/msi.c	modified	+1	−1	View file
arch/powerpc/platforms/pasemi/pasemi.h	modified	+1	−1	View file
arch/powerpc/platforms/pasemi/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/pasemi/setup.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/Kconfig	modified	+2	−1	View file
arch/powerpc/platforms/powermac/cache.S	modified	+2	−2	View file
arch/powerpc/platforms/powermac/feature.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/low_i2c.c	modified	+3	−0	View file
arch/powerpc/platforms/powermac/nvram.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/pfunc_base.c	modified	+3	−3	View file
arch/powerpc/platforms/powermac/pic.c	modified	+2	−4	View file
arch/powerpc/platforms/powermac/setup.c	modified	+3	−3	View file
arch/powerpc/platforms/powermac/smp.c	modified	+2	−2	View file
arch/powerpc/platforms/powermac/udbg_scc.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/powernv/idle.c	modified	+13	−14	View file
arch/powerpc/platforms/powernv/opal-core.c	modified	+3	−3	View file
arch/powerpc/platforms/powernv/opal-dump.c	modified	+2	−1	View file
arch/powerpc/platforms/powernv/opal-elog.c	modified	+2	−1	View file
arch/powerpc/platforms/powernv/opal-fadump.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/opal-imc.c	modified	+3	−3	View file
arch/powerpc/platforms/powernv/opal-lpc.c	modified	+1	−0	View file
arch/powerpc/platforms/powernv/opal-msglog.c	modified	+2	−2	View file
arch/powerpc/platforms/powernv/opal-power.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/opal-powercap.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/opal-rtc.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/opal-sensor-groups.c	modified	+2	−2	View file
arch/powerpc/platforms/powernv/opal.c	modified	+4	−4	View file
arch/powerpc/platforms/powernv/pci-ioda.c	modified	+2	−2	View file
arch/powerpc/platforms/powernv/powernv.h	modified	+2	−2	View file
arch/powerpc/platforms/powernv/rng.c	modified	+1	−1	View file
arch/powerpc/platforms/powernv/setup.c	modified	+12	−6	View file
arch/powerpc/platforms/ps3/gelic_udbg.c	modified	+1	−1	View file
arch/powerpc/platforms/ps3/mm.c	modified	+2	−2	View file
arch/powerpc/platforms/ps3/os-area.c	modified	+2	−2	View file
arch/powerpc/platforms/ps3/platform.h	modified	+7	−7	View file
arch/powerpc/platforms/ps3/repository.c	modified	+10	−10	View file
arch/powerpc/platforms/ps3/smp.c	modified	+1	−1	View file
arch/powerpc/platforms/ps3/spu.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/Kconfig	modified	+0	−5	View file
arch/powerpc/platforms/pseries/Makefile	modified	+0	−1	View file
arch/powerpc/platforms/pseries/event_sources.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/hotplug-cpu.c	modified	+5	−4	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+39	−32	View file
arch/powerpc/platforms/pseries/lparcfg.c	modified	+3	−2	View file
arch/powerpc/platforms/pseries/mobility.c	modified	+4	−0	View file
arch/powerpc/platforms/pseries/pseries.h	modified	+6	−1	View file
arch/powerpc/platforms/pseries/ras.c	modified	+2	−0	View file
arch/powerpc/platforms/pseries/rtas-fadump.c	modified	+3	−3	View file
arch/powerpc/platforms/pseries/scanlog.c	deleted	+0	−195	View before deletion
arch/powerpc/platforms/pseries/setup.c	modified	+6	−4	View file
arch/powerpc/platforms/pseries/vas.c	modified	+10	−3	View file
arch/powerpc/platforms/pseries/vio.c	modified	+3	−3	View file
arch/powerpc/sysdev/cpm2.c	modified	+3	−3	View file
arch/powerpc/sysdev/dart_iommu.c	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_mpic_err.c	modified	+2	−2	View file
arch/powerpc/sysdev/fsl_pci.c	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_pci.h	modified	+1	−1	View file
arch/powerpc/sysdev/i8259.c	modified	+1	−1	View file
arch/powerpc/sysdev/ipic.c	modified	+1	−1	View file
arch/powerpc/sysdev/mpic.c	modified	+2	−3	View file
arch/powerpc/sysdev/mpic.h	modified	+5	−5	View file
arch/powerpc/sysdev/mpic_msi.c	modified	+3	−3	View file
arch/powerpc/sysdev/mpic_timer.c	modified	+3	−3	View file
arch/powerpc/sysdev/mpic_u3msi.c	modified	+1	−1	View file
arch/powerpc/sysdev/tsi108_dev.c	modified	+1	−2	View file
arch/powerpc/sysdev/tsi108_pci.c	modified	+1	−1	View file
arch/powerpc/sysdev/udbg_memcons.c	modified	+1	−1	View file
arch/powerpc/sysdev/xics/icp-hv.c	modified	+1	−1	View file
arch/powerpc/sysdev/xics/icp-opal.c	modified	+1	−1	View file
arch/powerpc/sysdev/xics/xics-common.c	modified	+1	−1	View file
arch/powerpc/sysdev/xive/common.c	modified	+146	−68	View file
arch/powerpc/sysdev/xive/native.c	modified	+16	−3	View file
arch/powerpc/sysdev/xive/spapr.c	modified	+25	−22	View file
arch/powerpc/sysdev/xive/xive-internal.h	modified	+2	−0	View file
arch/powerpc/xmon/xmon.c	modified	+23	−15	View file
arch/powerpc/xmon/xmon_bpts.h	modified	+2	−2	View file
drivers/macintosh/mediabay.c	modified	+1	−1	View file
drivers/misc/cxl/Kconfig	modified	+1	−0	View file
drivers/misc/lkdtm/Makefile	modified	+1	−1	View file
drivers/misc/lkdtm/core.c	modified	+1	−1	View file
drivers/misc/ocxl/file.c	modified	+1	−3	View file
include/linux/cuda.h	modified	+1	−1	View file
include/linux/pmu.h	modified	+1	−1	View file
include/uapi/linux/perf_event.h	modified	+4	−1	View file
tools/testing/selftests/powerpc/security/mitigation-patching.sh	modified	+4	−1	View file
tools/testing/selftests/powerpc/security/spectre_v2.c	modified	+1	−1	View file
tools/testing/selftests/powerpc/signal/.gitignore	modified	+2	−0	View file
tools/testing/selftests/powerpc/signal/Makefile	modified	+2	−0	View file
tools/testing/selftests/powerpc/signal/sigreturn_kernel.c	added	+132	−0	View file
tools/testing/selftests/powerpc/signal/sigreturn_unaligned.c	added	+43	−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 4955d2f..f5a27f0 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3393,7 +3393,7 @@
 			Disable SMAP (Supervisor Mode Access Prevention)
 			even if it is supported by processor.
 
-	nosmep		[X86,PPC]
+	nosmep		[X86,PPC64s]
 			Disable SMEP (Supervisor Mode Execution Prevention)
 			even if it is supported by processor.
 
@@ -4166,6 +4166,14 @@
 			Override pmtimer IOPort with a hex value.
 			e.g. pmtmr=0x508
 
+	pmu_override=	[PPC] Override the PMU.
+			This option takes over the PMU facility, so it is no
+			longer usable by perf. Setting this option starts the
+			PMU counters by setting MMCR0 to 0 (the FC bit is
+			cleared). If a number is given, then MMCR1 is set to
+			that number, otherwise (e.g., 'pmu_override=on'), MMCR1
+			remains 0.
+
 	pm_debug_messages	[SUSPEND,KNL]
 			Enable suspend/resume debug messages during boot up.
 
@@ -6494,6 +6502,12 @@
 				  controller on both pseries and powernv
 				  platforms. Only useful on POWER9 and above.
 
+	xive.store-eoi=off	[PPC]
+			By default on POWER10 and above, the kernel will use
+			stores for EOI handling when the XIVE interrupt mode
+			is active. This option allows the XIVE driver to use
+			loads instead, as on POWER9.
+
 	xhci-hcd.quirks		[USB,KNL]
 			A hex value specifying bitmask with supplemental xhci
 			host controller quirks. Meaning of each bit can be

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index dea74d7..0631c92 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -129,7 +129,7 @@ config PPC
 	select ARCH_HAS_KCOV
 	select ARCH_HAS_MEMBARRIER_CALLBACKS
 	select ARCH_HAS_MEMBARRIER_SYNC_CORE
-	select ARCH_HAS_MEMREMAP_COMPAT_ALIGN
+	select ARCH_HAS_MEMREMAP_COMPAT_ALIGN	if PPC_64S_HASH_MMU
 	select ARCH_HAS_MMIOWB			if PPC64
 	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
 	select ARCH_HAS_PHYS_TO_DMA
@@ -165,6 +165,7 @@ config PPC
 	select BINFMT_ELF
 	select BUILDTIME_TABLE_SORT
 	select CLONE_BACKWARDS
+	select CPUMASK_OFFSTACK			if NR_CPUS >= 8192
 	select DCACHE_WORD_ACCESS		if PPC64 && CPU_LITTLE_ENDIAN
 	select DMA_OPS_BYPASS			if PPC64
 	select DMA_OPS				if PPC64
@@ -205,7 +206,7 @@ config PPC
 	select HAVE_DEBUG_KMEMLEAK
 	select HAVE_DEBUG_STACKOVERFLOW
 	select HAVE_DYNAMIC_FTRACE
-	select HAVE_DYNAMIC_FTRACE_WITH_REGS	if MPROFILE_KERNEL
+	select HAVE_DYNAMIC_FTRACE_WITH_REGS	if MPROFILE_KERNEL || PPC32
 	select HAVE_EBPF_JIT
 	select HAVE_EFFICIENT_UNALIGNED_ACCESS	if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
 	select HAVE_FAST_GUP
@@ -229,7 +230,7 @@ config PPC
 	select HAVE_KPROBES_ON_FTRACE
 	select HAVE_KRETPROBES
 	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
-	select HAVE_LIVEPATCH			if HAVE_DYNAMIC_FTRACE_WITH_REGS
+	select HAVE_LIVEPATCH			if HAVE_DYNAMIC_FTRACE_WITH_REGS && PPC64
 	select HAVE_MOD_ARCH_SPECIFIC
 	select HAVE_NMI				if PERF_EVENTS || (PPC64 && PPC_BOOK3S)
 	select HAVE_OPTPROBES
@@ -845,7 +846,7 @@ config FORCE_MAX_ZONEORDER
 config PPC_SUBPAGE_PROT
 	bool "Support setting protections for 4k subpages (subpage_prot syscall)"
 	default n
-	depends on PPC_BOOK3S_64 && PPC_64K_PAGES
+	depends on PPC_64S_HASH_MMU && PPC_64K_PAGES
 	help
 	  This option adds support for system call to allow user programs
 	  to set access permissions (read/write, readonly, or no access)
@@ -943,6 +944,7 @@ config PPC_MEM_KEYS
 	prompt "PowerPC Memory Protection Keys"
 	def_bool y
 	depends on PPC_BOOK3S_64
+	depends on PPC_64S_HASH_MMU
 	select ARCH_USES_HIGH_VMA_FLAGS
 	select ARCH_HAS_PKEYS
 	help

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index e02568f..5f16ac1 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -245,7 +245,9 @@ cpu-as-$(CONFIG_E500)		+= -Wa,-me500
 # When using '-many -mpower4' gas will first try and find a matching power4
 # mnemonic and failing that it will allow any valid mnemonic that GAS knows
 # about. GCC will pass -many to GAS when assembling, clang does not.
-cpu-as-$(CONFIG_PPC_BOOK3S_64)	+= -Wa,-mpower4 -Wa,-many
+# LLVM IAS doesn't understand either flag: https://github.com/ClangBuiltLinux/linux/issues/675
+# but LLVM IAS only supports ISA >= 2.06 for Book3S 64 anyway...
+cpu-as-$(CONFIG_PPC_BOOK3S_64)	+= $(call as-option,-Wa$(comma)-mpower4) $(call as-option,-Wa$(comma)-many)
 cpu-as-$(CONFIG_PPC_E500MC)	+= $(call as-option,-Wa$(comma)-me500mc)
 
 KBUILD_AFLAGS += $(cpu-as-y)
@@ -445,10 +447,11 @@ PHONY += checkbin
 # Check toolchain versions:
 # - gcc-4.6 is the minimum kernel-wide version so nothing required.
 checkbin:
-	@if test "x${CONFIG_CPU_LITTLE_ENDIAN}" = "xy" \
-	    && $(LD) --version | head -1 | grep ' 2\.24$$' >/dev/null ; then \
+	@if test "x${CONFIG_LD_IS_LLD}" != "xy" -a \
+		"x$(call ld-ifversion, -le, 22400, y)" = "xy" ; then \
 		echo -n '*** binutils 2.24 miscompiles weak symbols ' ; \
 		echo 'in some circumstances.' ; \
+		echo    '*** binutils 2.23 do not define the TOC symbol ' ; \
 		echo -n '*** Please use a different binutils version.' ; \
 		false ; \
 	fi

arch/powerpc/boot/crt0.S

View file

diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S
index 1d83966..feadee1 100644
--- a/arch/powerpc/boot/crt0.S
+++ b/arch/powerpc/boot/crt0.S
@@ -28,7 +28,7 @@ p_etext:	.8byte	_etext
 p_bss_start:	.8byte	__bss_start
 p_end:		.8byte	_end
 
-p_toc:		.8byte	__toc_start + 0x8000 - p_base
+p_toc:		.8byte	.TOC. - p_base
 p_dyn:		.8byte	__dynamic_start - p_base
 p_rela:		.8byte	__rela_dyn_start - p_base
 p_prom:		.8byte	0
@@ -226,16 +226,19 @@ p_base:	mflr	r10		/* r10 now points to runtime addr of p_base */
 #ifdef __powerpc64__
 
 #define PROM_FRAME_SIZE 512
-#define SAVE_GPR(n, base)       std     n,8*(n)(base)
-#define REST_GPR(n, base)       ld      n,8*(n)(base)
-#define SAVE_2GPRS(n, base)     SAVE_GPR(n, base); SAVE_GPR(n+1, base)
-#define SAVE_4GPRS(n, base)     SAVE_2GPRS(n, base); SAVE_2GPRS(n+2, base)
-#define SAVE_8GPRS(n, base)     SAVE_4GPRS(n, base); SAVE_4GPRS(n+4, base)
-#define SAVE_10GPRS(n, base)    SAVE_8GPRS(n, base); SAVE_2GPRS(n+8, base)
-#define REST_2GPRS(n, base)     REST_GPR(n, base); REST_GPR(n+1, base)
-#define REST_4GPRS(n, base)     REST_2GPRS(n, base); REST_2GPRS(n+2, base)
-#define REST_8GPRS(n, base)     REST_4GPRS(n, base); REST_4GPRS(n+4, base)
-#define REST_10GPRS(n, base)    REST_8GPRS(n, base); REST_2GPRS(n+8, base)
+
+.macro OP_REGS op, width, start, end, base, offset
+	.Lreg=\start
+	.rept (\end - \start + 1)
+	\op	.Lreg,\offset+\width*.Lreg(\base)
+	.Lreg=.Lreg+1
+	.endr
+.endm
+
+#define SAVE_GPRS(start, end, base)	OP_REGS std, 8, start, end, base, 0
+#define REST_GPRS(start, end, base)	OP_REGS ld, 8, start, end, base, 0
+#define SAVE_GPR(n, base)		SAVE_GPRS(n, n, base)
+#define REST_GPR(n, base)		REST_GPRS(n, n, base)
 
 /* prom handles the jump into and return from firmware.  The prom args pointer
    is loaded in r3. */
@@ -246,9 +249,7 @@ prom:
 	stdu	r1,-PROM_FRAME_SIZE(r1) /* Save SP and create stack space */
 
 	SAVE_GPR(2, r1)
-	SAVE_GPR(13, r1)
-	SAVE_8GPRS(14, r1)
-	SAVE_10GPRS(22, r1)
+	SAVE_GPRS(13, 31, r1)
 	mfcr    r10
 	std     r10,8*32(r1)
 	mfmsr   r10
@@ -283,9 +284,7 @@ prom:
 
 	/* Restore other registers */
 	REST_GPR(2, r1)
-	REST_GPR(13, r1)
-	REST_8GPRS(14, r1)
-	REST_10GPRS(22, r1)
+	REST_GPRS(13, 31, r1)
 	ld      r10,8*32(r1)
 	mtcr	r10
 

arch/powerpc/boot/dts/digsy_mtc.dts

View file

diff --git a/arch/powerpc/boot/dts/digsy_mtc.dts b/arch/powerpc/boot/dts/digsy_mtc.dts
index 57024a4..dfaf974 100644
--- a/arch/powerpc/boot/dts/digsy_mtc.dts
+++ b/arch/powerpc/boot/dts/digsy_mtc.dts
@@ -25,14 +25,6 @@
 			status = "disabled";
 		};
 
-		spi@f00 {
-			msp430@0 {
-				compatible = "spidev";
-				spi-max-frequency = <32000>;
-				reg = <0>;
-			};
-		};
-
 		psc@2000 {		// PSC1
 			status = "disabled";
 		};

arch/powerpc/boot/dts/o2d.dtsi

View file

diff --git a/arch/powerpc/boot/dts/o2d.dtsi b/arch/powerpc/boot/dts/o2d.dtsi
index b55a9e5..7e52509 100644
--- a/arch/powerpc/boot/dts/o2d.dtsi
+++ b/arch/powerpc/boot/dts/o2d.dtsi
@@ -34,12 +34,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			cell-index = <0>;
-
-			spidev@0 {
-				compatible = "spidev";
-				spi-max-frequency = <250000>;
-				reg = <0>;
-			};
 		};
 
 		psc@2200 {		// PSC2

arch/powerpc/boot/zImage.lds.S

View file

diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S
index d6f0728..d65cd55 100644
--- a/arch/powerpc/boot/zImage.lds.S
+++ b/arch/powerpc/boot/zImage.lds.S
@@ -36,12 +36,9 @@ SECTIONS
   }
 
 #ifdef CONFIG_PPC64_BOOT_WRAPPER
-  . = ALIGN(256);
-  .got :
+  .got : ALIGN(256)
   {
-    __toc_start = .;
-    *(.got)
-    *(.toc)
+    *(.got .toc)
   }
 #endif
 

arch/powerpc/configs/microwatt_defconfig

View file

diff --git a/arch/powerpc/configs/microwatt_defconfig b/arch/powerpc/configs/microwatt_defconfig
index 07d87a4..eff933e 100644
--- a/arch/powerpc/configs/microwatt_defconfig
+++ b/arch/powerpc/configs/microwatt_defconfig
@@ -15,6 +15,8 @@ CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB_MERGE_DEFAULT is not set
 CONFIG_PPC64=y
+CONFIG_POWER9_CPU=y
+# CONFIG_PPC_64S_HASH_MMU is not set
 # CONFIG_PPC_KUEP is not set
 # CONFIG_PPC_KUAP is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
@@ -27,7 +29,6 @@ CONFIG_PPC_MICROWATT=y
 CONFIG_CPU_FREQ=y
 CONFIG_HZ_100=y
 CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_MEM_KEYS is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_MQ_IOSCHED_KYBER is not set
 # CONFIG_COREDUMP is not set

arch/powerpc/configs/ppc64_defconfig

View file

diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 203d0b7..c8b0e80 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -26,7 +26,6 @@ CONFIG_PPC64=y
 CONFIG_NR_CPUS=2048
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
-CONFIG_SCANLOG=m
 CONFIG_PPC_SMLPAR=y
 CONFIG_IBMEBUS=y
 CONFIG_PPC_SVM=y

arch/powerpc/configs/pseries_defconfig

View file

diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index e64f224..b571d08 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -38,7 +38,6 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
-CONFIG_SCANLOG=m
 CONFIG_PPC_SMLPAR=y
 CONFIG_IBMEBUS=y
 CONFIG_PAPR_SCM=m

arch/powerpc/crypto/md5-asm.S

View file

diff --git a/arch/powerpc/crypto/md5-asm.S b/arch/powerpc/crypto/md5-asm.S
index 948d100..fa6bc44 100644
--- a/arch/powerpc/crypto/md5-asm.S
+++ b/arch/powerpc/crypto/md5-asm.S
@@ -38,15 +38,11 @@
 
 #define INITIALIZE \
 	PPC_STLU r1,-INT_FRAME_SIZE(r1); \
-	SAVE_8GPRS(14, r1);		/* push registers onto stack	*/ \
-	SAVE_4GPRS(22, r1);						   \
-	SAVE_GPR(26, r1)
+	SAVE_GPRS(14, 26, r1)		/* push registers onto stack	*/
 
 #define FINALIZE \
-	REST_8GPRS(14, r1);		/* pop registers from stack	*/ \
-	REST_4GPRS(22, r1);						   \
-	REST_GPR(26, r1);						   \
-	addi	r1,r1,INT_FRAME_SIZE;
+	REST_GPRS(14, 26, r1);		/* pop registers from stack	*/ \
+	addi	r1,r1,INT_FRAME_SIZE
 
 #ifdef __BIG_ENDIAN__
 #define LOAD_DATA(reg, off) \

arch/powerpc/crypto/sha1-powerpc-asm.S

View file

diff --git a/arch/powerpc/crypto/sha1-powerpc-asm.S b/arch/powerpc/crypto/sha1-powerpc-asm.S
index 23e248b..f0d5ed5 100644
--- a/arch/powerpc/crypto/sha1-powerpc-asm.S
+++ b/arch/powerpc/crypto/sha1-powerpc-asm.S
@@ -125,8 +125,7 @@
 
 _GLOBAL(powerpc_sha_transform)
 	PPC_STLU r1,-INT_FRAME_SIZE(r1)
-	SAVE_8GPRS(14, r1)
-	SAVE_10GPRS(22, r1)
+	SAVE_GPRS(14, 31, r1)
 
 	/* Load up A - E */
 	lwz	RA(0),0(r3)	/* A */
@@ -184,7 +183,6 @@ _GLOBAL(powerpc_sha_transform)
 	stw	RD(0),12(r3)
 	stw	RE(0),16(r3)
 
-	REST_8GPRS(14, r1)
-	REST_10GPRS(22, r1)
+	REST_GPRS(14, 31, r1)
 	addi	r1,r1,INT_FRAME_SIZE
 	blr

arch/powerpc/include/asm/asm-prototypes.h

View file

diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h
index 2228238..41b8a1e 100644
--- a/arch/powerpc/include/asm/asm-prototypes.h
+++ b/arch/powerpc/include/asm/asm-prototypes.h
@@ -141,11 +141,6 @@ static inline void kvmppc_restore_tm_hv(struct kvm_vcpu *vcpu, u64 msr,
 					bool preserve_nv) { }
 #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
 
-void kvmhv_save_host_pmu(void);
-void kvmhv_load_host_pmu(void);
-void kvmhv_save_guest_pmu(struct kvm_vcpu *vcpu, bool pmu_in_use);
-void kvmhv_load_guest_pmu(struct kvm_vcpu *vcpu);
-
 void kvmppc_p9_enter_guest(struct kvm_vcpu *vcpu);
 
 long kvmppc_h_set_dabr(struct kvm_vcpu *vcpu, unsigned long dabr);

arch/powerpc/include/asm/atomic.h

View file

diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
index fd594fd..853dc86 100644
--- a/arch/powerpc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
@@ -37,62 +37,62 @@ static __inline__ void arch_atomic_set(atomic_t *v, int i)
 	__asm__ __volatile__("stw%U0%X0 %1,%0" : "=m<>"(v->counter) : "r"(i));
 }
 
-#define ATOMIC_OP(op, asm_op)						\
+#define ATOMIC_OP(op, asm_op, suffix, sign, ...)			\
 static __inline__ void arch_atomic_##op(int a, atomic_t *v)		\
 {									\
 	int t;								\
 									\
 	__asm__ __volatile__(						\
 "1:	lwarx	%0,0,%3		# atomic_" #op "\n"			\
-	#asm_op " %0,%2,%0\n"						\
+	#asm_op "%I2" suffix " %0,%0,%2\n"				\
 "	stwcx.	%0,0,%3 \n"						\
 "	bne-	1b\n"							\
 	: "=&r" (t), "+m" (v->counter)					\
-	: "r" (a), "r" (&v->counter)					\
-	: "cc");							\
+	: "r"#sign (a), "r" (&v->counter)				\
+	: "cc", ##__VA_ARGS__);						\
 }									\
 
-#define ATOMIC_OP_RETURN_RELAXED(op, asm_op)				\
+#define ATOMIC_OP_RETURN_RELAXED(op, asm_op, suffix, sign, ...)		\
 static inline int arch_atomic_##op##_return_relaxed(int a, atomic_t *v)	\
 {									\
 	int t;								\
 									\
 	__asm__ __volatile__(						\
 "1:	lwarx	%0,0,%3		# atomic_" #op "_return_relaxed\n"	\
-	#asm_op " %0,%2,%0\n"						\
+	#asm_op "%I2" suffix " %0,%0,%2\n"				\
 "	stwcx.	%0,0,%3\n"						\
 "	bne-	1b\n"							\
 	: "=&r" (t), "+m" (v->counter)					\
-	: "r" (a), "r" (&v->counter)					\
-	: "cc");							\
+	: "r"#sign (a), "r" (&v->counter)				\
+	: "cc", ##__VA_ARGS__);						\
 									\
 	return t;							\
 }
 
-#define ATOMIC_FETCH_OP_RELAXED(op, asm_op)				\
+#define ATOMIC_FETCH_OP_RELAXED(op, asm_op, suffix, sign, ...)		\
 static inline int arch_atomic_fetch_##op##_relaxed(int a, atomic_t *v)	\
 {									\
 	int res, t;							\
 									\
 	__asm__ __volatile__(						\
 "1:	lwarx	%0,0,%4		# atomic_fetch_" #op "_relaxed\n"	\
-	#asm_op " %1,%3,%0\n"						\
+	#asm_op "%I3" suffix " %1,%0,%3\n"				\
 "	stwcx.	%1,0,%4\n"						\
 "	bne-	1b\n"							\
 	: "=&r" (res), "=&r" (t), "+m" (v->counter)			\
-	: "r" (a), "r" (&v->counter)					\
-	: "cc");							\
+	: "r"#sign (a), "r" (&v->counter)				\
+	: "cc", ##__VA_ARGS__);						\
 									\
 	return res;							\
 }
 
-#define ATOMIC_OPS(op, asm_op)						\
-	ATOMIC_OP(op, asm_op)						\
-	ATOMIC_OP_RETURN_RELAXED(op, asm_op)				\
-	ATOMIC_FETCH_OP_RELAXED(op, asm_op)
+#define ATOMIC_OPS(op, asm_op, suffix, sign, ...)			\
+	ATOMIC_OP(op, asm_op, suffix, sign, ##__VA_ARGS__)		\
+	ATOMIC_OP_RETURN_RELAXED(op, asm_op, suffix, sign, ##__VA_ARGS__)\
+	ATOMIC_FETCH_OP_RELAXED(op, asm_op, suffix, sign, ##__VA_ARGS__)
 
-ATOMIC_OPS(add, add)
-ATOMIC_OPS(sub, subf)
+ATOMIC_OPS(add, add, "c", I, "xer")
+ATOMIC_OPS(sub, sub, "c", I, "xer")
 
 #define arch_atomic_add_return_relaxed arch_atomic_add_return_relaxed
 #define arch_atomic_sub_return_relaxed arch_atomic_sub_return_relaxed
@@ -101,13 +101,13 @@ ATOMIC_OPS(sub, subf)
 #define arch_atomic_fetch_sub_relaxed arch_atomic_fetch_sub_relaxed
 
 #undef ATOMIC_OPS
-#define ATOMIC_OPS(op, asm_op)						\
-	ATOMIC_OP(op, asm_op)						\
-	ATOMIC_FETCH_OP_RELAXED(op, asm_op)
+#define ATOMIC_OPS(op, asm_op, suffix, sign)				\
+	ATOMIC_OP(op, asm_op, suffix, sign)				\
+	ATOMIC_FETCH_OP_RELAXED(op, asm_op, suffix, sign)
 
-ATOMIC_OPS(and, and)
-ATOMIC_OPS(or, or)
-ATOMIC_OPS(xor, xor)
+ATOMIC_OPS(and, and, ".", K)
+ATOMIC_OPS(or, or, "", K)
+ATOMIC_OPS(xor, xor, "", K)
 
 #define arch_atomic_fetch_and_relaxed arch_atomic_fetch_and_relaxed
 #define arch_atomic_fetch_or_relaxed  arch_atomic_fetch_or_relaxed
@@ -118,71 +118,6 @@ ATOMIC_OPS(xor, xor)
 #undef ATOMIC_OP_RETURN_RELAXED
 #undef ATOMIC_OP
 
-static __inline__ void arch_atomic_inc(atomic_t *v)
-{
-	int t;
-
-	__asm__ __volatile__(
-"1:	lwarx	%0,0,%2		# atomic_inc\n\
-	addic	%0,%0,1\n"
-"	stwcx.	%0,0,%2 \n\
-	bne-	1b"
-	: "=&r" (t), "+m" (v->counter)
-	: "r" (&v->counter)
-	: "cc", "xer");
-}
-#define arch_atomic_inc arch_atomic_inc
-
-static __inline__ int arch_atomic_inc_return_relaxed(atomic_t *v)
-{
-	int t;
-
-	__asm__ __volatile__(
-"1:	lwarx	%0,0,%2		# atomic_inc_return_relaxed\n"
-"	addic	%0,%0,1\n"
-"	stwcx.	%0,0,%2\n"
-"	bne-	1b"
-	: "=&r" (t), "+m" (v->counter)
-	: "r" (&v->counter)
-	: "cc", "xer");
-
-	return t;
-}
-
-static __inline__ void arch_atomic_dec(atomic_t *v)
-{
-	int t;
-
-	__asm__ __volatile__(
-"1:	lwarx	%0,0,%2		# atomic_dec\n\
-	addic	%0,%0,-1\n"
-"	stwcx.	%0,0,%2\n\
-	bne-	1b"
-	: "=&r" (t), "+m" (v->counter)
-	: "r" (&v->counter)
-	: "cc", "xer");
-}
-#define arch_atomic_dec arch_atomic_dec
-
-static __inline__ int arch_atomic_dec_return_relaxed(atomic_t *v)
-{
-	int t;
-
-	__asm__ __volatile__(
-"1:	lwarx	%0,0,%2		# atomic_dec_return_relaxed\n"
-"	addic	%0,%0,-1\n"
-"	stwcx.	%0,0,%2\n"
-"	bne-	1b"
-	: "=&r" (t), "+m" (v->counter)
-	: "r" (&v->counter)
-	: "cc", "xer");
-
-	return t;
-}
-
-#define arch_atomic_inc_return_relaxed arch_atomic_inc_return_relaxed
-#define arch_atomic_dec_return_relaxed arch_atomic_dec_return_relaxed
-
 #define arch_atomic_cmpxchg(v, o, n) \
 	(arch_cmpxchg(&((v)->counter), (o), (n)))
 #define arch_atomic_cmpxchg_relaxed(v, o, n) \
@@ -241,50 +176,20 @@ static __inline__ int arch_atomic_fetch_add_unless(atomic_t *v, int a, int u)
 "1:	lwarx	%0,0,%1		# atomic_fetch_add_unless\n\
 	cmpw	0,%0,%3 \n\
 	beq	2f \n\
-	add	%0,%2,%0 \n"
+	add%I2c	%0,%0,%2 \n"
 "	stwcx.	%0,0,%1 \n\
 	bne-	1b \n"
 	PPC_ATOMIC_EXIT_BARRIER
-"	subf	%0,%2,%0 \n\
+"	sub%I2c	%0,%0,%2 \n\
 2:"
 	: "=&r" (t)
-	: "r" (&v->counter), "r" (a), "r" (u)
-	: "cc", "memory");
+	: "r" (&v->counter), "rI" (a), "r" (u)
+	: "cc", "memory", "xer");
 
 	return t;
 }
 #define arch_atomic_fetch_add_unless arch_atomic_fetch_add_unless
 
-/**
- * atomic_inc_not_zero - increment unless the number is zero
- * @v: pointer of type atomic_t
- *
- * Atomically increments @v by 1, so long as @v is non-zero.
- * Returns non-zero if @v was non-zero, and zero otherwise.
- */
-static __inline__ int arch_atomic_inc_not_zero(atomic_t *v)
-{
-	int t1, t2;
-
-	__asm__ __volatile__ (
-	PPC_ATOMIC_ENTRY_BARRIER
-"1:	lwarx	%0,0,%2		# atomic_inc_not_zero\n\
-	cmpwi	0,%0,0\n\
-	beq-	2f\n\
-	addic	%1,%0,1\n"
-"	stwcx.	%1,0,%2\n\
-	bne-	1b\n"
-	PPC_ATOMIC_EXIT_BARRIER
-	"\n\
-2:"
-	: "=&r" (t1), "=&r" (t2)
-	: "r" (&v->counter)
-	: "cc", "xer", "memory");
-
-	return t1;
-}
-#define arch_atomic_inc_not_zero(v) arch_atomic_inc_not_zero((v))
-
 /*
  * Atomically test *v and decrement if it is greater than 0.
  * The function returns the old value of *v minus 1, even if

arch/powerpc/include/asm/bitops.h

View file

diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index 11847b6..a05d8c6 100644
--- a/arch/powerpc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
@@ -71,19 +71,61 @@ static inline void fn(unsigned long mask,	\
 	__asm__ __volatile__ (			\
 	prefix					\
 "1:"	PPC_LLARX "%0,0,%3,0\n"			\
-	stringify_in_c(op) "%0,%0,%2\n"		\
+	#op "%I2 %0,%0,%2\n"			\
 	PPC_STLCX "%0,0,%3\n"			\
 	"bne- 1b\n"				\
 	: "=&r" (old), "+m" (*p)		\
-	: "r" (mask), "r" (p)			\
+	: "rK" (mask), "r" (p)			\

This diff is incomplete. Download the complete patch.