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

Commit 1c6788e8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-for-4.14' of... 

Merge tag 'soc-fsl-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into next/drivers

Pull "FSL/NXP ARM SoC drivers updates for 4.14" from Li Yang:

This adds the DPAA QBMan support for ARM SoCs and a few minor fixes/updates.

This pull request includes updates to the QMAN/BMAN drivers to make
them work on the arm/arm64 architectures in addition to the power
architecture and a few minor update/bug-fix to the soc/fsl drivers.

We got the Reviewed-by from Catalin on the ARM architecture side.

DPAA (Data Path Acceleration Architecture) is a set of hardware
components used on some FSL/NXP QorIQ Networking SoCs, it provides the
infrastructure to support simplified sharing of networking interfaces
and accelerators by multiple CPU cores, and the accelerators
themselves.  The QMan(Queue Manager) and BMan(Buffer Manager) are
infrastructural components within the DPAA framework.  They are used to
manage queues and buffers for various I/O interfaces, hardware
accelerators.

* tag 'soc-fsl-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
  soc/fsl/qbman: Enable FSL_LAYERSCAPE config on ARM
  soc/fsl/qbman: Add missing headers on ARM
  soc/fsl/qbman: different register offsets on ARM
  soc/fsl/qbman: add QMAN_REV32
  soc/fsl/qbman: Rework portal mapping calls for ARM/PPC
  soc/fsl/qbman: Fix ARM32 typo
  soc/fsl/qbman: Drop L1_CACHE_BYTES compile time check
  soc/fsl/qbman: Drop set/clear_bits usage
  dt-bindings: soc/fsl: Update reserved memory binding for QBMan
  soc/fsl/qbman: Use shared-dma-pool for QMan private memory allocations
  soc/fsl/qbman: Use shared-dma-pool for BMan private memory allocations
  soc/fsl/qbman: Add common routine for QBMan private allocations
  soc/fsl/guts: Add compatible string for LS1088
  soc/fsl/qman: Sleep instead of stuck hacking jiffies
parents 8193d9ae e868adf2

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

+7 −5
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ to the respective BMan instance 
BMan Private Memory Node



BMan requires a contiguous range of physical memory used for the backing store

for BMan Free Buffer Proxy Records (FBPR). This memory is reserved/allocated as a

node under the /reserved-memory node

for BMan Free Buffer Proxy Records (FBPR). This memory is reserved/allocated as

a node under the /reserved-memory node.



The BMan FBPR memory node must be named "bman-fbpr"
@@ -75,7 +75,9 @@ PROPERTIES 
- compatible

	Usage:		required

	Value type:	<stringlist>

	Definition:	Must inclide "fsl,bman-fbpr"

	Definition:	PPC platforms: Must include "fsl,bman-fbpr"

			ARM platforms: Must include "shared-dma-pool"

				       as well as the "no-map" property



The following constraints are relevant to the FBPR private memory:

	- The size must be 2^(size + 1), with size = 11..33. That is 4 KiB to
@@ -100,10 +102,10 @@ The example below shows a BMan FBPR dynamic allocation memory node 
		ranges;



		bman_fbpr: bman-fbpr {

			compatible = "fsl,bman-fbpr";

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

			compatible = "shared-mem-pool";

			size = <0 0x1000000>;

			alignment = <0 0x1000000>;

			no-map;

		};

	};

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

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

	Definition:	Reference input clock. Its frequency is half of the

			platform clock

- memory-regions

	Usage:		Required for ARM

	Value type:	<phandle array>

	Definition:	List of phandles referencing the QMan private memory

			nodes (described below). The qman-fqd node must be

			first followed by qman-pfdr node. Only used on ARM



Devices connected to a QMan instance via Direct Connect Portals (DCP) must link

to the respective QMan instance
@@ -74,7 +80,9 @@ QMan Private Memory Nodes 


QMan requires two contiguous range of physical memory used for the backing store

for QMan Frame Queue Descriptor (FQD) and Packed Frame Descriptor Record (PFDR).

This memory is reserved/allocated as a nodes under the /reserved-memory node

This memory is reserved/allocated as a node under the /reserved-memory node.



For additional details about reserved memory regions see reserved-memory.txt



The QMan FQD memory node must be named "qman-fqd"
@@ -83,7 +91,9 @@ PROPERTIES 
- compatible

	Usage:		required

	Value type:	<stringlist>

	Definition:	Must inclide "fsl,qman-fqd"

	Definition:	PPC platforms: Must include "fsl,qman-fqd"

			ARM platforms: Must include "shared-dma-pool"

				       as well as the "no-map" property



The QMan PFDR memory node must be named "qman-pfdr"
@@ -92,7 +102,9 @@ PROPERTIES 
- compatible

	Usage:		required

	Value type:	<stringlist>

	Definition:	Must inclide "fsl,qman-pfdr"

	Definition:	PPC platforms: Must include "fsl,qman-pfdr"

			ARM platforms: Must include "shared-dma-pool"

				       as well as the "no-map" property



The following constraints are relevant to the FQD and PFDR private memory:

	- The size must be 2^(size + 1), with size = 11..29. That is 4 KiB to
@@ -117,16 +129,16 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes 
		ranges;



		qman_fqd: qman-fqd {

			compatible = "fsl,qman-fqd";

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

			compatible = "shared-dma-pool";

			size = <0 0x400000>;

			alignment = <0 0x400000>;

			no-map;

		};

		qman_pfdr: qman-pfdr {

			compatible = "fsl,qman-pfdr";

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

			compatible = "shared-dma-pool";

			size = <0 0x2000000>;

			alignment = <0 0x2000000>;

			no-map;

		};

	};

drivers/soc/fsl/guts.c

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ static const struct of_device_id fsl_guts_of_match[] = { 
	{ .compatible = "fsl,ls1021a-dcfg", },

	{ .compatible = "fsl,ls1043a-dcfg", },

	{ .compatible = "fsl,ls2080a-dcfg", },

	{ .compatible = "fsl,ls1088a-dcfg", },

	{}

};

MODULE_DEVICE_TABLE(of, fsl_guts_of_match);

drivers/soc/fsl/qbman/Kconfig

+1 −1
Original line number Diff line number Diff line 
menuconfig FSL_DPAA

	bool "Freescale DPAA 1.x support"

	depends on FSL_SOC_BOOKE

	depends on (FSL_SOC_BOOKE || ARCH_LAYERSCAPE)

	select GENERIC_ALLOCATOR

	help

	  The Freescale Data Path Acceleration Architecture (DPAA) is a set of

drivers/soc/fsl/qbman/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_FSL_DPAA)                          += bman_ccsr.o qman_ccsr.o \

						   bman_portal.o qman_portal.o \

						   bman.o qman.o

						   bman.o qman.o dpaa_sys.o



obj-$(CONFIG_FSL_BMAN_TEST)                     += bman-test.o

bman-test-y                                      = bman_test.o