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

Commit 08d183e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Michael Ellerman:

 - disable the 32-bit vdso when building LE, so we can build with a
   64-bit only toolchain.

 - EEH fixes from Gavin & Richard.

 - enable the sys_kcmp syscall from Laurent.

 - sysfs control for fastsleep workaround from Shreyas.

 - expose OPAL events as an irq chip by Alistair.

 - MSI ops moved to pci_controller_ops by Daniel.

 - fix for kernel to userspace backtraces for perf from Anton.

 - merge pseries and pseries_le defconfigs from Cyril.

 - CXL in-kernel API from Mikey.

 - OPAL prd driver from Jeremy.

 - fix for DSCR handling & tests from Anshuman.

 - Powernv flash mtd driver from Cyril.

 - dynamic DMA Window support on powernv from Alexey.

 - LLVM clang fixes & workarounds from Anton.

 - reworked version of the patch to abort syscalls when transactional.

 - fix the swap encoding to support 4TB, from Aneesh.

 - various fixes as usual.

 - Freescale updates from Scott: Highlights include more 8xx
   optimizations, an e6500 hugetlb optimization, QMan device tree nodes,
   t1024/t1023 support, and various fixes and cleanup.

* tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (180 commits)
  cxl: Fix typo in debug print
  cxl: Add CXL_KERNEL_API config option
  powerpc/powernv: Fix wrong IOMMU table in pnv_ioda_setup_bus_dma()
  powerpc/mm: Change the swap encoding in pte.
  powerpc/mm: PTE_RPN_MAX is not used, remove the same
  powerpc/tm: Abort syscalls in active transactions
  powerpc/iommu/ioda2: Enable compile with IOV=on and IOMMU_API=off
  powerpc/include: Add opal-prd to installed uapi headers
  powerpc/powernv: fix construction of opal PRD messages
  powerpc/powernv: Increase opal-irqchip initcall priority
  powerpc: Make doorbell check preemption safe
  powerpc/powernv: pnv_init_idle_states() should only run on powernv
  macintosh/nvram: Remove as unused
  powerpc: Don't use gcc specific options on clang
  powerpc: Don't use -mno-strict-align on clang
  powerpc: Only use -mtraceback=no, -mno-string and -msoft-float if toolchain supports it
  powerpc: Only use -mabi=altivec if toolchain supports it
  powerpc: Fix duplicate const clang warning in user access code
  vfio: powerpc/spapr: Support Dynamic DMA windows
  vfio: powerpc/spapr: Register memory and define IOMMU v2
  ...
parents 4b1f2af6 6096f884

Documentation/ABI/testing/sysfs-class-cxl

+33 −0
Original line number Diff line number Diff line
@@ -6,6 +6,17 @@ Example: The real path of the attribute /sys/class/cxl/afu0.0s/irqs_max is 


Slave contexts (eg. /sys/class/cxl/afu0.0s):



What:           /sys/class/cxl/<afu>/afu_err_buf

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                AFU Error Buffer contents. The contents of this file are

		application specific and depends on the AFU being used.

		Applications interacting with the AFU can use this attribute

		to know about the current error condition and take appropriate

		action like logging the event etc.





What:           /sys/class/cxl/<afu>/irqs_max

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org
@@ -15,6 +26,7 @@ Description: read/write 
                that hardware can support (eg. 2037). Write values will limit

                userspace applications to that many userspace interrupts. Must

                be >= irqs_min.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/irqs_min

Date:           September 2014
@@ -24,6 +36,7 @@ Description: read only 
                userspace must request on a CXL_START_WORK ioctl. Userspace may

                omit the num_interrupts field in the START_WORK IOCTL to get

                this minimum automatically.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/mmio_size

Date:           September 2014
@@ -31,6 +44,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Decimal value of the size of the MMIO space that may be mmaped

                by userspace.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/modes_supported

Date:           September 2014
@@ -38,6 +52,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                List of the modes this AFU supports. One per line.

                Valid entries are: "dedicated_process" and "afu_directed"

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/mode

Date:           September 2014
@@ -46,6 +61,7 @@ Description: read/write 
                The current mode the AFU is using. Will be one of the modes

                given in modes_supported. Writing will change the mode

                provided that no user contexts are attached.

Users:		https://github.com/ibm-capi/libcxl





What:           /sys/class/cxl/<afu>/prefault_mode
@@ -59,6 +75,7 @@ Description: read/write 
                                 descriptor as an effective address and

                                 prefault what it points to.

                        all: all segments process calling START_WORK maps.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/reset

