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

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

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

Pull powerpc updates from Michael Ellerman:

 - Update of all defconfigs

 - Addition of a bunch of config options to modernise our defconfigs

 - Some PS3 updates from Geoff

 - Optimised memcmp for 64 bit from Anton

 - Fix for kprobes that allows 'perf probe' to work from Naveen

 - Several cxl updates from Ian & Ryan

 - Expanded support for the '24x7' PMU from Cody & Sukadev

 - Freescale updates from Scott:
    "Highlights include 8xx optimizations, some more work on datapath
     device tree content, e300 machine check support, t1040 corenet
     error reporting, and various cleanups and fixes"

* tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (102 commits)
  cxl: Add missing return statement after handling AFU errror
  cxl: Fail AFU initialisation if an invalid configuration record is found
  cxl: Export optional AFU configuration record in sysfs
  powerpc/mm: Warn on flushing tlb page in kernel context
  powerpc/powernv: Add OPAL soft-poweroff routine
  powerpc/perf/hv-24x7: Document sysfs event description entries
  powerpc/perf/hv-gpci: add the remaining gpci requests
  powerpc/perf/{hv-gpci, hv-common}: generate requests with counters annotated
  powerpc/perf/hv-24x7: parse catalog and populate sysfs with events
  perf: define EVENT_DEFINE_RANGE_FORMAT_LITE helper
  perf: add PMU_EVENT_ATTR_STRING() helper
  perf: provide sysfs_show for struct perf_pmu_events_attr
  powerpc/kernel: Avoid initializing device-tree pointer twice
  powerpc: Remove old compile time disabled syscall tracing code
  powerpc/kernel: Make syscall_exit a local label
  cxl: Fix device_node reference counting
  powerpc/mm: bail out early when flushing TLB page
  powerpc: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
  perf/powerpc: reset event hw state when adding it to the PMU
  powerpc/qe: Use strlcpy()
  ...
parents 6b00f7ef a6130ed2

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7

+22 −0
Original line number Diff line number Diff line
@@ -21,3 +21,25 @@ Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> 
Description:

		Exposes the "version" field of the 24x7 catalog. This is also

		extractable from the provided binary "catalog" sysfs entry.



What:		/sys/bus/event_source/devices/hv_24x7/event_descs/<event-name>

Date:		February 2014

Contact:	Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>

Description:

		Provides the description of a particular event as provided by

		the firmware. If firmware does not provide a description, no

		file will be created.



		Note that the event-name lacks the domain suffix appended for

		events in the events/ dir.



What:		/sys/bus/event_source/devices/hv_24x7/event_long_descs/<event-name>

Date:		February 2014

Contact:	Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>

Description:

		Provides the "long" description of a particular event as

		provided by the firmware. If firmware does not provide a

		description, no file will be created.



		Note that the event-name lacks the domain suffix appended for

		events in the events/ dir.

Documentation/ABI/testing/sysfs-class-cxl

+65 −2
Original line number Diff line number Diff line 
Note: Attributes that are shared between devices are stored in the directory

pointed to by the symlink device/.

Example: The real path of the attribute /sys/class/cxl/afu0.0s/irqs_max is

/sys/class/cxl/afu0.0s/device/irqs_max, i.e. /sys/class/cxl/afu0.0/irqs_max.





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



What:           /sys/class/cxl/<afu>/irqs_max
@@ -67,7 +73,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

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



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

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

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only
@@ -75,6 +81,42 @@ Description: read only 
                this this kernel supports.





AFU configuration records (eg. /sys/class/cxl/afu0.0/cr0):



An AFU may optionally export one or more PCIe like configuration records, known

as AFU configuration records, which will show up here (if present).



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		Hexadecimal value of the vendor ID found in this AFU

		configuration record.



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		Hexadecimal value of the device ID found in this AFU

		configuration record.



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		Hexadecimal value of the class code found in this AFU

		configuration record.



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		This binary file provides raw access to the AFU configuration

		record. The format is expected to match the either the standard

		or extended configuration space defined by the PCIe

		specification.







Master contexts (eg. /sys/class/cxl/afu0.0m)
@@ -106,7 +148,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Identifies the CAIA Version the card implements.



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

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

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only
@@ -127,3 +169,24 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

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

                onto the card.



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

Date:           December 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read/write

                Valid entries are "none", "user", and "factory".

                "none" means PERST will not cause image to be loaded to the

                card.  A power cycle is required to load the image.

                "none" could be useful for debugging because the trace arrays

                are preserved.

                "user" and "factory" means PERST will cause either the user or

                user or factory image to be loaded.

                Default is to reload on PERST whichever image the card has

                loaded.



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

Date:           October 2014

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.

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

+70 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONTENTS 
  - FMan MURAM Node

  - FMan dTSEC/XGEC/mEMAC Node

  - FMan IEEE 1588 Node

  - FMan MDIO Node

  - Example



=============================================================================
@@ -356,6 +357,69 @@ ptp-timer@fe000 { 
	reg = <0xfe000 0x1000>;

};



=============================================================================

FMan MDIO Node



DESCRIPTION



The MDIO is a bus to which the PHY devices are connected.



PROPERTIES



