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

Commit f689b742 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull powerpc updates from Michael Ellerman:
 "Core:
   - Ground work for the new Power9 MMU from Aneesh Kumar K.V
   - Optimise FP/VMX/VSX context switching from Anton Blanchard

  Misc:
   - Various cleanups from Krzysztof Kozlowski, John Ogness, Rashmica
     Gupta, Russell Currey, Gavin Shan, Daniel Axtens, Michael Neuling,
     Andrew Donnellan
   - Allow wrapper to work on non-english system from Laurent Vivier
   - Add rN aliases to the pt_regs_offset table from Rashmica Gupta
   - Fix module autoload for rackmeter & axonram drivers from Luis de
     Bethencourt
   - Include KVM guest test in all interrupt vectors from Paul Mackerras
   - Fix DSCR inheritance over fork() from Anton Blanchard
   - Make value-returning atomics & {cmp}xchg* & their atomic_ versions
     fully ordered from Boqun Feng
   - Print MSR TM bits in oops messages from Michael Neuling
   - Add TM signal return & invalid stack selftests from Michael Neuling
   - Limit EPOW reset event warnings from Vipin K Parashar
   - Remove the Cell QPACE code from Rashmica Gupta
   - Append linux_banner to exception information in xmon from Rashmica
     Gupta
   - Add selftest to check if VSRs are corrupted from Rashmica Gupta
   - Remove broken GregorianDay() from Daniel Axtens
   - Import Anton's context_switch2 benchmark into selftests from
     Michael Ellerman
   - Add selftest script to test HMI functionality from Daniel Axtens
   - Remove obsolete OPAL v2 support from Stewart Smith
   - Make enter_rtas() private from Michael Ellerman
   - PPR exception cleanups from Michael Ellerman
   - Add page soft dirty tracking from Laurent Dufour
   - Add support for Nvlink NPUs from Alistair Popple
   - Add support for kexec on 476fpe from Alistair Popple
   - Enable kernel CPU dlpar from sysfs from Nathan Fontenot
   - Copy only required pieces of the mm_context_t to the paca from
     Michael Neuling
   - Add a kmsg_dumper that flushes OPAL console output on panic from
     Russell Currey
   - Implement save_stack_trace_regs() to enable kprobe stack tracing
     from Steven Rostedt
   - Add HWCAP bits for Power9 from Michael Ellerman
   - Fix _PAGE_PTE breaking swapoff from Aneesh Kumar K.V
   - Fix _PAGE_SWP_SOFT_DIRTY breaking swapoff from Hugh Dickins
   - scripts/recordmcount.pl: support data in text section on powerpc
     from Ulrich Weigand
   - Handle R_PPC64_ENTRY relocations in modules from Ulrich Weigand

  cxl:
   - cxl: Fix possible idr warning when contexts are released from
     Vaibhav Jain
   - cxl: use correct operator when writing pcie config space values
     from Andrew Donnellan
   - cxl: Fix DSI misses when the context owning task exits from Vaibhav
     Jain
   - cxl: fix build for GCC 4.6.x from Brian Norris
   - cxl: use -Werror only with CONFIG_PPC_WERROR from Brian Norris
   - cxl: Enable PCI device ID for future IBM CXL adapter from Uma
     Krishnan

  Freescale:
   - Freescale updates from Scott: Highlights include moving QE code out
     of arch/powerpc (to be shared with arm), device tree updates, and
     minor fixes"

* tag 'powerpc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (149 commits)
  powerpc/module: Handle R_PPC64_ENTRY relocations
  scripts/recordmcount.pl: support data in text section on powerpc
  powerpc/powernv: Fix OPAL_CONSOLE_FLUSH prototype and usages
  powerpc/mm: fix _PAGE_SWP_SOFT_DIRTY breaking swapoff
  powerpc/mm: Fix _PAGE_PTE breaking swapoff
  cxl: Enable PCI device ID for future IBM CXL adapter
  cxl: use -Werror only with CONFIG_PPC_WERROR
  cxl: fix build for GCC 4.6.x
  powerpc: Add HWCAP bits for Power9
  powerpc/powernv: Reserve PE#0 on NPU
  powerpc/powernv: Change NPU PE# assignment
  powerpc/powernv: Fix update of NVLink DMA mask
  powerpc/powernv: Remove misleading comment in pci.c
  powerpc: Implement save_stack_trace_regs() to enable kprobe stack tracing
  powerpc: Fix build break due to paca mm_context_t changes
  cxl: Fix DSI misses when the context owning task exits
  MAINTAINERS: Update Scott Wood's e-mail address
  powerpc/powernv: Fix minor off-by-one error in opal_mce_check_early_recovery()
  powerpc: Fix style of self-test config prompts
  powerpc/powernv: Only delay opal_rtc_read() retry when necessary
  ...
