Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de399813 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Michael Ellerman:
 "Highlights include:

   - Support for the kexec_file_load() syscall, which is a prereq for
     secure and trusted boot.

   - Prevent kernel execution of userspace on P9 Radix (similar to
     SMEP/PXN).

   - Sort the exception tables at build time, to save time at boot, and
     store them as relative offsets to save space in the kernel image &
     memory.

   - Allow building the kernel with thin archives, which should allow us
     to build an allyesconfig once some other fixes land.

   - Build fixes to allow us to correctly rebuild when changing the
     kernel endian from big to little or vice versa.

   - Plumbing so that we can avoid doing a full mm TLB flush on P9
     Radix.

   - Initial stack protector support (-fstack-protector).

   - Support for dumping the radix (aka. Linux) and hash page tables via
     debugfs.

   - Fix an oops in cxl coredump generation when cxl_get_fd() is used.

   - Freescale updates from Scott: "Highlights include 8xx hugepage
     support, qbman fixes/cleanup, device tree updates, and some misc
     cleanup."

   - Many and varied fixes and minor enhancements as always.

  Thanks to:
    Alexey Kardashevskiy, Andrew Donnellan, Aneesh Kumar K.V, Anshuman
    Khandual, Anton Blanchard, Balbir Singh, Bartlomiej Zolnierkiewicz,
    Christophe Jaillet, Christophe Leroy, Denis Kirjanov, Elimar
    Riesebieter, Frederic Barrat, Gautham R. Shenoy, Geliang Tang, Geoff
    Levand, Jack Miller, Johan Hovold, Lars-Peter Clausen, Libin,
    Madhavan Srinivasan, Michael Neuling, Nathan Fontenot, Naveen N.
    Rao, Nicholas Piggin, Pan Xinhui, Peter Senna Tschudin, Rashmica
    Gupta, Rui Teng, Russell Currey, Scott Wood, Simon Guo, Suraj
    Jitindar Singh, Thiago Jung Bauermann, Tobias Klauser, Vaibhav Jain"

[ And thanks to Michael, who took time off from a new baby to get this
  pull request done.   - Linus ]

* tag 'powerpc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (174 commits)
  powerpc/fsl/dts: add FMan node for t1042d4rdb
  powerpc/fsl/dts: add sg_2500_aqr105_phy4 alias on t1024rdb
  powerpc/fsl/dts: add QMan and BMan nodes on t1024
  powerpc/fsl/dts: add QMan and BMan nodes on t1023
  soc/fsl/qman: test: use DEFINE_SPINLOCK()
  powerpc/fsl-lbc: use DEFINE_SPINLOCK()
  powerpc/8xx: Implement support of hugepages
  powerpc: get hugetlbpage handling more generic
  powerpc: port 64 bits pgtable_cache to 32 bits
  powerpc/boot: Request no dynamic linker for boot wrapper
  soc/fsl/bman: Use resource_size instead of computation
  soc/fsl/qe: use builtin_platform_driver
  powerpc/fsl_pmc: use builtin_platform_driver
  powerpc/83xx/suspend: use builtin_platform_driver
  powerpc/ftrace: Fix the comments for ftrace_modify_code
  powerpc/perf: macros for power9 format encoding
  powerpc/perf: power9 raw event format encoding
  powerpc/perf: update attribute_group data structure
  powerpc/perf: factor out the event format field
  powerpc/mm/iommu, vfio/spapr: Put pages on VFIO container shutdown
  ...
parents 57ca04ab c6f66347

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -169,4 +169,5 @@ ti,tsc2003 I2C Touch-Screen Controller 
ti,tmp102		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface

ti,tmp103		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface

ti,tmp275		Digital Temperature Sensor

winbond,w83793		Winbond/Nuvoton H/W Monitor

winbond,wpct301		i2c trusted platform module (TPM)

arch/powerpc/Kconfig

+40 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK 
config PPC

	bool

	default y

	select BUILDTIME_EXTABLE_SORT

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select BINFMT_ELF
@@ -163,6 +164,7 @@ config PPC 
	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE

	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_KERNEL_GZIP

	select HAVE_CC_STACKPROTECTOR



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN
@@ -396,6 +398,14 @@ config MPROFILE_KERNEL 
	depends on PPC64 && CPU_LITTLE_ENDIAN

	def_bool !DISABLE_MPROFILE_KERNEL



config USE_THIN_ARCHIVES

	bool "Build the kernel using thin archives"

	default n

	select THIN_ARCHIVES

	help

	  Build the kernel using thin archives.

	  If you're unsure say N.



config IOMMU_HELPER

	def_bool PPC64
@@ -456,6 +466,19 @@ config KEXEC 
	  interface is strongly in flux, so no good recommendation can be

	  made.



config KEXEC_FILE

	bool "kexec file based system call"

	select KEXEC_CORE

	select BUILD_BIN2C

	depends on PPC64

	depends on CRYPTO=y

	depends on CRYPTO_SHA256=y

	help

	  This is a new version of the kexec system call. This call is

	  file based and takes in file descriptors as system call arguments

	  for kernel and initramfs as opposed to a list of segments as is the

	  case for the older kexec call.



config RELOCATABLE

	bool "Build a relocatable kernel"

	depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE))
@@ -479,6 +502,15 @@ config RELOCATABLE 
	  setting can still be useful to bootwrappers that need to know the

	  load address of the kernel (eg. u-boot/mkimage).