Date:           September 2014
@@ -66,12 +83,14 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    write only

                Writing 1 here will reset the AFU provided there are not

                contexts active on the AFU.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/api_version

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Decimal value of the current version of the kernel/user API.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/api_version_compatible

Date:           September 2014
@@ -79,6 +98,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Decimal value of the the lowest version of the userspace API

                this this kernel supports.

Users:		https://github.com/ibm-capi/libcxl





AFU configuration records (eg. /sys/class/cxl/afu0.0/cr0):
@@ -92,6 +112,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

		Hexadecimal value of the vendor ID found in this AFU

		configuration record.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/cr<config num>/device

Date:           February 2015
@@ -99,6 +120,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

		Hexadecimal value of the device ID found in this AFU

		configuration record.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/cr<config num>/class

Date:           February 2015
@@ -106,6 +128,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

		Hexadecimal value of the class code found in this AFU

		configuration record.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>/cr<config num>/config

Date:           February 2015
@@ -115,6 +138,7 @@ Description: read only 
		record. The format is expected to match the either the standard

		or extended configuration space defined by the PCIe

		specification.

Users:		https://github.com/ibm-capi/libcxl
@@ -126,18 +150,21 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Decimal value of the size of the MMIO space that may be mmaped

                by userspace. This includes all slave contexts space also.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>m/pp_mmio_len

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Decimal value of the Per Process MMIO space length.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>m/pp_mmio_off

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Decimal value of the Per Process MMIO space offset.

Users:		https://github.com/ibm-capi/libcxl





Card info (eg. /sys/class/cxl/card0)
@@ -147,12 +174,14 @@ Date: September 2014 
Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Identifies the CAIA Version the card implements.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/psl_revision

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Identifies the revision level of the PSL.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/base_image

Date:           September 2014
@@ -162,6 +191,7 @@ Description: read only 
                that support loadable PSLs. For FPGAs this field identifies

                the image contained in the on-adapter flash which is loaded

                during the initial program load.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/image_loaded

Date:           September 2014
@@ -169,6 +199,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Will return "user" or "factory" depending on the image loaded

                onto the card.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/load_image_on_perst

Date:           December 2014
@@ -183,6 +214,7 @@ Description: read/write 
                user or factory image to be loaded.

                Default is to reload on PERST whichever image the card has

                loaded.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/reset

Date:           October 2014
@@ -190,3 +222,4 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    write only

                Writing 1 will issue a PERST to card which may cause the card

                to reload the FPGA depending on load_image_on_perst.

Users:		https://github.com/ibm-capi/libcxl

Documentation/devicetree/bindings/powerpc/fsl/fman.txt

+13 −0
Original line number Diff line number Diff line
@@ -189,6 +189,19 @@ PROPERTIES 
		Definition: There is one reg region describing the port

		configuration registers.



- fsl,fman-10g-port

		Usage: optional

		Value type: boolean

		Definition: The default port rate is 1G.

		If this property exists, the port is s 10G port.



- fsl,fman-best-effort-port

		Usage: optional

		Value type: boolean

		Definition: Can be defined only if 10G-support is set.

		This property marks a best-effort 10G port (10G port that

		may not be capable of line rate).



EXAMPLE



port@a8000 {

Documentation/devicetree/bindings/powerpc/fsl/guts.txt

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ Required properties: 


 - compatible : Should define the compatible device type for

   global-utilities.

   Possible compatibles:

	"fsl,qoriq-device-config-1.0"

	"fsl,qoriq-device-config-2.0"

	"fsl,<chip>-device-config"

	"fsl,<chip>-guts"

 - reg : Offset and length of the register set for the device.



Recommended properties:

Documentation/devicetree/bindings/soc/fsl/qman-portals.txt

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ PROPERTIES 


	For additional details about the PAMU/LIODN binding(s) see pamu.txt



- fsl,qman-channel-id

- cell-index

	Usage:		Required

	Value type:	<u32>

	Definition:	The hardware index of the channel. This can also be
@@ -136,7 +136,7 @@ The example below shows a (P4080) QMan portals container/bus node with two porta 
			reg = <0x4000 0x4000>, <0x101000 0x1000>;

			interrupts = <106 2 0 0>;

			fsl,liodn = <3 4>;

			fsl,qman-channel-id = <1>;

			cell-index = <1>;



			fman0 {

				fsl,liodn = <0x22>;

Documentation/powerpc/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -30,3 +30,5 @@ ptrace.txt 
	- Information on the ptrace interfaces for hardware debug registers.

transactional_memory.txt

	- Overview of the Power8 transactional memory support.

dscr.txt

	- Overview DSCR (Data Stream Control Register) support.