Commit 5f5c9952 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Madhavan Srinivasan:

 - CONFIG_HZ changes to move the base_slice from 10ms to 1ms

 - Patchset to move some of the mutex handling to lock guard

 - Expose secvars relevant to the key management mode

 - Misc cleanups and fixes

Thanks to Ankit Chauhan, Christophe Leroy, Donet Tom, Gautam Menghani,
Haren Myneni, Johan Korsnes, Madadi Vineeth Reddy, Paul Mackerras,
Shrikanth Hegde, Srish Srinivasan, Thomas Fourier, Thomas Huth, Thomas
Weißschuh, Souradeep, Amit Machhiwal, R Nageswara Sastry, Venkat Rao
Bagalkote, Andrew Donnellan, Greg Kroah-Hartman, Mimi Zohar, Mukesh
Kumar Chaurasiya, Nayna Jain, Ritesh Harjani (IBM), Sourabh Jain, Srikar
Dronamraju, Stefan Berger, Tyrel Datwyler, and Kowshik Jois.

* tag 'powerpc-6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (23 commits)
  arch/powerpc: Remove .interp section in vmlinux
  powerpc: Drop GPL boilerplate text with obsolete FSF address
  powerpc: Don't use %pK through printk
  arch: powerpc: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX
  misc: ocxl: Replace scnprintf() with sysfs_emit() in sysfs show functions
  integrity/platform_certs: Allow loading of keys in the static key management mode
  powerpc/secvar: Expose secvars relevant to the key management mode
  powerpc/pseries: Correct secvar format representation for static key management
  (powerpc/512) Fix possible `dma_unmap_single()` on uninitialized pointer
  powerpc: floppy: Add missing checks after DMA map
  book3s64/radix : Optimize vmemmap start alignment
  book3s64/radix : Handle error conditions properly in radix_vmemmap_populate
  powerpc/pseries/dlpar: Search DRC index from ibm,drc-indexes for IO add
  KVM: PPC: Book3S HV: Add H_VIRT mapping for tracing exits
  powerpc: sysdev: use lock guard for mutex
  powerpc: powernv: ocxl: use lock guard for mutex
  powerpc: book3s: vas: use lock guard for mutex
  powerpc: fadump: use lock guard for mutex
  powerpc: rtas: use lock guard for mutex
  powerpc: eeh: use lock guard for mutex
  ...
parents 6fb44438 da30705c

Documentation/ABI/testing/sysfs-secvar

+14 −3
Original line number Diff line number Diff line
@@ -22,9 +22,13 @@ Description: A string indicating which backend is in use by the firmware. 
		and is expected to be "ibm,edk2-compat-v1".



		On pseries/PLPKS, this is generated by the kernel based on the

		version number in the SB_VERSION variable in the keystore, and

		has the form "ibm,plpks-sb-v<version>", or

		"ibm,plpks-sb-unknown" if there is no SB_VERSION variable.

		version number in the SB_VERSION variable in the keystore. The

		version numbering in the SB_VERSION variable starts from 1. The

		format string takes the form "ibm,plpks-sb-v<version>" in the

		case of dynamic key management mode. If the SB_VERSION variable

		does not exist (or there is an error while reading it), it takes

		the form "ibm,plpks-sb-v0", indicating that the key management

		mode is static.



What:		/sys/firmware/secvar/vars/<variable name>

Date:		August 2019
@@ -34,6 +38,13 @@ Description: Each secure variable is represented as a directory named as 
		representation. The data and size can be determined by reading

		their respective attribute files.



		Only secvars relevant to the key management mode are exposed.

		Only in the dynamic key management mode should the user have

		access (read and write) to the secure boot secvars db, dbx,

		grubdb, grubdbx, and sbat. These secvars are not consumed in the

		static key management mode. PK, trustedcadb and moduledb are the

		secvars common to both static and dynamic key management modes.



What:		/sys/firmware/secvar/vars/<variable_name>/size

Date:		August 2019

Contact:	Nayna Jain <nayna@linux.ibm.com>

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ KBUILD_LDFLAGS += -m elf$(BITS)$(LDEMULATION) 
endif



LDFLAGS_vmlinux-y := -Bstatic

LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) := -pie

LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) := -pie --no-dynamic-linker

LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) += -z notext

LDFLAGS_vmlinux	:= $(LDFLAGS_vmlinux-y)

arch/powerpc/boot/dts/microwatt.dts

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ cpus { 


		ibm,powerpc-cpu-features {

			display-name = "Microwatt";

			isa = <3010>;

			isa = <3100>;

			device_type = "cpu-features";

			compatible = "ibm,powerpc-cpu-features";

arch/powerpc/configs/powernv_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y 
CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_CPU_IDLE=y

CONFIG_HZ_100=y

CONFIG_HZ_1000=y

CONFIG_BINFMT_MISC=m

CONFIG_PPC_TRANSACTIONAL_MEM=y

CONFIG_PPC_UV=y
@@ -340,3 +340,4 @@ CONFIG_KVM_BOOK3S_64_HV=m 
CONFIG_VHOST_NET=m

CONFIG_PRINTK_TIME=y

CONFIG_PRINTK_CALLER=y

CONFIG_KALLSYMS_ALL=y

arch/powerpc/configs/ppc64_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y 
CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_CPU_FREQ_PMAC64=y

CONFIG_HZ_100=y

CONFIG_HZ_1000=y

CONFIG_PPC_TRANSACTIONAL_MEM=y

CONFIG_KEXEC=y

CONFIG_KEXEC_FILE=y
@@ -465,3 +465,4 @@ CONFIG_TEST_MEMCAT_P=m 
CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m

CONFIG_MEMTEST=y

CONFIG_KALLSYMS_ALL=y