config RELOCATABLE_TEST

	bool "Test relocatable kernel"

	depends on (PPC64 && RELOCATABLE)

	default n

	help

	  This runs the relocatable kernel at the address it was initially

	  loaded at, which tends to be non-zero and therefore test the

	  relocation code.



config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
@@ -490,7 +522,7 @@ config CRASH_DUMP 


config FA_DUMP

	bool "Firmware-assisted dump"

	depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC

	depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC_CORE

	help

	  A robust mechanism to get reliable kernel crash dump with

	  assistance from firmware. This approach does not use kexec,
@@ -549,6 +581,13 @@ config ARCH_SPARSEMEM_DEFAULT 
config SYS_SUPPORTS_HUGETLBFS

	bool



config ILLEGAL_POINTER_VALUE

	hex

	# This is roughly half way between the top of user space and the bottom

	# of kernel space, which seems about as good as we can get.

	default 0x5deadbeef0000000 if PPC64

	default 0



source "mm/Kconfig"



config ARCH_MEMORY_PROBE

arch/powerpc/Kconfig.debug

+16 −0
Original line number Diff line number Diff line
@@ -354,4 +354,20 @@ config FAIL_IOMMU 


	  If you are unsure, say N.



config PPC_PTDUMP

        bool "Export kernel pagetable layout to userspace via debugfs"

        depends on DEBUG_KERNEL

        select DEBUG_FS

        help

	  This option exports the state of the kernel pagetables to a

	  debugfs file. This is only useful for kernel developers who are

	  working in architecture specific areas of the kernel - probably

	  not a good idea to enable this feature in a production kernel.



	  If you are unsure, say N.



config PPC_HTDUMP

	def_bool y

	depends on PPC_PTDUMP && PPC_BOOK3S



endmenu

arch/powerpc/Makefile

+8 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ CROSS32AR := $(CROSS32_COMPILE)ar 
ifeq ($(HAS_BIARCH),y)

ifeq ($(CROSS32_COMPILE),)

CROSS32CC	:= $(CC) -m32

CROSS32AR	:= GNUTARGET=elf32-powerpc $(AR)

KBUILD_ARFLAGS	+= --target=elf32-powerpc

endif

endif
@@ -85,7 +85,7 @@ ifeq ($(HAS_BIARCH),y) 
override AS	+= -a$(BITS)

override LD	+= -m elf$(BITS)$(LDEMULATION)

override CC	+= -m$(BITS)

override AR	:= GNUTARGET=elf$(BITS)-$(GNUTARGET) $(AR)

KBUILD_ARFLAGS	+= --target=elf$(BITS)-$(GNUTARGET)

endif



LDFLAGS_vmlinux-y := -Bstatic
@@ -121,6 +121,7 @@ CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 $(MULTIPLEWORD) 


ifeq ($(CONFIG_PPC_BOOK3S_64),y)

CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4)

CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power4

else

CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64

endif
@@ -249,6 +250,7 @@ core-y += arch/powerpc/kernel/ \ 
core-$(CONFIG_XMON)		+= arch/powerpc/xmon/

core-$(CONFIG_KVM) 		+= arch/powerpc/kvm/

core-$(CONFIG_PERF_EVENTS)	+= arch/powerpc/perf/

core-$(CONFIG_KEXEC_FILE)	+= arch/powerpc/purgatory/



drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
@@ -275,16 +277,16 @@ zImage: relocs_check 
endif



$(BOOT_TARGETS1): vmlinux

	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

$(BOOT_TARGETS2): vmlinux

	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)





bootwrapper_install:

	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)



%.dtb: scripts

	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)



# Used to create 'merged defconfigs'

# To use it $(call) it with the first argument as the base defconfig

arch/powerpc/boot/Makefile

+13 −17
Original line number Diff line number Diff line
@@ -172,10 +172,6 @@ $(addprefix $(obj)/,$(libfdt) $(libfdtheader)): $(obj)/%: $(srctree)/scripts/dtc 
$(obj)/empty.c:

	$(Q)touch $@



$(obj)/zImage.lds: $(obj)/%: $(srctree)/$(src)/%.S

	$(CROSS32CC) $(cpp_flags) -E -Wp,-MD,$(depfile) -P -Upowerpc \

		-D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<



$(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S

	$(Q)cp $< $@
@@ -357,17 +353,17 @@ $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz 
# Don't put the ramdisk on the pattern rule; when its missing make will try

# the pattern rule with less dependencies that also matches (even with the

# hard dependency listed).

$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)

$(obj)/zImage.initrd.%: vmlinux $(wrapperbits) FORCE

	$(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)



$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits)

$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits) FORCE

	$(call if_changed,wrap,$(subst $(obj)/zImage.,,$@))



# dtbImage% - a dtbImage is a zImage with an embedded device tree blob

$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb

$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE

	$(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb

$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE

	$(call if_changed,wrap,$*,,$(obj)/$*.dtb)



# This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
@@ -375,31 +371,31 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb 
$(obj)/vmlinux.strip: vmlinux

	$(STRIP) -s -R .comment $< -o $@



$(obj)/uImage: vmlinux $(wrapperbits)

$(obj)/uImage: vmlinux $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot)



$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb)



$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)



$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)



$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)

$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)



# Rule to build device tree blobs