Commit 707df298 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Michael Ellerman:

 - Add support for KVM running as a nested hypervisor under development
   versions of PowerVM, using the new PAPR nested virtualisation API

 - Add support for the BPF prog pack allocator

 - A rework of the non-server MMU handling to support execute-only on
   all platforms

 - Some optimisations & cleanups for the powerpc qspinlock code

 - Various other small features and fixes

Thanks to Aboorva Devarajan, Aditya Gupta, Amit Machhiwal, Benjamin
Gray, Christophe Leroy, Dr. David Alan Gilbert, Gaurav Batra, Gautam
Menghani, Geert Uytterhoeven, Haren Myneni, Hari Bathini, Joel Stanley,
Jordan Niethe, Julia Lawall, Kautuk Consul, Kuan-Wei Chiu, Michael
Neuling, Minjie Du, Muhammad Muzammil, Naveen N Rao, Nicholas Piggin,
Nick Child, Nysal Jan K.A, Peter Lafreniere, Rob Herring, Sachin Sant,
Sebastian Andrzej Siewior, Shrikanth Hegde, Srikar Dronamraju, Stanislav
Kinsburskii, Vaibhav Jain, Wang Yufen, Yang Yingliang, and Yuan Tan.

* tag 'powerpc-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (100 commits)
  powerpc/vmcore: Add MMU information to vmcoreinfo
  Revert "powerpc: add `cur_cpu_spec` symbol to vmcoreinfo"
  powerpc/bpf: use bpf_jit_binary_pack_[alloc|finalize|free]
  powerpc/bpf: rename powerpc64_jit_data to powerpc_jit_data
  powerpc/bpf: implement bpf_arch_text_invalidate for bpf_prog_pack
  powerpc/bpf: implement bpf_arch_text_copy
  powerpc/code-patching: introduce patch_instructions()
  powerpc/32s: Implement local_flush_tlb_page_psize()
  powerpc/pseries: use kfree_sensitive() in plpks_gen_password()
  powerpc/code-patching: Perform hwsync in __patch_instruction() in case of failure
  powerpc/fsl_msi: Use device_get_match_data()
  powerpc: Remove cpm_dp...() macros
  powerpc/qspinlock: Rename yield_propagate_owner tunable
  powerpc/qspinlock: Propagate sleepy if previous waiter is preempted
  powerpc/qspinlock: don't propagate the not-sleepy state
  powerpc/qspinlock: propagate owner preemptedness rather than CPU number
  powerpc/qspinlock: stop queued waiters trying to set lock sleepy
  powerpc/perf: Fix disabling BHRB and instruction sampling
  powerpc/trace: Add support for HAVE_FUNCTION_ARG_ACCESS_API
  powerpc/tools: Pass -mabi=elfv2 to gcc-check-mprofile-kernel.sh
  ...
parents 6bdfe2d8 303d77a6

Documentation/arch/powerpc/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ powerpc 
    isa-versions

    kaslr-booke32

    mpc52xx

    kvm-nested

    papr_hcalls

    pci_iov_resource_on_powernv

    pmu-ebb

Documentation/arch/powerpc/kvm-nested.rst

0 → 100644
+634 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ config PPC 
	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_FAST_GUP

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_ARG_ACCESS_API

	select HAVE_FUNCTION_DESCRIPTORS	if PPC64_ELF_ABI_V1

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_GRAPH_TRACER

arch/powerpc/Kconfig.debug

+14 −0
Original line number Diff line number Diff line
@@ -82,6 +82,18 @@ config MSI_BITMAP_SELFTEST 
	bool "Run self-tests of the MSI bitmap code"

	depends on DEBUG_KERNEL



config GUEST_STATE_BUFFER_TEST

	def_tristate n

	prompt "Enable Guest State Buffer unit tests"

	depends on KUNIT

	depends on KVM_BOOK3S_HV_POSSIBLE

	default KUNIT_ALL_TESTS

	help

	  The Guest State Buffer is a data format specified in the PAPR.

	  It is by hcalls to communicate the state of L2 guests between

	  the L1 and L0 hypervisors. Enable unit tests for the library

	  used to create and use guest state buffers.



config PPC_IRQ_SOFT_MASK_DEBUG

	bool "Include extra checks for powerpc irq soft masking"

	depends on PPC64
@@ -147,6 +159,8 @@ config BDI_SWITCH 
config BOOTX_TEXT

	bool "Support for early boot text console (BootX or OpenFirmware only)"

	depends on PPC_BOOK3S

	select FONT_SUN8x16

	select FONT_SUPPORT

	help

	  Say Y here to see progress messages from the boot firmware in text

	  mode. Requires either BootX or Open Firmware.

arch/powerpc/boot/install.sh

+10 −6
Original line number Diff line number Diff line
@@ -21,13 +21,17 @@ set -e 
# this should work for both the pSeries zImage and the iSeries vmlinux.sm

image_name=`basename $2`



if [ -f $4/$image_name ]; then

	mv $4/$image_name $4/$image_name.old



echo "Warning: '${INSTALLKERNEL}' command not available... Copying" \

     "directly to $4/$image_name-$1" >&2



if [ -f $4/$image_name-$1 ]; then

	mv $4/$image_name-$1 $4/$image_name-$1.old

fi



if [ -f $4/System.map ]; then

	mv $4/System.map $4/System.old

if [ -f $4/System.map-$1 ]; then

	mv $4/System.map-$1 $4/System-$1.old

fi



cat $2 > $4/$image_name

cp $3 $4/System.map
 
cat $2 > $4/$image_name-$1

cp $3 $4/System.map-$1