- compatible

		Usage: required

		Value type: <stringlist>

		Definition: A standard property.

		Must include "fsl,fman-mdio" for 1 Gb/s MDIO from FMan v2.

		Must include "fsl,fman-xmdio" for 10 Gb/s MDIO from FMan v2.

		Must include "fsl,fman-memac-mdio" for 1/10 Gb/s MDIO from

		FMan v3.



- reg

		Usage: required

		Value type: <prop-encoded-array>

		Definition: A standard property.



- bus-frequency

		Usage: optional

		Value type: <u32>

		Definition: Specifies the external MDIO bus clock speed to

		be used, if different from the standard 2.5 MHz.

		This may be due to the standard speed being unsupported (e.g.

		due to a hardware problem), or to advertise that all relevant

		components in the system support a faster speed.



- interrupts

		Usage: required for external MDIO

		Value type: <prop-encoded-array>

		Definition: Event interrupt of external MDIO controller.



- fsl,fman-internal-mdio

		Usage: required for internal MDIO

		Value type: boolean

		Definition: Fman has internal MDIO for internal PCS(Physical

		Coding Sublayer) PHYs and external MDIO for external PHYs.

		The settings and programming routines for internal/external

		MDIO are different. Must be included for internal MDIO.



EXAMPLE



Example for FMan v2 external MDIO:



mdio@f1000 {

	compatible = "fsl,fman-xmdio";

	reg = <0xf1000 0x1000>;

	interrupts = <101 2 0 0>;

};



Example for FMan v3 internal MDIO:



mdio@f1000 {

	compatible = "fsl,fman-memac-mdio";

	reg = <0xf1000 0x1000>;

	fsl,fman-internal-mdio;

};



=============================================================================

Example
@@ -531,4 +595,10 @@ fman@400000 { 
		compatible = "fsl,fman-ptp-timer";

		reg = <0xfe000 0x1000>;

	};



	mdio@f1000 {

		compatible = "fsl,fman-xmdio";

		reg = <0xf1000 0x1000>;

		interrupts = <101 2 0 0>;

	};

};

Documentation/devicetree/bindings/soc/fsl/bman.txt

+11 −1
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ are located at offsets 0xbf8 and 0xbfc 
	Value type:	<prop-encoded-array>

	Definition:	Standard property. The error interrupt



- fsl,bman-portals

	Usage:		Required

	Value type:	<phandle>

	Definition:	Phandle to this BMan instance's portals



- fsl,liodn

	Usage:		See pamu.txt

	Value type:	<prop-encoded-array>
@@ -96,7 +101,7 @@ The example below shows a BMan FBPR dynamic allocation memory node 


		bman_fbpr: bman-fbpr {

			compatible = "fsl,bman-fbpr";

			alloc-ranges = <0 0 0xf 0xffffffff>;

			alloc-ranges = <0 0 0x10 0>;

			size = <0 0x1000000>;

			alignment = <0 0x1000000>;

		};
@@ -104,6 +109,10 @@ The example below shows a BMan FBPR dynamic allocation memory node 


The example below shows a (P4080) BMan CCSR-space node



	bportals: bman-portals@ff4000000 {

		...

	};



	crypto@300000 {

		...

		fsl,bman = <&bman, 2>;
@@ -115,6 +124,7 @@ The example below shows a (P4080) BMan CCSR-space node 
		reg = <0x31a000 0x1000>;

		interrupts = <16 2 1 2>;

		fsl,liodn = <0x17>;

		fsl,bman-portals = <&bportals>;

		memory-region = <&bman_fbpr>;

	};

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

+12 −2
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ are located at offsets 0xbf8 and 0xbfc 
	Value type:	<prop-encoded-array>

	Definition:	Standard property. The error interrupt



- fsl,qman-portals

	Usage:		Required

	Value type:	<phandle>

	Definition:	Phandle to this QMan instance's portals



- fsl,liodn

	Usage:		See pamu.txt

	Value type:	<prop-encoded-array>
@@ -113,13 +118,13 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes 


		qman_fqd: qman-fqd {

			compatible = "fsl,qman-fqd";

			alloc-ranges = <0 0 0xf 0xffffffff>;

			alloc-ranges = <0 0 0x10 0>;

			size = <0 0x400000>;

			alignment = <0 0x400000>;

		};

		qman_pfdr: qman-pfdr {

			compatible = "fsl,qman-pfdr";

			alloc-ranges = <0 0 0xf 0xffffffff>;

			alloc-ranges = <0 0 0x10 0>;

			size = <0 0x2000000>;

			alignment = <0 0x2000000>;

		};
@@ -127,6 +132,10 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes 


The example below shows a (P4080) QMan CCSR-space node



	qportals: qman-portals@ff4200000 {

		...

	};



	clockgen: global-utilities@e1000 {

		...

		sysclk: sysclk {
@@ -154,6 +163,7 @@ The example below shows a (P4080) QMan CCSR-space node 
		reg = <0x318000 0x1000>;

		interrupts = <16 2 1 3>

		fsl,liodn = <0x16>;

		fsl,qman-portals = <&qportals>;

		memory-region = <&qman_fqd &qman_pfdr>;

		clocks = <&platform_pll 1>;

	};