parents 37cea93b be6bfc29
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ Required properties:
	  tegra132, or tegra210.
	- "nxp,lpc3220-uart"
	- "ralink,rt2880-uart"
	- "ibm,qpace-nwp-serial"
	- "altr,16550-FIFO32"
	- "altr,16550-FIFO64"
	- "altr,16550-FIFO128"
+63 −0
Original line number Diff line number Diff line
* Thermal Monitoring Unit (TMU) on Freescale QorIQ SoCs

Required properties:
- compatible : Must include "fsl,qoriq-tmu". The version of the device is
	determined by the TMU IP Block Revision Register (IPBRR0) at
	offset 0x0BF8.
	Table of correspondences between IPBRR0 values and example  chips:
		Value           Device
		----------      -----
		0x01900102      T1040
- reg : Address range of TMU registers.
- interrupts : Contains the interrupt for TMU.
- fsl,tmu-range : The values to be programmed into TTRnCR, as specified by
	the SoC reference manual. The first cell is TTR0CR, the second is
	TTR1CR, etc.
- fsl,tmu-calibration : A list of cell pairs containing temperature
	calibration data, as specified by the SoC reference manual.
	The first cell of each pair is the value to be written to TTCFGR,
	and the second is the value to be written to TSCFGR.

Example:

tmu@f0000 {
	compatible = "fsl,qoriq-tmu";
	reg = <0xf0000 0x1000>;
	interrupts = <18 2 0 0>;
	fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a>;
	fsl,tmu-calibration = <0x00000000 0x00000025
			       0x00000001 0x00000028
			       0x00000002 0x0000002d
			       0x00000003 0x00000031
			       0x00000004 0x00000036
			       0x00000005 0x0000003a
			       0x00000006 0x00000040
			       0x00000007 0x00000044
			       0x00000008 0x0000004a
			       0x00000009 0x0000004f
			       0x0000000a 0x00000054

			       0x00010000 0x0000000d
			       0x00010001 0x00000013
			       0x00010002 0x00000019
			       0x00010003 0x0000001f
			       0x00010004 0x00000025
			       0x00010005 0x0000002d
			       0x00010006 0x00000033
			       0x00010007 0x00000043
			       0x00010008 0x0000004b
			       0x00010009 0x00000053

			       0x00020000 0x00000010
			       0x00020001 0x00000017
			       0x00020002 0x0000001f
			       0x00020003 0x00000029
			       0x00020004 0x00000031
			       0x00020005 0x0000003c
			       0x00020006 0x00000042
			       0x00020007 0x0000004d
			       0x00020008 0x00000056

			       0x00030000 0x00000012
			       0x00030001 0x0000001d>;
};
+6 −0
Original line number Diff line number Diff line
@@ -2993,6 +2993,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
			may be specified.
			Format: <port>,<port>....

	ppc_strict_facility_enable
			[PPC] This option catches any kernel floating point,
			Altivec, VSX and SPE outside of regions specifically
			allowed (eg kernel_enable_fpu()/kernel_disable_fpu()).
			There is some performance impact when enabling this.

	print-fatal-signals=
			[KNL] debug: print fatal signals

+4 −3
Original line number Diff line number Diff line
@@ -4490,8 +4490,9 @@ F: include/linux/fs_enet_pd.h
FREESCALE QUICC ENGINE LIBRARY
L:	linuxppc-dev@lists.ozlabs.org
S:	Orphan
F:	arch/powerpc/sysdev/qe_lib/
F:	arch/powerpc/include/asm/*qe.h
F:	drivers/soc/fsl/qe/
F:	include/soc/fsl/*qe*.h
F:	include/soc/fsl/*ucc*.h

FREESCALE USB PERIPHERAL DRIVERS
M:	Li Yang <leoli@freescale.com>
@@ -6444,7 +6445,7 @@ S: Maintained
F:	arch/powerpc/platforms/8xx/

LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
M:	Scott Wood <scottwood@freescale.com>
M:	Scott Wood <oss@buserror.net>
M:	Kumar Gala <galak@kernel.crashing.org>
W:	http://www.penguinppc.org/
L:	linuxppc-dev@lists.ozlabs.org
+2 −2
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ choice

config PPC_4K_PAGES
	bool "4k page size"
	select HAVE_ARCH_SOFT_DIRTY if CHECKPOINT_RESTORE && PPC_BOOK3S

config PPC_16K_PAGES
	bool "16k page size"
@@ -568,6 +569,7 @@ config PPC_16K_PAGES
config PPC_64K_PAGES
	bool "64k page size"
	depends on !PPC_FSL_BOOK3E && (44x || PPC_STD_MMU_64 || PPC_BOOK3E_64)
	select HAVE_ARCH_SOFT_DIRTY if CHECKPOINT_RESTORE && PPC_BOOK3S

config PPC_256K_PAGES
	bool "256k page size"
@@ -1075,8 +1077,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "arch/powerpc/sysdev/qe_lib/Kconfig"

source "lib/Kconfig"

source "arch/powerpc/Kconfig.debug"
Loading