From patchwork Mon Sep 18 20:39:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815164 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xwyq83qkhz9s7m for ; Tue, 19 Sep 2017 06:51:48 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwyq831JRzDqh5 for ; Tue, 19 Sep 2017 06:51:48 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nxp.com (client-ip=104.47.38.50; helo=nam02-bl2-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0050.outbound.protection.outlook.com [104.47.38.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYX5bVDzDq5k for ; Tue, 19 Sep 2017 06:40:00 +1000 (AEST) Received: from BN6PR03CA0020.namprd03.prod.outlook.com (10.168.230.158) by BN3PR03MB2354.namprd03.prod.outlook.com (10.166.74.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Mon, 18 Sep 2017 20:39:56 +0000 Received: from BL2FFO11FD014.protection.gbl (2a01:111:f400:7c09::111) by BN6PR03CA0020.outlook.office365.com (2603:10b6:404:23::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9 via Frontend Transport; Mon, 18 Sep 2017 20:39:56 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD014.mail.protection.outlook.com (10.173.160.222) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Mon, 18 Sep 2017 20:39:54 +0000 Received: from otc-sw1.am.freescale.net (otc-sw1.am.freescale.net [10.29.200.182]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8IKdn2p025841; Mon, 18 Sep 2017 13:39:53 -0700 From: Roy Pledge To: , , , , Subject: [v5 04/12] dt-bindings: soc/fsl: Update reserved memory binding for QBMan Date: Mon, 18 Sep 2017 16:39:39 -0400 Message-ID: <1505767187-4596-5-git-send-email-roy.pledge@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505767187-4596-1-git-send-email-roy.pledge@nxp.com> References: <1505767187-4596-1-git-send-email-roy.pledge@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131502407950060792; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(346002)(39380400002)(376002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(2906002)(356003)(305945005)(47776003)(3450700001)(68736007)(5003940100001)(104016004)(16586007)(2201001)(110136005)(81156014)(81166006)(8676002)(33646002)(316002)(50226002)(8936002)(8656003)(106466001)(15650500001)(498600001)(105606002)(189998001)(77096006)(5660300001)(97736004)(7416002)(6666003)(2950100002)(4326008)(54906002)(43066003)(50986999)(76176999)(50466002)(48376002)(53936002)(85426001)(86362001)(36756003)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2354; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD014; 1:OpXkuRYl5pZT9bg0nq0dNRc0SACRyMPAwONfyEqqSjouwAyIxvM6DvCZiGwxQp5fL8iegmjo0axbQD8yQIMavMVkwymhqJtUeeDm+Pm5tTqoH2v3dcU8R03lPTolRrbn MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c982b0c4-6bbe-47c8-c1f0-08d4fed56b5c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN3PR03MB2354; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2354; 3:5ivg88jMAL1IF1SEOUEfO0Szw6S4Now1VIogcblSY/8setF3aQViZCpuxzacnkYtIM1LM9CSp4rBQuj8dfzDOL44w4leEnv002bxQt/jSnLLDtZ6HeXF5NhIZM7ieKyfTbUISjsOfenqZKZ22ulamtuy7OeBMKwt6trdi+vXMvrw59AwUcQSCfsr5svILc//XgdJo7NenrVw6sb7db+1JmklTyfxjDc2HO7fSKSFPi/pRYr+lsLguphZp+wOfFudofZ599A/AF9WUa9NtVUnuqjS6oJRzZtL6acZn4A4MlGepxcqYpNMY4tirjTeThmoKaAC331wediFepmZCItzVca02amE7Z0xuU2pzFMK/L8=; 25:a9IkhpVwQfF3qRZTKko7dC0D1esn7FkvrP+miKK2+zPeesZdY4C4oAmJ4Y3DX1UNf09Gb7GSLrTxeyIhWTu+AXV3emQUKKscxTLOqQj88KwHW10j3oW2FjBGZWFKB9fWCtM1IvR65WkWWUgC9Pl0QWtSozrecwX7DPNiUVuFS3eVa/o2kIOgcTd4NAgzmdzvgwbhj1kCDSiXq1DR/xC6OyYPu2ys/JvcYMMViCWbhi2OwZ6gR8HJmLDRffZxHTdLtciFAgP1jqwoLDmohIDzyIeFZp2YCA2FBXDOTnwQE0GVwPCwAI8+3/+ECW2ETINQr9j2ZgjHLF18aZV7qyM6pQ== X-MS-TrafficTypeDiagnostic: BN3PR03MB2354: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2354; 31:93Rq02PjPFHDQEITiPCXeCJHT4Jizh+R6MDDvzNLxinDWQmd5AT0ARwdsmzs3N/gH4Ui1JWf9H5Xd2D/BV525KCs3XQXLouYLfgjlzZCNJjiYi+WSaESuEqeKlElYdGB4u5BUMkTjjxvqDqbBety7H+EOe/F2IKNKkAHGPRICrerIAZj0oypcYuHOFc9XNTumyvuELN8qE8BO+3vff5iJ9iTTmbumwvokhhtsFPZ+oc=; 4:e9QDsHuu4nokR4Ly98FPxzaR2RdvMme1DXzrspGa1enAN7b6ql8Nm+nWNmsrHtJW1+nqTdpsIXRm3JxBgSpjtvfLUhyYEeO4J4YVJnkvYnmTdzG0e64G9tBZdTS0IAE58VQGN/jM9EktPC4BZy13w0LNUGA8Jg+WRAke1I/bP8hp4XSncECbNEcUtLA1IMI139ozBAcacNznyb49HmYdxBZ8nAfefLuDYuShca+oaKqrV7h5+rtBLNmuoRF00zpnk5nr1o8VKOmpLVMs3AYAHNYdSSbqjGqEVc3UGnhi8H0UF2sbzNTbqN4DdUAFBtN+/7kIq0Yc5TWUB2nam4FOP/O7mKwonXoRdKQ2PZvORbvcLmIbgRq9ywUlA/YnPzks X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(227817650892897)(21532816269658); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(20161123559100)(20161123556025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123561025)(20161123565025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR03MB2354; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR03MB2354; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2354; 23:TZ8Tyi+cbX4tO+hS+YcZm19A9hdun4nH7a/7LC8r5?= v28e1eZqbMSpsZiaZuCbN5kr/PWMru/w6XyUvrT068fEvVvsCvKfJxLghWuWqL7/6PRBm7i6cyQAecO7SlC6WAWhRMCUMY5BoXQAPzzGeZDMsBc25LYKbGJ2E1T5PNjV319fftiS6O4bjUEz0wcubgejUN5CbmUdGAhclc4u/u/z85YG+C63urEmMv1nfsL2FJwZ2cTN/MflFwEhgiiFx1SuG1WkjMsKQJvykS0Zi73lQb+A05SFayauPQzZ0wmFc7T25iq2e9nUnc0mOhHj46XlVv7NTJ6xVrJArfFmg+GRQzw6/ALH21/Cj4cC/j4dvzP/79h6LKRKp5nU6agZYCXJRi6+9zRVgKV+8QTcexMBmJR//tAIiToGnPBRNTinB4UFsN3OWxcjdjp6kkY/RvrwExaxISMkBevb6z7kdsWlqjlBoYrTX5ACHrbJJbbWta8DSpCZlY1k2xsq0ROKfBet/qs5i0G2EEVfVDY+QKoBV2CGxlZX27xUYlRgB9+C+p5ze45Gy/FEp9KecxhqhY3RnTUYLnIbseYh6trYpEaMlkMcztaxm/2VFvfyePf8jZa20uZ7/mdUPaqTtAXoqwiapqXxK7TWhBW7U2bOhMgzQB3tAIHMvVVegO3/LA5ja5VenHQaXySkQFvYV0FKHRdz/z4FNrW9tu4haqC2XvCkxToZOocLDjL7W+wsAai+zEV3ty+IuwBV/DqCCtB+b8LY8OngCsQnRuNqfGub4DffeoIGK8qn+A3mEKgjwySF7961zfFnMDLKBgA7MkyQHY8vgMtgeYfzVqgJww8F3r1aWMpDPyCtoB/fK1Re97xfXmiBu3QQLPZHLdg2UA8AC+ap3/eSMIb2kgfI8c8nv21jcS7XCMZKRsijPps363k3LBEpv7EIt9Hx6/iraNzaklus/IqeGxP8hySDPgJ68Rsl6mnpDfRFRLWFYsGNQWtjxzq6YtcsEdjI+32gqrh+SxX2/ZxjvXeoNiBW4STCtT1OVvYSk9selAT1Hhfk8tVfPuDsRvnt1NFN0ovXmh0N5NReqRH2Bg4M4cDUw99UHVbXBGmLW8OsnongiiyllDSG7Hd/06bvVJ22/51/0rwN589k6s1aQyHJzTomilBf+0cPGMnGbGLZeLUVmPFNWTPCfI7phVa8+0BQTnhAT+O6JHKW684XMWr4trGrX8doOq/HBMWqZLAevLBA9x+/j0umHw6fxlRX0Ey0GmJNgEqdCpY X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2354; 6:DsqFnd5D1sE74Fj9/ZR3w5qZiT1Dj8EdMAWN24y4KZtWp/5OBxQla/2BVR3l5GMx/89R/6zaRZDP80aeW41yjP5NBJbuvEpXZG6WsR81h0ZQYFwMif1K0DM8tK+Y2X+Jc0rkXfLubtslHHcRAb1F8O7120QOLMLEmSohaBsCcX9qeQbkShEbkgC4+bpMDUdpqPHqSOJ2jayftEo0OAB3HZdQ0Lz4l1eVHemsMiAQ/9o7n2jU5642VYXiCaKdBgSAc8YiaA6P9izCivRc0gKkBAJmjOWbJwgumJDiTzZfKfEx3d//8f2mzMmv+FTnvnLIcA0ox4UuBEG8X0neOyqtFQ==; 5:3zH7PyY+L9PG414iOI+GCbn/l5GqEUi9GeIGjzhIkPYRGWTUZUpAZYxnrUI+cG7zziWW7EuUuL3ce6HgDUboED/eWaqYGHzOOAyzav0jJTF6VH2xmHDgEFRXnPFZ+vStYMWIEOPYlDnPGk39P466bg==; 24:kHKXqYex0C5jm0AzamYXBzlBKrthG5uwwmOnpCQUxyyw+321TQPgmKgv8OrEKS+7XnKuQf//10fMOOt1TyfTFhbHADDcfpLx6Fo42iXPekY=; 7:Ipw6ADLeDbysFNmzTWJVwTTTwzdLq6faIt8iE8SbAuQFXmvTDI6jYPt2Nt1NpgOqo0TgdCW2hgVVv7OcYoiz2wqGdD5z9Q5+jE2MHOhp4yh2otyLUvNEuiXhnkqJGsIJPMn+NsT3iU9UPHv6zsqUTUdzL6YSpknzlPF2rCdJU1nmTMBc9ovcdXpVLNJtouHdhq31y2QIWESAqPhuNHM9lv0unup2DSiuudPFtUFYWKE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:54.7096 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2354 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: roy.pledge@nxp.com Cc: mark.rutland@arm.com, arnd@arndb.de, madalin.bucur@nxp.com, catalin.marinas@arm.com, Roy Pledge , linux@armlinux.org.uk, oss@buserror.net Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Updates the QMan and BMan device tree bindings for reserved memory nodes. This makes the reserved memory allocation compatible with the shared-dma-pool usage. Signed-off-by: Roy Pledge Acked-by: Rob Herring --- Documentation/devicetree/bindings/soc/fsl/bman.txt | 12 +++++----- Documentation/devicetree/bindings/soc/fsl/qman.txt | 26 ++++++++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/fsl/bman.txt b/Documentation/devicetree/bindings/soc/fsl/bman.txt index 47ac834..48eed14 100644 --- a/Documentation/devicetree/bindings/soc/fsl/bman.txt +++ b/Documentation/devicetree/bindings/soc/fsl/bman.txt @@ -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: - 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; }; }; diff --git a/Documentation/devicetree/bindings/soc/fsl/qman.txt b/Documentation/devicetree/bindings/soc/fsl/qman.txt index 556ebb8..ee96afd 100644 --- a/Documentation/devicetree/bindings/soc/fsl/qman.txt +++ b/Documentation/devicetree/bindings/soc/fsl/qman.txt @@ -60,6 +60,12 @@ are located at offsets 0xbf8 and 0xbfc Value type: Definition: Reference input clock. Its frequency is half of the platform clock +- memory-regions + Usage: Required for ARM + Value type: + 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: - 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: - 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; }; };