From patchwork Thu Aug 24 20:37:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 805658 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xdbr428QSz9sRq for ; Fri, 25 Aug 2017 06:44:20 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xdbr418QkzDrVn for ; Fri, 25 Aug 2017 06:44:20 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0087.outbound.protection.outlook.com [104.47.40.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xdbht5nG4zDrJy for ; Fri, 25 Aug 2017 06:38:06 +1000 (AEST) Received: from BN6PR03CA0001.namprd03.prod.outlook.com (10.168.230.139) by DM5PR03MB3322.namprd03.prod.outlook.com (10.174.241.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Thu, 24 Aug 2017 20:38:02 +0000 Received: from BY2FFO11OLC013.protection.gbl (2a01:111:f400:7c0c::136) by BN6PR03CA0001.outlook.office365.com (2603:10b6:404:23::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9 via Frontend Transport; Thu, 24 Aug 2017 20:38:02 +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 BY2FFO11OLC013.mail.protection.outlook.com (10.1.15.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Thu, 24 Aug 2017 20:38:02 +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 v7OKbv0k004767; Thu, 24 Aug 2017 13:38:00 -0700 From: Roy Pledge To: , , , Subject: [v4 03/11] dt-bindings: soc/fsl: Update reserved memory binding for QBMan Date: Thu, 24 Aug 2017 16:37:47 -0400 Message-ID: <1503607075-28970-4-git-send-email-roy.pledge@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503607075-28970-1-git-send-email-roy.pledge@nxp.com> References: <1503607075-28970-1-git-send-email-roy.pledge@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131480806822947406; (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)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(43066003)(106466001)(15650500001)(8936002)(36756003)(68736007)(8676002)(81166006)(81156014)(33646002)(5660300001)(8656003)(356003)(50986999)(76176999)(498600001)(50466002)(5003940100001)(4326008)(3450700001)(105606002)(53936002)(48376002)(7416002)(54906002)(97736004)(85426001)(189998001)(86362001)(47776003)(77096006)(2201001)(626005)(2950100002)(305945005)(6666003)(104016004)(2906002)(50226002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB3322; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC013; 1:wapHpW3IxMAbwy0garrDdsosA/rWPERbjD3VQStwtUX7tkFh4pUQjqYom1RFv9PFn4MfCKtmTvzbOmNfTK4JDDQV81VEvp/t1AevBOUG6957Pjds6lJ6Ep8pbkL8R5L/ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c88466d-bb9d-4fae-48f1-08d4eb3003eb 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:DM5PR03MB3322; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB3322; 3:HBhiIljxnzvi7oQMGYRVXt3KdKVAVkl1YBtqXhLzlEBFXr13Kdj5y8mxxVoBrNLO1I9M1fjhPPYOzqFAVRJnCnBg/N/ifwrvEwq6X9JpbH6ni9VqT/F4qi1y3e9elfWGVGUqu2Wd8x01aBj7p7xuaKC7ZJD5xAMtA0V6QgO8KD58TkLd3doNtJ6awAOjjTk780alzFVPbgejOptsgEa+llCATwrmvQ4dh9G27Dj+/kryUGdWDef1xstL8X98l/jG9fig1U3opaOrbhCU+kJLgkq4j47m+uRkDdfowWJeXVKS3KGFAMDS0SqWiR+vZxM8upYsy6wmK8YkFjsgiXdCM5MDS7arlsQXKjGz/PsZwuM=; 25:aW0iZatDZk6CQ45U07qzbHtRCFQPi7Ev+Hx7irAY8cTnfcJhUuBIkfAqTjM15hNNjC5LoRDQVwP7AovJG3wvRevZ6o+nDmV3LogoPEzfBR/DaiPy3h88aHUcgPXxhEtppXXxIfNATarKa7r4ztHM5mP5qk8lOUro+G5mTyRQVlXPYJ0h5EtUbyjxmqvYFQf4lS22dhtPJkldp+WrQGnxG8tTG+O4HOWSykAMtWlE3BjtnvHlqgFyrUar1TCS2C+7W9nZ1p5bX/4N68XQFVNuchwflNFSNBHTDTu6WyDVFRQi981sfmbPtUxE92RNIjOJm/awdOa6wEeGftUbrEx8pg== X-MS-TrafficTypeDiagnostic: DM5PR03MB3322: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB3322; 31:/UoR8Bvji9V/fzpn8iyfdV1QcXuL1eMCckXNieiEJ+i28yapL2ikhknezPfXeREvWpAhIrntRGPF1CVIuV+x+CCV/lEp/6byKNnORzvlqFRb73Pea0tB0qqbRPaBg4w+H1gos+qZCsfARZs0pUqNpVqX0nQrkdmyYebZ5AZAroLyH3M4ADM1HoLtWOI6NFfYIDAWg9dDv9Yw2qYtadQuXnVOkUC3pPF0v19+k9TSdxM=; 4:rkziS1AhnBgQj0zioQdw59kvvxf1ukHVxUzFkrJvGGDfMLjF4VjD/ftXhBqjCRzwZD60gdULxzjdP08XJec9L/HBEOdXQ8DsntOHQcu4HZx35zPUgshAV4PtQx0HoLyKTWEh57hqwVkMuw3/zTvljAKxs6HEwbto5tx9rE6FECn1sIE0YF88Big+4N9Fvteqw/5EHc5YirZBtv3dwTzu+TL/SVFCm9HLo+aDQIqfAFbHr8Y939Y7Xt2ytz7peSpYmq11jGbCWx4B009sZgC+WMjx6FzA9hjO6uapQkk7HjyJMp/uqtusIQfXYszdf7t2/waiubH5SDinAWog/j8yh7E2RCRsLDXgz9g88CtwhALcS9508SHpTijHZvnMmuAn 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)(601004)(2401047)(8121501046)(13016025)(13018025)(5005006)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123563025)(20161123559100)(20161123556025)(20161123561025)(20161123565025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR03MB3322; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR03MB3322; X-Forefront-PRVS: 04097B7F7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB3322; 23:NHwLIuzCUFTXpoIj+xTkd6v8cFM7atYznKbR42TCQ?= =?us-ascii?Q?q3NvyvJzs2f7vqElOSV71Sx4zA2M1nLH2W9wPw+D+4SYBkraHsYcw+ASp+J2?= =?us-ascii?Q?qGL0ejQy/JU7GDNZWdCZdmeGGmL6E9J4TKyv31bh4ThZe2MIRXBnvC5jF8Q2?= =?us-ascii?Q?Wu5KMPHtCA0yg+jBT2l/Tht+4YAc3ajLRNltqBzVSELI5wOb5ijZZbfvKpfJ?= =?us-ascii?Q?jo6kVUN77+RPyyZ5/Tcqb1END0w6SS1l0YyNu3f6d1zXfatKSuB5tCqg6CrX?= =?us-ascii?Q?NHhC1nY5SEaftvhjAKbnJZZbHIaoyW4ZP4utAHwCb6dK+yI+qFNjPBvAX6Rq?= =?us-ascii?Q?SU8B7Qe9zUhK4nA50aiPoNSr9p9W33yZiulY+m5WvPKGcgQG6lypjGxHxhY8?= =?us-ascii?Q?I2MtbpiIkZyUnWkVgVAcr+EhAI9Z+JVqb7zPBWxUOnz6xCiDkATq2rcZ0Q/H?= =?us-ascii?Q?NnXV+qWpf4qy/Jfzi56Y1R29+aUQbhfTTKqY6DwlLW21aCOufMTBhjtsUXUr?= =?us-ascii?Q?Kn71y/1IlzkqiWXF1YWnZhPNNWSuK28Sm1QfP4RwZp5XrrTY2B/Z8+uVtmbe?= =?us-ascii?Q?DyZNyruIJL8btPeTgZtm/Cu2Y2GxWyFRWuhwBfrDRxKGGNi0p/HZ6Ir09teG?= =?us-ascii?Q?475OJnZDDbDR5PQl3CSGW56dyTR6MHtBVnJsADOH/F1ycxTcw3F6CGMnEo7L?= =?us-ascii?Q?SsxHcvUmpFzXbVjj2pilReMHjRTwsHeg8aN7TSm1huyJF4s+XsLFQN5skkDc?= =?us-ascii?Q?ROq3oaM9nkTq819BSkAjk7OLhcfhRPnNh5YCQvYTHIpD4m1cKxzFWB2dN+zn?= =?us-ascii?Q?MfbvRpnQQCcXp7YCdoIs3GNquMM1U2W+fH5qKQY6LqCZLa5yz1pL4484jT70?= =?us-ascii?Q?4u4jnkPLTK9f5nDfNgO1hCfAC4hsOs99crZUUcVZOO1BjsoudsulnxphiZBm?= =?us-ascii?Q?rBvVkHAADdJcJLvE2dLLjACGo2cXLd9H3vds92K6gOl9vEJ+5EM99o1JD/0l?= =?us-ascii?Q?wDqpPvQC9+FDsRWLu9cEAirBok0/IcOpD7IuYA4lep4RjoTV4ON2KOloUR56?= =?us-ascii?Q?1lwrUxXhT+aSLZ2haWQwpSHT2YknZNvbZDeBowPsRA0Kph6X8q6AN7Nz/MgE?= =?us-ascii?Q?0YSCyqiIO0YTEvnnQmeGp517yq5HnLW96TqmgC9CoHt3a58avVDt88Nwsrbj?= =?us-ascii?Q?Mv5fKUTxQMihRJiByFJL0eMDBITGK1fwaag?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB3322; 6:hF0gQF5zivtFIgsAPoGVB9wfQ81VfVD4pLpf37bpo7szDj+y2OJBFWvVmmnKjzkHOSTAtqVqoKpsasIpjAvo+521x1NXSPfqqBYiZs6TObi76eUOX80swnnt+ekGHjQhpNmJdgHmm+o+yt+5NadZYMR40Sw0zpRmJr8LxTF04UIDOrbPGhwyML2oqqSqxTiVWCdqU69EEbSnQbPgwAxdxNMts2myrKs07ZX6LYz9VkJo56zEBoEw3e/fHWO/CH/QiT2aIP3w0uPCeGEZeecgYd9u3ESKx6HzowH0TgIHJKNWjb7lgoh3CVY9HvbdVjAVVnVeZm3k5+VW+XAM7Dp8FA==; 5:n36MEQp6qVKWXduD/mTRJ3vOaDYEBBvY5xuStjxh4g0xYO9KgKpKBNplPHCgwfoBXszHOfvYJ72OPAjxDYE5Ji7BM611EZC1PFvWCGohIQuJTEGrz4ZnpQb05lNaLWMu/gJGy3N22xTtx/vSBn7f4A==; 24:nGHKvEMllHCPnh0RSk874CWXQq9pCe65xn7XTCwLyvjxAunq0o2DNtWBHiAoYkRG4nQOffZmHqjAE4JONkfRremj8UGMXfLuKy79dd3rs70=; 7:RnnlyKqZBR/JVqDVfVRAxkHlAI/DZ+C6vXYWOTxCnYOYO8blYGykqckMxBu5TyfJ2PlNO1O/AqR8SHTS/54fISTtC/S0NisgAufCntbUmD8qbbumNV0vRSsm9I2PX4T8kmbe7CFbLoHO3ckuEFvqk1wiCDQNq1/ddueIicjNOS+zgseh25kc7LT+E3ELY1LC9rQoZxcNVAaM/9kNCvoOygReXLfU4OkMNnQYRD3VgeI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2017 20:38:02.0919 (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: DM5PR03MB3322 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 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 --- 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; }; };