From patchwork Mon Sep 18 20:39:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815159 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 3xwyjc5kyBz9s7p for ; Tue, 19 Sep 2017 06:47:00 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwyjc4vGmzDqjf for ; Tue, 19 Sep 2017 06:47:00 +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.48; 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-bl2nam02on0048.outbound.protection.outlook.com [104.47.38.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYV4rsBzDq5k for ; Tue, 19 Sep 2017 06:39:56 +1000 (AEST) Received: from DM5PR03CA0035.namprd03.prod.outlook.com (2603:10b6:4:3b::24) by SN2PR03MB2367.namprd03.prod.outlook.com (2603:10b6:804:e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9; Mon, 18 Sep 2017 20:39:52 +0000 Received: from BY2FFO11FD042.protection.gbl (2a01:111:f400:7c0c::170) by DM5PR03CA0035.outlook.office365.com (2603:10b6:4:3b::24) 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:52 +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 BY2FFO11FD042.mail.protection.outlook.com (10.1.14.227) 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:51 +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 v8IKdn2m025841; Mon, 18 Sep 2017 13:39:50 -0700 From: Roy Pledge To: , , , , Subject: [v5 01/12] soc/fsl/qbman: Add common routine for QBMan private allocations Date: Mon, 18 Sep 2017 16:39:36 -0400 Message-ID: <1505767187-4596-2-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: 131502407919137887; (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)(7966004)(39860400002)(376002)(346002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(43066003)(106466001)(53936002)(50466002)(33646002)(81166006)(54906002)(4326008)(81156014)(68736007)(5003940100001)(48376002)(7416002)(50226002)(8936002)(305945005)(6666003)(2950100002)(105606002)(189998001)(104016004)(47776003)(5660300001)(8676002)(2906002)(97736004)(356003)(36756003)(86362001)(2201001)(77096006)(50986999)(76176999)(8656003)(3450700001)(498600001)(85426001)(316002)(16586007)(110136005)(2004002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2367; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD042; 1:nT+RgvB8oigsAhW8+LSzRlXdaUdGHUP8yAxDDlwSCviavRRmLakPR/quius+ddDacPqaLQznJba1aUY7byb65+/KPsAKPSyZA832JBAKPy4UrPfUIqtp+0u+LIJ0JORk MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d444bec-29ee-4ced-92fe-08d4fed56995 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:SN2PR03MB2367; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2367; 3:f0PSUSzp8IRDSIWi5QYIXO1sIBmt892+/lXxdfytTAVZEiCWMzDjVM/a7jLvRO45SJtfpQtm0nIcx70t6pSHbT0bAQ5flYTG9KD7IchO7KX4OjosbT5lLR7lL7UrDA6OmTRX8iEWFXtqU3uRwPulYm9E5RMo5lMdjOE9WxWv3wHBgcGPMcAhJ6ATmJCy8Zo0V0GCujq0pRg8/Emd0/pt99k4sMCrYv8x5a+/MgSQEZvULeF0JGG1CC2mwc6GKANO46EuyGbgsdwiSIhwLncVISXidnB8Y/wlsitJOVIUUtNtpF40K8dC/1975QWCoI0bujTf8yEnYgjqH3UvyAtfizwKXTSSbZERnVpcNVq27ec=; 25:U/zONgPJEx/hAfnDFgDN6Uya65uUqUvALHM/toNaNCc9L/7O6opm1hIWBXgDuJ+kHL29lK0jOb49QNwyP9hLwYZLfrhmprza3GLd21lIYIdcFzZ1nlFHRVKkW30DB4+XDJrJ2uHo7UElhl2QFMw73h1oG4HnnMA3szvv+DFsgKtdoJjVvSK885B6MTW9LUbGEeaM/4hl2jXEUYSuU++aEPu+Txy5/SF0WZkG+w88LkPDmpz7Nc5UJuBbJHomQd8zElSlk3u3cN/erY4Rv9mBq/3ZsH3SfhrkGNVDq6G4lEsver9mjLamN9J1A0IFYXNPQI2vE5K7bKdiw9yqf4POJQ== X-MS-TrafficTypeDiagnostic: SN2PR03MB2367: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2367; 31:Al1b6mvmzT2pAU1eKHhnWZJFfrovUnMG5p/OAsjY3zjjWSrGu+Bnk037yz+00cjKvZgGdPQ8U7CIqCkhQB8LuLOATYlayvbbv1p9n3jkZnFsXKr83IDo3h+aJx6bDiBR5v2M9+j4Pn4f2K59ERVZCxpjGqzS1sLFDvI/PWTVFR7SNMo0Jnvbvd/rQ5pNtmD572Q0SKTrnQ48TBkT8kPHidiuLohY7i1rDDo/IyqX9gA=; 4:OyXtgCy/kCyDJVHj3gcEGzo7PpDeFHJSArQ76Hu4BfaN1YIpPb83m9hftiYdXfZyb+4I1TgTJbk1/nqHm6g6ZuPhCkuSuAyp7/zE2WimjC2vrsc7Rhs2iYNT1nEo0C2y0qVuNVOdCXSd9wNxS/GyDxMC5V4glVnZqrhH2exU8TTnH0vh96vFQkklqEOtD6rwGgbcBSuNYCtSa8cMQg177Wd4FZhEw7M+Uks2xR4jRLxdVbNLkBkkxUCfIhqAgxwlmfN9kRyRf5gF9h97VawgOYvSmemd38K/UjunqYjLX/A= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); 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)(3002001)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(6055026)(6096035)(20161123559100)(20161123556025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123561025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR03MB2367; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR03MB2367; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2367; 23:SEbt5dhttcsbRluvzKEjo5Syld+sJ1MryF30Yr1+r?= 13cgn+YFdqq4z2YRWCKbc38iiXZ/pVQk7QsyGusJSSe5SZ1o7aQ2clRYXBVuazkoIaNxWxuGHRpzbO8EDZMPZq11p965aq7AygahD0AhQfcHDIuNA/v0p7er2dpLJbg1RR/nWbtDPaM3Qo1SvBteJSy2TvI0ertfHZ42G020KsTBdyoJwnkjXm0yDhv7FwKzUi0Th7W2Fx2kk5KnE8WKEH7IRODfWchvwKsd/ZUbE2A4dT4CiXb91+wlZOnEwXIC/sznTU/z2wTkz3kjdMt1WLgKCLfJ8edRfcsRD1ujJRgNcfGMSlXWQrQA78Go7sp6PM14XFDTo6hWbuxA7+JnsLobsfHYhAnJbBbEbt87K2dpzhl5nbEIy43d9LxAGAFgX1eaC8zxxGGpoiauISB/dH2d80uv33DGmvcU3YKR5PTxTzDjMjd977nWjMv0n3U4m0Sp5wzuTtVq34e4OrQn3jMi3svE9ryA2QJmIVX6kgO2b21xW1VoDJDFAp7yyEwqBk8liM2hfuicewAc5nvKNXv1E+N3GZDSKxfnOQydpwxDapsa20w8X2hVLe/sm2q5kAzmJUYLG8ipYpdyDSULlckY4E49QhwF0lUFp+BQ/SQ8LX87WCBsbgRDZZiHqXnaEo4DRQfL3EThoB3BNdjjmNDEbLUOnIjkNi9FvkyC3ckndGtIgf8klfNEgS8MJV4Gk6iMtEUoQ4nGkBUJyZB3NKMXT8PVJ31M+kIij+3UlLW7LlE8qeGX0hxzQENMkGqUxHlf8mBudHKrZ4uAZz2124gsC8F9tY459cGYZ0ugIeBFPaUclgYVvxy2ekZOQW3e0mkw1X1Jux8VmyebWiXESD6ivQPBaNhuf8tTqatNMVNXCIsK68EOujifTf12bLSzhFAHYoY7fmPB8CvJAh8ZpI/SaCDUhHbRF3aMXfIrTpyJKTGsx3w/w4/mvsadmEwdc2TNoihWW3fXALtcAx7BxEHZIPvPw9uETkt9V70RQcGej8eBxfnDdVLQhuRO2LJLHXvgZXzk7sGAj5Llae2SnO7bOlH6GYP1ZZPvKBSRkTzFfT7kzo3aJIO1j6Y8vHMsfhR82hJrWaiwQVPRLI2KbZwYgji0ciPLp7rRB0YdiS6DjXxMtX7vAs7UmcOVJFJRtgg3lY7EXCytSK65ZX5AUjNp9B8TFAbhbMpR+Z0UO71wZqi/VAM3AzVMwdfRDfgzSMxa/qrrBVm3Gj5DacBpiTtRU3RbDOLaLXOeyvgle2yPQ== X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2367; 6:0yGfuaRjAdk/3WbSUB6E7Dvo6lrSb9+sW/XI2MqLd1Wq8Bj4jBBphKZEiYf2fkeZZ1mxkdxkD5ib5Pb935JTsZZbOtZ43qqQ65nIIWcqyr1cJBrqL/c5puIscuI/D11v/bDVzsx4RUKvMw5HH4LBQXT9HaoQ/9H6ZxxOUkl4P2Q9+v72ySFUrlx08WsoSY70KT+aFeGUnZn96pz/3UjhxuqPWxXpHPyR5DQ21ibxSthqwCu9ofDNePaemt2kX6MIOEXiia6t5t5KPYscBzbyVzesnIKLYvGLdGxR8P9T2eFHZuQvtCVTHWv7jecefW9aJeWLQM2O5y/blDW4P2BEAA==; 5:Hkw5nLk6jAJagy30BQD8IIT0DTqr3QidveaNOoIEOJzEb3+QbdxMhv6+3lQo44e2rk7bMSK38TvXT13NJOBlV7Q7g7v8rBQ/ct7JK6GfLsQ7LsVPGL0aokWnSyxAidMDWyiHdAwJdBmbpnkvhRczMA==; 24:dHGeXAB1B4WNDxlQ4KVpTjkQm2TnCAaJXkCskVNwb63o6zEe6y34WEk3z14K8Vc48Hj9W4uIe/XcxPuQ7gqi+eHQoYU5wlHehb7FCXVK/FI=; 7:Jw9Ut8pUf5om2gnvczokRPHn8PDJ2nDF/AemghdcKBJnRhG76OcBjhCFyXNzTVRwV39x8mzgVqzr4b+jVocsnUs5as4jfTPYmkWvkjfRgc3HKEMoIEAPSYETl7eGnxJos5iEg8TZoayQQyHWXVoye9QwXZ/VaJGCS+BFCp3z0v3HfE3VSPOuKU0/8m38SpRFJaiu+tKlYZbkl81fI+b0yq/7VfHVg6MIXhyrkmpJNBQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:51.6953 (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: SN2PR03MB2367 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" The QBMan device uses several memory regions to manage frame queues and buffers. Add a common routine for extracting and initializing these reserved memory areas. Signed-off-by: Roy Pledge Reviewed-by: Catalin Marinas --- drivers/soc/fsl/qbman/Makefile | 2 +- drivers/soc/fsl/qbman/dpaa_sys.c | 78 ++++++++++++++++++++++++++++++++++++++++ drivers/soc/fsl/qbman/dpaa_sys.h | 4 +++ 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/fsl/qbman/dpaa_sys.c diff --git a/drivers/soc/fsl/qbman/Makefile b/drivers/soc/fsl/qbman/Makefile index 7ae199f..3cbd08a 100644 --- a/drivers/soc/fsl/qbman/Makefile +++ b/drivers/soc/fsl/qbman/Makefile @@ -1,6 +1,6 @@ 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 diff --git a/drivers/soc/fsl/qbman/dpaa_sys.c b/drivers/soc/fsl/qbman/dpaa_sys.c new file mode 100644 index 0000000..9436aa8 --- /dev/null +++ b/drivers/soc/fsl/qbman/dpaa_sys.c @@ -0,0 +1,78 @@ +/* Copyright 2017 NXP Semiconductor, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of NXP Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY NXP Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL NXP Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include "dpaa_sys.h" + +/* + * Initialize a devices private memory region + */ +int qbman_init_private_mem(struct device *dev, int idx, dma_addr_t *addr, + size_t *size) +{ + int ret; + struct device_node *mem_node; + u64 size64; + + ret = of_reserved_mem_device_init_by_idx(dev, dev->of_node, idx); + if (ret) { + dev_err(dev, + "of_reserved_mem_device_init_by_idx(%d) failed 0x%x\n", + idx, ret); + return -ENODEV; + } + mem_node = of_parse_phandle(dev->of_node, "memory-region", 0); + if (mem_node) { + ret = of_property_read_u64(mem_node, "size", &size64); + if (ret) { + dev_err(dev, "of_address_to_resource fails 0x%x\n", + ret); + return -ENODEV; + } + *size = size64; + } else { + dev_err(dev, "No memory-region found for index %d\n", idx); + return -ENODEV; + } + + if (!dma_zalloc_coherent(dev, *size, addr, 0)) { + dev_err(dev, "DMA Alloc memory failed\n"); + return -ENODEV; + } + + /* + * Disassociate the reserved memory area from the device + * because a device can only have one DMA memory area. This + * should be fine since the memory is allocated and initialized + * and only ever accessed by the QBMan device from now on + */ + of_reserved_mem_device_release(dev); + return 0; +} diff --git a/drivers/soc/fsl/qbman/dpaa_sys.h b/drivers/soc/fsl/qbman/dpaa_sys.h index 2ce394a..676af82 100644 --- a/drivers/soc/fsl/qbman/dpaa_sys.h +++ b/drivers/soc/fsl/qbman/dpaa_sys.h @@ -102,4 +102,8 @@ static inline u8 dpaa_cyc_diff(u8 ringsize, u8 first, u8 last) /* Offset applied to genalloc pools due to zero being an error return */ #define DPAA_GENALLOC_OFF 0x80000000 +/* Initialize the devices private memory region */ +int qbman_init_private_mem(struct device *dev, int idx, dma_addr_t *addr, + size_t *size); + #endif /* __DPAA_SYS_H */ From patchwork Mon Sep 18 20:39:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815157 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 3xwydW4Qvrz9s7p for ; Tue, 19 Sep 2017 06:43:27 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwydW2lqKzDqHj for ; Tue, 19 Sep 2017 06:43:27 +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.51; 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-bl2nam02on0051.outbound.protection.outlook.com [104.47.38.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYV4v6SzDq8f for ; Tue, 19 Sep 2017 06:39:57 +1000 (AEST) Received: from BN3PR03CA0053.namprd03.prod.outlook.com (10.167.1.141) by BN6PR03MB2692.namprd03.prod.outlook.com (10.173.144.11) 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:52 +0000 Received: from BL2FFO11FD016.protection.gbl (2a01:111:f400:7c09::150) by BN3PR03CA0053.outlook.office365.com (2a01:111:e400:7a4d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Mon, 18 Sep 2017 20:39:53 +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 BL2FFO11FD016.mail.protection.outlook.com (10.173.160.224) 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:52 +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 v8IKdn2n025841; Mon, 18 Sep 2017 13:39:51 -0700 From: Roy Pledge To: , , , , Subject: [v5 02/12] soc/fsl/qbman: Use shared-dma-pool for BMan private memory allocations Date: Mon, 18 Sep 2017 16:39:37 -0400 Message-ID: <1505767187-4596-3-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: 131502407928956838; (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)(7966004)(336005)(376002)(39860400002)(346002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(316002)(5003940100001)(104016004)(189998001)(7416002)(5660300001)(36756003)(16586007)(97736004)(356003)(3450700001)(6666003)(76176999)(50226002)(50986999)(54906002)(305945005)(498600001)(81156014)(81166006)(43066003)(2906002)(106466001)(8676002)(2201001)(8656003)(68736007)(230783001)(33646002)(2950100002)(8936002)(105606002)(85426001)(47776003)(4326008)(53936002)(77096006)(50466002)(48376002)(86362001)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2692; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD016; 1:uj7sUnTfOK8btsLjOXOhvplWiz/wlewWxLuP0t9um9zVgefwWC6meRULHZDmw1xQjO2IT0kkEV2Gze/u0VvVl/klCwoSIvbOn3BreuXTQ/IK70+xh91hUnZ34UuJZlMh MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8bf19c2b-5ebe-44ac-bc9e-08d4fed56a1a 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:BN6PR03MB2692; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 3:ta9VMAv+n97snqyMTjYglJ7mDAuJphgRmYLHe8QT7a/k364ZrxL3e2vLiidFUed2pUEf7T/zraxihYVi+Txb/Tn5VfEUt+R5TRHQdMmrEZNf1kZe0iU9FbQYWgDnFVpmPfcYp5TV9w6D7MhDGLhmIN9ApMan4TfHoSaamV7g80QsAzw7GIHx5ksRRCI9YXIB7unKYVtP9+B/1fa+rHUobcYH2Snnbgacyo2HRkkVcm3UbG4YHpsYfzNMt/VlcY0yy7hjdqmcaXniCCdvIHK7/f+P/qQUA+5ZnXjMvEiHxnLCqICpNo4tI7JHZ99VJV3lfFGNb1QCjXq5GmRlDtslcdPGMsYf8Hg4WxSe2GEqXf4=; 25:vnpumDn3hbkCXJJV5EniVyR+GuuPOKt+Lw1GEyYro7k0ISF7LnopsJoKzY/9DN19QLPnil8GgXHGjfktsIQrlEXHvj++tVCmi3uateNRaCYdFkHIdIQTktdynhiR8HrwfEoAUZsP8OW44P2bpJxgNb6ct+dhgIzjFcRFOTkdJ5fHSz8Y64zPhz4PibI3s6k4VMVID4W1jJGXtqzUwWHwCq3N4UMmFndpC+od+2BvlyjLfd0qwj5od8zBz+R2ksTlpFpxrtghGR6mgduCFdgFacRUIIOqpIYeJf+uIKBmSHRjPVgWTrtb+QAqkknGP9FEbdx8wfvTjBzsDC2jUDepMg== X-MS-TrafficTypeDiagnostic: BN6PR03MB2692: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 31:7t9g2STwOGWXNMzu9HMiTdYbp7QS3SI2EjHN801zUApndvE7P0bHPpFb1lP+ZZbbJBNKh6ZccEgBd9QCTJRzOMzvARH4/0GFPBWnjuvBYsddWgDzvptGfO77FOO+lzWEC1T+aH8J6vyXGuKI6wwJ3C8/tSVPxXfJWFa0izCtHko7wSLsJYIHjMAEjhsRbtbqV1rsTZP3x+K4SUm+1wqlWJ9nEM/7hQq0dRE/8Cs5y90=; 4:VDcdPwqgpZGjAnM+r+FfHGM6B3cooIu3JELPGVey3Rgv2LNwbHfFdaZEh7cS7MopQLNoeeEHNqKdEehx5pTuWHrV6bZN94Tlzy6kQn7YNDWcn4jr6EoVd3clro2rH7zh/87B9a/S/nOEAz91Lp/hUqNw67EKLKpgY4UHGfiMUkqC4LC7BK/1QcQa1QZs8MVLUyOpeLrYdso4fr3xkCLQrHcFxv3F41cfoULtTCRcv/gAFu/DRzK4tp77h+4sYJiJ1SjDUnNJr1QWy5Bw5fHXSWlqm39P9UWumMb0h5x+r/M= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); 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)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123565025)(20161123559100)(20161123563025)(20161123561025)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB2692; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB2692; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2692; 23:mmkgiG394YMZFCHZPU33PVnc5CCjtU/mONLH2GO0C?= iXS6pii0FLySqKZfB8q5vezfhxP63mkwkMtpaQzk/L2BnCN5KwWy09jA4buuiZqdn6xll6jxWMj8GajdoCDZJCQOJJWzburM5TITtMNFMPrxcTB5CSt6K8hDtv7sRZqDZ5AL4SnTIv7HvKMwT5sSQp4YuRG0vtbx/pNKO8C9dKLTOD/6BcS1t3WkADHXRLDELvmQpEsYpPNDXKPw7bCayqi72tFQReLgQIQd61XTpwyVCAUuaXV22dJRfP35Aj6nUpl8zyxV5MSu6E8sKBXANSLHzy/aHVHEAxi/QpRKrVA3FW1yLtbTkgaMCTMB3W8P/sVEG2tu1upe69EusQnQn1h0XOSEQTH9s3AVFuANxNwpdiLF/ABicnljP50+hMWEYAkZq/oWBen6ljGxjYUXx5xmpoKPjN2rQOytznJdmkbcP385t8vwHlAEcltJmYcGmLBWGFmhIZYVXg/19VULFASB/7q5hFLHiBBaIS7yPD9av9nwLp661Kx3BMYTxDsr9qaHDRFW98ThGfLVZd6nqa1Gbriznlv8Bi+NVxUTMgGov2UHqxbNBrmCcN85olqhxfNmmIGeY9ClOHjNK3uHmnarwpetO1lYmGpynEAtuDiz+Py5uIcSpJgiergKRqjOCVrLQeP82ZONJTDwvu7dMPXMV7ttx6BRvtnnan62fGpA2DCcLtRxw8CqY9ZuCbjug5IQLF6M/hO0yBN87hAZySU0GoYdvBs2Jczl1J0Y5KlnkLXntfO+XHCWFFeYhlznEUkEe1SHkRJOZnMUQpx+bZbscWxw8Ml+LUWUytP55oK4wDSctii+uKS9nRAFt+YGefjc+ueVsoMqxEbNK71pVDNd111Iw2h70wxqQ9xrjtIvbNKEdWjwJ6g2DMdAwKhab3bwdOLO27Veu7BU9x91UBVG3c6AIApQnbSzQ3fJkmpHoliBWUQH+uGpF/Fd3uKSg/KTWdPjB6OgzA9ZkYkWcv42YXkdt8g3LGNwGtVhN/pDTKH0kVamNf2Lo/C3QTKt1I2sSpSaMrun/avWiAx1rbONckLmbwZ4vdsnIU9UKIQmb+5XBWAiZFnDusiE19K9zxf0LjX0+t+FOupqD5clmR9GQyDtO8P6J1zcJrQ817SKyR32MRmVm5fOgCoWNt3aYOJHYJ/X6pP57P3qVqDm5/SzkmkNnh8mGxEAhD9U/mES4CDkHo/wxgcIHNfqNOZBxf1lBOmyy2ebm8M8X+/QzC/8qeEhqiu0EQkNtBD8TfPIA== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 6:+DsmP1gpn3I++d3LHwIxp+8JQAjpl0dEffKGrrpXNy98Fjo/W9jjLs3niedWLf3IN+O0mTR1y4EZmm131rs1t0JZcnghrWJqAN8S6EIwmUfTmKUrrlcHgotWjFPL40nU2MqBtxEdGi+veVU3eyeaycHt6D5Bu+0rQlqO3zRSp0IWLS7olKUBBlw77oaus61yPJLZONhZWUGbb1QVKAQDTgMMSxVRHf0uHGN0r4Ez3l6Rt1/dq4pk8xCxf4zFZtaWTqpfwzzfXE4x1SNBq5+YmtnS3kkm0BJ8F2jtusA/HGL2EXvMSwhr7SdZ4hSKZwy2y0elF4FQjsz/W3m6cqUyaw==; 5:DqdKlbhAB1pkV1OzzJfoqddxN59mht+arqzRlgfO8Cuw47H7D99E9OhnEyF2E5ExH7Kc0H+f3tLuCuneoGZ1XOMMMNgRj2qVLSouCNmEJlJ/N7L0UGuaxWdAXdI4fugohJ4vPiUKRBy+LdM0dVztWw==; 24:gzbqhq/FHgi6PyJcPyJnXQEcRZqENFlnymm7WIBElk8gjm7/aH4G+oPBQ8eX8ilxE3+P+BIzhbPiJH06xFXW1JQDBHdcZde+kcgIB7X73gM=; 7:dtpl/d6UOogLjaKicIUErKp+p3CWTXnEoTCQp2+0fJDSDfMsii92qFhkMuKRNUd+dW+Le3YG7+wMWxzWET7deugLTEIS1Ede4sG068B8f3cix0Bo/YA9rfxgRrh4m/ZOdXDz1Pg2+HTJJT77A/wO590c/idbZ+zfkDIuazXqfc5/YhjohHIoSwn6cvrHVV7oYIxArR/+fsWwLDKqhI1TVU8y8WRhf1tNowuBOFQAKdw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:52.6148 (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: BN6PR03MB2692 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" Use the shared-memory-pool mechanism for free buffer proxy record area allocation. Signed-off-by: Roy Pledge Reviewed-by: Catalin Marinas --- drivers/soc/fsl/qbman/bman_ccsr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/soc/fsl/qbman/bman_ccsr.c b/drivers/soc/fsl/qbman/bman_ccsr.c index eaa9585..05c4223 100644 --- a/drivers/soc/fsl/qbman/bman_ccsr.c +++ b/drivers/soc/fsl/qbman/bman_ccsr.c @@ -201,6 +201,21 @@ static int fsl_bman_probe(struct platform_device *pdev) return -ENODEV; } + /* + * If FBPR memory wasn't defined using the qbman compatible string + * try using the of_reserved_mem_device method + */ + if (!fbpr_a) { + ret = qbman_init_private_mem(dev, 0, &fbpr_a, &fbpr_sz); + if (ret) { + dev_err(dev, "qbman_init_private_mem() failed 0x%x\n", + ret); + return -ENODEV; + } + } + + dev_dbg(dev, "Allocated FBPR 0x%llx 0x%zx\n", fbpr_a, fbpr_sz); + bm_set_memory(fbpr_a, fbpr_sz); err_irq = platform_get_irq(pdev, 0); From patchwork Mon Sep 18 20:39:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815154 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 3xwybg6xB0z9s78 for ; Tue, 19 Sep 2017 06:41:51 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwybg64GnzDqXn for ; Tue, 19 Sep 2017 06:41:51 +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.34.65; helo=nam01-by2-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0065.outbound.protection.outlook.com [104.47.34.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYV4wkQzDqBc for ; Tue, 19 Sep 2017 06:39:58 +1000 (AEST) Received: from BLUPR0301CA0009.namprd03.prod.outlook.com (10.162.113.147) by MWHPR03MB2702.namprd03.prod.outlook.com (10.168.207.136) 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:54 +0000 Received: from BN1AFFO11FD039.protection.gbl (2a01:111:f400:7c10::115) by BLUPR0301CA0009.outlook.office365.com (2a01:111:e400:5259::19) 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:54 +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 BN1AFFO11FD039.mail.protection.outlook.com (10.58.52.243) 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:53 +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 v8IKdn2o025841; Mon, 18 Sep 2017 13:39:52 -0700 From: Roy Pledge To: , , , , Subject: [v5 03/12] soc/fsl/qbman: Use shared-dma-pool for QMan private memory allocations Date: Mon, 18 Sep 2017 16:39:38 -0400 Message-ID: <1505767187-4596-4-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: 131502407940223129; (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)(7966004)(336005)(39380400002)(39860400002)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(50986999)(3450700001)(189998001)(5003940100001)(48376002)(50466002)(33646002)(2950100002)(105606002)(6666003)(106466001)(54906002)(53936002)(104016004)(2906002)(76176999)(43066003)(305945005)(36756003)(50226002)(85426001)(230783001)(8936002)(356003)(97736004)(498600001)(8656003)(47776003)(81166006)(4326008)(5660300001)(81156014)(77096006)(2201001)(8676002)(86362001)(316002)(7416002)(68736007)(110136005)(16586007)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2702; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD039; 1:z5Y/W1Bels9i+qeuHn8hJPwfUyLs6rYhXsTOTqyTLBpiwARkw0aMubfzed/Q6v7+P64h1L+FnfzW4X/S+R9Lmf+jN6qj3BEOUdzYtfZtS8Kz4bhNEUAAJHBRlwvXgkye MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 344648fd-038a-417a-b099-08d4fed56ad9 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:MWHPR03MB2702; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 3:ce6oIERqMjkVb2CVt7du4r69JcmhjL+geUT8kYgQKowvNksYiLWIvWndhd1ZxUv0K4/H7z9t+tAhuCWt1mGUS+rwLQOWLhJe50qwYVgKRLFGQ35mDrrd9nfNRzDUY2FzWxHdeUHZ/TjODIk5McmfBEJBVC6Pl85R5St3xbkG3rq1mfO3zYKJsslYpSZH4QHpzJ2C7T1YZqTT1WjPlA446SKRM7jsSrU0xxHHirpKAk1KNyuQ9Amak5jkkAS9vK25UgeJLz6jytuKuYmv0SZRiRG236BilvxDyiYm4lH3OByhjkAOfXSkCbBnNZwnCd6RvNZoQVQUYZY1yWIfdiWC0cypyKH0rDs0awbbMAbAJQ8=; 25:A49Vadxe6aEpmLU80h7Bd8KoK7aBlLKRbEWv7aF4aN+XNbFFZE4BRnPC5ftow64oA5ZPobKrsfe1THdRNlCPdW2O5lG1n5L+F5Z9pI2QdO0KY0gCFhehvwMdz1XvW02LY1Q9cjg+MWEaVhynutC4sprHlBlVWEK7aYwp/e++xJ02stwGFQZ36JBldP4Jie4UO7CRFOc7RwQvZOvDBJIUTvtCpU9NZV9nrCbkR+I7fD320ZGcBNiHJpE/KZLtOQF4T4FlXfzj/ZutrqBF+7rOuTWzIkCr92u1nHtsu9HbhJnoQchlu7lmbeWAe+yjfAmdY57UrnL9kArLUqGHisnPAg== X-MS-TrafficTypeDiagnostic: MWHPR03MB2702: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 31:TAxbZZdR9uMBoQHPw+Do/ezdE4en6Xe3hnQTgrso+U7Q0GkNaA97gwZd4lmOfM1d6Z8aU4xbBC63EGSIVW/WMFncjZ/+ZaaNrXnHnbgMfkublr4Zx2Jndbokl8fwgB8ri6jCqk7I3R15MtP/qu0t+wcIHfOXgsiujG4ErMz7VqrrL3JQKw6XsSyn4fWWYPBEcacKqeaUqQw21l4juQJXQwsW9lb57WJBRpFWUxFX2so=; 4:G0PAtnXK6S0xch4XNSBVrfgFKMvggO6bCp+zY/as/TD4d+QOIdiQVr/E0OmfcFqlx9BtNftF/SY8pE0iHeXl81YXUekhref2oEeYS/wJeByHgLlF3PO+uijbNcsbMHLJtRN7vbzBa8hKNjXMyNNgz+YnzqWSz1g6vx26zNPkRowlVWpfQa3cJJxOHCBNRKgKxNzECTKbY7ZU4YovZy3JiiUfZcbpcZeOk+dESKj8Wyet8HPO/lxw4y89K9b48R9cwhDozxym0xdAmF7wG0lYqIbWv/b7CYB48CWEVjU8lg4= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123559100)(20161123565025)(20161123556025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2702; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2702; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2702; 23:hW2N19zzJ911RW/gHDX4C2229ohEcYfipXbiQdHJf?= NUj/xdyVI9W2d7TuapV5nf05yx+mroKWmJ7SmXhfFiS3iKl/7d7mp6o0nqjsfc5Sm4mzcp6FhHzhdWR03XverCTXs1tdizGfU5c0tzBPp86XiHw2YYTyF4sNu76HF3LA4vqKgqoDS7dmrXK9l+0/Xnuiz9mzkRqdLUXBxhTbjvEqOnzblSUeylcRGph6QLivAx8oELu2eKg/79NmQHWdEmGlMrb0Kx6d3byyEfQr07jQcTqbRQvupHbj18pthNf6oaC5DXBIM3VXHkncFxwFvJ7S+RXtevlNIOXIazsdiUXMJ6TLqQEOyvGLe8H6MLGL+bKFkveXGFnNI/6aP1HAHJTuHk0U16kgB5lol7H4vOPXB4sulTK697XxReQfvu55dguC1URWCpkmgRn+QwcwQDiZwWS4VAfSwnieuZmgOOQr1nN7uqremq9MwC5lK1zBiZ8Vz3ntBXE0Why2eSyGALmGJYnPQ19scnj30s0N5Y9N1Z/UkJKGxeMyLAeyr55LaEw1X1Yx/hrpSLToV6O3TvrV1Iuo5kBWPfDnLzm0KzXYPjANVBR30v7x0s0yC7TIO7JlI3hndAirU/2Nic6eQUD6r/79AP/lODF0lDtTy4xkx4G7WtMLNpQK0ON1DvZOwD9SJlbvwFeKdV2s/zsdNW8TgQzz5PmC4AOnn+7MzDy76XVXWxqfewD2ouF7Kr4QwGz0ivkaxNK94gjrRXfbNkiWiah9o+TRVI88VD6p9stynOJTS+/XddTms0UBVVot3KHIGWx8c/VZY2W6xL2hRxFbKsziA0L6e8q+0zgDNfE9wMCcElxD5jJ6zoX82sISp8X1D4IIYV5LnEu5hmropRT+TWncTNx12gWf3lnfNIzGai2cBPM9Jn0Jx11nmKAXHWaMNaN/TMEXA4lrIRk3uoOA6KmTxCqKVG0KF6GSnsFKFGaLQIdAQU2W9G2T3yagk9ksZ7QnRQX4CCpzz76GC6BWCFB+UFdrWgiJ2L5D0XGuHtKtL7n2cBgdkG3qEvHvY5lLdb+W/Z6Y7Eicb9gWMYA2E9pM6sxqO2No5qMcM1lHL/uyrKTj2L+SG5JlGwyNYOGEezzICZdjSEgAf6EpxfpTsSQRz0Hyjp1DjweRVOPjx1aDoCDJWwnmcpZwszrkQCor4KEj7e04TNkF8XXIOw5YDiaAsG7pp/ngDm729lrl0MskaNxhoLxeBot8iEYY7abSaIuX1yxcUbXajs8maq7+JmrJ26UvqnCk5t+LuuyKQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 6:aFDa0RBBRf0dvy7LUhJCE9zhYnAavay8/Kmf5D4yeVvGIJCst5lr78SWUAOrLipjfFyg6+R97AWV2gUZB3e20jOI50e318fEyK2YJ3n7PaQ5WMO8sroPM2s+JTj4R+jgPXo6YL2Egb5+oaLp/iBru4AjfGIb48BbI2iO/2W4WDSFQNON2Rd5Ry5c3eNaG/pHeqgZp3KAQrJ5ji3ywHqpTmSyRLtnUskKXF71koOLgQ+kb+6EdOGrqH6yZ5Rak+h9Xd8GxsaDwqYQOhvpQDbwRAx2qcHIN1eTKceczOnqEeeg09YnMNCcrhjQAzWQT1jVrW1txKtVMqxQv7Lr8RiRIQ==; 5:VSNerCgS6X8cfz9l9biYFJ0c+bGy8NDXyfOYUD/Z9wLx59P5CACB3ffFB5zcxJ7B4sKSHjMRQiNcpwQ6wXA6DNBIWMRw/sn7hXCgrbRET0lgyRqNL9exZ7YbmXj08VZh96mioeyt6aSEyJ0uhDdNdQ==; 24:uHKBc22kX1vWoGR3qkODFeFUdy2XEqv87CTGo65xtUCrRLaDlWasaKPYgqQfGOBmi+qvQ90WcBvkS+eBo9xmk01f8RZz1O41jPAmrukrhhw=; 7:66Kk2N6qsIPdbQPcKEdI5+8wYtx114d3sbzrzxmPWrWLp9171DB1CrvkB6MU33G6jrTHSqut4imAybrnfcJDk8XYvoVBVuk4oGHYlqba36ExblGXatlMoIecPRGiLXRw9fYnPlo8m/6slmBgMFTzWlSIejXTEiyRJgAwypmqtOWqHFtXt7u+FxA5qpCJt7J34JAvwyJsvn/yKJtP2/PvoThRb2iLjAEvqsMT0mmwBlk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:53.8507 (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: MWHPR03MB2702 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" Use the shared-memory-pool mechanism for frame queue descriptor and packed frame descriptor record area allocations. Signed-off-by: Roy Pledge Reviewed-by: Catalin Marinas --- drivers/soc/fsl/qbman/qman_ccsr.c | 93 ++++++++++++++++++++++++++------------- drivers/soc/fsl/qbman/qman_priv.h | 2 - drivers/soc/fsl/qbman/qman_test.h | 2 - 3 files changed, 63 insertions(+), 34 deletions(-) diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c index 835ce94..607355b9 100644 --- a/drivers/soc/fsl/qbman/qman_ccsr.c +++ b/drivers/soc/fsl/qbman/qman_ccsr.c @@ -401,21 +401,42 @@ static int qm_init_pfdr(struct device *dev, u32 pfdr_start, u32 num) } /* - * Ideally we would use the DMA API to turn rmem->base into a DMA address - * (especially if iommu translations ever get involved). Unfortunately, the - * DMA API currently does not allow mapping anything that is not backed with - * a struct page. + * QMan needs two global memory areas initialized at boot time: + * 1) FQD: Frame Queue Descriptors used to manage frame queues + * 2) PFDR: Packed Frame Queue Descriptor Records used to store frames + * Both areas are reserved using the device tree reserved memory framework + * and the addresses and sizes are initialized when the QMan device is probed */ static dma_addr_t fqd_a, pfdr_a; static size_t fqd_sz, pfdr_sz; +#ifdef CONFIG_PPC +/* + * Support for PPC Device Tree backward compatibility when compatible + * string is set to fsl-qman-fqd and fsl-qman-pfdr + */ +static int zero_priv_mem(phys_addr_t addr, size_t sz) +{ + /* map as cacheable, non-guarded */ + void __iomem *tmpp = ioremap_prot(addr, sz, 0); + + if (!tmpp) + return -ENOMEM; + + memset_io(tmpp, 0, sz); + flush_dcache_range((unsigned long)tmpp, + (unsigned long)tmpp + sz); + iounmap(tmpp); + + return 0; +} + static int qman_fqd(struct reserved_mem *rmem) { fqd_a = rmem->base; fqd_sz = rmem->size; WARN_ON(!(fqd_a && fqd_sz)); - return 0; } RESERVEDMEM_OF_DECLARE(qman_fqd, "fsl,qman-fqd", qman_fqd); @@ -431,32 +452,13 @@ static int qman_pfdr(struct reserved_mem *rmem) } RESERVEDMEM_OF_DECLARE(qman_pfdr, "fsl,qman-pfdr", qman_pfdr); +#endif + static unsigned int qm_get_fqid_maxcnt(void) { return fqd_sz / 64; } -/* - * Flush this memory range from data cache so that QMAN originated - * transactions for this memory region could be marked non-coherent. - */ -static int zero_priv_mem(struct device *dev, struct device_node *node, - phys_addr_t addr, size_t sz) -{ - /* map as cacheable, non-guarded */ - void __iomem *tmpp = ioremap_prot(addr, sz, 0); - - if (!tmpp) - return -ENOMEM; - - memset_io(tmpp, 0, sz); - flush_dcache_range((unsigned long)tmpp, - (unsigned long)tmpp + sz); - iounmap(tmpp); - - return 0; -} - static void log_edata_bits(struct device *dev, u32 bit_count) { u32 i, j, mask = 0xffffffff; @@ -727,10 +729,41 @@ static int fsl_qman_probe(struct platform_device *pdev) qm_channel_caam = QMAN_CHANNEL_CAAM_REV3; } - ret = zero_priv_mem(dev, node, fqd_a, fqd_sz); - WARN_ON(ret); - if (ret) - return -ENODEV; + if (fqd_a) { +#ifdef CONFIG_PPC + /* + * For PPC backward DT compatibility + * FQD memory MUST be zero'd by software + */ + zero_priv_mem(fqd_a, fqd_sz); +#else + WARN(1, "Unexpected architecture using non shared-dma-mem reservations"); +#endif + } else { + /* + * Order of memory regions is assumed as FQD followed by PFDR + * in order to ensure allocations from the correct regions the + * driver initializes then allocates each piece in order + */ + ret = qbman_init_private_mem(dev, 0, &fqd_a, &fqd_sz); + if (ret) { + dev_err(dev, "qbman_init_private_mem() for FQD failed 0x%x\n", + ret); + return -ENODEV; + } + } + dev_dbg(dev, "Allocated FQD 0x%llx 0x%zx\n", fqd_a, fqd_sz); + + if (!pfdr_a) { + /* Setup PFDR memory */ + ret = qbman_init_private_mem(dev, 1, &pfdr_a, &pfdr_sz); + if (ret) { + dev_err(dev, "qbman_init_private_mem() for PFDR failed 0x%x\n", + ret); + return -ENODEV; + } + } + dev_dbg(dev, "Allocated PFDR 0x%llx 0x%zx\n", pfdr_a, pfdr_sz); ret = qman_init_ccsr(dev); if (ret) { diff --git a/drivers/soc/fsl/qbman/qman_priv.h b/drivers/soc/fsl/qbman/qman_priv.h index 5fe9faf..b1e2cbf 100644 --- a/drivers/soc/fsl/qbman/qman_priv.h +++ b/drivers/soc/fsl/qbman/qman_priv.h @@ -28,8 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "dpaa_sys.h" #include diff --git a/drivers/soc/fsl/qbman/qman_test.h b/drivers/soc/fsl/qbman/qman_test.h index d5f8cb2..41bdbc48 100644 --- a/drivers/soc/fsl/qbman/qman_test.h +++ b/drivers/soc/fsl/qbman/qman_test.h @@ -30,7 +30,5 @@ #include "qman_priv.h" -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - int qman_test_stash(void); int qman_test_api(void); 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; }; }; From patchwork Mon Sep 18 20:39:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815160 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 3xwylC5qKKz9s7m for ; Tue, 19 Sep 2017 06:48:23 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwylC4zFQzDqXs for ; Tue, 19 Sep 2017 06:48:23 +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.34.48; helo=nam01-by2-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0048.outbound.protection.outlook.com [104.47.34.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYX12BczDq5k for ; Tue, 19 Sep 2017 06:39:59 +1000 (AEST) Received: from BN6PR03CA0054.namprd03.prod.outlook.com (10.173.137.16) by CO2PR03MB2359.namprd03.prod.outlook.com (10.166.93.19) 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 BL2FFO11FD052.protection.gbl (2a01:111:f400:7c09::100) by BN6PR03CA0054.outlook.office365.com (2603:10b6:404:4c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Mon, 18 Sep 2017 20:39:55 +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 BL2FFO11FD052.mail.protection.outlook.com (10.173.161.214) 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:55 +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 v8IKdn2q025841; Mon, 18 Sep 2017 13:39:54 -0700 From: Roy Pledge To: , , , , Subject: [v5 05/12] soc/fsl/qbman: Drop set/clear_bits usage Date: Mon, 18 Sep 2017 16:39:40 -0400 Message-ID: <1505767187-4596-6-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: 131502407957683659; (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)(376002)(346002)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5660300001)(316002)(8936002)(77096006)(81156014)(81166006)(48376002)(8676002)(7416002)(50466002)(2950100002)(106466001)(6666003)(68736007)(54906002)(4326008)(5003940100001)(16586007)(97736004)(104016004)(47776003)(36756003)(53936002)(33646002)(43066003)(76176999)(50986999)(356003)(305945005)(2201001)(3450700001)(86362001)(189998001)(85426001)(498600001)(50226002)(8656003)(105606002)(2906002)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2359; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD052; 1:OhkxbYzbVpKvqfq429EU29TmGZCcEdrppQbQVJrl9Q/P9UdGz9629jFUmCyRP4M0wnZxsoIGDU7o9ckrF1lZW2Mi2/Rs2un1CYKGjpJrpxWQQMx0wBJKPB9E0Z0jYEOl MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d120855-4d97-49a6-bc6c-08d4fed56be1 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:CO2PR03MB2359; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 3:MswmVmtnP4MOHdysrUFeqbefAmY4i1RHZYMoGnEx892S7lonkwLbinxH/pqhw5nQBGUm1RcFB+JOW2p/b10uTWbo3FRim1VOD6tr0IIEWILvzpOcLwiDlhmQu98MB8acfuWnzqwe0ymSGKzrliygXLAO61K4C6rb/ba9haoI+8BQt9hAPI5eaBK8LQ3tOXH2Zn8MMC4atrvaYJrmLlxdUAoY/Jp6arBZUzcZK2b/4zz01dArGXeiv4qdX8WrnKTcnRDsTFBtzymeSD5XLYQzMyhGH4T2AsmnUTgDVcNRQPEfUciSxZ2aMmVhcPQgweH04VJAjHF0qmvObaps95VFeS+7GsXKHa4YMoHVeTvfusA=; 25:3LzTlDPVZY+KnRgTdkonXS1y3Lb6xDGOpBn0GYjnNeq+KjaHjyIemE8f1PNlokx20KmZ2hd2G9t0F2dfLSHqp6IGgpquVCqOSHllR+lTfy9KvV/d1UL8h1ZsTu+aj1eGj8zfw/k8s83eeTeIK0otMwwp0LD7FT0TmvftIDcrqYYHZblrIxX+P3QCp8VpSbI+9aZhLPNRZGe6PHTvM85//rargQERksFwyqZCCeJ7UyYeO2tpEyvkmkdmg+csN/5ZseYWf4nk9tJCsLJDRZNlx4p8ajv6+kePjDqdBR9xjVq74RWQwZpRDBG7WEtr+aNRKPI1QwoPDQtvxA1g/LxR2w== X-MS-TrafficTypeDiagnostic: CO2PR03MB2359: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 31:fGxIE4QaROsj6vVnrUxDiInKG6pNOR1veYjX3FcJaAms5Vvx7Wo8v2RhdWs/4Mj+IrP8jHoypbykYRNAKT8KA1MUao9yD7/UILYZGkjrQdb9YwNyBSM9skq+m0kZ9Ud1OznUZw+eKEXIuXW1fugc2wRiUBdOHvYbnveMaaiNqen66DA9bnwRuuls4F+GDjaYIoaz2M5XnGSmJDdNTOeh75Amf46FgxEsn/AwPM/kij8=; 4:pDmZh8x8vuSlF3XZ97FhlqrYKIVgBDeoI4U8Ed/lrH8pIoAaTm/6J6kfE98oQq25EQZDECe0krkKH8Wd4j9O10GPFGbwL7Lu6doSck6I9WZfi3vP371j4N+XtaLmw1k3mDHRK5zJYRZG0QBCRLbTRfCBQHvJdh2jh/PkELk1XaRP5feTCqVGnSS3vM47gAUY/FguOxb97wVMpLVeCXe9BwDxb4e+Y8mA1GZyxO9mwaLW7ntrC9hcwVASvT69RmIjCldp7W7Zve8aWMATKq9t+vTDsiZ0FVyh66RQ1bCqjUvazbQJQCHq9FjVYHlIdN2SS/PXsGR7z/mY1JYgyLe39Q== X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(788757137089); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123559100)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123565025)(20161123556025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2359; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2359; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2359; 23:8NR/Yo7M5j9+lFl5br3H/l4ifvlahkvNGuxTPdmn6?= HxL/fYYUvGgvNwg4O4towvp0tXJ+xHwlia0iuK5ROLulM45IM8PVaa6GKDhDOnJtdm9ccjli2lLzkflQKztjrLdicam4vnNFDBW1phMOaPuLH6QFcAbVISJNJB+JRptSKoYIBAYsEx5EnQfNC4Ntp3K0k5dHxlENK+Ft9dQrh3FNreZxzQzoWHOCdScQVUiIPBc44+JqVJlgY3zpeN8ErhdmnuOYbx3cxsZDabn63FL7Ffkh7mgm4dVlEL0i2K6ftSTKu/OqNBWbAN0hRx5i/NJO/BPGExw+FGr/NNRKO7OpCdSj41lZpUw7TuhZ6ZuGC7gPsnnz8S7XAgnunXZAizIOzjL/m20gcXm+UEATiJe+/bAOgR5j8kod1XBI/rKXr3pGzHH7FG25OZXzBrhddnJvicQMH+gSmkWLqjB1PL7hPQsm1z0KV14V9CK3lFGdN7kYhKw6ijT8TSaQVKNQ1noZ1xg1dMyRD00S+l/WCHujBz8jZ6u7d2OVO60OoixmI6E3XiNq4+369W7SjAgpCKv5N59Gznln0o5+KqEAV4jmrTgt46egtd0AWRykO3uXH8+0EUrbYJaw6of+7ii1VGZtVcjoYgAp9qkYVmxX6i5ipIJxjxZIebpBevg/onnlK7X6GCQYw5BK54AvviG6xt+lhjwOi6aYcuJxVQxMKzZOfmB2hQ3hOjl3dxdXhXyLwR8yCDVaeYXO6J7EmDsXlPOtxPIZaMD9mfZ9ApNA3uNSMsmfJRUog2BsFjT1R4DQzD46tLviI2OEzsf/SqkVEBHcSOPoP+CdssSg8UVThXESDJebACcRQGExf2c4T9B2ACaLIC6uf3w5LBxjpXRP1LiaK63qKxDWxvtA5yUOCMQr1Gh3gEC6yMFKUCv51rEp/tz9jnZyeSv0BQvn6QVMcCYiJSBb/qTTGPDnHK3fIglLEAqJc0lvXhZVDz0cvp+bGwjAT/eUi7UdCT9v5Pw1P/TFFU7CbOpbxqPOKW7QlNgcU3fY9rMOwOtec0y87a5Kzc3pfX/jKH3kiq0WA2dORd2hZeB84fnb6rgSFEbfByre6qhgO+ET8cvN1Wp32PfOKtblK0F2UOYqJXFVAZgh/wdsZmLrLe4s39ogmeFMc1Mxl612XrySe9Ph/aXZyS1qjFXp4tN+lHM4W4B2ZmUzAt8sJtivwo7BxypTyQRe5TyQHEzJIOBbAef0IlT7yXEYvo= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 6:PD8OHA8vFW/cHt8dee3qERnjyi0SU4UiYSBjsXd5wk9DWOvJ11FjVrQIudeLZz7PXWsO89bSnhp6pVA/C1FnNd2RAiKkJU/9K0zf5Hnvt2Jvjk1DQjqAKey+OIBhVNMPY0ye55PXhXzO6mfAInKD6so25yFpRitBStR/HVZlOVgwKcBofx35D1QukA6ZB77oPkeZM/Y/T1CeURiv6aj4G/WQFKjQnkFhxpORppsOpiAVEoBU9xy6Wj73FEMGSKvjPAOkedcBCKI/NprU7jUHSbeS9IKJH0Qm5pMoKX/ToFWebaYNUbZO7/kKElRHVtDi75lUNmUl/k+HqTnuaSQJQQ==; 5:qqH+XKopK140fB1KHi90Ya7bpdtL4eX7rhn3C+yzZEjhLv/e2FLVAx1h/XLx8YwdraA9So0YIwZuJ1Ze2CtZY58goVRotivoR0X4hYLW1n3NRRccph1YxBpKtuadDoOBv0WEX3yJImPrdwUzBPVnTw==; 24:ive3cGDysFjFOOATa/KETaMy/VR7aa3w6JZvkX3v6BrCfQTaQPMz93qq94HZSdTI5KHiGPqLTWT7sTTPq9unG38CpjVgoCZsA6W0kt+MC0A=; 7:UZqWtl3CfTS8hr3q7JEmifacQXQ/KDRlNXLWJpQNqp1ZOCpY168MoPMVs6apqA1RMnI2kE+5C1o6WDdnrjDkzFImuyd+CmD4aiXbluBooT99LombxQnmlPgM7OpZbDntj4yDfwmxen1orWqjPCZtq7Tuqhv2TmpcNtlVjZ22vh8TjJkPREyI8URhAqU8S9t/GbgoPqHVdMN08YxiHmMIocIHmT121fTjoVCs0DvNKpk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:55.5811 (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: CO2PR03MB2359 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, Claudiu Manoil Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Madalin Bucur Replace PPC specific set/clear_bits API with standard bit twiddling so driver is portalable outside PPC. Signed-off-by: Madalin Bucur Signed-off-by: Claudiu Manoil Signed-off-by: Roy Pledge Reviewed-by: Catalin Marinas --- drivers/soc/fsl/qbman/bman.c | 2 +- drivers/soc/fsl/qbman/qman.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c index 604e45c..ff8998f 100644 --- a/drivers/soc/fsl/qbman/bman.c +++ b/drivers/soc/fsl/qbman/bman.c @@ -616,7 +616,7 @@ int bman_p_irqsource_add(struct bman_portal *p, u32 bits) unsigned long irqflags; local_irq_save(irqflags); - set_bits(bits & BM_PIRQ_VISIBLE, &p->irq_sources); + p->irq_sources |= bits & BM_PIRQ_VISIBLE; bm_out(&p->p, BM_REG_IER, p->irq_sources); local_irq_restore(irqflags); return 0; diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index 1bcfc51..25419e1 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -908,12 +908,12 @@ static inline int qm_mc_result_timeout(struct qm_portal *portal, static inline void fq_set(struct qman_fq *fq, u32 mask) { - set_bits(mask, &fq->flags); + fq->flags |= mask; } static inline void fq_clear(struct qman_fq *fq, u32 mask) { - clear_bits(mask, &fq->flags); + fq->flags &= ~mask; } static inline int fq_isset(struct qman_fq *fq, u32 mask) @@ -1574,7 +1574,7 @@ void qman_p_irqsource_add(struct qman_portal *p, u32 bits) unsigned long irqflags; local_irq_save(irqflags); - set_bits(bits & QM_PIRQ_VISIBLE, &p->irq_sources); + p->irq_sources |= bits & QM_PIRQ_VISIBLE; qm_out(&p->p, QM_REG_IER, p->irq_sources); local_irq_restore(irqflags); } @@ -1597,7 +1597,7 @@ void qman_p_irqsource_remove(struct qman_portal *p, u32 bits) */ local_irq_save(irqflags); bits &= QM_PIRQ_VISIBLE; - clear_bits(bits, &p->irq_sources); + p->irq_sources &= ~bits; qm_out(&p->p, QM_REG_IER, p->irq_sources); ier = qm_in(&p->p, QM_REG_IER); /* From patchwork Mon Sep 18 20:39:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815165 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 3xwyrY6P1bz9s7m for ; Tue, 19 Sep 2017 06:53:01 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwyrY5JRczDqYV for ; Tue, 19 Sep 2017 06:53:01 +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.33.69; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0069.outbound.protection.outlook.com [104.47.33.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYY3T34zDq78 for ; Tue, 19 Sep 2017 06:40:01 +1000 (AEST) Received: from DM5PR03CA0041.namprd03.prod.outlook.com (2603:10b6:4:3b::30) by SN2PR03MB2368.namprd03.prod.outlook.com (2603:10b6:804:e::19) 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:57 +0000 Received: from BY2FFO11FD041.protection.gbl (2a01:111:f400:7c0c::183) by DM5PR03CA0041.outlook.office365.com (2603:10b6:4:3b::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 BY2FFO11FD041.mail.protection.outlook.com (10.1.14.226) 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:56 +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 v8IKdn2r025841; Mon, 18 Sep 2017 13:39:55 -0700 From: Roy Pledge To: , , , , Subject: [v5 06/12] soc/fsl/qbman: Drop L1_CACHE_BYTES compile time check Date: Mon, 18 Sep 2017 16:39:41 -0400 Message-ID: <1505767187-4596-7-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: 131502407968962399; (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)(7966004)(346002)(39380400002)(376002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(4326008)(356003)(189998001)(53936002)(48376002)(305945005)(8656003)(50466002)(5003940100001)(2201001)(3450700001)(47776003)(86362001)(2906002)(316002)(97736004)(54906002)(5660300001)(81166006)(6666003)(105606002)(106466001)(7416002)(81156014)(16586007)(77096006)(8936002)(498600001)(2950100002)(8676002)(50226002)(76176999)(50986999)(85426001)(104016004)(43066003)(68736007)(33646002)(36756003)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2368; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD041; 1:5FRucMYFqwL3e8Yff9FeVJyJZPcsGMl2Oa1WKAUSd2DuNF2AEKfE1GCFO+FapQ5xmfGAClU7ddCi9J2WPYX5Awrqeq22Du7GPB5qjfJc/J6YncmhgBzfDH3PtGTq5vWq MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 70b1edf4-7edb-4974-375f-08d4fed56c90 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:SN2PR03MB2368; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 3:rrNJ+QBsH+JQV+CmMJMXLeji/VkZ/23CayptqWZySoUYQ5zduWECOVd5eh2HqJunKnc4IUntO/AeAJDwHxAPaBE/en3aY3fiB9hLtf5mRHkO3OxiZ0Hrk5ktR0QHXfU1x2MieVKxmYjvy2YPyecQL9J7mtQM0E3Dc44ivt//BF2tBwLxZtK9UysSsg1WuWCQnm8bpWMr9ZTLvuI08iOpyaXbKBdlwyYinl6QIxLAHdkWXLY5mofNCC58qFIxTlNPEk3OiCjoxcSYH3645gEmxUlYqz1szICIN+C4bpy1zBv5f5Yz90KuVYaC7RMLBMnd9qZns+QJMqB3TbseblMNG5vlRHqPRGSVZjkzf+j+YeY=; 25:lmevf+0HnVDE0TmwaY8joR/j/6L1SnQ5nOkXhurX+xr8YHTzqOSi5gb+PAVUDGy86mfnGLrmmf/Twq72vMFkQ66UBCG+YH0z8DpLb1rDqiClSVi7aM2sxOg0YFCTPgBT9Y4TcSHpE6D9tmbAdMIGZep2KKHNg6B/WAagqSvZxhmVVGDnQTC/w6NmioavCJL3FZ0d1+Gd3OD80SkKzekBAl1SDxIIQVcpRCl0OH3Za80Xl1GRz8Ze1eq7fo+28Fne3uOYpzWU1F8vMntP1JOKjng7t728xzrpHJhW0qNFx+xFHmGKHwqYRqSv/LuXpGflJOQ77ONfCwEJwY+eK+HqdA== X-MS-TrafficTypeDiagnostic: SN2PR03MB2368: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 31:6zXMLSJYhmJbOERU3+tABERwag+7e7Db3gnlyUbpScvdVhC4KA+n0kBg5uZ1FNARHfqQfZfjrGqqF7hu0U9iQdFpVs1CbNpCZtGhzN8PxiS8JBnEBeKYHDNoZjMkoizyW2KM9Haaur0bn7WuRbseeKePEFw+ef9GSSG7YZ1v2u5/+cFb/ZcLjriq4dD0vOJ0d22Uhsl0u99G1qGQeuLpIz1+KAlGnuYHb0o0I7jXV7k=; 4:whFBU7LpwvGFxQpuh9NvTFrSVFqQnVllXYT6Tukc15is8nNotKuVnja8+QM87axI+KTZwi/8AtkjikQvgTVALa1qSMsPtuOhRlTsNrhtPCU5ebb0wG/ceXSainOVBRm4TjPwrfhv5YQ+K0Ib5KEZXK8yR01c0X67B1s8V7NbK6UXmbAyGG+oWcl2+kuaW89iHH1dRa59VdE7XyLWwIy41GFnVvJBZXQjcjHB1zS6pDc2H3r3LE8lRgN3wSdexbEng7WHIMuaTJ2N++Q8yAPP6o9tthB9a5GdqCQucXQtUBg= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123563025)(20161123556025)(20161123561025)(20161123565025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR03MB2368; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR03MB2368; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2368; 23:ZXqRJr4fO9V3V9FVvDewUKn6n82o1X3s8uG9HaHjg?= 4UrAwlBtfLK/OXjTCgUeCIJyPNYmZQ39K+18gFBLqd1kLteJVHWaU68pWKC4hC2Py5blJ0/T4vNhzL38vdtvQYya6C9f9bxTfJKab2Kmh+ySNmXeWyEGecDLbQRI9sNvLWvz6onYdPccT+4n3izJK4DZJExnFBTbZtGMnX4vJNSkBdvXFU9e4b0+fG4GGvvxVM3lIpI9j/Ff9/ziaJFAfh0LYLnoMT1ltcKAaaERp1zb/74njYY86ruIxroDgSs5DaWYkInH+PPkchdALZc+22B2ZL6X5S3amoXg+nlBY88s9Qqi6740jm+fSVqUkQBvGFGRYgwwc+OG8jNp8N8p6nJHBbJj+7nI2OyOy1fkAD+YQDLGXgxFNlcbsU+LIXpp9WJhnmmd69uJq1yhzRPvuKFoP49Xa2OQNwHbb76IEphDxvApl9bCxRhboG6bSNKWX10QHGmFijb7q9PSSUWseHkibbpYwGNEPTxDPFAj0qznA/yyaKhmLRVTIezm/lbN8HQwyZVl2xaBw41iPG7MW53rjB5UqhGNiJmgqtEqCruHLTSJGhAjQseCf6vCYpGqaFIgdPqnxZQMyLnGBL0YVp3iudDTgZ6Lbk7oqK4cDXCRtCrEdL/w8OO+6DboIloICFLDt0PGZcI+VfcM3QTWVJK6nCklz2USbxlcUZBeYNW2/PfpJTyPcC8ID6epKXf0bGhnHs7LBGC1aArl9H9xsV7RlO9BcEE5Xy20BXIUgJOPWbReMygBBZL974wV1jcqccfxNC5vK4CfGnGt+Xlh2yIS4gqByKP+Mi2TIdwNPQpIK3n+28bUiRyTn1n7hvDaeZGTXYvJ79iT9pOrSYxK2yxI2ShQf5DXuH2oOyN77Cg7i/nuNrt0X8oKSEwPrV/JP85Vo1x7U/30l9ddXJRQ48yxiCq6btbYYl2ib0ReyG+VnoBlLNyJKM+k5Touygo+qXqs6GOM1b7DYw6C6vD4RQqk/yhXfAfzJmho0DxT1DhH686gWxxgERmS+hjsX77/Kv62B5BO0D4bbT/m3M5A+j0j/0hIUSpd4ZUHD9cjNQhXmd9caJJubG+mBbjKslnkjAoDyASXXINnME8ph9E67gYam+OMH3tDMDLSEG22R5WFqcmMFnTWE7bziAl1JEOebyvjAii8PH7Q+OhpvmEbBT4GhmDbsg1IkdqnmCZ2e4xBo85GiKlib3aRrEvxxWCedeL+4k1SMc9w5C4+Aa96l3j X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 6:I6FMssbb6Fxs9rFZnIKP0PvqdPktJI5BGICUL7A3eItl+mkAo1vcw5rrYSNqSlFL8Emb/4ewOPmdY4XqR60K0IS5nlesgT0ssmrPIAxeUhFKsQNeoqTe5LpuvaMuNSsbCp2pMIvNtjVB7vvYx19yswdWVIngsGO9vfIPM/S1mH1ixySbPEUKBZwDzOyvUtLcb2dyZk5M8YezSrA0IAvU1pIwZbQCh2z2ZGS/wl1bPTV5KAU3eTVZtNDoMRCo8Xm4wLDP8RLKr29YLtDZvxP8aG7XSMzx5I7JBlHkt2CVaUcS6z584Rwygle7HRK5OLvxLc/CQ/JcGfkHsJxygrfuEw==; 5:lPgd5llS3KPz/QVmDGnzc1G7V31S+GoXSPUAOCLV2/ky5Zaq+JZz4GC7vjzdtFT26MUejnWKswQAkmfXaCL4BtYOfE4W/5QX2OwnWcTbwmhyntiSLP3gJ5hgQSFw1I6exwZaNCorT4BzlHlR4MGNSQ==; 24:YEAVPO9Y2av8rt+exp3acheCnx+MyGFjTUMtLxyKMkDQHN98MrmzOo1MOcV+wpq9GjH3OejjYMCSMRMsFkhaS2rjJdMdtkG2RpE4O5mPwew=; 7:WfwZID9Fg+Sfxv+z/yHGnN35YP7pTqgeLbBegNhBYjB77F8yJSO1zZDt7WDl5VDOId/YC4/FqXHJjH0PWCkaKB/2MCMF90gikfZbYS32l3ZD7Ozon8D68CH2ZvkQOiEJ6tDgKlw05jJ5jEkyF/9HbTNrJNN6ZLCRHcjxL/HmgMVMPqn2I0JVscx8VyACUPwvRZ2DTyTNyoY5ZtoIu7mFbIA6Wr9sg9cddzYU332N0f4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:56.7090 (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: SN2PR03MB2368 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, Claudiu Manoil Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Claudiu Manoil Not relevant and arch dependent. Overkill for PPC. Signed-off-by: Claudiu Manoil Signed-off-by: Roy Pledge Reviewed-by: Catalin Marinas --- drivers/soc/fsl/qbman/dpaa_sys.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/soc/fsl/qbman/dpaa_sys.h b/drivers/soc/fsl/qbman/dpaa_sys.h index 676af82..4b1a467 100644 --- a/drivers/soc/fsl/qbman/dpaa_sys.h +++ b/drivers/soc/fsl/qbman/dpaa_sys.h @@ -49,10 +49,6 @@ #define DPAA_PORTAL_CE 0 #define DPAA_PORTAL_CI 1 -#if (L1_CACHE_BYTES != 32) && (L1_CACHE_BYTES != 64) -#error "Unsupported Cacheline Size" -#endif - static inline void dpaa_flush(void *p) { #ifdef CONFIG_PPC From patchwork Mon Sep 18 20:39:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815166 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 3xwyt36Bgfz9s7p for ; Tue, 19 Sep 2017 06:54:19 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwyt35HKqzDqff for ; Tue, 19 Sep 2017 06:54:19 +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.33.52; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0052.outbound.protection.outlook.com [104.47.33.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYb2JPVzDq5k for ; Tue, 19 Sep 2017 06:40:03 +1000 (AEST) Received: from CY1PR03CA0039.namprd03.prod.outlook.com (10.174.128.49) by MWHPR03MB2703.namprd03.prod.outlook.com (10.168.207.137) 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:58 +0000 Received: from BN1AFFO11FD023.protection.gbl (2a01:111:f400:7c10::106) by CY1PR03CA0039.outlook.office365.com (2603:10b6:600::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12 via Frontend Transport; Mon, 18 Sep 2017 20:39:58 +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 BN1AFFO11FD023.mail.protection.outlook.com (10.58.52.83) 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:57 +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 v8IKdn2s025841; Mon, 18 Sep 2017 13:39:56 -0700 From: Roy Pledge To: , , , , Subject: [v5 07/12] soc/fsl/qbman: Fix ARM32 typo Date: Mon, 18 Sep 2017 16:39:42 -0400 Message-ID: <1505767187-4596-8-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: 131502407982730216; (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)(346002)(376002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(105606002)(97736004)(106466001)(36756003)(189998001)(50466002)(5660300001)(6666003)(7416002)(77096006)(86362001)(50226002)(2201001)(316002)(4326008)(5003940100001)(16586007)(3450700001)(33646002)(85426001)(48376002)(54906002)(356003)(43066003)(8936002)(498600001)(68736007)(81156014)(81166006)(8676002)(8656003)(2950100002)(53936002)(2906002)(39060400002)(50986999)(104016004)(305945005)(76176999)(47776003)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2703; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD023; 1:LrWocHkMojFW6+tPMYnbQdoASJPq93B0C441Yie8j/F/lnQlTNKMeHmtpAkfGZWXn2lrMRtmPV63By8qX+ZoIqoPD/SwaXNqrCHfTXgJhPJYJQ48CoRDoQ9UxcP6Pyq0 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06fc9099-f7ea-4e80-df7f-08d4fed56d4c 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:MWHPR03MB2703; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2703; 3:E84jok3liaWdFRBs6dxy9bJ7bMX3ej83k994OsDiI+U2Zl1n67boN6w3+Ky90IK7ppA17fqSHoOT/hTiOP4GsLo2CF3D+kT7aj6vMyTwVUnPfOq4HYwtQpsjbhCERBuKf1yJNNZPvmOa3NbuLACBt0bqPF8c/m1EaHV7CePZb9yczd+kSEWpqNct5a12lcPAXz3yuPNXYj1tdVtKEmSKGYPL8bpDaA3q6Xz6MMugjFxLDT5jwDmqB2kWxXRYdMS+Ih7RPsSz32rM83mSni2PwHdEk9tHo5/F8RH4t0TW7LZ3Olj7N3oxv324sLu9o+Uoe8rxnLudc1dubLxmC92glY2VFlPLs7l5lpPxGTXK/k0=; 25:yScXcurzlw5fxbRbTvc1t2EhJPrWttrzBx/Stt4eJmw4tECjbGZjxYCFnctQQfkGL8EuMLjugJk5e54ntN027igeW8CcNBlnC+A2f1evY5XME3NMkKcQaAqyTqlT95vbHxffm0tGU5OYx9Gz3OmcevxSG9ulPmgcytU4Ylz6RDZmLWSX7O3Hu7MN+cmqi4MBX6pb0sIoLiZ/BZcqVxfDAEDjU6XOhnY2jxPmFaUfF6O0pOnYWJkMsBzXQtOBuoyO1jNdacFGQwE0pw6+DaPWkIg/QqpGxLP+P/Nhns2OZx7AX3DOs9sKTGhC8FrzKTW2FIf9fA6p5Xmq+QjDXUWqnw== X-MS-TrafficTypeDiagnostic: MWHPR03MB2703: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2703; 31:OHfMfsTjw8//5bR0lVUClBhg9n8sb2yr+Q78B4nqSh7vRkCKApc9rhhZLOMdQV8wT1mlOQh7kmqynzauyNIJywuHzWy0PCHGMbLhmKDJA9bhej6jy56bI68Wl1yqfK6U6VSr/uc8rvaT1FJrnchGeOvV19PFbkVyez0FY5mkmWpkFc0Jqqq7UXkgs33ms41do5KHMfhptXeVAKhZdccxQyElfUacj6B++crqLvZwNrc=; 4:u0xCSdL4BMfn2DXtn58ciDaR3XeipV337hIo3le7rTiUX8gSu0GQ0qUyRb+Cs5wB3Fw3AhPEoMY1r8SjPq2wvTYTWFQ/wQ++APUDMTgHzEzj3RrR+oId5Lrz05EDCOTeLGrOQ4yR7OW08UhenX7oxnZ4GY9YtsMza6H34kRurtrlf9u/JlxvU1AA9iYcabDfimlygcLAJ+fGLdwZf7yxcm/a+jJ2y1Kn+DKkXIgAWey8cgsclzXO4PYI5vakScMxBj3cFTdvGd6I7Jl4E/rnAjX0e995JsZNu25xQ+fPqck= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6096035)(20161123561025)(20161123556025)(20161123559100)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2703; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2703; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2703; 23:xVG5bavrGwPLdDf8uTEoref7dPGE1vvx8brvAnWTq?= bWFJCVr091r6oaDSGDTJmufzpg7bjWKyaJ6jtK06T+iXdfOShcdQ+aR6Hx+Fzm5hlojfxPObAat+2qXXI2JK6j6Qxgg8dARHHobE17CuivYTifJxSHbV9FRUNGy8IovBU6eCrFj4jwXRkcHgbcP6kAiY9H7qzgb5Z3KMNvHZMKcATfagDaP7Iqy3SithADnZGoYJdeMzbAAjhq6G00to3PtycelqTIGGaYMyVlWYJAszgeOQtoMgdzARN4/VOKpEHUHPcsJZKOSwqnRYi9z46AAChNrd3fM5oTh/QdwyU59w5u5fEIL+wcojaK6HBxEe74Uejsmbx5MYneXoKW4RmJpSdq+7FlTArRqEl2BhxwfSbIRM+jyt3/o+I2G51hPzO+Pg6emNAGhH/U30Vm+QLmXGbMgH/SpbqanUVIZR8NSxgi35hN+dOq7DvgQqYsRp7Vpz2AILPTGHqVISDfgmzm7gcHw1ILuDrXGTOojhgWbMi5eClITX2jpT13zj6iZdRud87Lb5N8NUpArYmm9KL+Rf+lJGR6coS9UZGUfAtk7oyuAoid4UnQqrxrjFn170uri44KHCpaekmltaz3vQKZGWQwr5lf8qOXzi2LeYSEEm013Cg9PLP6CvxM0xodG1r1Sslo0OQsgrvlDJ7Oh0EYzVbBL03pgCe/W4GiLGzL2lVuvABlmio2gEP7Wny+xEoR184XsIWlmjLqqLhWvlmN7ajgydj7h/yVeODpfagZQ3H3iLZvLE+GE9ev80cKvEnfD0YwH0lJA8lHeo+3vlCfdWDgR090tSjLrylbDQlK3IXYyqdodeNGN4+tXKU7iQBhqHwdIoNrKuNV4bTR/7c5Dz/wHr8v9PfiX4f1Zcc97yzFWQPs0FM4OIuWxSy08cFCWUQ/7K5HMU43zJyWFV1ZCERQQpFPKQZgSIrKpTZ7GBPHFhb9uH3OoOqeSWkH2wQ7oZUsGUvz4ch8ICIB9ijsUCzefr8nKsu95c4haVmWya1zySpMe0h/WU72UagdyDu5n5QzxpvQXstge9OGKjxdRMMQvK33A6/KQ5LWLHFFTTdOhtq1AqdJK4Nj8Lf1zjdGzTiWebikKpdxs9vaYLDWEMG7D2KddRzkKG3TXTFp0voFej8PG4atTryN/v/mag0PDuw+zd705GjNlXgKbX8nIHoa7R27jeThKqZlvQbW+9Kf0YwVDHubWytoZLEKn5NV9NPGOeE7Swo/YOTiy0vnZ X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2703; 6:DIWogmHlJm02Ubl6E7fUfyhH1NGIwyuSdoo3yYxDeP9L3Vu6q50ZCFJdJOTMCfcE+G3Y3FE/WgyJnIEj16uRKJqy5h5QFVK5nwEfXqsmYWAP4aWUQxHhkb0ED0UFY5/bRQid/i0/l6OdVlYVowDmbbxo9XYsVI4d1QwZb2vFNU40TG1w/cQH4Rf4dRMAdmvJ71sEHqOe2V+63xAE7CSBY7iEcxxy7VI4KMmWk+DYi7glsWFnRfnnj21Je47MLdl17LWaBxRBdNlfpeuqHtpppnTUoGHrUZAkmOpzNqu2P+MkFJmKQ1qfyMwRk4QsJvaE08qw7LfERJO0ttdEnIEGDg==; 5:FM/hzTenfKcgljl9aud1JABp07HNQxWWSTOILFiflQUw99xtwhLt17DtiEoQcjinyoYeZW/QzzkKcR52J5oFY0Y80aiuQkKJYOoM5XRH60LjuNcY6pfximFPE1JJj3b+cED4sDVJmCnEsr75/jttYQ==; 24:rQAtM4BLnTpVkToGAvijP8sFmfq2bR85V4s2n489kMsItZPiA7vYdyY0Jqyka2Qn4mxEQimnpyJDiFOc8PyDc6bQrH3VkQUipbBURKUi13Q=; 7:oZ+4IfAVbO92tbYRQUpMqaHhDGt//5vfRlUjzj9UVQxJbDN8w7y0tDYVaHl/rhf33+724wrFc07812iM3IdsBCPqKQdYAYT6uP6W+Ivo2dAbhQHwHqoc5HpmQ7s+4WaFyui3uPHdN8uQnbX40A8D3qr7kxMZQKW9HDtPBGen+HQwWvH/k1cTe8LxjXxQgzrfwHAyHKYIgvyBGoCxs8USJuAxF1m7n3sIrnj886ot6+Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:57.5398 (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: MWHPR03MB2703 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, Claudiu Manoil , Valentin Rothberg Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Valentin Rothberg The Kconfig symbol for 32bit ARM is 'ARM', not 'ARM32'. Signed-off-by: Valentin Rothberg Signed-off-by: Claudiu Manoil Signed-off-by: Roy Pledge Reviewed-by: Catalin Marinas --- drivers/soc/fsl/qbman/dpaa_sys.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/fsl/qbman/dpaa_sys.h b/drivers/soc/fsl/qbman/dpaa_sys.h index 4b1a467..61cfdb3 100644 --- a/drivers/soc/fsl/qbman/dpaa_sys.h +++ b/drivers/soc/fsl/qbman/dpaa_sys.h @@ -53,7 +53,7 @@ static inline void dpaa_flush(void *p) { #ifdef CONFIG_PPC flush_dcache_range((unsigned long)p, (unsigned long)p+64); -#elif defined(CONFIG_ARM32) +#elif defined(CONFIG_ARM) __cpuc_flush_dcache_area(p, 64); #elif defined(CONFIG_ARM64) __flush_dcache_area(p, 64); From patchwork Mon Sep 18 20:39:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815167 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 3xwywG4Tswz9s7m for ; Tue, 19 Sep 2017 06:56:14 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwywG3ctgzDqYP for ; Tue, 19 Sep 2017 06:56:14 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=permerror (mailfrom) smtp.mailfrom=nxp.com (client-ip=2a01:111:f400:fe48::604; helo=nam03-co1-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe48::604]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYc0fVpzDq78 for ; Tue, 19 Sep 2017 06:40:03 +1000 (AEST) Received: from BN3PR03CA0090.namprd03.prod.outlook.com (10.167.1.178) by BN6PR03MB2689.namprd03.prod.outlook.com (10.173.144.8) 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:59 +0000 Received: from BN1AFFO11FD016.protection.gbl (2a01:111:f400:7c10::199) by BN3PR03CA0090.outlook.office365.com (2a01:111:e400:7a4d::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Mon, 18 Sep 2017 20:39:58 +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 BN1AFFO11FD016.mail.protection.outlook.com (10.58.52.76) 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:58 +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 v8IKdn2t025841; Mon, 18 Sep 2017 13:39:57 -0700 From: Roy Pledge To: , , , , Subject: [v5 08/12] soc/fsl/qbman: Rework portal mapping calls for ARM/PPC Date: Mon, 18 Sep 2017 16:39:43 -0400 Message-ID: <1505767187-4596-9-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: 131502407988919859; (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)(7966004)(376002)(346002)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(77096006)(50226002)(189998001)(68736007)(4326008)(54906002)(43066003)(36756003)(356003)(53936002)(81156014)(105606002)(305945005)(5003940100001)(8936002)(498600001)(81166006)(8676002)(47776003)(6666003)(33646002)(104016004)(2201001)(2906002)(85426001)(7416002)(106466001)(316002)(5660300001)(76176999)(97736004)(575784001)(50986999)(86362001)(16586007)(48376002)(2950100002)(50466002)(3450700001)(8656003)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2689; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD016; 1:lve3upOr+uywWwYJ6Gvb4IDmnLicySQaZ89QvtlcajVywuuwRNVg3H5O4TrvAc3nOe7FVyVjnyWzHY0k/5OeLUgRtyxzy4G9UiS9tiXedeXl+NO9v1wdjK6It2JLhReF MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 434287bf-1303-4cd8-5cd2-08d4fed56dbe 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:BN6PR03MB2689; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 3:nK33bNTz4Zl252sfVIEI3ZLZmgXUC9Avbk4B4wZhR7KbpGvlZ4A+8DGS0Xgt8H0KQnYQoL5/bPyh3NsD/uQ0F29Y3ImYouc8GwsgQq1ceXfZupDDPtxS5Mhh8fTWRoEiwjulXIl1kK/S4JVnIYsxIndgwqg1gON8yd58K/5v4ogVDHr/zYq1/87ph/F2FFiLTsFPIJeJRiad1wzNwwtmZ18sVlNAj0Rym2ExBdKEmrW5xIKR+eEYkhnfGT974bfKM/XqKANlIqPZTlYf3U0M0DSd00F5qO76vVCM0jobmq20BMkTYBq8pQ8IKU/wLgj/aiIcntbROzfoK+sJu9O+7s03wQ89+E/pPZLYfv/adbI=; 25:irZMMk3j4xDerd46HLw1LdBKdAqc+5u2Wfc2rW8h/c4QmwBjYIHMR19BRooPo5jgsomUnBugMRTrZwpaDbUgIZwu0mXuvQUVYb4OJm7zfyNlSPVaMhvHmvv/sd3ZWV592Zn3Ctcrc1NzTPFAEB4PuHUjjoH8LYAej4q+qq4uCHuLFv08hdwjiWn8uZyN5BBbUiRwJIN91LTbSJ4xScLteOb5bsjTW+xY89jY7H/OtJXxbfBw+JRTjyEJIZsVGmMUSmA65XqPR0iivtZwI1ukvoGGRg3U94XPDIeMMUaJ3CfW6Dq0THXdiVTkShr7oFT6CYbZHtaE4F9wJc95QY/NUg== X-MS-TrafficTypeDiagnostic: BN6PR03MB2689: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 31:KAjN5Rs5vzmEimHys7Ozq7T/DkmeHINLf5VAknPz9BxKFVt67B7deHsu94Lr2eOj/i2mStoZYoBeZ+G+ROOvxgQV9vRTwakAMsGjnsTq16hIzH3d6sd6z4jgxs6jFS5SvlUxVZar6Holqrmu3KzSUEXnCghezx6smV/vJotVEN+be5SGFgG+MWq2JY/VnudYyCYMOMUcb9P/hBhIrFicJIbHvYEBZ4f2eHne2kwRAb0=; 4:oXAEPvNs09D1hcey0GjPlOBvXpaXlR60kU3bu+nUnLBPW7YQCCo4FkvxGWqXinC6hMKGNm0p31gzNgL+QrO7xphy3V0E1XQ7FmAK/e+v1c5kxKgLJ7gCZm57w5l6pg9tzOWkQGcXXJc2/MC3O4WyAGQrDuIKdl+P8hjNlYDZ/7+WbLLWZ4rFEMMhWLjrPcPnrhHP8/BW2Gwf6qXeRbKml+8GBYTr8qqN4st/XZfIwn2puEoiGNLEmJeDbf1nCPB6xb03iYBwxiY/lXbP90xG3WB0pp2SBwelzzTgJssWkP0MPwadfoFrYfGw7scXxvzhyza627fsgIRF+o8S/b5ZIg== X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3002001)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123556025)(20161123559100)(20161123563025)(20161123561025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB2689; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB2689; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2689; 23:N+Ecf+js21XjcTZloKATiYAur0PXzseoEAKBBMuwc?= aSV8tycKpNChXvP6eF7uJcYzs6tS1KKl0dCnDPQ+5VUebMwn2/Zn0O5tqYnwimYCk3LyPsxPdeCH+IqPZ+Oaj/tqlCKE+x9iTmBKQ5PhjVvzlGxNYgEbvuebBBIk9zIUSzE3m9sY2+wWR1zVjavngYaoxOLB0XsUghIv4VSvXElVBIpbA1lmi8hW/RKV2n/koGLPcVcj565yyWsPL7kc2rsNp3xkhNxdfr2owoM2w3gBcckc2ge2tT1Qkghk7Ar05jBIFP5XX0IA3fbCjBfIbI97Yq+VGCFJY4kbnOSOJDhBpHp/JBX84T+hel3e4OtG0HNM+sVkXkte0KqbSs+Bqlw/YC9G+PbeJbGDHV9IXiR+UymD3yMAKrh8hYlCTjsHURd+CZAQmQvlvaoQmahwTu3kggVyLNGAfwUhqkuGlS8DCwyM+Y2dZjoNs1O3msbL2HPhEkdOeDxdVyy9ghQNMjtjXDqpcZQmyni0hzJu123b5MWbi83DmJti5NDKM9I/J+MziuQ0/RGA2u1d7LiVDgDguOE0q079IzYfrCrsFiRT7Daijw3djFt+JU1jkIQtjuq4fbvA1I1JJpBZYcFE7UYou2Se0BFWLvsBL4riJgI+oJX/IIZEfO0Wj8dms35hgovP0FBu4xdAUmuPvAlnui8lj/UP2qeIW6gBXWBngutxSmq1LAaHMyHSQyg60lfj8ZAU2A5jih6CDsOKFE6s1PZTdnTW6JsEoSRGV5uwJm1jScyioKcwpi3DvBnQxQHdjgYmwFu8tOCbbK6p00gWmJHdoTrp1yRXocxQYCBiloa1i7uZ1gTN6RFo0O2JHYH0tgdbQPLJWBgeS3iDcZHPCI6VNKZjrwbT1URQd3IHarBd0P2LJ8dVJ5Sujv6zhacLFqL727oTeFBOCQdNg5BXMKE3HDqAvqzNeugw47iQ1xuPfP/ELjwXcQINpscptvvEzw0DMe/qLFyCBNI8R0b/gpXj8m+otf6yV6IV29UIcIIxLYUq+KewCJ8swr0QXU36/tBg4miSK+myk+Nem1ORVMYPvEKh2agQSTWFqT/a5CVgiYgHR42p8QmfPGe9fX6b+/NoosGg0tAN0h7DkPeXrC2O3CyNyReCL86mVmZEvNG+h63QO0ff+jd9wrg7VffAAHUeqEBoNI2xtMEMuj2csw3Rxt7iF1xlCsrbD7UNJH8pGaG3fcrl9M1guWAOF/iCRdhYZoExeFQMi5bp4kf7lpk5q7TZ94M53JIDvg2hFnO/w== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 6:XMkLGqU+NzqBYpI5K2xWzuT3q6rFoQjFglGT5psMxKs/dGcoC8WMHb8RifHVtVyqV7QMMNislPDR60X0Qg2hsUSf414PFdRAoSwJ2bSoUW4wIC9vvm5LB165mmIVnQLHNLonacY23ITXNX2vaKHk/NqNWBCecF5HiVlGMbx0Dx8E3Jo27LBmySlKcFsn3Q+uVAQ4mlTw6wOXfgOs0suxaStA011GGg9RLJZuO2YmUU37ipFKTUkyWlDHmqqCyPVnPVm5wnnaysGW8C98vIEGqz9GuJjv8u6prM8QcPd7Tglk3jmu6j8BhrGTig/hhTpIlRE28FY92lHheb+jh8UjFw==; 5:nuQ72BT2XdNvv/OQmCQto0AeFPFO7m+WUta30FURJfCzR4JQMYGjy1no6BOAPpewinPE7ps1G+Hfh1U13nOdxSYHjwkKeOBXjDJvr+87yiKKlnd6iu7ZW6KAzfxrm57m0gPLxeScljasJTB4eer3QQ==; 24:AT/fwW3a8CNFKjJ9y+GGNMYwskbr2AYVA1DJziv4yc/WioC63d3JyCsTpJG6GB6dkaRqKE7OLW0aQZTejP4VUx1tEB13kA0P0b/qcpfcPF8=; 7:BoK6fPC/DDFCtBKOuyxYiUs7rA6CJAbVE5vuLlgbawAtusT8a7eAcDoZHiGQL77sMZAsZE/sfKkMZObQ5sUXGWFx8/ABf6IOYhXyoaRby4IwOHIdkxAw8S+fWvqpdEtqJBurT8pcAD1ChhP44g0xCPLkPIEBjWeg7fvSyI43sE9h8q3StJ+qwCUB43+OEpoDIFwH/oo5W8ClwCMblUPBeeHdFgBC8qLbSpnBCb+gfzg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:58.6891 (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: BN6PR03MB2689 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" Rework portal mapping for PPC and ARM. The PPC devices require a cacheable coherent mapping while ARM will work with a non-cachable/write combine mapping. This also eliminates the need for manual cache flushes on ARM. This also fixes the code so sparse checking is clean. Signed-off-by: Roy Pledge Reviewed-by: Catalin Marinas --- drivers/soc/fsl/qbman/bman.c | 18 ++++++++++-------- drivers/soc/fsl/qbman/bman_portal.c | 23 ++++++++++------------- drivers/soc/fsl/qbman/bman_priv.h | 8 +++----- drivers/soc/fsl/qbman/dpaa_sys.h | 15 +++++++++++---- drivers/soc/fsl/qbman/qman.c | 31 +++++++++++++------------------ drivers/soc/fsl/qbman/qman_portal.c | 23 ++++++++++------------- drivers/soc/fsl/qbman/qman_priv.h | 8 +++----- 7 files changed, 60 insertions(+), 66 deletions(-) diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c index ff8998f..5dbb5cc 100644 --- a/drivers/soc/fsl/qbman/bman.c +++ b/drivers/soc/fsl/qbman/bman.c @@ -154,7 +154,8 @@ struct bm_mc { }; struct bm_addr { - void __iomem *ce; /* cache-enabled */ + void *ce; /* cache-enabled */ + __be32 *ce_be; /* Same as above but for direct access */ void __iomem *ci; /* cache-inhibited */ }; @@ -167,12 +168,12 @@ struct bm_portal { /* Cache-inhibited register access. */ static inline u32 bm_in(struct bm_portal *p, u32 offset) { - return be32_to_cpu(__raw_readl(p->addr.ci + offset)); + return ioread32be(p->addr.ci + offset); } static inline void bm_out(struct bm_portal *p, u32 offset, u32 val) { - __raw_writel(cpu_to_be32(val), p->addr.ci + offset); + iowrite32be(val, p->addr.ci + offset); } /* Cache Enabled Portal Access */ @@ -188,7 +189,7 @@ static inline void bm_cl_touch_ro(struct bm_portal *p, u32 offset) static inline u32 bm_ce_in(struct bm_portal *p, u32 offset) { - return be32_to_cpu(__raw_readl(p->addr.ce + offset)); + return be32_to_cpu(*(p->addr.ce_be + (offset/4))); } struct bman_portal { @@ -408,7 +409,7 @@ static int bm_mc_init(struct bm_portal *portal) mc->cr = portal->addr.ce + BM_CL_CR; mc->rr = portal->addr.ce + BM_CL_RR0; - mc->rridx = (__raw_readb(&mc->cr->_ncw_verb) & BM_MCC_VERB_VBIT) ? + mc->rridx = (mc->cr->_ncw_verb & BM_MCC_VERB_VBIT) ? 0 : 1; mc->vbit = mc->rridx ? BM_MCC_VERB_VBIT : 0; #ifdef CONFIG_FSL_DPAA_CHECKING @@ -466,7 +467,7 @@ static inline union bm_mc_result *bm_mc_result(struct bm_portal *portal) * its command is submitted and completed. This includes the valid-bit, * in case you were wondering... */ - if (!__raw_readb(&rr->verb)) { + if (!rr->verb) { dpaa_invalidate_touch_ro(rr); return NULL; } @@ -512,8 +513,9 @@ static int bman_create_portal(struct bman_portal *portal, * config, everything that follows depends on it and "config" is more * for (de)reference... */ - p->addr.ce = c->addr_virt[DPAA_PORTAL_CE]; - p->addr.ci = c->addr_virt[DPAA_PORTAL_CI]; + p->addr.ce = c->addr_virt_ce; + p->addr.ce_be = c->addr_virt_ce; + p->addr.ci = c->addr_virt_ci; if (bm_rcr_init(p, bm_rcr_pvb, bm_rcr_cce)) { dev_err(c->dev, "RCR initialisation failed\n"); goto fail_rcr; diff --git a/drivers/soc/fsl/qbman/bman_portal.c b/drivers/soc/fsl/qbman/bman_portal.c index 39b39c8..2f71f7d 100644 --- a/drivers/soc/fsl/qbman/bman_portal.c +++ b/drivers/soc/fsl/qbman/bman_portal.c @@ -91,7 +91,6 @@ static int bman_portal_probe(struct platform_device *pdev) struct device_node *node = dev->of_node; struct bm_portal_config *pcfg; struct resource *addr_phys[2]; - void __iomem *va; int irq, cpu; pcfg = devm_kmalloc(dev, sizeof(*pcfg), GFP_KERNEL); @@ -123,23 +122,21 @@ static int bman_portal_probe(struct platform_device *pdev) } pcfg->irq = irq; - va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), 0); - if (!va) { - dev_err(dev, "ioremap::CE failed\n"); + pcfg->addr_virt_ce = memremap(addr_phys[0]->start, + resource_size(addr_phys[0]), + QBMAN_MEMREMAP_ATTR); + if (!pcfg->addr_virt_ce) { + dev_err(dev, "memremap::CE failed\n"); goto err_ioremap1; } - pcfg->addr_virt[DPAA_PORTAL_CE] = va; - - va = ioremap_prot(addr_phys[1]->start, resource_size(addr_phys[1]), - _PAGE_GUARDED | _PAGE_NO_CACHE); - if (!va) { + pcfg->addr_virt_ci = ioremap(addr_phys[1]->start, + resource_size(addr_phys[1])); + if (!pcfg->addr_virt_ci) { dev_err(dev, "ioremap::CI failed\n"); goto err_ioremap2; } - pcfg->addr_virt[DPAA_PORTAL_CI] = va; - spin_lock(&bman_lock); cpu = cpumask_next_zero(-1, &portal_cpus); if (cpu >= nr_cpu_ids) { @@ -164,9 +161,9 @@ static int bman_portal_probe(struct platform_device *pdev) return 0; err_portal_init: - iounmap(pcfg->addr_virt[DPAA_PORTAL_CI]); + iounmap(pcfg->addr_virt_ci); err_ioremap2: - iounmap(pcfg->addr_virt[DPAA_PORTAL_CE]); + memunmap(pcfg->addr_virt_ce); err_ioremap1: return -ENXIO; } diff --git a/drivers/soc/fsl/qbman/bman_priv.h b/drivers/soc/fsl/qbman/bman_priv.h index f6896a2..751ce90 100644 --- a/drivers/soc/fsl/qbman/bman_priv.h +++ b/drivers/soc/fsl/qbman/bman_priv.h @@ -46,11 +46,9 @@ extern u16 bman_ip_rev; /* 0 if uninitialised, otherwise BMAN_REVx */ extern struct gen_pool *bm_bpalloc; struct bm_portal_config { - /* - * Corenet portal addresses; - * [0]==cache-enabled, [1]==cache-inhibited. - */ - void __iomem *addr_virt[2]; + /* Portal addresses */ + void *addr_virt_ce; + void __iomem *addr_virt_ci; /* Allow these to be joined in lists */ struct list_head list; struct device *dev; diff --git a/drivers/soc/fsl/qbman/dpaa_sys.h b/drivers/soc/fsl/qbman/dpaa_sys.h index 61cfdb3..5a2c0af 100644 --- a/drivers/soc/fsl/qbman/dpaa_sys.h +++ b/drivers/soc/fsl/qbman/dpaa_sys.h @@ -51,12 +51,12 @@ static inline void dpaa_flush(void *p) { + /* + * Only PPC needs to flush the cache currently - on ARM the mapping + * is non cacheable + */ #ifdef CONFIG_PPC flush_dcache_range((unsigned long)p, (unsigned long)p+64); -#elif defined(CONFIG_ARM) - __cpuc_flush_dcache_area(p, 64); -#elif defined(CONFIG_ARM64) - __flush_dcache_area(p, 64); #endif } @@ -102,4 +102,11 @@ static inline u8 dpaa_cyc_diff(u8 ringsize, u8 first, u8 last) int qbman_init_private_mem(struct device *dev, int idx, dma_addr_t *addr, size_t *size); +/* memremap() attributes for different platforms */ +#ifdef CONFIG_PPC +#define QBMAN_MEMREMAP_ATTR MEMREMAP_WB +#else +#define QBMAN_MEMREMAP_ATTR MEMREMAP_WC +#endif + #endif /* __DPAA_SYS_H */ diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index 25419e1..8934c27 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -300,7 +300,8 @@ struct qm_mc { }; struct qm_addr { - void __iomem *ce; /* cache-enabled */ + void *ce; /* cache-enabled */ + __be32 *ce_be; /* same value as above but for direct access */ void __iomem *ci; /* cache-inhibited */ }; @@ -321,12 +322,12 @@ struct qm_portal { /* Cache-inhibited register access. */ static inline u32 qm_in(struct qm_portal *p, u32 offset) { - return be32_to_cpu(__raw_readl(p->addr.ci + offset)); + return ioread32be(p->addr.ci + offset); } static inline void qm_out(struct qm_portal *p, u32 offset, u32 val) { - __raw_writel(cpu_to_be32(val), p->addr.ci + offset); + iowrite32be(val, p->addr.ci + offset); } /* Cache Enabled Portal Access */ @@ -342,7 +343,7 @@ static inline void qm_cl_touch_ro(struct qm_portal *p, u32 offset) static inline u32 qm_ce_in(struct qm_portal *p, u32 offset) { - return be32_to_cpu(__raw_readl(p->addr.ce + offset)); + return be32_to_cpu(*(p->addr.ce_be + (offset/4))); } /* --- EQCR API --- */ @@ -646,11 +647,7 @@ static inline void qm_dqrr_pvb_update(struct qm_portal *portal) */ dpaa_invalidate_touch_ro(res); #endif - /* - * when accessing 'verb', use __raw_readb() to ensure that compiler - * inlining doesn't try to optimise out "excess reads". - */ - if ((__raw_readb(&res->verb) & QM_DQRR_VERB_VBIT) == dqrr->vbit) { + if ((res->verb & QM_DQRR_VERB_VBIT) == dqrr->vbit) { dqrr->pi = (dqrr->pi + 1) & (QM_DQRR_SIZE - 1); if (!dqrr->pi) dqrr->vbit ^= QM_DQRR_VERB_VBIT; @@ -777,11 +774,8 @@ static inline void qm_mr_pvb_update(struct qm_portal *portal) union qm_mr_entry *res = qm_cl(mr->ring, mr->pi); DPAA_ASSERT(mr->pmode == qm_mr_pvb); - /* - * when accessing 'verb', use __raw_readb() to ensure that compiler - * inlining doesn't try to optimise out "excess reads". - */ - if ((__raw_readb(&res->verb) & QM_MR_VERB_VBIT) == mr->vbit) { + + if ((res->verb & QM_MR_VERB_VBIT) == mr->vbit) { mr->pi = (mr->pi + 1) & (QM_MR_SIZE - 1); if (!mr->pi) mr->vbit ^= QM_MR_VERB_VBIT; @@ -822,7 +816,7 @@ static inline int qm_mc_init(struct qm_portal *portal) mc->cr = portal->addr.ce + QM_CL_CR; mc->rr = portal->addr.ce + QM_CL_RR0; - mc->rridx = (__raw_readb(&mc->cr->_ncw_verb) & QM_MCC_VERB_VBIT) + mc->rridx = (mc->cr->_ncw_verb & QM_MCC_VERB_VBIT) ? 0 : 1; mc->vbit = mc->rridx ? QM_MCC_VERB_VBIT : 0; #ifdef CONFIG_FSL_DPAA_CHECKING @@ -880,7 +874,7 @@ static inline union qm_mc_result *qm_mc_result(struct qm_portal *portal) * its command is submitted and completed. This includes the valid-bit, * in case you were wondering... */ - if (!__raw_readb(&rr->verb)) { + if (!rr->verb) { dpaa_invalidate_touch_ro(rr); return NULL; } @@ -1123,8 +1117,9 @@ static int qman_create_portal(struct qman_portal *portal, * config, everything that follows depends on it and "config" is more * for (de)reference */ - p->addr.ce = c->addr_virt[DPAA_PORTAL_CE]; - p->addr.ci = c->addr_virt[DPAA_PORTAL_CI]; + p->addr.ce = c->addr_virt_ce; + p->addr.ce_be = c->addr_virt_ce; + p->addr.ci = c->addr_virt_ci; /* * If CI-stashing is used, the current defaults use a threshold of 3, * and stash with high-than-DQRR priority. diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c index cbacdf4..a120002 100644 --- a/drivers/soc/fsl/qbman/qman_portal.c +++ b/drivers/soc/fsl/qbman/qman_portal.c @@ -224,7 +224,6 @@ static int qman_portal_probe(struct platform_device *pdev) struct device_node *node = dev->of_node; struct qm_portal_config *pcfg; struct resource *addr_phys[2]; - void __iomem *va; int irq, cpu, err; u32 val; @@ -262,23 +261,21 @@ static int qman_portal_probe(struct platform_device *pdev) } pcfg->irq = irq; - va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), 0); - if (!va) { - dev_err(dev, "ioremap::CE failed\n"); + pcfg->addr_virt_ce = memremap(addr_phys[0]->start, + resource_size(addr_phys[0]), + QBMAN_MEMREMAP_ATTR); + if (!pcfg->addr_virt_ce) { + dev_err(dev, "memremap::CE failed\n"); goto err_ioremap1; } - pcfg->addr_virt[DPAA_PORTAL_CE] = va; - - va = ioremap_prot(addr_phys[1]->start, resource_size(addr_phys[1]), - _PAGE_GUARDED | _PAGE_NO_CACHE); - if (!va) { + pcfg->addr_virt_ci = ioremap(addr_phys[1]->start, + resource_size(addr_phys[1])); + if (!pcfg->addr_virt_ci) { dev_err(dev, "ioremap::CI failed\n"); goto err_ioremap2; } - pcfg->addr_virt[DPAA_PORTAL_CI] = va; - pcfg->pools = qm_get_pools_sdqcr(); spin_lock(&qman_lock); @@ -310,9 +307,9 @@ static int qman_portal_probe(struct platform_device *pdev) return 0; err_portal_init: - iounmap(pcfg->addr_virt[DPAA_PORTAL_CI]); + iounmap(pcfg->addr_virt_ci); err_ioremap2: - iounmap(pcfg->addr_virt[DPAA_PORTAL_CE]); + memunmap(pcfg->addr_virt_ce); err_ioremap1: return -ENXIO; } diff --git a/drivers/soc/fsl/qbman/qman_priv.h b/drivers/soc/fsl/qbman/qman_priv.h index b1e2cbf..9407d2e 100644 --- a/drivers/soc/fsl/qbman/qman_priv.h +++ b/drivers/soc/fsl/qbman/qman_priv.h @@ -153,11 +153,9 @@ static inline void qman_cgrs_xor(struct qman_cgrs *dest, void qman_init_cgr_all(void); struct qm_portal_config { - /* - * Corenet portal addresses; - * [0]==cache-enabled, [1]==cache-inhibited. - */ - void __iomem *addr_virt[2]; + /* Portal addresses */ + void *addr_virt_ce; + void __iomem *addr_virt_ci; struct device *dev; struct iommu_domain *iommu_domain; /* Allow these to be joined in lists */ From patchwork Mon Sep 18 20:39:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815162 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 3xwynQ0jGfz9s7m for ; Tue, 19 Sep 2017 06:50:18 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwynP6nmFzDqb5 for ; Tue, 19 Sep 2017 06:50:17 +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.34.48; helo=nam01-by2-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0048.outbound.protection.outlook.com [104.47.34.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYX66cjzDq78 for ; Tue, 19 Sep 2017 06:40:00 +1000 (AEST) Received: from CY4PR03CA0014.namprd03.prod.outlook.com (10.168.162.24) by CO2PR03MB2359.namprd03.prod.outlook.com (10.166.93.19) 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:59 +0000 Received: from BN1AFFO11FD024.protection.gbl (2a01:111:f400:7c10::176) by CY4PR03CA0014.outlook.office365.com (2603:10b6:903:33::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Mon, 18 Sep 2017 20:39:59 +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 BN1AFFO11FD024.mail.protection.outlook.com (10.58.52.84) 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:59 +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 v8IKdn2u025841; Mon, 18 Sep 2017 13:39:58 -0700 From: Roy Pledge To: , , , , Subject: [v5 09/12] soc/fsl/qbman: add QMAN_REV32 Date: Mon, 18 Sep 2017 16:39:44 -0400 Message-ID: <1505767187-4596-10-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: 131502407996076710; (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)(376002)(346002)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5660300001)(316002)(8936002)(77096006)(81156014)(81166006)(48376002)(8676002)(7416002)(50466002)(2950100002)(106466001)(6666003)(68736007)(54906002)(4326008)(5003940100001)(16586007)(97736004)(104016004)(47776003)(36756003)(53936002)(33646002)(43066003)(76176999)(50986999)(356003)(305945005)(2201001)(3450700001)(86362001)(189998001)(85426001)(498600001)(50226002)(8656003)(105606002)(2906002)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2359; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD024; 1:BhePgtjTk6O6raPIL33ZmhedeYuy9Z45Ui2U7Hz0Gy5gK+RTxG6zN0IzE8amndziOzt6nd0wZbazH+h7IpSqL0+DDg3SDo9TsFJqL30xOSF7peIfDDgDd3iDod6+Wxq5 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18abf17f-44ba-45ec-9145-08d4fed56e2b 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:CO2PR03MB2359; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 3:T4fR029Lnhy83PB4U669+Xo6ReYkHVJ/MTdEBI+LDR0+5HqJ4PPfKrSdXtkJWYW2tC8Wy3U7LBdLH4IZK+ZKjnfENZKC5bWyw3c5GO5NQ6S3fhMWEiv0OQNLNKN9i4z5lc3SZ98h7kWh9pwotXJFSb60jWKkFK14uB+fGCPX0uyZrSUPWxQtGtgPmZd1RLkjZWNuLfFfOMPGGGltcEpVytmVZAi5nIWMQuJ5DDpFm6sHnWaWW1PqAHHiZir39E/tdDhH8JcJsh6ccWDkkXsTnWRZtD1RgWAkGKjkAKfU89kZy9AqO1T4xXGbKT5VDXIwq3QZ1e1W+oMCtGIHERVxPhIaPFlAB0EWzE6eDtm+OAI=; 25:JsWmkf8SvObwjtcCYf27jVCXiQkfqxtEtWVb/1ndGinZSoebKDihmCobnm+s22c6CUq9D88+ehJbhS2HhApv6O3hPscT9GNUnfjakraU4wrdkRO/UdXzdq7M0KPqzAuqUo5csc8EAx2v1kXSCwG9f35M++R1HKwfxEMRoYZdG4q3NuunERyCH1Ev3xhuvXoNt55yo2iMYXmqHIhrKOgmwO+TR3nLnuB6TxdjH1VW9916PoimaFN505RzEe6/M/bMJm8PmIpY/ojPf6MS9m6WQo1MIkkPLDRaeBQ36H2+OMOtC+2eZJ+NyRv0XPmehXlS+Di9IsGKMsl4SOKIHOkrtg== X-MS-TrafficTypeDiagnostic: CO2PR03MB2359: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 31:lOPwrYNksceSFoPA3VVwb35bc4I1GACbyurrcc8UwZX47PGS3Cd+Glw1ugwN694lFEonNHF0ll1O57bDgcenH46XZJj86MkovysjmcAq9qDwsnjbEW0HnZv8EYL1V8Y4eFSM2DKaUlbDelyMUd9QH9pNd3e738p1qGshsncx0jX/WwyY0gfbQNvvn2kDj+pDPhhqJR7vkLySA6ofNBLsep5daMiXeKNR8I9q19+GmiQ=; 4:Vmms/voQotKixUNqugMNlw5QDMTcAOBEXDej1QQfmFo2p8FlThhFHoXkhc77eT56368YWutBVyHtuwGQuFR6rqTeMehUagsy4y2BPekAmybELF0m+a2cABI/YpGc1KXGyHqB+D9DBspeHDyHvFFayhTTG5fz9vN2FbNtOyw/WrdJ1vugxtE/CnaZ//bZr+jGoAszl0RA3x9mYaxermt+XuhM2dGM87Zxy4feyfC+hFvtJqOvBVdPDsIUKiuN9ZUwQIGAWaH9nKYIHCr1i+lWTsEcC4sAkT6OhmVM4JJWAJ4= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123559100)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123565025)(20161123556025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2359; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2359; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2359; 23:wuoTP5p5A3vIw2zIY/4kj1u/ApBMufrJOcDJpZFw/?= mL4Vo4ayzcNL8Hw6q3PPWOTuqaMoFhakcBhIE6aRdS5ETtLzNNJNBPeIytm1x1WmJsB6wHwGd7cMnEQT+0/b2oW1tqUIjntcAVGe+Plk+k4TOS8qiuwADISZRONuI/tyIUNhT5UfFHBuluQ0NI9iXTIMPZvd5ngVukAWUJhqZUVwjPFkDVIXv1QFgJ42+eo0WwttdWXht/Bn8OxPPmg3yVyF6oiVt+8y5WADJlDD0T3UFmXTgBw/9nSbzR0IN5U8NZ26VYGuFOOPX4Yrtu6ksnKmy5oqSiLG8DCFKJCiLWJSoPzCMQ5KUmldghicpWm2YhvK4EsSjnDdGZVgGfGn/WtZy/zuQVDL+fzCf4BL6UQ7LIHcIdCWDaOU38lhvKaU2Yr6QtwP0OICao8QBW2xiiXm3Uc/hBGvgJYPO+7EWj2+Wf669i3Qr2WlBkn/unGiyeZkDxnBrAnHbP9V4wiitDhdi39HORzgJHTdZuqSSzxgdrx6WHKbIyBIAskDe3wtrTLK4O/M0CGv8gafBvl8Qbqm5swCfhTMudTkZk2KMU9+eA8vJxAynWxTr4wH8nDZjUJGsVJmkFjCMvW0fz27fbbAe/ksWo2kAp+ZVhxXEDyKWnu+0SZ7Jw5LkjAoWAA3KMaQ8X7auTUyH1FBD9EaXtjMyWjm2rlCO3oo5BVciT5a8JDYvBGEQRCtDQ6s6xfbMMJDwGmi4zt+NhaeajCE4CwLO6LcE2e8Oalx+Y2vJlIsbk6xjfLoTwQt65/mK7Ok58+M1q8gaFxQc51MHugiE7W/kHazIJrUVPpQLt1vv9KBuI8cNuKhqkX7PkGiQgiO+6DNfzij6qEoBexxKknGpeLTMPqHQHNJCLtsyGIZC4/lTxT6hc7rF7M1ALEm9gfYJK/1w5jvMrGkIjG2TxybhKXdea3LgC9f+KlHTgHGMkI0rii4vhNHBK7fnT2NLmTkbZ86rXo5aRfaSpq6BUNesKfZ4mwpt4k72UWPdOuIWpgIMPr7xVLVLeD3Vq88mn9JIudRdvgAu2JOaW3ICVHvLRN85/qCcUtTvC1pYqb1gG1viEFa4Hyb19o7SWNCLLzwHJ64K/7wHOI+ytsmtHmMTcdNUwqIbcmvGK7DCGXV9ST9CKIojMFV9EUd1pgjHZ4qxe433ZD7OwBfDvf5clzlmV+E6tAs79uCdztUIp4ATaPEQYbwd0r87goOCi68Fe2fco= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2359; 6:EBV2gXySeoTf1oSMeRUNFTfa0+pU5lBXi47+Aa4vS/z2bwKDdALkeAgzfKkEaPoQXF4ByQGAwHKZH5Oy6P86V9Fp2oQ2aecheJ57ccSUoe544XsnD0dDPCPT8WiqyBeux2PlulvD9q46/qX49XulSAWQAQEEQeT6jy2YjVLX+naH2H8s1LSsksqR0xN2c4QSh72v3/I8CNkqmp63foN1FPlj2Lkw1dy6taeaCOE+a/AdRxn7lGuDJp4gKefxH5P3/5URMJL3a8uO76gJJX8BaHiyZtQ1zQ5rMfxklGd7r1ibzJwDtNzbwStFm8mmwMP+dJebAyHDh2tqa+vWDZePlQ==; 5:D87PMhfHUNw5FLk6aWNFsFlIFsPu99M/y0btNtqCB0zT5iOMHMdJmiy1jU4F2ej+L9hugtf+SNLFOLzmIbRwBH05cRwy6hli6WTidaj9LSBUK2svIImlXR/FwTb03SVaypZAZBsAPjDO71jRwo3EyA==; 24:Jp4sqBW+JKVR8zFrj/nCVp3oMlABtMQoFjncca7y4iM5BAqEJhmS+fW5bBQLpScX39nKKCZu+FU15PwyTATICSK4XLI9IiUbpuQQFCukV7g=; 7:lSlgn4/cDRTLq7qhDMM/0lMYVVtYav8xwKUHSuwIj9ZScocEHsmcOwzxC1NstPdNQC0ERBF5Jb6wHO2UMpRbRh6zLDwXvPwE4pMj0wRaR9suNh27De6WMAjmrdfYduDqQfe11fjOvN9VbPW5p3FEn3XLys/bPceAwgi937y1aJwsK2irvc5hPVqftyI17AU1PchxwKisBQalVSt7K6Rx0SDKQRI2J6IGE57YsqIRmS4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:39:59.4360 (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: CO2PR03MB2359 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" From: Madalin Bucur Add revision 3.2 of the QBMan block. This is the version for LS1043A and LS1046A SoCs. Signed-off-by: Madalin Bucur Signed-off-by: Roy Pledge --- drivers/soc/fsl/qbman/qman_ccsr.c | 2 ++ drivers/soc/fsl/qbman/qman_priv.h | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c index 607355b9..79cba58 100644 --- a/drivers/soc/fsl/qbman/qman_ccsr.c +++ b/drivers/soc/fsl/qbman/qman_ccsr.c @@ -719,6 +719,8 @@ static int fsl_qman_probe(struct platform_device *pdev) qman_ip_rev = QMAN_REV30; else if (major == 3 && minor == 1) qman_ip_rev = QMAN_REV31; + else if (major == 3 && minor == 2) + qman_ip_rev = QMAN_REV32; else { dev_err(dev, "Unknown QMan version\n"); return -ENODEV; diff --git a/drivers/soc/fsl/qbman/qman_priv.h b/drivers/soc/fsl/qbman/qman_priv.h index 9407d2e..75a8f90 100644 --- a/drivers/soc/fsl/qbman/qman_priv.h +++ b/drivers/soc/fsl/qbman/qman_priv.h @@ -183,6 +183,7 @@ struct qm_portal_config { #define QMAN_REV20 0x0200 #define QMAN_REV30 0x0300 #define QMAN_REV31 0x0301 +#define QMAN_REV32 0x0302 extern u16 qman_ip_rev; /* 0 if uninitialised, otherwise QMAN_REVx */ #define QM_FQID_RANGE_START 1 /* FQID 0 reserved for internal use */ From patchwork Mon Sep 18 20:39:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815168 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 3xwyxw2LtFz9s7m for ; Tue, 19 Sep 2017 06:57:40 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwyxw1SyhzDrJR for ; Tue, 19 Sep 2017 06:57:40 +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.33.52; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0052.outbound.protection.outlook.com [104.47.33.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYc3nkKzDq5k for ; Tue, 19 Sep 2017 06:40:04 +1000 (AEST) Received: from BN3PR03CA0102.namprd03.prod.outlook.com (10.174.66.20) by MWHPR03MB2703.namprd03.prod.outlook.com (10.168.207.137) 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:40:01 +0000 Received: from BY2FFO11OLC003.protection.gbl (2a01:111:f400:7c0c::127) by BN3PR03CA0102.outlook.office365.com (2603:10b6:400:4::20) 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:40:00 +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 BY2FFO11OLC003.mail.protection.outlook.com (10.1.15.183) 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:40:00 +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 v8IKdn2v025841; Mon, 18 Sep 2017 13:39:59 -0700 From: Roy Pledge To: , , , , Subject: [v5 10/12] soc/fsl/qbman: different register offsets on ARM Date: Mon, 18 Sep 2017 16:39:45 -0400 Message-ID: <1505767187-4596-11-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: 131502408006517762; (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)(346002)(376002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(105606002)(97736004)(106466001)(36756003)(189998001)(50466002)(5660300001)(6666003)(7416002)(77096006)(86362001)(50226002)(2201001)(316002)(4326008)(5003940100001)(16586007)(3450700001)(33646002)(85426001)(48376002)(54906002)(356003)(43066003)(8936002)(498600001)(68736007)(81156014)(81166006)(8676002)(8656003)(2950100002)(53936002)(2906002)(50986999)(104016004)(305945005)(76176999)(47776003)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2703; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC003; 1:npokkwdsQvw/jyTHzUBbnF6vIfa3lXS0XQSNbbpIfCPp5NpaXfYUzd5w7mpwNr9GiWnzVIR3csHVZuEJRAIoBo45MBNhwIwrYKp8tCyXj1W/WLQNUCaE1TkkNcXEAYct MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b47d7d99-77d7-40e5-4402-08d4fed56ecd 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:MWHPR03MB2703; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2703; 3:4u7c3POpMW42PVcDCWrKKqVQAH9kGcFTs2vl57ZWRQtr5vDzDQ1jf5i4cLCvyJPkSSTmdlJU5bddNwlXL3neGuhxK28RS51Vc/O0NR6ra8OO8EchhF8RwwbFTKaOPEEs7N8z0UImtQItYpDmzjiP4YhckxYpctWrp/NyuisWJUSAUXW276MXxG8Tajs+tQPSXBqtIJv6ThtB/NUq5AiP/ipxwTcU6W2GXGl+ojoo89zrav561+Q05kPuCzQhalOz4gfjECOesI/crW0aCwd0Ir8cu6PG9BJ27pm+oEF8Bm2MjMzyw57BGo+PTdf+taRWxeivV/VbDp9ABwBcKd93Wd+UQphwAGwf1dE+gk0g714=; 25:mPa7PYGh1TBGBNnE8OGfdaR9W8s2NImBm79JK146MjCUwFLhUA+nJzCvCJLCUNqEo70f/Xatz2b8DL+CeiH3SBSBvaRaEb3Cori87AV05c1zbZOCe0yjLSyzj5bjkV3pnPmjeC0xn2KmbQPrHsVDNFjRyuxoTnPhYLF/dVw1d2KtqrHa2Vyij5fOpAS4jrDfGPDohssSw3l/WkmSH+MCuklDKVNycIPT3U4kU3QdSKmRiyu3Cn+KXJMkcz7qz2lN4ujqUE6V1namdE4OJZCrgSktt2dLmk8nJoq421zrjj0KLuIzIvteFcs+2J9MM/uvWeH/r+joNYL/MoRwHWRzgQ== X-MS-TrafficTypeDiagnostic: MWHPR03MB2703: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2703; 31:7g7/C1m1x77qRPjJL5WENzt8D2WgRehvQZe0WKajq8wjRKD2CdMDxfd7cV0JOKqXnJbxSSj/z2UAFmDoUHhliC/mfemthQrMz/hE/yRM/BrdBKicpfNljY38rqCKnr6PDJOBNaVO8rZ4Qci93rCewpEZcCNYUKn3WGZNoR4Ll0OcC5wfkIetRBKFITYo70VEpDCdQuI1FltBpUDuU4slJCWhCahn/m7Nvdi8pZ0Uabk=; 4:FmlL+7ODHku7ywmMGZeysgW9jdMKp7t5NxiVOSmrjqaW1NfkybU5s1B2V5QCEDUCuy/GmCzVCqpO8M1vp1pjVfeDNobl0l28ubHgqt8LmO+dAoMTTBcVcDjlGcn4g+ZmEG3KNpEy0MAMbsWKQfuQDVXory13rnNEMs0K6Mtq3Tji7h8uxNf+Wr8aZ3HXccnvBOffw93byi6j0MLUol3lb03PT03+KsPxW6uoY8EESjLAjACugr+Fhenwxx9tcaVyh5ZWLf31PADja32dYmQXcR6kNSJBd+wD0WlZWfw8dtqcH5p5xuRUTdmf5XKBDm4zyxnxF6WYcqZm2MWIo8B4VQ== X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6096035)(20161123561025)(20161123556025)(20161123559100)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2703; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2703; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2703; 23:NDJFe1OZauqCKfT8LywnhYB5KMmxN+dFXY0WhI5q3?= Ui+T9Pel4oMZafrGaklCc0UqqfccE2zC6SUktIGYPzArz6luYSVDyr8o+OWN5BRv+YC7r2oiDcMsVEabmkc9l5P2VODqRwpde2a+j4vsTB34YTYTj3xv0eAQHk6Xj12r4oV2NwDQU/9bYJdV0EOXkBR/AdCxlkrJc5hP6WiDHbEsSiGxEE0KvXP7MRDf0Nc1NrplnEsphhDWNFip42aGenG48BZgtdCyqV7hCtKryzjAFijusawtLlY8lA2TCNq9/XzbASfUnolieaOzekSWlgY/1tdwGLcLbQJoOrk6/6bMR9Ny6vGGHdsutp8k7jV4jJ592qodeB4lrsLduyudUJadpssObfMGxKXu/dP1KW8YszsR+mj47NovVJ8R7sZ057XrHBvVp06pmod99obM1d1CR9CZcFIqcutHkzhn5Z52cBSf+M8UdBLXZvAVz2QZnkIHiqJDGa6loBAn1EFDBwk2QmnJzmzdStHlD8ZYBvjT4lq6hCRCB+/uqxnRnZ7f1QkjRo+HdIH2tlAmpRPGpa4ucDhfpM6FQF/q4cku5nVvbKnHx5rhLLI+VDsi5rFbZ5j+QdqdQ8y9vTWZNaIqeWsRemNKxLD0RgYbb5nY2oRYrSn8Ia6wjCGNxl3HZxCsjUNayFqOrN+4Ys70R9u3V1Kww/pYsHOBXTnkeUTMpEJ/G76MwKX1p0ITJJyHyTUx2RTilLFLE5rT+MM/0qA9L5qqVhU6TKw4Yv/TWJhw9uvQW8BKhiM2TsQ/aFNjP7uhhbTqZX/vQv90Qf/AZWlZc+qlzD03SG0p0ll0/Qqb0n9cyfSEYZg7kotIp/xM5CQCwx2e5RRajEwiV2N0efdlU404JvDbxDHBiLUgNKGO8KHnv2BEX5sqsE1nhoyZCKRk29fn4PKimMqLap47x6l0PoAzbSNg6iTdupZm0D98OdnvLrnY++27REmpgVg+meVA3aeV7efCjR89fF0CAaxhcRkn6ywIafZtbfRqECSfvpLTvV1u6IX1CsP9xseF+RkwQCG/pPmAZItwIzGyyvYkwrUYDIu/MqHtEjZV3Y219pxZ4V2e40lB0MRmQNV68KmfHIeAuB+jeqnrhbQOAmKkvzX48MHMqFKnj3UzftX70wAFBZiJWS9DqKZYVe1ffQSBPIxjU2trb/a0YrGA6cA8hHcfsUeprYFLRYrGmuUAXgbUwBYqRZSDR5f+PFcSr3XMBw= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2703; 6:0UpRs2uaKBTVDY5hFBmMD6JlJX8vKOnX5Ivs8+UoDRfKwxVKuGBNIbVSe3gCUn93ByqcD6GBT4X9MYjmpEV5vGOiIMqY3Rk//5tk2/fFAgRwwXEgPezpbG8rBECkq7EUWsIkOhrxfRiNQ3yDYf5rKNwy7MK6zcgALdLC1hrcOsFK+hjdXOruhn4oGlrh4I5jf5E4abo8sO5KEKUdn54m4KcM9zG5ja4q4qh0MIzlLIKjtNDX6lRrfaqz9KPDXEc4iMpQX7J8qVSlITATfGNYUn62qJciA14xlaJicNYdjlSbkBDnxn+NaZ21VHUA3h6ItlNQGTSaITt8naAZOLlP9w==; 5:614vyv9PXPMlM79thxvXIDDi1cKR57HoufKC8fG+OR8jBnHTx2IY8h3y32yTnNCsFmaU8nsyhKHaMwqYxbYj01S52QJlhlzt/DC7dfiwAxlMP1J9NcONRVkTQf8m/Gc58i8kXd62uHossQ3HlJnEuQ==; 24:fK/FmW7C2UYsO/I75Gg3BDcj0SAjYoRrQF2KjgXZhZSkO/NX1+VGSj0tm+bNaoVgG3d53x8z/3G645LPAiv0NSi+RDUpH6jAnIncXNtRVao=; 7:NoOKHklhCLK7L8gpSxSSd+Vo3azdRPct7hO+NQEvRe/wVfzjzpHYrWryfDlszxFZoCBkLJ4/qcx//RMjbrw0v4ijFhf+/Z/lZhpSI0KWacGwlmofmEKPTayCTGO70316yXCVt1WuhTNiyIqjH7DFPkjthSpIKFWPHPsV+W2IX7MdMEm0QpsJ/aTLThrAmMv64fb4dHP5D/IMmbqCWcYVqNW+FMOl/iQnd+4+690JEU8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:40:00.4489 (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: MWHPR03MB2703 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, Claudiu Manoil Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Madalin Bucur Signed-off-by: Madalin Bucur Signed-off-by: Claudiu Manoil Signed-off-by: Roy Pledge --- drivers/soc/fsl/qbman/bman.c | 22 ++++++++++++++++++++++ drivers/soc/fsl/qbman/qman.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c index 5dbb5cc..2e6e682 100644 --- a/drivers/soc/fsl/qbman/bman.c +++ b/drivers/soc/fsl/qbman/bman.c @@ -35,6 +35,27 @@ /* Portal register assists */ +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) +/* Cache-inhibited register offsets */ +#define BM_REG_RCR_PI_CINH 0x3000 +#define BM_REG_RCR_CI_CINH 0x3100 +#define BM_REG_RCR_ITR 0x3200 +#define BM_REG_CFG 0x3300 +#define BM_REG_SCN(n) (0x3400 + ((n) << 6)) +#define BM_REG_ISR 0x3e00 +#define BM_REG_IER 0x3e40 +#define BM_REG_ISDR 0x3e80 +#define BM_REG_IIR 0x3ec0 + +/* Cache-enabled register offsets */ +#define BM_CL_CR 0x0000 +#define BM_CL_RR0 0x0100 +#define BM_CL_RR1 0x0140 +#define BM_CL_RCR 0x1000 +#define BM_CL_RCR_PI_CENA 0x3000 +#define BM_CL_RCR_CI_CENA 0x3100 + +#else /* Cache-inhibited register offsets */ #define BM_REG_RCR_PI_CINH 0x0000 #define BM_REG_RCR_CI_CINH 0x0004 @@ -53,6 +74,7 @@ #define BM_CL_RCR 0x1000 #define BM_CL_RCR_PI_CENA 0x3000 #define BM_CL_RCR_CI_CENA 0x3100 +#endif /* * Portal modes. diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index 8934c27..7cb7bad 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -41,6 +41,43 @@ /* Portal register assists */ +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) +/* Cache-inhibited register offsets */ +#define QM_REG_EQCR_PI_CINH 0x3000 +#define QM_REG_EQCR_CI_CINH 0x3040 +#define QM_REG_EQCR_ITR 0x3080 +#define QM_REG_DQRR_PI_CINH 0x3100 +#define QM_REG_DQRR_CI_CINH 0x3140 +#define QM_REG_DQRR_ITR 0x3180 +#define QM_REG_DQRR_DCAP 0x31C0 +#define QM_REG_DQRR_SDQCR 0x3200 +#define QM_REG_DQRR_VDQCR 0x3240 +#define QM_REG_DQRR_PDQCR 0x3280 +#define QM_REG_MR_PI_CINH 0x3300 +#define QM_REG_MR_CI_CINH 0x3340 +#define QM_REG_MR_ITR 0x3380 +#define QM_REG_CFG 0x3500 +#define QM_REG_ISR 0x3600 +#define QM_REG_IER 0x3640 +#define QM_REG_ISDR 0x3680 +#define QM_REG_IIR 0x36C0 +#define QM_REG_ITPR 0x3740 + +/* Cache-enabled register offsets */ +#define QM_CL_EQCR 0x0000 +#define QM_CL_DQRR 0x1000 +#define QM_CL_MR 0x2000 +#define QM_CL_EQCR_PI_CENA 0x3000 +#define QM_CL_EQCR_CI_CENA 0x3040 +#define QM_CL_DQRR_PI_CENA 0x3100 +#define QM_CL_DQRR_CI_CENA 0x3140 +#define QM_CL_MR_PI_CENA 0x3300 +#define QM_CL_MR_CI_CENA 0x3340 +#define QM_CL_CR 0x3800 +#define QM_CL_RR0 0x3900 +#define QM_CL_RR1 0x3940 + +#else /* Cache-inhibited register offsets */ #define QM_REG_EQCR_PI_CINH 0x0000 #define QM_REG_EQCR_CI_CINH 0x0004 @@ -75,6 +112,7 @@ #define QM_CL_CR 0x3800 #define QM_CL_RR0 0x3900 #define QM_CL_RR1 0x3940 +#endif /* * BTW, the drivers (and h/w programming model) already obtain the required From patchwork Mon Sep 18 20:39:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 815169 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 3xwyzT2Y8pz9s7m for ; Tue, 19 Sep 2017 06:59:01 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xwyzT1ZwCzDq78 for ; Tue, 19 Sep 2017 06:59:01 +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.37.54; helo=nam02-cy1-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0054.outbound.protection.outlook.com [104.47.37.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYf1hJXzDqGZ for ; Tue, 19 Sep 2017 06:40:06 +1000 (AEST) Received: from MWHPR03CA0017.namprd03.prod.outlook.com (10.175.133.155) by MWHPR03MB2702.namprd03.prod.outlook.com (10.168.207.136) 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:40:02 +0000 Received: from BN1AFFO11FD033.protection.gbl (2a01:111:f400:7c10::129) by MWHPR03CA0017.outlook.office365.com (2603:10b6:300:117::27) 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:40: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 BN1AFFO11FD033.mail.protection.outlook.com (10.58.52.246) 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:40:01 +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 v8IKdn2w025841; Mon, 18 Sep 2017 13:39:59 -0700 From: Roy Pledge To: , , , , Subject: [v5 11/12] soc/fsl/qbman: Add missing headers on ARM Date: Mon, 18 Sep 2017 16:39:46 -0400 Message-ID: <1505767187-4596-12-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: 131502408017970676; (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)(7966004)(336005)(39380400002)(39860400002)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(50986999)(3450700001)(189998001)(5003940100001)(48376002)(50466002)(33646002)(2950100002)(105606002)(6666003)(106466001)(54906002)(53936002)(104016004)(2906002)(76176999)(43066003)(305945005)(36756003)(50226002)(85426001)(8936002)(356003)(97736004)(498600001)(8656003)(47776003)(81166006)(4326008)(5660300001)(81156014)(77096006)(2201001)(8676002)(86362001)(575784001)(316002)(7416002)(68736007)(110136005)(16586007)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2702; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD033; 1:GvTPdrSLO8ycZ1DdqtdDSkAoNAzaboMshKg+mE39yXTIUUAaxXvzsUxXynPAZODI7+vtwA6O5pf9Ixs/Ajdd2kcNs8UxYfmMO/aCQ7/0YwkLtakn0IuH+XR6M7PEQHvK MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9511ec8-4681-4d7c-4332-08d4fed56f77 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:MWHPR03MB2702; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 3:ld1V8PEVeO5rr2YOWhe8QOVP5eiOfdfbMByu/O1yz4zYcZ82YCB0+EX5WFFM4s1GgrJy8qziKjzQril/XqCj0p/NHkMDCw1SRNhmMrZ4g4dNI6zHTi7Oexnnuhb4fX7ZKqosy4JDp4Yj5OlBxBzDhCsJHNbJX79u/zM35V9wJI5m22ide5XeKhg07Jnpms1lYGxssfT/YPqPlkV0KddcQGr6TBGnup3OY1Ixmb9ynH9kMwIaWmShpO0g1SbmzO+9Q63bDpbJB8f5gNuJL/99TRBS0rgHQofpp1Zt8s1ODCigfQv/+kWbgV/FFQlAEf/cadb4jdFqPdCNFBNZP1heRODEYQ5ezIpqCMcJhkkKW4E=; 25:EyWTTubImD6IfV203WBFaDCVEcGKUrQTnmTwEIM+RhvE9Ke2ufxAy4ey3Saxoos1WCOR3ORtPU9uaMQ/Io3wcR9ZexzLbsB3WCRQeFjc906oeec3opNE9tAyxQDtPKbmH9GCN4ETDG/NstF2lXa7l2zdAOF4UMudxQSAq0PmaRNLwPEhpSYVfklqQ+fTgvdNz2x/GhAK/PonjVFu7tYVUxoW5gG1yyXAQUs9VIXgsR8YsOaIr+QKfLH+cZQZ8B+ph84ruCKgB269yZDezqgbuniD8cipb/o5lobOfmx4PSZz3kDkdqU7q9pkwWTG+YYfUeSbmkgcJzrnxJdG3JhD9A== X-MS-TrafficTypeDiagnostic: MWHPR03MB2702: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 31:9CxIByFSAZcRjfFlEZAMuXbfP8wwtntKrYWf/i0YimxVhZysJeQONqEiRxKVlt/H0FkdKiYlKvmsHIioAGq7t/3RFNqb2pirBFxmW0Nzn5uLX8YPKMxHSBT2F9hQmSj0U8/3ypnhNNQLKckyLczQ+3Tp5BWdiqTct6zyRHbPe2XFRVepDR1XYnPV4jsCddWGhVIDDbJaKlFMuN5IIFRT7ZIrx8g1Req/WkuNwa31s4I=; 4:CPW9FY0u0pa7ayaUgbzawhLXzJxOkcG7Lubgz67vpuD3bgxZ4zyiAL3PpWU8vtYFVTfjt01kcriRmxYHfnamJRYUCwmIQ26QfdJM7pbz4ypZIyZN+JSJC14IIzq/GQ/g95RTO7bq+VmzpX0zpTkS+G67AeWE/KMTzcHa6dy2qhqQozLZ++VxAqFCYwrx2JAL0LMkfaRhqxPtbock4QGA2GKxANjGHXbyBfCtGf3o7eFlKD82653Z8EPGEMsrmttvJpad3iMwf4x2WQkwA7GJBUnyAbxbZ96pIvtXp4aF5yk= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123559100)(20161123565025)(20161123556025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2702; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2702; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2702; 23:FGmX8+MXC0r7TXNSkdE9luivsi46FuLWNliMIPYHZ?= yG+ZUmM6Vck5lEYHLK2DVUGHKC/toWRjx2PZ7pukT+6WdPUxWq0qWFBWIOKPGiO3ceOLZTZ84Nv6LmLDnU6C8ZqLWgFi5XOa0XiTMpCLfL1o6gHGwq706Iy1EGYz6oCc5HDHGCa6IBaMLmQfhiogGDgWDNV8U3c/ct4TlVxMqKlCxVy6of2fFC6D1L/Z2o/Tmxrd/YY+aum+QPcfQnug2IQGDUyGKsqjMSdTdyi2VmH3HOiSqIwVPlhmf+6OBFRN8PSXwAxpeePWvU7rKt2tx6QWcJydpIH6p//4QGzRbg7x442SdGIfDmpy4AaLHAftPl2OLrQ1ievbV992W80ATemegUaokV7HWfIzSusERjo50/xAUsTAsVBLhIwwC+acFepmpLKcHuqPegdqcf/gZhr9NcTrSm5nYLFNp+etmMnb3AFfsr60QqEW9eWbRmVW1b+FEAtFjAG/G0qLBBIKsz7Nlg17vdSyx9EyGlj2vJU4GypjLDHNw6lUSjOIyxuH6gM2lNTbJXMaNlbzLayMlUhSdgetdM6VF9gQfEfDVquDuLBNUY2uhw8knybPIP7bZnTRyAUKxOJ7hl8pAlBeyqnMh+K7eBA7MZVh9OBSvsAxWGV3dcyhikAC5BUOvn++vgbaw17/K2pUGMKcY0OTNR44kv4ltTOu21YIflLYv0oxmIAM0/mQFCbiHygPoB0gOwtIy9byD2QpYHhbJoQbIAG1QG3NVxtrQcf1rKKMX/qFqredJ0SqVg9+dSkaCgDVyHkk9YaV5MZKXC/s7Hs0wIFfEor0EBebG3Lt5o6eyjPp5KnwDeJyG1UB3dQCujFFSDmWmFVlsHzjyduY7oJi2wUsJvWwLkQBwlj8A2TTvMrYI2GKJ9bmnjXB9zKhEqelRTHzn2EXkE4xNDK99PoB0UfOUE7eFpmdOVQMDvvRuuPuekeH4cstCPyTth3c39J/TGw3KUuaZMW4KOGcuym9CA34vBZEej+3FhgB4TKc2GVMmpzeMdBJXq8S33R1cgTMZQhXu22+twPp7tf6Ta2XHE1GiLjS0ueQ+QQhCoDOly82fai7jrEZ4XPl3KaY/NTFn0oHzYGujO0odwXtOE2WCxxwYcPCC4CnlktrxefWut1HfqHHbFqkTSpQlK8kXskl+3l7OAMv784kM5iKq6Oh5topNXa/gwLPgA2OYSq7gZQjuyuhrciCRiF+HaZFzuzAZeviYCyAjTXDDH6aMctmVksUYaEoEwwozRaZ8wEW5PMCQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 6:gyjvJK/G9G8bqnQj1H5vkCO2/shalLvXodcsGJxj8fQfSZgU6Iy6oPn9szY167ifVPXMnauINJ/oFetfsHK2DgmZ3SfwV8rOZRUGwU37oYQ/DKb53lhU4Y0PQuR4BpbE105XnnnPyMiBq7xtO+1EelSAoEsy2Cvo0+EKxcGvu3Ql4VqftQ4Ar0B7Y+GlZXAGSts/jl6KVITLZfEyg0os8UwSSNypNM69qCwdRXI2QC1CzMIQMN0b6sfZIgEScqD3pd+j0hyoX8woLl3uxBi4kQFwlgt6W4Kid8Ny5AP5bJ5N5Fz1qImB2uXsQoxG48fNNN/vT5zdjCXAgQT5Xbe/7g==; 5:+KJS0Y4ozLs3eoVuBfZqMiGDbeZlCMCmkCsUXsts80CZPL07ZO3d2zpZZx4Tzv8NeYcauBK8Otu0+U1MYyBg7Sr06C0tShuGrHjCKDk+usy9jwcgelsNBeM+WtUn/GVUKC+AS/yc3SJag0gjUNYGOw==; 24:NZNmThzomi7tZ1p5I3Hu41mkLTjx8z6fbaNmxsqHXupjgAOtxuF1m/IrjbmUAkAss/Rq9DIymh8xGOeRuTe/B8oUwvlcyUCWWOvEFnTrJZA=; 7:IBWc5ogTt1J9CUMMhmbyeeCp7CRsi0aQVhAvjW7IUXXXl/2DrT2JAGLq470iqFQ2P2Z0SSxlFcHKnuOsNXPKdeFTMkudDSsdXmxQrAWsCWp4u+bXsClMEahwFxhRnzuo7u7h0D6UlSrnIgBaBHeDS+RKio9pShg4wsuSW1klT5jHs9/7VTPI+Uv60caSDC6d0KbIUH7c82uMPhH8/ueYGwsdu3cMY1JvwglGkpQX7Os= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:40:01.5942 (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: MWHPR03MB2702 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, Claudiu Manoil Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Claudiu Manoil Unlike PPC builds, ARM builds need following headers explicitly: +#include for ioread32be() +#include for udelay() Signed-off-by: Claudiu Manoil Signed-off-by: Roy Pledge --- drivers/soc/fsl/qbman/dpaa_sys.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/soc/fsl/qbman/dpaa_sys.h b/drivers/soc/fsl/qbman/dpaa_sys.h index 5a2c0af..9f37900 100644 --- a/drivers/soc/fsl/qbman/dpaa_sys.h +++ b/drivers/soc/fsl/qbman/dpaa_sys.h @@ -44,6 +44,8 @@ #include #include #include +#include +#include /* For 2-element tables related to cache-inhibited and cache-enabled mappings */ #define DPAA_PORTAL_CE 0 From patchwork Mon Sep 18 20:39: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: 815170 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 3xwz1X3ftPz9s7m for ; Tue, 19 Sep 2017 07:00: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 3xwz1X1zHTzDr47 for ; Tue, 19 Sep 2017 07:00: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.33.46; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0046.outbound.protection.outlook.com [104.47.33.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xwyYg63ynzDq78 for ; Tue, 19 Sep 2017 06:40:07 +1000 (AEST) Received: from BN6PR03CA0013.namprd03.prod.outlook.com (10.168.230.151) by CO2PR03MB2358.namprd03.prod.outlook.com (10.166.93.18) 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:40:03 +0000 Received: from BN1AFFO11FD017.protection.gbl (2a01:111:f400:7c10::157) by BN6PR03CA0013.outlook.office365.com (2603:10b6:404:23::23) 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:40: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 BN1AFFO11FD017.mail.protection.outlook.com (10.58.52.77) 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:40: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 v8IKdn2x025841; Mon, 18 Sep 2017 13:40:00 -0700 From: Roy Pledge To: , , , , Subject: [v5 12/12] soc/fsl/qbman: Enable FSL_LAYERSCAPE config on ARM Date: Mon, 18 Sep 2017 16:39:47 -0400 Message-ID: <1505767187-4596-13-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: 131502408026896994; (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)(39380400002)(39860400002)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(6666003)(5003940100001)(356003)(50986999)(85426001)(4326008)(106466001)(50466002)(3450700001)(2906002)(50226002)(8936002)(97736004)(104016004)(8676002)(68736007)(43066003)(316002)(76176999)(81156014)(7416002)(16586007)(54906002)(5660300001)(189998001)(105606002)(81166006)(2201001)(33646002)(305945005)(77096006)(2950100002)(86362001)(47776003)(8656003)(48376002)(53936002)(498600001)(36756003)(110136005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2358; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD017; 1:bPKEJJ1ALCpD3E50YKtAA5xmcIwyCbmXWCi6qtpGjsbDX3u4oWTs2nXDyEpqu1qG7pqNBKYee5VvwaSLH1AYKn0OI9ngs0CdjiuKP98e6pNnT7Om9POsKi9ulK5HV1Lm MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8950dd82-a263-4a22-3a62-08d4fed57004 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:CO2PR03MB2358; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 3:pPtE4RvfIc5dprPC8f+6xrFPj3U9KoWk7qvcOcng/eLFqkMOPJkzaM8Na0A1ihYee8o4ZqpbEa8QX+HgnSSbZY0/oaiWNKdy7dEZf1L+oyrbKUW5NNF2pgouG00UR4peR+Vwqma96rBqseDyT/TLpnuJF3YOw14bCLdACJuECCB5NB6KddNQ06r5bVaMprjKTyzR7LzV+6gc2+V4OQo7j/RSftmjQ16+Xw473ClnMqwNS50rsAXKjGZ1Mu4lPs8xO3RilkMARvgKvZwo0Y35i52Hzlwfny8orxlI/x0Fo4O0nNW26OLqswRtEz0b1X0+NlNNz5eOOX0uIK5rl3JnqeU0kBbCaVmPkr/oiQVbNB4=; 25:DY7Kp8jlZSszdx1ktJFx4C1pfMkk4F3tkU9TI2uI71Vnts8u08JHKMlCnVYyLqpQlBg//RbonyqzojGHvXQANMtTQNOc95cM/zrqLwoPicqePq2QuWn+22FTL7oNqDMtT1MH19GH/Wb/rJZgGh2iUKs4B9ez8+aGs8Hq94IChxy6Z3I0X6wq8T70nrwdZhEvWuLOcSy1Yvv7CKzjiCGdPtmgdzEumgE9vGovp3C5e0NoY49lOB9M6NdtZo0UJ7KEO707sfCuoxusjEKo6/nNkrfNpn/dkG+8KvWfzHSgZOxYU5JG+fdCwEYWd8gnfMa8ZJq7J0smmFQQtQoeST/r5w== X-MS-TrafficTypeDiagnostic: CO2PR03MB2358: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 31:rsam9m4hHTKcJoN3QdOuvbB4+gbSGcmkfbKVYLkVobYnylBnbB57Nfi2BVZhr2TQP8C7BgytlN52RYbpaghvYcDJ9oNegntGv/Zs/D6ydXtjgjT0gElywDWTElfFY31LSbsi1Wdaldi+P55cfdEySYVtqk3PakAOWtGRDY8KeFQYombtYG8iIJCOELElO3van22R/W9mU+In7G++B/3T0uu8LgrMFsTdJnJNqBmTqSQ=; 4:exH1U1xQo61c2hCO9UYj699uiRRjeb84S1v6uMeJLn99mk4keHpAv+aclNDjrLbRxir2Mp1KR1QfC35mRo/aQJHkzWPbsIqEPIx/kwRe7JBh9xiA2RIuJIPcizyAvVBHqk/UXRVZp94/P6jX4QUTLwGnWq6+FCJNWS6BGpNWlH7SsDhSa5a/8J4owfsKPkv1AnRv9EwxEaC4Z3DHWPr/MfsuHPi4oKS7WUt8HXtZdeZaybEo1Vv6mxDuMm166mJ+fhfiAMIRqIl94K4SEHisIpb9x/s0G4bUrGoSREFYiQc= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); 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)(3002001)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123561025)(20161123563025)(20161123559100)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2358; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2358; X-Forefront-PRVS: 04347F8039 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2358; 23:wxnhX3osG6Y2k3L1r7CMOTC1dChJ56Nujt7Z0xmiX?= TIcWbJ/EIchHLzBlWVqGSdMys21dRD76T8P9C+YNMFurQx3ZT83TWNO/KHSabZ+Eje3gPOuqNEUingtANQrzwOYC+dGAlrwQ1s8dhJ6KhwZ67vd9JjlgSl0PfPn7mYhTe0wFNA0RmnvbuZqYhD/W+9svbC635qO3VxeB/YlmrQSlmFVUqucS9UFsjQ0Z3BjPq1oawvxjPAyWX7U+nxvOeLe1Qzk0cyjnDVYFCyZCHrdcjClGZYMhBbtOPREvBnRIQe2qbxkG1QLn8nJkBE+jWR9vBj5RcAjn+QXQJMUR38TEFNm6fmCzzT3/SbR0OLmGeYkeByKlcxGRHqv+4zXU9O2204K+2nPTWMusW8Hw+mTWIjT425H2EYM7TLH06lw732zMHUu183dhq9ENduivDUwpgRvy4JvhK8TEHE4DCd1IfkD8LLMlehlAQk5TBRhTnhZSjhcJWQjPKJe4a+8IUDw9hVeGW5F6e0OLLJdq29lU5fqhV0BF8J3TmwW1nUmEOSMeTXdYtjNYCRG4QW0zIGL5OTHH/merMXjOljs9mxb5swnLham1gkatNVWL0SnKiUmS0KuCGCPzEeoe27QCvVREnnH3n7fuZUdZh5NgiA2QHZGD7cWG0IkHJqwzGgdUf5MIB/Ntpy0c+MFSKncckTzNXBnkNayK7VVdjzunl29ASx+AfUjmj1A1ld3fSgFjSW6fZ4ObgrLIS03s4pYQ22jDMl7XTlz8q0vJSdKi29//qdgAnzb8RjxAOOYCcGTxwopAZJtT4QYF8YBqOXccsXPL7uA9PDGoJ1k2S2A0EFlsqbQFTYTUun2auIgBrc4yQGHziAZtqyw7tHdA1mnGX2XIZkisG1eSfIbY/R3i+8NnO4pRZrPGrzz2OjrErtK8jW55Rc563NAUgFPIJ5H2qGDpCn/3IK+2QDS5NETcuvmkPYpBeqwKDCyDyYeqC0SHKZOx7sYu36GO5/mEyYCpd4871v71rCrQ9TyAY9o4sioNqetC+q3QZ8h93+izVjbJ6rzSRSw5c0cyp2CUEsq7UOlUSMg8mwCJhM8+znNEczqZ4wQ+P1UfOxTik3UabyD6q6++X3qnaBS8/lTKNEldw4sCOtXP/y2qTIQGPvUDlqbr6cv+mM4+VsaR7iQFql6WPoC6T/K3QuDrVPzyCjz9FS0Z8l14GrhIU2EYZ5yxt2gt21ddTj1C9ahfhYiaCuZW6o= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 6:+nt1hYQHT3CwoeV3m8K8Px8pVaw09MpJqwqqi7wohV3x5obcGUz3In3tfJsfhkEfqK7D5eQAQDlTo8j16dwJMRUBGs5Sk0WVJpkErlcjIb6yo148hB6/+GyalFSv2DOjO0dIrZ/Y8RzTcHGodQ0fSJcuvYO+5a6bwaovCRr0paiCtoKGaN/SDQU8XDMH8C+YHd026fXOkYqKZAxifLtwyBlr4wQ4oltbtx7wlJNcMcTc+7SQQ+v/Tq7lh3YxMLUI+KXWgxqjQ7uUifRzsOEj05EUoP5XBnrOJgyrKIbOt2yThNhb/en9aW5A4NIgxDtkPlrV4gOVAYMhIdH4GB6hNA==; 5:QlCmWQEA+a3y5dgrQ+0uVLUp/G6cwwT6XXnIbfQGTzholXds/HjKsDqTaJj2AYzkU5tvkPpVAGF6t8yEM9KZVt0vcrmW9pVj/dGvKX6Jx4Vna+43OhGBx651FaiVcAhsSkvMuE5uAoH6tEvcECLfAA==; 24:Iep39KChsrQe9utPcSsZ81n03BqBNhpIrcMmsQt0fzFiGQT0wsEn0ZFe96q5WZoQy4AmcR9m3VeNkYdQ35m1LRilVLfgTAFDffE073Obcww=; 7:sYVRvc8LMjrsYU1UiTW4T2aXxVY4yLbiyD/qszGdgYIPgWRtfe0SoZsr5+jfGpHrKhPZdq0u7sN3OZ/vSUp49r+b++W4oSwrS28b2NPnH+CsT4NNxYYKIO3mn3FiWoXaouXDKMLdjkzX08QNaMY/E13AOAM2BveJW7qdTTSuVN/9QsAXemFLpMacb6mmLpW8ddjbnRkB8hHW5NXPVYoHbJg1ToxIOjjBa6NGDriDcPw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 20:40:02.2840 (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: CO2PR03MB2358 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, Stuart Yoder , oss@buserror.net, Claudiu Manoil Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Madalin Bucur Signed-off-by: Madalin Bucur Signed-off-by: Claudiu Manoil [Stuart: changed to use ARCH_LAYERSCAPE] Signed-off-by: Stuart Yoder Signed-off-by: Roy Pledge --- drivers/soc/fsl/qbman/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/fsl/qbman/Kconfig b/drivers/soc/fsl/qbman/Kconfig index 757033c..fb4e6bf 100644 --- a/drivers/soc/fsl/qbman/Kconfig +++ b/drivers/soc/fsl/qbman/Kconfig @@ -1,6 +1,6 @@ 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