From patchwork Mon Jul 23 17:00:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 10540619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 97E081805 for ; Mon, 23 Jul 2018 17:01:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8157928B58 for ; Mon, 23 Jul 2018 17:01:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7514028BEC; Mon, 23 Jul 2018 17:01:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ECB4828B58 for ; Mon, 23 Jul 2018 17:01:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HVgEQUreWUJMZSZ8A5BkVOK76UO3OiezwL1XF+Pb3aI=; b=pdFFLM5NbhHrmQ L9syk6TvfSxG7zfUU2PdWypbGK3ODRGN2BD+Bk+UQp6PrMdVvj3mopufFyr9udz9sG0Jw6ImrC+dS LEr7GeG8d3NDvAACRbjzayahc9y/K8NbLwHviPr0W3F+yR6R4nL0zEE4p+8CvsLIr0IjxSVpMccH7 936Jcnb1u3C5GkP+uhiL/Iy3OAs/98BzbmWL+u7ZJOzW1rmQCoXjwiHwLr8IP9IiOCshZ7GzzGWHF qKUzVVlkymT9drAL1bQl3excg4UxdYA0GQ3G4BWx46FJZPONcgSE1uktOLK46T5JNk5yyunILmgn0 l5HWkwmiVOqbDvXnI9yQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheDB-0008KA-VB; Mon, 23 Jul 2018 17:01:29 +0000 Received: from mail-eopbgr40084.outbound.protection.outlook.com ([40.107.4.84] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheCt-000813-7G for linux-arm-kernel@lists.infradead.org; Mon, 23 Jul 2018 17:01:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lDZKIHyR2034iUyRWQVawtltx+astMShveJjBdzqC+Y=; b=vo8iXNmllFkxJun3vOpUrUJBfK9I33fIp7uB0fNaEiYUgQOuqNGofIIe1zs4cxw7DPmNd5wxxc7HRSui7V3hvObXxVp/C1tZsjddR1lKCFFsBMOO3ueHAdgtR4+Sr+LD+kyfcsLDJw6ZwCMQeHrEps2H4rJMSf8RbJm2qwlUFLw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=roy.pledge@nxp.com; Received: from rhuath.am.freescale.net (64.157.242.222) by VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.16; Mon, 23 Jul 2018 17:00:46 +0000 From: Roy Pledge To: devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, gregkh@linuxfoundation.org, leoyang.li@nxp.com Subject: [PATCH v2 1/4] staging: fsl-dpaa2/eth: move generic FD defines to DPIO Date: Mon, 23 Jul 2018 12:00:22 -0500 Message-Id: <20180723170025.2259-2-roy.pledge@nxp.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com> References: <20180723170025.2259-1-roy.pledge@nxp.com> MIME-Version: 1.0 X-Originating-IP: [64.157.242.222] X-ClientProxiedBy: SN6PR1501CA0021.namprd15.prod.outlook.com (2603:10b6:805::34) To VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7709d918-d4f1-4ea3-a1ce-08d5f0bdd6c9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4494; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 3:4KwJdjx4R/CMTvflFmG3dnMCN8hlYSLWWPUShA3tVEcTeP/6WqcZoX5dUIL2zIG/IZqvMLF73ec5pPNpA3t6AliFCYBToOgzG+xym79t0td+8BI4A+LoqXXSMJsrO13O+SAwzkWbiaJzTPlROtkI/JuUYr+kKRliXCs3dHUuOEjT2VzsyqnFTigWpePyf6QFIKwQs7YmMzDET4p2DMUCAKgU+OPx6C6ly6ixs4v2IUcFCuuVBQVGYJK1FKdDNAl8; 25:nG/AsBk6XY0G7hygfkSTiXy0tKXHulbrGV9Y1kxqLIQeS5i8KaCFMC9VSRpfYOgd+3f8JByFgShYASTg4tmD+j6GYoPfEHrgpmP+XHJdfKdXgl4cN714kc6rBW1OkYh4a+pY6ewanx7w/vOO3B5Xq+yhJZeq0EVdMeD5lSSxtOXIC5DvW8K3U9xCQXO20qDzQK5U292ueH5TkGhYfo0JZKjnhdYrqG2CI3qXwHlWGuOotKsMVp/KG/zoZprVgD2nGflwahuZluopzFe4XeaCgYy6fAv7HevXbV4Zw/rQcWnc1VW687f9rMf+jA+iyVP6JF8r9dB4cQgYus0grIgyLA==; 31:MPrMZXmaUBjMIZi8C3QCFrMKsb1vY3wJQOA/2UK3+3yH0lURHV+K7FsIi60IVO7tgJNNsI27VbThcTDjxCQBjeDMMoLoEzGsCO0ZjOEfX8vIwykK5B0JAuIJcIYTEg68fXQ6zVwa4f2cC5vVxLYy5/iIUJwU47Re6nU2ZqgLQmAnxOJdh07SgMUtq17q6Kg2ajG4krE0i9O8B5ouju49L0R6Fm1ErQkZ4WiRGw6+TC4= X-MS-TrafficTypeDiagnostic: VI1PR04MB4494: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 20:SgW0vcM5ttDfPpIxbeH3CQyHLGoTdFrjw+dJYTYTrkm+XxVG4nRCmt7xT0ayUm6iY/TOfMgwLt3WnfeLNY1EARa3GQ4rFzcXFXTTE4oFrD6nr1HNdPJUDx3h969KccFR86qNFzvmv627J8W5TUT/57ArUaxnpHRlhw7hAMdZlUwX55c0TCwU1XLv2IkeCMkcCM1+MkegdVkx7PgIUZMMhhhwiRS1aVfDYe8Z2D0BdYA2iOahgUQ6rNHYjgXXLzcDOmMfC2664zKP2BW70lceScDYClwZyT/tksMoBb+MdEePoCLe9lnN7lSafc6B/6brEmAwj0rSZUB+UOumTf15z/SNNJ0AgQrGfreRkLzY+H6RBcfbh5r7jPOJv9hMeg7+7lWE6ur7kW5gUE94ERKsF7ZVzxms3SxOTZTMrigs8aL0lmd1VmKBVqCuf/txyLiim/m5VzSmF1w4uXoPNFbqBUBS/9CXbjhscdVTPmvEOqgngTtjs/KUq+zipe0D9tS2; 4:0KgfwQoWhaImRfN/tRhC32MNlKCRIdrUmnLTwTmlNdweeleodYfurd6DztXgPbfFhwxDFwlwSFBQtZLpd185EkS+BMBP/nLRWrSY7lDwXeVqyZOK9B3JufMyRnGkGqV/JIF58L8JO4NlE3bjAPbZLRUy1mClvTJMSpMrZMLpNA60Sb0Lzqb5TORL5sybGrfVdeki1EIBBMHTjAZjrMv9V/LPeh7ZUbOM2ggQZFc8/naBktXcvsHtHNtZVtjA11vNG1pv9PJV/rN3Euwsjsbc/MWka4ihI8usKx5JSAf9HKjZgHAfCvfv1usUmYeF+At/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR04MB4494; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4494; X-Forefront-PRVS: 0742443479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(136003)(39860400002)(366004)(396003)(189003)(199004)(7736002)(386003)(6506007)(76176011)(105586002)(5660300001)(6666003)(186003)(2906002)(16526019)(6636002)(26005)(47776003)(8936002)(316002)(81156014)(3846002)(6116002)(50226002)(53936002)(476003)(4326008)(68736007)(106356001)(446003)(11346002)(956004)(2616005)(25786009)(14444005)(43066004)(6486002)(575784001)(50466002)(66066001)(52116002)(478600001)(8676002)(23676004)(86362001)(2870700001)(3450700001)(1076002)(44832011)(81166006)(36756003)(486006)(305945005)(6512007)(97736004)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4494; H:rhuath.am.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BVI1PR04MB4494=3B23=3AC8UpvdG?= =?utf-8?q?BGx1cLF3nbHjaaQTgSzBJxeGbItD48IDbcGqhzyLOQihBWvvej7N4DYbJGAxOAVKl?= =?utf-8?q?i7wYzBR5Z7vQxOiopGWFZwZfhX5fHoDi1+PAoxlT5kStJr2NKJGQ4gtcvA5YMAfUJ?= =?utf-8?q?Lf4PMBcxxgDq8AsmFygI84TnwhILz63CYwBR9VeclEf0Fv4gkGWCmV8h45XE7r9ut?= =?utf-8?q?6NXQYJZV84efs3ZfjbkKiNWECK3+DWHBmR+ZDsbOAV5GcHe9fRleEVQwp0ySN1T2z?= =?utf-8?q?NyLYYFov+nJJBfEuflSb25iUUqn6a5R0eDDWrS7rcE5Y82VvSNOlynOow3XUok2Ww?= =?utf-8?q?EJnzhjFQ33+j3gVA0DhD3kuiV0Q5uNRa4UjaGPhevwhq1Xuv7AE6Oj/xsVll4dNZ6?= =?utf-8?q?wj9GYXdnaklYRcO92Omeoi/0r4EKcXhQyPn/wOV29KwX0bOHe5Zr1Gycjzlm7XwvT?= =?utf-8?q?OgqZN3/0N6oeQMnX6MnyZfD+wKtV52D+9ibERGwfbi+2qI/mpYQLHkKecctCz6A97?= =?utf-8?q?zKq3tP3qvwtTG8b6GP/v1FpyU/ol62Cr9+0DzTW0aF+9Y5xldDy6AYWRYlGeHhSNj?= =?utf-8?q?YsbHJsK0sU/kqJ0f77OiYbjpsOlYYoB0rGjJzfoNOZ4BsqH2KXzJVCGs07ilv1/oz?= =?utf-8?q?Ba0IJNaFhqf/SB5Lh0XC+MRJOY+rDMxtpFGyYT/C+PQe8cZpuGW1/GsSXuVdXkU6T?= =?utf-8?q?b+JQP9Duf1uEeoNjbpFO+ClozkKU7gQhQKFrZ7wKCgP+CDijPHI4qckVmXLahmV5N?= =?utf-8?q?rAVsdAES43aEcC5kGmSOGlZsgGzOPUQG6lRAPq3Ws8iMJiBwsfO2VA6xWiVIFuiyz?= =?utf-8?q?dFflrQt8eGfh7bFr8xOIUK7zhrHt9mXdfNh79YFCBEPl+iNogcaTmaUF6wtPbpFaN?= =?utf-8?q?QdBxyyDtcVslBQeOZ02ETojCT7nCQ/qwIPpNe7WATdxSacFJiGRmJKzU7eIavh9c7?= =?utf-8?q?o8n2SnasnTVZYYTs2EkaKl2l650FS5jgn0P3M+ec/pd1mq2nINUaBrsOijST0hPWc?= =?utf-8?q?87E38hCJ/pEBhFo0iC+WotQFNZmFqnEpYm2Jjk95erQftOMfMqwoLb+S/QZjP4ClP?= =?utf-8?q?XAG0dV7WLSmc9oaV1VjYOngo340Y9D6V0CtjlxcEhS8zwitWX26fKY7945zeqkC3H?= =?utf-8?q?5UNaSXoVnPju6G0wZ+nza/v1Y0aVKE4V3yOTn0x4WjYtQVsUFIcfIiiFsVxE7YtHY?= =?utf-8?q?5AYjNCxYMf3pQ3091f4WVlbQMdaJ+rp57O7pGrPYel/1NNXoDBiTzCdmck4w=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: TV2k/+VqXFFkGxYYQCqdNAzJT+pExl1aEja7whD9h8mshn6k4J6Mkbcq3SnJdUtHcRfWoFQAQaJOUP1r1s4pQqjOY2TxJn0Z8PYBpDkiDu69G0YyVtwPnCAq1vU+z3AwaqoHVngOtHExzB2lfD2HxSgDrpa7QsoLcXk3kiCRU3hjWHFv9S5EA0AS71m+AAvI62WujuH8LuTdU6KmxvJnZV/eEiRRnSSfi2EslKcx90fitR+IVUHUlqEhd2YndtxURXl6T/VsY7XGL9amoOq3ghwA6kjYeogSC7PYdG6c8TU83yfKcLXxUnnZEQd9PhIM1D7TDPQ2JnX8mK+6h7QEZi2kuWVJZIAXCF/lEItNfao= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 6:6qHG/QAcMNx16/yyY0ZqXfMD4p60cXc8eEVyZcnAnpb8KeRwYv642koF7AupjaCvTjCYNhm5HviaoRgxHTjP0GAzi7yz4sTHMYzpzEvsyWEKV3UziEn166avp8jkOqQcsstsx4qH7vdTTCBzMvmdrPosTZShAzut+oIYcUDQ9W4xbOEetxaZ1ZISWd5ApkFrdH6uBWaRbrZNKmS9Pg7Ifw+GGDSZwmD/lsrpmxePwX8MSNeBw2Xius1xxuCTXXiYWptyxZ63wRyUE4S5ytmk8KWc6GXPpHdSjkS6M0XS4K2+rBx4ihbLdroekF4PiitrP9fz561VFlo5ZK2RptLLaI5RfyRTISVFXW/rmtw2b7EEn0BOlkVjC+msO0LkPQ1e/gDxwZXRYVsbQhO5eCgRnHWfAGnRUvC4JKh0r+rnJ8h3vIYzouf9QeZREXOpBM4UW164ByY3sqKuchFBgo34rA==; 5:LkvIWoeXMF7xW9dWSiFSwC6f+EsU3PG/0DrSvBIuGM+sCbbOxlYber15accoIJNplNQZaq5wdO+BBZ3OuygVKKtGrrkOdtusbS1ZJJkO862pJDPnEix2kG6geBbvl1sdLwQCVHrPG/Zr7yu3Ou6t9k4292FfPotF8mPdvmiGXqs=; 7:Cn46CoprVF6+iU54GVnKmfd0HH0C3jF1V+EnIXU+kon8/unwhCFjZvUPSXj/wTN5y2mrRdk5wnncCx5mjRXhHMLMhK2sq8M3JfpskQCV6jhF6F85aFJaDQL8FDpb+MaGiS/GMUB8M4BErSjtEjoGXW1YEQzLbxKFvLzqFSkRUvxzGmocgWEB1c3wX2w3QxWK5Qxnsg4apdVyZNRagLA0QYLd1wS91Zu6TZC1rSGs+/zR6nnVevWQj1E4KD+ASqZO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2018 17:00:46.6910 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7709d918-d4f1-4ea3-a1ce-08d5f0bdd6c9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4494 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_100111_265967_543F98C9 X-CRM114-Status: GOOD ( 10.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: roy.pledge@nxp.com Cc: horia.geanta@nxp.com, arnd@arndb.de, catalin.marinas@arm.com, ruxandra.radulescu@nxp.com, linux-kernel@vger.kernel.org, robin.murphy@arm.com, laurentiu.tudor@nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Horia Geantă Previous commits: commit 6e2387e8f19e ("staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver") commit 39163c0ce0f4 ("staging: fsl-dpaa2/eth: Errors checking update") have added bits that are not specific to the WRIOP accelerator. Move these where they belong (in DPIO) such that other accelerators can make use of them. Signed-off-by: Horia Geantă Acked-by: Ioana Radulescu --- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++-- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 18 +++++------------- drivers/staging/fsl-mc/include/dpaa2-fd.h | 12 ++++++++++++ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 3963717..d5f0ac5 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -455,7 +455,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, dpaa2_fd_set_format(fd, dpaa2_fd_sg); dpaa2_fd_set_addr(fd, addr); dpaa2_fd_set_len(fd, skb->len); - dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1); + dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1); if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) enable_tx_tstamp(fd, sgt_buf); @@ -508,7 +508,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv, dpaa2_fd_set_offset(fd, (u16)(skb->data - buffer_start)); dpaa2_fd_set_len(fd, skb->len); dpaa2_fd_set_format(fd, dpaa2_fd_single); - dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1); + dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1); if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) enable_tx_tstamp(fd, buffer_start); diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index 905a4e6..9269cb0 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -124,21 +124,13 @@ struct dpaa2_eth_swa { #define DPAA2_FD_FRC_FAICFDV 0x0400 /* Error bits in FD CTRL */ -#define DPAA2_FD_CTRL_UFD 0x00000004 -#define DPAA2_FD_CTRL_SBE 0x00000008 -#define DPAA2_FD_CTRL_FSE 0x00000020 -#define DPAA2_FD_CTRL_FAERR 0x00000040 - -#define DPAA2_FD_RX_ERR_MASK (DPAA2_FD_CTRL_SBE | \ - DPAA2_FD_CTRL_FAERR) -#define DPAA2_FD_TX_ERR_MASK (DPAA2_FD_CTRL_UFD | \ - DPAA2_FD_CTRL_SBE | \ - DPAA2_FD_CTRL_FSE | \ - DPAA2_FD_CTRL_FAERR) +#define DPAA2_FD_RX_ERR_MASK (FD_CTRL_SBE | FD_CTRL_FAERR) +#define DPAA2_FD_TX_ERR_MASK (FD_CTRL_UFD | \ + FD_CTRL_SBE | \ + FD_CTRL_FSE | \ + FD_CTRL_FAERR) /* Annotation bits in FD CTRL */ -#define DPAA2_FD_CTRL_PTA 0x00800000 -#define DPAA2_FD_CTRL_PTV1 0x00400000 #define DPAA2_FD_CTRL_ASAL 0x00020000 /* ASAL = 128B */ /* Frame annotation status */ diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/drivers/staging/fsl-mc/include/dpaa2-fd.h index b55b89b..2576aba 100644 --- a/drivers/staging/fsl-mc/include/dpaa2-fd.h +++ b/drivers/staging/fsl-mc/include/dpaa2-fd.h @@ -67,6 +67,18 @@ struct dpaa2_fd { #define SG_FINAL_FLAG_MASK 0x1 #define SG_FINAL_FLAG_SHIFT 15 +/* Error bits in FD CTRL */ +#define FD_CTRL_ERR_MASK 0x000000FF +#define FD_CTRL_UFD 0x00000004 +#define FD_CTRL_SBE 0x00000008 +#define FD_CTRL_FLC 0x00000010 +#define FD_CTRL_FSE 0x00000020 +#define FD_CTRL_FAERR 0x00000040 + +/* Annotation bits in FD CTRL */ +#define FD_CTRL_PTA 0x00800000 +#define FD_CTRL_PTV1 0x00400000 + enum dpaa2_fd_format { dpaa2_fd_single = 0, dpaa2_fd_list, From patchwork Mon Jul 23 17:00:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 10540637 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BAA0174A for ; Mon, 23 Jul 2018 17:11:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A29528BB4 for ; Mon, 23 Jul 2018 17:11:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1D6A28BBE; Mon, 23 Jul 2018 17:11:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3064F28BB4 for ; Mon, 23 Jul 2018 17:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+Sul1s5shstcZmkOZxry8VGCFJOpASKZlLohNWye9cw=; b=WF6oMBq19o0pCb RRE/C8ykA42feuxlJWfjWCWSIVBK2LyuZ7BfNOfznnFFoWOIouA3DKZjQa5NT3MV1BHyxT3INAOwV eSt6jX/pZ/Kwc5DfWXUTY3HFQIr9GpkHjJlBBvDLEW1uIq+Q2gVFNdw2XVYlM0qdO8tVn+SFN4QIL J5n8PJUQOGcNBMLG8iId1sxY9H3SGO3bQOAif3k4VCq7LpS5VqGSMLRQy23vuk3W6ZmEltlUrab+7 37bkhRkDXqkTGqd0BRKrP3BIs6iJ2UmAJa0XeuC4R3AKcQmsD+hfrDYFGOUXTglZQgLxMbnnVika9 tlDUu+D4RmM6nfRcPtMQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheMn-0006BG-Vu; Mon, 23 Jul 2018 17:11:26 +0000 Received: from mail-eopbgr40084.outbound.protection.outlook.com ([40.107.4.84] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheCv-000813-3H for linux-arm-kernel@lists.infradead.org; Mon, 23 Jul 2018 17:01:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+LsalBKgUJZq44g9mzRM7yamMsL8K21LyTWwijZcFmM=; b=G10D2+L3e4PHYC/prUpW5CiJ0L7rNMsApVKLqPThfBsG21CG/fKUXGuvnVkBCxWIyqFW1k2osG/m4NF1lqI5X2G9msfuDPQ4i3icNP76fr2Gmc/SP/5q9yhmCc+/v1gCFirpOxU14NTH4OASztV5pGC5QJD+OhKIXE++1nVRsp8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=roy.pledge@nxp.com; Received: from rhuath.am.freescale.net (64.157.242.222) by VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.16; Mon, 23 Jul 2018 17:00:48 +0000 From: Roy Pledge To: devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, gregkh@linuxfoundation.org, leoyang.li@nxp.com Subject: [PATCH v2 2/4] staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl Date: Mon, 23 Jul 2018 12:00:23 -0500 Message-Id: <20180723170025.2259-3-roy.pledge@nxp.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com> References: <20180723170025.2259-1-roy.pledge@nxp.com> MIME-Version: 1.0 X-Originating-IP: [64.157.242.222] X-ClientProxiedBy: SN6PR1501CA0021.namprd15.prod.outlook.com (2603:10b6:805::34) To VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04a810a1-ba42-490e-90fa-08d5f0bdd83d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4494; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 3:wZ629RaGlFa1IlXeEIM51tp+ZtL7WPNUsV+HMtP/PM6WhPDEsVJtEzEiE5EaZCoP7DLM90mwo1t3OUDGh+PuuvPVXCXYGjLkXhXboOEwCvPBoF3FfFRj+EsEndl2HEX265Ln9eQaGCQQbYMe8NvR6G5OeRMwhW+HV1YzCwtVO81iIxH6i+DtGWZqnLBbpfQ/g58AIZNfJbyy3755bIgIQKFp8vKQo9scyJPFR9mbXMxrhcN+8pOJmcY6kqLOJJTe; 25:coLJTiyqB3XRa/p/EYrIibtUdHL5iurz+FgdA4PyE8bvkkCJicdxn3NSeNd5q2RTvAkX1dHMyPiNAYvM4FHqT1mTGhqJz5KZC5464q+eDdSKNKGdx4ZyhzmOMdz8+LjF6dHJxhkCBjhZsMgzerIkQ1oEkvBiIyqYL9jgsLt4iW0uyek5h1r3mgr8dV5ng/HF99juJGK4OSdwBKIyXkwmCI6lTO6OcH/dCsM+/8E4PswYY7oJGOj8RSnSJLI+WcNj05/b4tb5lFyMbK1ks00bRaAz3P7lvlu+lZfietU1Jh2IYskFwXcgEv8HGTEWODZRrS7rLRQcwpSu2VBHMED2Vw==; 31:DZguvrudYrKUvIyMrMziqH4ZQxRqcV/8+eWmHbSHBTb0a+wjowaSTbJoCyM71jK00gkLpKLdBzUGMK78CCeMSKFUzPjpcHVSik6LHZjHJDVd1Ji4LLIL9WarrspRp5iDzpNdzliaywfmRx9iCv/AgIJ0tB2q5v/DJwC4VhZZg663+s8mqjglte8RyOzuiuuWOuvTZm81fEgNlGY612+KPVmc7eA4hg7uReF4XqHyOlE= X-MS-TrafficTypeDiagnostic: VI1PR04MB4494: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 20:qtIBowXTs6lUiHPJHT3CnVnYKMVYsn0mXem0wCtAFGrVrTYKEnyM1kNbqCrGaFvBefKxMOAVOCYpWXlcNr4EjAIKJmkQVPG8VfTvWNRIUQXKeapldqI0Y+WTfddA51OBEopyIfWAIP925Mz159dyodR5z37O5PR7ct166uZAg6fLjbf2h7fokLon8XWyQnhve2Kp4wXLHAwgmQ86O0u0XhaGCBdHUrU6tZDr4V9SmKlZlBUcNB7d1V2Ipes6jEVuGSBsgHGU5wzopPRfuaiIVbL5s+PB9odZ4Too1HpygBDHf2B9OUDtwTuEFF7wMFBVYHG6PIiLkKZ0FmV2zpr5gZPNheqboXS/WbRHaQPtuo0wSn2YGu6IVjQ2VED5Dya7/XAmFzAQ+0ozymQSFtTzd/oKrGcD8FJZW4U3xVWaRWEUOAyiSH0Zeu4J59GnZGRDU1+ipx2s+MXODi5BPUMmCuljVhlaXu+OLlLb0BYHHPInD8bUyBgGbo511GCIb1jP; 4:l1C07XkBxZwyMCN6KxcDmYu7Sy8iBRh0WYveLoVlWoJu7o0dLafvz1UjBtntvgP7WW7LeOZj6z9e3EAp8tkT96HY9/4wVPu6GI50nQPVrQPzBDw3uuKjpI8Ls1dpgu3blSNfu6nPsf7kSvnskJndLQByQqfRtw087NsQRb0gfMRhIFLdccUpEecnNCBsFMB6/PajOHXhI0y8Vn7bDXuUdfPHo2RmA26gAdugZW7nXxb1UrVGBebZIfA7ddDBNYp0efVwz+WUgHVg6yp+4/EkKMicx6jCLu1IQskmmxFHNAC5A8oBonnfwbRVYP3m/+1j78ph7O1BiFXcVjvUOMI/ZVoo5fMnQxGrhFsp3v5Az7aGo/c22q12r26pRJAxG8xk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(35073007944872)(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR04MB4494; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4494; X-Forefront-PRVS: 0742443479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(136003)(39860400002)(366004)(396003)(189003)(199004)(7736002)(386003)(6506007)(76176011)(105586002)(5660300001)(6666003)(186003)(2906002)(16526019)(6636002)(26005)(47776003)(8936002)(316002)(81156014)(3846002)(6116002)(50226002)(53936002)(476003)(4326008)(68736007)(106356001)(446003)(11346002)(956004)(2616005)(25786009)(14444005)(43066004)(6486002)(16586007)(48376002)(50466002)(51416003)(66066001)(52116002)(478600001)(8676002)(86362001)(3450700001)(1076002)(44832011)(81166006)(36756003)(486006)(305945005)(6512007)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4494; H:rhuath.am.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB4494; 23:3S9IyBZw0zqOY3m8KEPL3rGUWNmt7gkUHk7If0ixy?= 2Ur6wrSggS3HMzue1baZLApSx/1GbXNc9Whz0a2YDg5VKqinyUz01bo7w1p6M0T6mIgV6f2ybF101vIN4lQ8OCK73fhcTb/C9VYVqW7o9IMGQLqcVqLKu3tvQ3Glf0fWiQ+bVTT6dsUUIq5S9z94549ocuGyqvpO9xm0q282hpuC211QJS9IjXOdLz1mEeb4/N0RoVQ80jeP3d+Cr2niGRaFPJ4dDn9/kQUI86mGgSBO/BVvbm7n4Hmwt/yYFS4+1oZPwQdFeP1lJNRH3s9OSj3v/2+8J5bFY+NOWpTfEXnu+WnGrZlKO+3MXZunJnQa3Iv5irwgP6ZjTEUhs8VF0K6JrSGCcDbAMA4Dk0SZM+LBM+BdmEH0vw2oyGCqJa/Mze2eQ0XUAsLsmiGeQBfuA3BvOyNtOhE1WZ8pxI+NHQYKAPr7FnEiAfvXF5KjdRbDGjY6SuQZ5af1yTFbb//SNlsgdbBlnGxHA/h5ZwDy1b6RtCzKjRn5zMsyHHdkxusKChTmv9rffs23RaHSVosT0QVLP47r80cGwZjVUKM0oCyQwCinLqRmOoPcNERTk5tsD28Mk18UuVj//YqnAC/xom5OWIhpb3DK+fSkugv68KNiaPG9KPuIfcDjAqwHpr11moJqEabFjmqPd1NxsScMDXnSoWZiSuTEiWsLMx/I184na6AtAlrfYVVpXvo6gcbpNF4gXEiEdqSniot7MqNEmfrxUzdF8Y9JFPtct/1hqJrEPE+lTw8EP0cqK4m6tFH6103gbg8ZpJG4FI9RGNMm1UMrBDaLIVxuRcvMBNc7Wfi31UIhvd09mgOlFJLTX3v7XWgmJ+YkWU7Edwv/uixQsFvE+E070tSQWZbL2zNpeBVoFuT0K+Cxdt7kKX2NptcrpVHY2vUFTkkbZIm9L1ryTpk8eJE3CIKZPZEuVITNeb2rAIw9s2d1D/TAum2lABD+7L2alD2H0+IpQvGbGO+L1xlvsz2HNpoFZ2MIU9h3Dr5MHdIHgHHhOrZdCl2pd+NJjqSsmkqVNBAqK/SOcvuDSExW18pV56Ge5e9yob13u+RmwI4LiWKYe8Ad75MP76D9JGqU6PqYfh6vOxvN1cnrkN0UZ1fS/toIqbd/hWwRSzfvrC/ezDPqsvgJnVOEM681qF3ocwsVtGIDNfV5RxMgT6RIFtlON6poXfjHvxDY+9jNHYIILOPZ4N4CLN8vVIJpipLVZLIrThcmH6rbVKrPStg X-Microsoft-Antispam-Message-Info: FafVJDqpWm1AOSfF698mcYxD49wJ1m3Aawm7eOrZ39HfGziTseSBswnlZ97tX4nqlTVb42hIkF5eqFDSqeinlbtz1MXuB7mU45dZyQT1lO9aNtvlEAGK4GwFsISwCugcSoTtCQF7wuUn2tyEfhJLCTIRPv7po/vjb3f3Zf0rb8VNOBYw3ffzHLlFgXron7FM2mW/UWY7lTnJG/SOikElAQvBLbP9Nl9CtQ5LuHVlg38XZy+TOX/D/w3H8+4WSU1V9pxuzWGBXxOxpX/56HrprOXHyUonnHq2IGS3iJQ62CMpIOcDjbO6fGFQ3oAb0zT7gFgCOEaLjzXQy+ht902UdCHexYLSqJv/FTs2imaEc2A= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 6:YBrHHC8nXUeVX0hGodq4Digklt8oi3w7l1g0qMismRvnM1KtzBsCUlWBv4SkQSUVX1E5aOLwGeK8td5a3uvfNLhcC3+/XnkM8SjNQto4E8WL6BCcozsIZryyePK3STLzvVxZIru1UZY8QkTS09t1LrMm4JoX1kkdddHAJb4oR1sgerU8tUJB0gTELZdQxyiY0jA4rIXJFSi7l09kqX65NDmBKDE99gcMdbA5FZ6kSjvFzHwpqlq0P4MzLKSADvvKAnbBViH7LAL4rUx8ft64x1xYA4mRadszNGkDBWeymSgHLamYay7mAU9a+kn2La4RH04AQPVTI7rskNkGLlPOkJ+zPZ1DKzRwrG0S5ANotD9Jm061Kp+PzabUA6PwLz+XT+OcNmxIwK5HU06TeYWPwBsXZSsE2QQ2lYFeBnAPwwyRXzN+kb9OcYE32eNQ0saRBUH74J7yJO+CeTH8f/Ytpg==; 5:kBAlAAy22f7aKCO9ejeM2wepZ7TEtqu8a5XohHYnASV+CRS6NBOXFO8MiGIVv82ep9nhwDgsqgSTUE/4E6/kKIPzaUgoX7ZqKsfhz7Y/KuTGeF7mwv0PNSp4YLcG3VgIKav35Hxw9WHfcU1peRGbAs4ldDWFc2QafkNGLYf6uWI=; 7:Re7Xn0SZBgHRRRhHAySPj78YJzXtLfAqmJ05yJ8GQoKRUZs13AZp1mltpgAB85q/cuIzb6F0j969ta2CQth8qByu+62QLVupImC6TvDvCbe1jwMkwgCMk+VwgczK0xYLLPFCWs4ChFR9YVg3DAJPFlzOkGKkhdDAazacz4GHcYitdAHGFFDKLQjNx/9mD+jbAE9cCemrGawNQ+S8uqYSfbTCTa4Uh9UfQnJUJU1/NPwu6qNj8a3nVmx8FN7019Vt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2018 17:00:48.9879 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04a810a1-ba42-490e-90fa-08d5f0bdd83d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4494 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_100113_397811_90140476 X-CRM114-Status: GOOD ( 12.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: roy.pledge@nxp.com Cc: horia.geanta@nxp.com, arnd@arndb.de, catalin.marinas@arm.com, Roy Pledge , ruxandra.radulescu@nxp.com, linux-kernel@vger.kernel.org, robin.murphy@arm.com, laurentiu.tudor@nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move the NXP DPIO (Datapath I/O Driver) out of the drivers/staging directory and into the drivers/soc/fsl directory. The DPIO driver enables access to Queue and Buffer Manager (QBMAN) hardware on NXP DPAA2 devices. This is a prerequisite to moving the DPAA2 Ethernet driver out of staging. Signed-off-by: Roy Pledge --- MAINTAINERS | 2 +- drivers/crypto/caam/sg_sw_qm2.h | 2 +- drivers/crypto/caam/sg_sw_sec4.h | 2 +- drivers/soc/fsl/Kconfig | 10 ++++++++++ drivers/soc/fsl/Makefile | 1 + drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- drivers/staging/fsl-mc/bus/Kconfig | 9 --------- drivers/staging/fsl-mc/bus/Makefile | 2 -- {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 20 files changed, 20 insertions(+), 20 deletions(-) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%) rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%) rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%) rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%) rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 0fe4228..34ce842 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4418,7 +4418,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER M: Roy Pledge L: linux-kernel@vger.kernel.org S: Maintained -F: drivers/staging/fsl-mc/bus/dpio +F: drivers/soc/fsl/dpio DPAA2 ETHERNET DRIVER M: Ioana Radulescu diff --git a/drivers/crypto/caam/sg_sw_qm2.h b/drivers/crypto/caam/sg_sw_qm2.h index 31b4407..b5b4c12 100644 --- a/drivers/crypto/caam/sg_sw_qm2.h +++ b/drivers/crypto/caam/sg_sw_qm2.h @@ -35,7 +35,7 @@ #ifndef _SG_SW_QM2_H_ #define _SG_SW_QM2_H_ -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include static inline void dma_to_qm_sg_one(struct dpaa2_sg_entry *qm_sg_ptr, dma_addr_t dma, u32 len, u16 offset) diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index e586ffa..dbfa9fc 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -12,7 +12,7 @@ #include "ctrl.h" #include "regs.h" #include "sg_sw_qm2.h" -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include struct sec4_sg_entry { u64 ptr; diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig index 7a9fb9b..c17bf38 100644 --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig @@ -16,3 +16,13 @@ config FSL_GUTS Initially only reading SVR and registering soc device are supported. Other guts accesses, such as reading RCW, should eventually be moved into this driver as well. + +config FSL_MC_DPIO + tristate "QorIQ DPAA2 DPIO driver" + depends on FSL_MC_BUS + help + Driver for the DPAA2 DPIO object. A DPIO provides queue and + buffer management facilities for software to interact with + other DPAA2 objects. This driver does not expose the DPIO + objects individually, but groups them under a service layer + API. diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile index 44b3beb..803ef1b 100644 --- a/drivers/soc/fsl/Makefile +++ b/drivers/soc/fsl/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_FSL_DPAA) += qbman/ obj-$(CONFIG_QUICC_ENGINE) += qe/ obj-$(CONFIG_CPM) += qe/ obj-$(CONFIG_FSL_GUTS) += guts.o +obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/bus/dpio/Makefile b/drivers/soc/fsl/dpio/Makefile similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/Makefile rename to drivers/soc/fsl/dpio/Makefile diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h b/drivers/soc/fsl/dpio/dpio-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h rename to drivers/soc/fsl/dpio/dpio-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c b/drivers/soc/fsl/dpio/dpio-driver.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.c rename to drivers/soc/fsl/dpio/dpio-driver.c index 11a90a9..b60b77b 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c +++ b/drivers/soc/fsl/dpio/dpio-driver.c @@ -16,7 +16,7 @@ #include #include -#include "../../include/dpaa2-io.h" +#include #include "qbman-portal.h" #include "dpio.h" diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt b/drivers/soc/fsl/dpio/dpio-driver.txt similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt rename to drivers/soc/fsl/dpio/dpio-driver.txt diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/dpio-service.c rename to drivers/soc/fsl/dpio/dpio-service.c index 14ed2be..9b17f72 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c +++ b/drivers/soc/fsl/dpio/dpio-service.c @@ -6,7 +6,7 @@ */ #include #include -#include "../../include/dpaa2-io.h" +#include #include #include #include diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.c b/drivers/soc/fsl/dpio/dpio.c similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio.c rename to drivers/soc/fsl/dpio/dpio.c diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.h b/drivers/soc/fsl/dpio/dpio.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpio/dpio.h rename to drivers/soc/fsl/dpio/dpio.h diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.c rename to drivers/soc/fsl/dpio/qbman-portal.c index 116fafb..cf1d448 100644 --- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c +++ b/drivers/soc/fsl/dpio/qbman-portal.c @@ -8,7 +8,7 @@ #include #include #include -#include "../../include/dpaa2-global.h" +#include #include "qbman-portal.h" diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h b/drivers/soc/fsl/dpio/qbman-portal.h similarity index 99% rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.h rename to drivers/soc/fsl/dpio/qbman-portal.h index 69db3c8..89d1dd9 100644 --- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h +++ b/drivers/soc/fsl/dpio/qbman-portal.h @@ -7,7 +7,7 @@ #ifndef __FSL_QBMAN_PORTAL_H #define __FSL_QBMAN_PORTAL_H -#include "../../include/dpaa2-fd.h" +#include struct dpaa2_dq; struct qbman_swp; diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index 9269cb0..f2917b5 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -37,8 +37,8 @@ #include #include -#include "../../fsl-mc/include/dpaa2-io.h" -#include "../../fsl-mc/include/dpaa2-fd.h" +#include +#include #include "dpni.h" #include "dpni-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig index 3424530..90f234d 100644 --- a/drivers/staging/fsl-mc/bus/Kconfig +++ b/drivers/staging/fsl-mc/bus/Kconfig @@ -5,12 +5,3 @@ # Copyright (C) 2014-2016 Freescale Semiconductor, Inc. # -config FSL_MC_DPIO - tristate "QorIQ DPAA2 DPIO driver" - depends on FSL_MC_BUS - help - Driver for the DPAA2 DPIO object. A DPIO provides queue and - buffer management facilities for software to interact with - other DPAA2 objects. This driver does not expose the DPIO - objects individually, but groups them under a service layer - API. diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 21d8ebc..2141e4b 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -5,5 +5,3 @@ # Copyright (C) 2014 Freescale Semiconductor, Inc. # -# MC DPIO driver -obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/include/soc/fsl/dpaa2-fd.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpaa2-fd.h rename to include/soc/fsl/dpaa2-fd.h diff --git a/drivers/staging/fsl-mc/include/dpaa2-global.h b/include/soc/fsl/dpaa2-global.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpaa2-global.h rename to include/soc/fsl/dpaa2-global.h diff --git a/drivers/staging/fsl-mc/include/dpaa2-io.h b/include/soc/fsl/dpaa2-io.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpaa2-io.h rename to include/soc/fsl/dpaa2-io.h From patchwork Mon Jul 23 17:00:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 10540621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D9F4112B for ; Mon, 23 Jul 2018 17:02:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E86A428C3A for ; Mon, 23 Jul 2018 17:02:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA59D28C71; Mon, 23 Jul 2018 17:02:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7035828C3A for ; Mon, 23 Jul 2018 17:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ontb6NfEfopPs414lElqGU+0KhDeraUECFAp19w4DSQ=; b=f97VJ4BzzEZbjN 4Hgj5Sx5c7VMLxFnD4Ry1kI55cYARbAaK/vUM76WqnKxUqN5OsVwOd+URLeXCp/CjeXxRU/hrAAcs WqhS5BSO9yA5tiNSrC0qs3Pftkc6aJlL3e5KVv26MPxZnIlPa0s+GBEZwpf9LTGtI0XrSZpSbCaA6 ZLNuhfM0dgasHmO87J/gVTxO4wKR5UscNBaFuP3VZGjuKR14wtfLijz6bMlDQ3KWmTHJBBrjds7+D rMC5BCsv9ivpfcJCIE6Zr5WlttXkBlBrQABEmj/xMvRHc1IEFUHvRxnfR1c+q5Nip+9lFsQSmpGov Puc7do8twT5slDu5SGKQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheDd-0000LM-0X; Mon, 23 Jul 2018 17:01:57 +0000 Received: from mail-eopbgr40084.outbound.protection.outlook.com ([40.107.4.84] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheD0-000813-VF for linux-arm-kernel@lists.infradead.org; Mon, 23 Jul 2018 17:01:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3xe4bTCOnz+rR7Mysxu8fEOPpliQmrKVSBXiujyPOj8=; b=h44cSYVrKx2WmHzWAuya+p4sqKhvxC3eLsLUklKt7sHw5Hy9r4nJn9RnYg/IBNcIBpkIiPdLOMj9pEiFbYb/pzdOGwLwE/jyz4JVxbZz8PsBZPUYy3n1Vrhdm1bAMEXC9AIxZoLqfF7BYA//X3NycE4yBcGLeHpKeJ8XXC6UmIo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=roy.pledge@nxp.com; Received: from rhuath.am.freescale.net (64.157.242.222) by VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.16; Mon, 23 Jul 2018 17:00:51 +0000 From: Roy Pledge To: devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, gregkh@linuxfoundation.org, leoyang.li@nxp.com Subject: [PATCH v2 3/4] drivers/staging: Remove fsl-mc driver from staging Date: Mon, 23 Jul 2018 12:00:24 -0500 Message-Id: <20180723170025.2259-4-roy.pledge@nxp.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com> References: <20180723170025.2259-1-roy.pledge@nxp.com> MIME-Version: 1.0 X-Originating-IP: [64.157.242.222] X-ClientProxiedBy: SN6PR1501CA0021.namprd15.prod.outlook.com (2603:10b6:805::34) To VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e02fcc9-0ed5-4af1-f574-08d5f0bdd9c6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4494; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 3:FUGf6iEGLJBlGNH0/2yDF5G+xtDA6WmUZpRpbfIFECcuME2Ec1kZ6cHffqX+a6Hq8bf/AWC+A1R4UXq+mAgDVp+c/0Q2um5svj5B/cdAezVXWYVovMpX2t4ffp+p3KHXMbEfVyjZi3hIAbm4hqUJ4Y0IohjGWxWaqh7zOGcfsDyn60Xg3Im0aeDyD7gYFOd9qLm3kDWZIXI9RLV2eghQokHRM+o3nFFPEYl0o25M8TQDItZ07vMH8joLp7kg8hPD; 25:9O7Xh+U+uRtCdpzXH8wrTDF7kg3d+THNTyYGXYg2uRLl+gGsU57qAbphsNxshXy0Io4iyI6ZkhSqDXqyyIFCiGcaFNB/pp79m+/MgXUDxMzRwl+98y8byQeKzHSAZHLj64BOVCWHtuoGCk+Ch6PoEHEHwo3AusjnA8o1SaGusANqKCHnK3wDNX7ikKqEArrjNJEumJQI2YRG5Cv5WBOb75PFlEvlg6eRwrwWVEdUW/LVZAE6nIjW/ndeUgqROcZQYsT6Uh03aHD76slm9FvXUofYgv9mNkv3npJShkgJfpIh+xHU7U3sdvu0Aevmp3eddW7dHd0D2BvHEyeY+5+2VA==; 31:havPb8qiWLakWnXn3LXecGhhu0c4kPQHLtERUeK0OBs/9MUlXjr6SH76hdoTlNiJiY3lyKUsi/ixK0gzrIfBT8t+H3GOJFZg3l1sMxNKw7LAqgTohattU1npV7pFKgfo99DQTzxPibD/ThbeEfx9OWcqdw9TRRpmzqorNlsFW8p6d/IHTtOGvnd5n8xmFDjC4qVZDVCIL/ZxR9/oCQDwOEgBapeIqWXAnZjdiOPEegg= X-MS-TrafficTypeDiagnostic: VI1PR04MB4494: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 20:57MEq63nqfOKukfHEYhK2GL0aQZQCGGCZi7ha/FfNkmwK+riXg12/54Hrr2vWtRC0RdyxcT5g5QhExOqK5h/YRFvoD4H79PRTVAKP+kUcI7MGcJ2gaybfGdgEkb7kYw9ool3H+NotZb7siFq4Ug7oxk79j38OHBgoVJz2HWoEgS4dL9xv26qDjGSLeZz907uuVP52gyaoRfA8pE2JcDBk06DCjZziV1RJg7/PMphaigtOij+ZHfdZQHHxStpIiC/dLzqPoxyK5npxCRYixbtMHO03D19ZTMgco09y91DU1B6+yd9HcV8u8xVNKpeNtxfL2F/2nZOknW67SdwqxFZidvZEZIq0G4HJy8xu9S3FKt7V1WZlRIPxra2UVNdyNCGv46OCcLhV9XyB4vdfBZZcSCj+BI6tfV9XhhGoe46pJGbRrK8txkLbYHVlGLf1aYYX7lhaJ8T/G4iRLxu3eDJdp/FQh7Oi59ziVecR1RyNyT+lwVnoA+hRdQibcyG1QxC; 4:gl6bdPEW+LlKL4eu4NyKjE09/O9fKuLq2wtnEHcVnVR4SHtXUV1VI0ujyX8/v8E2pL51l5Ck2c+ogQqegmc/EFE7VusqiBR5pU04lHEd7TaeurPxfCaXra7mJXoRfDDZPw9qgiCVRZ04v66VMXqj36DbIT67MxGusoINMmWX3nLHhOC5sJj8iQ0yfhn/llvGCaJOLITQg7fT/qO9Aoys+bwn0B9n0zqeaJVVAgz9y+pf6WxX9gmEEpF4Ie7PhsSCzeOX5mmt6GqS0rye8adexM2Bb9tR7qHe4OdPusGfcHpb9q6RMH/qjHLMK2hUkc6n X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR04MB4494; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4494; X-Forefront-PRVS: 0742443479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(136003)(39860400002)(366004)(396003)(189003)(199004)(7736002)(386003)(6506007)(76176011)(105586002)(5660300001)(6666003)(186003)(2906002)(16526019)(6636002)(26005)(47776003)(8936002)(316002)(81156014)(3846002)(6116002)(50226002)(53936002)(476003)(4326008)(68736007)(106356001)(446003)(11346002)(956004)(2616005)(25786009)(14444005)(43066004)(6486002)(16586007)(48376002)(50466002)(51416003)(66066001)(52116002)(478600001)(8676002)(86362001)(3450700001)(1076002)(44832011)(81166006)(36756003)(486006)(305945005)(6512007)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4494; H:rhuath.am.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB4494; 23:ENWOn8gdDzycdfXqRExCI2M7qb8T9GiBM8iYCc6rG?= mivYRV9weBmVND/Das6076QXHJCQQN6YN1gcnEZknM9bZD1aB51Eq7FOQt7w2dE99CSkvQ+JwSvflB/7b34BiAkHH0t8kacRlcYj0ThL0s+maJPUclwTu+Mr03//JRTlL0CMKygOcZ3WWwN3f4VImmVFoQY9EjrOAFtmlSFaCM/SbpFB3vMf6/6JU53QWMg141o9zJtnt9LpBfprURDc9JHQS6J7/qocO3S6A/skAoC02Rc07KfPN7KDmW1HwpOlxo1P9O7FPo80kxY3eSwsdHai7qNWSLo3pWMzKvrEx/cKcTHrUb+SqOUe7J9y3xDJ4yr+CuuTAdikAmkHR9A5v9/rZT5BOpcuH4glZnl04BpFh6tO2rBbYcHKVJwvfkTLw9j7z/DpiQj5KrrSlVtyoHlci0+BzZOYhq6E7EPlz/3ox/ELCydFUu9plaOPRhiddiHiyxSZjhmYBFLyPtZwzjd9I/+Fx9YmMtYYVSiH+pc573g1Yw0eLlmWwgfuSy66ZbaeMJXArG3IhxMcJoj79L4bzqIc/Utdj11jvIMm+UqzrHBb2Z/L6v0ksB3Bspp9W+uvI0UbM7hQ+9/eGwjCush4SJDcx99NrhmF++cKvr3k3oqfTvQRA/5fqx6QLZxUGqcdiOCyDasvtfvgqGTAQEJJSEktOesenunxHilyAe+Bnc77GeitEM++Ec85eZGppY9OG6M+D6tevwmEesWjwqpFr+ttJCNsj/9KX/66/4z5fHpIL9ytg+MVt8XWsorFY0cg+pnlFh8X5RW9pei7l5OXBT6my/+rPaY75B/JahA8CLi/7lPboaqXfm22/nljOBGo4C2R0cDG4ZTrMM+ha31T4WW7+6NToZ7cFi7DibmgNuvQkG7NNi35FwUc6d77Mmo4Fh3ZY4V/EYTtLSqGMtkFNwVlyL/y9YAD+jNR61Fqt/AuraRzvzI5R1c7ZPNI0OHrgpo8LxNgwKcKs/caPNxCu7ZROUy6mZ7WVf6/Yz4rOWt5JJYU9s/8VdwNxKVALvTOKMR9Nv+mctl21WJRVEN1iLAic97qcsMQ5W6AEmtAUPCpEFU7fcuChpdxr7ifGCY62GBMv+OjGJR5To5Ed3kNlfZGDwJfBX1lyxMZZNrOSg1GuDAXuxljv5HEH0qHXAGBK+JqFPtDAGRHlvcF4+sRDFrdq35JOtwliUqslYdkZ1phpC2GXO0MA/rUkCC1nwfbJWGkCi+GLe+3ftx589H X-Microsoft-Antispam-Message-Info: 6aHTElT8uPH4tmDdT2VI5Oou1VUDphgyzWnLoYENMnRR5j91lXTTkE37EUs+gHuE7kntAS2uTfmv5XpB1QEGrrJ8y9tbtpzXTrRq3NSjQzmNHOtGLCLhj3bRv0PeF/ELCvsZ2v6npoDPGwAVyBUfZjcsrtcMYHlNW5HeG1/jqCV+P+Akozezq7EvLlDNrY6F7B5JPZOcNCRBpoiHnUe+1zOVKryA5iD1mdR97y1+XOrEFmAIr/q9Z3o3Df31rrPOWSwUbjU2aWEpedrFLMjmIGzw/l+AfE2BCwJ5sBJYBResl+Xa+DynwUBgNLzf0wZpGDkzI7DDgIixHdEcvEuPm6XBTfEzzdzkixcexhbMEd8= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 6:fJvYk90Z5aHfDa9ZcL1886ouh5UXD7EmpoRf+ldAtB51n9ZCrv5Qz7IrhXK3fl61GOx2BYsrGgW95hhTPn7taUdT0Oq+ZbWXFHKzkSIq3N45SkxGpLimjeJRqwUvzf5qkjhgLexVHm3PUZXi/3CPJq9XOhA7BFFAE8nRwUmhoKdkGTijw3c4HWWnkzQkQqI+VEQxIcx77SDO7JXLlnj2yG00gfi5zkEy6FM/KmQ2WAqhBQpWt7gasPldND7jQlWSM55GlazUOy0PLQhVI7IQoj3i5I/3Ym+tio4KsscWdkSauzGsJvGv9nlVjY6cpmbFc7U47nL2T2IWPiDWZh70KPfdEbKr7qSGiPcPKp11WfnFx4BYUXbxjw6Ab0csAg3z98KUe6kVN4J463WUWLwgAqwKZqZ9dSufKzgOC516an1Phz0DPop66t/Rss+qzZaZFmNWgWQSJweqVFkdXmwKQg==; 5:lFyqqz8rGYfRJl1oTabM8v2Jgl8j2d01rqAI3nqkKF9WBHoLVXlWQL0Xbd88aOW5uZhrCTrpKordcz1CNQ3WFb01Jpq+MLN9n1lYhT+IocoMl6/JuPYZZmoNXET6/UR0tOx8vehzF8HDCB+eb84Fp0JsIOWPBmWi0Hc/hoyx9vw=; 7:zO5MFc3j8Go2JaJdVswHqR4e9Joj2E7R3NzoGl7AOhwUjYS1Cs2Oxuoy/BDU4gDmgDKHY68+Z6lNivAPFP5Lqcf9434pqYfEMHWWod1SMVKjhGVSxzjNJ9XadyImNw+aK6eD1hpkaf+yhQnOluQTwIizjbzEk5Fk5oiyc0DcjK3r5baxbAUHPu/Uk0zQsj72s7j/7Ha6xSGYLS2OZcTM3MzeJTuWW1TIaI01FPeVdydZ5lyyyqJKXTH2RWRSeAYu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2018 17:00:51.5660 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e02fcc9-0ed5-4af1-f574-08d5f0bdd9c6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4494 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_100119_482785_31C8D180 X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: roy.pledge@nxp.com Cc: horia.geanta@nxp.com, arnd@arndb.de, catalin.marinas@arm.com, Roy Pledge , ruxandra.radulescu@nxp.com, linux-kernel@vger.kernel.org, robin.murphy@arm.com, laurentiu.tudor@nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the staging/drivers/fsl-mc directory from the staging area now that all the components have been moved to the main kernel areas. Signed-off-by: Roy Pledge --- drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/fsl-mc/Kconfig | 2 -- drivers/staging/fsl-mc/Makefile | 3 --- drivers/staging/fsl-mc/bus/Kconfig | 7 ------- drivers/staging/fsl-mc/bus/Makefile | 7 ------- 6 files changed, 22 deletions(-) delete mode 100644 drivers/staging/fsl-mc/Kconfig delete mode 100644 drivers/staging/fsl-mc/Makefile delete mode 100644 drivers/staging/fsl-mc/bus/Kconfig delete mode 100644 drivers/staging/fsl-mc/bus/Makefile diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 75a4804..47b61c3 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -92,8 +92,6 @@ source "drivers/staging/clocking-wizard/Kconfig" source "drivers/staging/fbtft/Kconfig" -source "drivers/staging/fsl-mc/Kconfig" - source "drivers/staging/fsl-dpaa2/Kconfig" source "drivers/staging/wilc1000/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e84959a..bfef8f2 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -37,7 +37,6 @@ obj-$(CONFIG_CRYPTO_SKEIN) += skein/ obj-$(CONFIG_UNISYSSPAR) += unisys/ obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ obj-$(CONFIG_FB_TFT) += fbtft/ -obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/ obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/ obj-$(CONFIG_WILC1000) += wilc1000/ obj-$(CONFIG_MOST) += most/ diff --git a/drivers/staging/fsl-mc/Kconfig b/drivers/staging/fsl-mc/Kconfig deleted file mode 100644 index 3002229..0000000 --- a/drivers/staging/fsl-mc/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -source "drivers/staging/fsl-mc/bus/Kconfig" diff --git a/drivers/staging/fsl-mc/Makefile b/drivers/staging/fsl-mc/Makefile deleted file mode 100644 index 1468388..0000000 --- a/drivers/staging/fsl-mc/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Freescale Management Complex (MC) bus drivers -obj-$(CONFIG_FSL_MC_BUS) += bus/ diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig deleted file mode 100644 index 90f234d..0000000 --- a/drivers/staging/fsl-mc/bus/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# DPAA2 fsl-mc bus -# -# Copyright (C) 2014-2016 Freescale Semiconductor, Inc. -# - diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile deleted file mode 100644 index 2141e4b..0000000 --- a/drivers/staging/fsl-mc/bus/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Freescale Management Complex (MC) bus drivers -# -# Copyright (C) 2014 Freescale Semiconductor, Inc. -# - From patchwork Mon Jul 23 17:00:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 10540623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 28C0117FD for ; Mon, 23 Jul 2018 17:02:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 105EC28C05 for ; Mon, 23 Jul 2018 17:02:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 046D428C77; Mon, 23 Jul 2018 17:02:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7D25E28C05 for ; Mon, 23 Jul 2018 17:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Et4oTiygbepgTbP56vBwuwzvYEq2qKbxccqbams3PJs=; b=m6JF4asgUMlwzV OVwEq4k4mbMhr/mXVcZjHW6fN0ZG1jRiqcKknsykMt6ST7m62tHKGTGmRwzNt1GxtOVxN7FQRZn8H CPLjESz8NvBKCUBjS7bvyimdPsHVg5lNq0Xc4bjqJxBzcNtOqQUqT34+YSE80Ea3eduOCZbhMuBaJ ZWDqWS0UDJbxpbHKM9sV9PxzB5gnyp4Q5z3WZLyhIeUyedAxBgw7FDlMZXkr2ep0KqF+uQELMBzIX mYKhh4ox+iTIOoZNZnoZopI84kKa1xfTEE7ZM+5N9mbRNnykHPsMKwYYwwkhXBZATJO5g56IHs7q+ KrTxsbifcYX0I735hd/Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheE3-0000np-Hg; Mon, 23 Jul 2018 17:02:24 +0000 Received: from mail-eopbgr40084.outbound.protection.outlook.com ([40.107.4.84] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fheD4-000813-Ur for linux-arm-kernel@lists.infradead.org; Mon, 23 Jul 2018 17:01:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EMjAxu+I5BaMDPCIu6/Ue0mGU/opUYDNM0C4+ReScxM=; b=RsdEAeiSJl+5cFmGYbHVhSqSgtG3Z7nASvqPmuUV8u1VqlJgHSt8smR1N+rFWStFf96VPEu3/GzDKrYswToPm3C1kQJKP/fFzXvH6u1+4qE5neuOfghAMYB4AWJGuXUfzQuZBdQOTH8zkW+8dGLPA0jZO7ruVDumZB970Pd27Cs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=roy.pledge@nxp.com; Received: from rhuath.am.freescale.net (64.157.242.222) by VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.16; Mon, 23 Jul 2018 17:00:54 +0000 From: Roy Pledge To: devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, gregkh@linuxfoundation.org, leoyang.li@nxp.com Subject: [PATCH v2 4/4] drivers/soc/fsl/dpio: Convert DPIO documentation to .rst Date: Mon, 23 Jul 2018 12:00:25 -0500 Message-Id: <20180723170025.2259-5-roy.pledge@nxp.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com> References: <20180723170025.2259-1-roy.pledge@nxp.com> MIME-Version: 1.0 X-Originating-IP: [64.157.242.222] X-ClientProxiedBy: SN6PR1501CA0021.namprd15.prod.outlook.com (2603:10b6:805::34) To VI1PR04MB4494.eurprd04.prod.outlook.com (2603:10a6:803:69::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c902f0d5-b882-4e34-e4c3-08d5f0bddb3a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4494; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 3:hVezI7A7ThafbBbwoYVDocRSr++Rh+vjMykFDZX6kdML9WH6owjy29kjQJi3/l6tQ+9T6dwuO1iKgulqWuxrtnZPtkAfa6FBgBOF6BvPpkhCxnd0bivObkP2POJa99Rrpd5Zh2X/sfO0ttiA5nsnRZG+CQOOLR+3KLS2b6tRQrkHiPwDu0pxt7xXNPF4YY36QcaSKq05NA3G9yBxXf10e3jw4mJwv98LvMkPNxHVN8P0L4IhjW5O8wVc4NBMZL4o; 25:IW8h2UQ6yyCdlIOsoe2a7iSkkh03wBWZ2ozOexENoAg9EMrakqjfJkwUzzS+wuAx6LQgiaOUrr3pXSPpO0Hdhgphyxf5wg9bHogXS49VIz15mkquDYU0P2GxYfmMeyBCG9apJK3nxuS3qWEK8X0jXS4ury69r8s8C9IaT+QAPwdxWc6M2zA0afHUxFvbaYCRYwpX7qL5RgKsF7CIQL8XkeraFsTSPDR6Y2i2fUUmJvA/VzxZjiI1uhWLhBujnj6RNuiq4+QRXh8u1zbuFDdzLrHCXt5vMsV2Q8TdfnGsRRugj5I4spXb6csVBWpWZV8GuRy+31QEZBzvm6LcX7+FrQ==; 31:6Yv8jaEihQ+IBcCiPYHfzE1VaODf0TFpJNPADfwy0u19pEJu7Vyxdb3tPkFlx3KUVeyn4v/UzqSyzOs0SGKIQtdQMaVENKDmx7HQ3jeOxDcyr72mMPYte+PtmVJoL1umT50usR9hJQGCMPqB4un72TvSlK7rkrJ3cLYRXzYesY7p9WaQPOCojJr8BSUGkUbtx6jwgM3XCkEz61NVoWb6mbZJ3q3sjEioUeYSAlQctAM= X-MS-TrafficTypeDiagnostic: VI1PR04MB4494: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 20:+ocy07SrSc0PeqyDtJX2iE2RTe1ss39+4f+mZ9xVq6+bNCKJAcAgD/CM9MuOjmfncV8s1+LZFtgxmSNp2BVamoi2NmDDvg9Wd0Hsepffqr590wg9ZXHUJ6YqoBMSaBoGCj59L/eeK1Gh8WDzKpSE9NW03qtiJFm8oUocXILHiyKWPIruiA5Y8XJSPS0iyj9Rj8lmap4fVWqHLThkHLbMObjb03mAZvTXc8TSTp5tboQBSwxk5rDoTOgBzQDENlIBlMMvmhQEawO6JMGahMUta5Smjt0w2I6wpbeGO/PygGB09a2dS9UAJDWL2DdHhY6lsZ5sMmNFuXL4R5UeK9EiIhiEh8FrkTXAmaD0WptLGhF41LFpv+l6c0WpGmOr4PZXGlGVeCZ6M2QbIFfoa8RUbvqmMyAwFCrKH+UjyWgi0cGLgk2abChkGF6weFpCfpV8bZ13/qxus8z1BYCseZRHujd4WREIZ9gWZj0TxBJ/g2MSdT16Lm5rEUhUsrLhUECm; 4:m6IjCBffT2U2bLHy22iCNNCen+pay0jAYrPaDRkEPtm1q5xwQdoDK3oDtNla3yHcdf2qqgMn2VZV2iYqJIIrWDzOXaj631uoGzzx2z4hnNVQSHfBiBVPPMPIgpBNj4q2TECZoEZ/uHe3It83gkABjGeZ3dOcjYb6lXVskklzGtOVM7PIuk7WvX90F4QWgOsP+Jnr1NJ7hlzfzmcFEWRQfIS5DDyNQw7/XOHB+IBg76gj1Q14p/X/fzRmMQXBbe0hf6j8orI1YTu0/ie1Dhim0w64Ocg/ULuC2KFuxTVRrmgXBt7AMbmSNDlkibP6JowcCElbzX7YJubAAK5jK/p3ntTInnyJPhVdnzsMrJid46fMXTXFTSmibwgg1DRDNzRQ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(227817650892897)(275809806118684); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR04MB4494; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4494; X-Forefront-PRVS: 0742443479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(136003)(39860400002)(366004)(396003)(189003)(199004)(7736002)(386003)(6506007)(76176011)(105586002)(5660300001)(6666003)(186003)(2906002)(16526019)(6636002)(26005)(47776003)(8936002)(316002)(81156014)(3846002)(6116002)(50226002)(53936002)(476003)(4326008)(68736007)(106356001)(446003)(11346002)(956004)(2616005)(25786009)(14444005)(43066004)(6486002)(16586007)(48376002)(50466002)(51416003)(66066001)(52116002)(478600001)(8676002)(86362001)(3450700001)(1076002)(44832011)(81166006)(36756003)(486006)(305945005)(6512007)(97736004)(142923001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4494; H:rhuath.am.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB4494; 23:P0kRLZ8ygZo5DISoisSg2nyfjFIBpc4WRoxaJkim9?= PeG/44bCtiH0cRhnpwLq9lN1sG/Mea98pKchiLxYYOWZy/IniBR4w1Xg5RlvNqSGLwg+A6m62JMHyqYHlH2yLHIb01m/zj/bjQtr8Bl8TO2aZaSsUaM/Cw5lqca9ijUN4VxR3x82Vl95zPsUbNEv4JNiwB9fkVEBI9v6DsCX/Qaj68l3k2eDaii4gHk5KUJgLGDYZm6J14KhlqQ2f2bW6qr4kALlzo/X9RvF2sqMAQC2Z3jhQhqucO6p6NeY/QaC6JePpYOqbSADPSkof2tQio/HlGC71aTHiq6/QpHIrc1bcI2syIpjkyi5zXPd0JAeI1QwvvaRTHaQUaXr1uSliLlKZ+NJUCm4oC5UVW9tuDW9L5YSYFMhnQXU6JwWugkE6S0zIhiz5QrcXAx7ircXVz/eh6tUleTBM7VPDz1V+hjJDn7swTAhQl3si9aP5ADOQpOtW4h9NiAZCEB9ZoEBFtM9GlumwQYcBOkS8X8/OUzucH+MPzs+2UgFXECZS2FpnURMLtAsUKnkQhTe3HNZe/zbTVaHJN10+Hiv5uVaoG7AdWzNnABkxtDlYqLAnK26godfm0KtveJvCD0Ctrctu/nHbbsdsXjwSsWSrQ01gl906j8advqLrcPvagjjAAUBIQrjDUkZbxfH09+i/R4Cd0vUjtTXPLaWb3C8Zbkb+0dW/n3NNxcjFRZiapM2FBNL4OUyywGuuq81BaINYL+3gORAgPaWtcGTUlNccbGov5qelx6r2O2D1OQG8qw49/1Wf+a65FFtamh8NAFXOL846E7hEpSLV539RoqM6nrjNpOSYpvfCtdkFxlPhiRXq9Vt2PjcGe7NtjJVaXHPIkCCzjXTofgSPquicfvgRHc1ulu0g7tZE2VicRuaBmfsGxVH95hydVa2ktiGET1ABrYsKSi4nqof/3Tqi6JApBZh8NfqkJurjItP1gWAAvoUrb2k3wd1IvtYgcTqOE6Hm+z+JC5qtk5UbHRQw8ZfDof+EruuEp3u3YJMrdc2Uy7bD5f/4FDKXqxSQN+ej5Aejjdv4szxwGgtW2OlYo3bzeyk6I2u5+i+aEh3MWrlY7gnSDgPZ1yKH2/NifBna2YgA6bfI2zj6uyqexvLaUFMhRjrTYLo5OE4H9c7/+Q+gY7I9dIL9UmSNRxgoKEVYXYu4xH0VMBwwlk4o7XNpUHR99m0YRvkU13ocejVqBPC2BFUZ1i5cFevqhA9asVezLXQC/yvtK7g7HsMbAKOSNzBkuPycllFQ== X-Microsoft-Antispam-Message-Info: xQiiT8aoF9FaWTd/yWECuJaOr3ytAAgZHHn3KFJy8aqW3FK6ppyyFL2vWl+ZS07WwoAyzDW+wxxGohsBl7JhS19tWb6UBFO+O332D2c4QZotK77/YBDXE4XyMq7WegCgDot9S2trr9P+ShfRqd00ep4AIH7uHBOx5RPGLnx8nlPHBQbByGLfMKLcrgqlxus0YsrdSMbH8ME03owssInffJHTxoxNfwM3Ham41vITJTJJTym4ho95/1k1wg+yHFBnx7lpok26MH0m/P7h4ALGjbpB3/uMS4okgzsYRPB+MYVkmV2uDDYW2fgr838v+26SPgq5+csSxZDEvK4TubZCP+EVdAm8vYWQn3D0pUk8YcU= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4494; 6:8J9xH+xsS4W33OexllMnmDybulHmi5e2B7d9N+YB5ATyMX8D/KTrRMkc3C2j7ajaHv7/tKC8fUoEWpgFJ36tPqcaBzXRa/I2EUvkSvYPxQkoB3rWbVqH2Rw5qKY2xwGEVfND73snTdWhKokSKENipoQGDL1Mw4bzZByAGJtQi+IEIVEYWcazDxPAGfzdk8xEOfnReNH+Kr14V+BZylxL/8fLhSmasCL7zcBhOb/yEoNrdlzrXtCs7JcixlXS56fWY4YaExfFYHLGVrP8CCj4PxZLr58LIg79cH/X1kIE/cjrGPZKE+2ExAZlhexknGFKyhX/azHxUdVrXlu+y4CXR3rXDWSTe55NY6AEW4gQ+QC8dlPPwXEQpgPhRb5cLF06c71gVrwXozwYGvKfwQgTiI8auqevBYIaqauq3K/6tR3Q6QIxxvaE1AcF+3v2Md8h7L0A/YAzw+NLwTk2+wMBUA==; 5:8SacQ13l6RrxMDb0YJZf0wUss6uMpRVfwTpsuPky/r1Stey8f/5xdYyoIbn+1ccI2mJ43NatVjjtqwUJAnW6f4w7Z+YpoQcJQL+4WUXXEpFuFKAlFLIX/AVPiwj3T7KG7YsGNs8WsBVf9IZS/rO9v83bxsPwnXk7mzRDjGJ475o=; 7:abwXDNHYuOyIdXtBRv35UiXwgbHXEdhL2E8QIoQAWt+5FgmG2L70SvdKsnAQUXWEw/ofdr6pDTB9rthtkFL5BQW9XMEogf2McuSaIc+nmGiAIPB31Xa7X2GsWf8dm6sA4l7sH3kbI539sI8f/lgXs4XgiSIoyED+OIhmpJP+E8wIVx77Ca2vuHHaOTQ/6mVcpS0uiONJ0xjl3jxxObGWiZYrf9YFTuZVyYmeqhoUwNwr8mgruwJuX04w4EDcera0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2018 17:00:54.0035 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c902f0d5-b882-4e34-e4c3-08d5f0bddb3a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4494 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_100123_246489_A3C023F2 X-CRM114-Status: GOOD ( 10.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: roy.pledge@nxp.com Cc: horia.geanta@nxp.com, arnd@arndb.de, catalin.marinas@arm.com, Roy Pledge , ruxandra.radulescu@nxp.com, linux-kernel@vger.kernel.org, robin.murphy@arm.com, laurentiu.tudor@nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Convert the Datapath I/O documentation to .rst format and move to the Documation/networking/dpaa2 directory Signed-off-by: Roy Pledge --- .../networking/dpaa2/dpio-driver.rst | 30 +++++++++++++++++++--- Documentation/networking/dpaa2/index.rst | 1 + 2 files changed, 28 insertions(+), 3 deletions(-) rename drivers/soc/fsl/dpio/dpio-driver.txt => Documentation/networking/dpaa2/dpio-driver.rst (94%) diff --git a/drivers/soc/fsl/dpio/dpio-driver.txt b/Documentation/networking/dpaa2/dpio-driver.rst similarity index 94% rename from drivers/soc/fsl/dpio/dpio-driver.txt rename to Documentation/networking/dpaa2/dpio-driver.rst index 72ba9da..3a33a33 100644 --- a/drivers/soc/fsl/dpio/dpio-driver.txt +++ b/Documentation/networking/dpaa2/dpio-driver.rst @@ -1,7 +1,16 @@ -Copyright 2016 NXP +.. include:: + +DPAA2 DPIO (Data Path I/O) Overview +=================================== + +:Copyright: |copy| 2015 Freescale Semiconductor Inc. +:Copyright: |copy| 2018 NXP + +This document provides an overview of the Freescale DPAA2 DPIO +drivers Introduction ------------- +============ A DPAA2 DPIO (Data Path I/O) is a hardware object that provides interfaces to enqueue and dequeue frames to/from network interfaces @@ -27,8 +36,11 @@ provides services that: The Linux DPIO driver consists of 3 primary components-- DPIO object driver-- fsl-mc driver that manages the DPIO object + DPIO service-- provides APIs to other Linux drivers for services + QBman portal interface-- sends portal commands, gets responses +:: fsl-mc other bus drivers @@ -45,8 +57,9 @@ The Linux DPIO driver consists of 3 primary components-- | hardware + The diagram below shows how the DPIO driver components fit with the other -DPAA2 Linux driver components: +DPAA2 Linux driver components:: +------------+ | OS Network | | Stack | @@ -98,20 +111,29 @@ DPIO service (dpio-service.c, dpaa2-io.h) Notification handling dpaa2_io_service_register() + dpaa2_io_service_deregister() + dpaa2_io_service_rearm() Queuing dpaa2_io_service_pull_fq() + dpaa2_io_service_pull_channel() + dpaa2_io_service_enqueue_fq() + dpaa2_io_service_enqueue_qd() + dpaa2_io_store_create() + dpaa2_io_store_destroy() + dpaa2_io_store_next() Buffer pool management dpaa2_io_service_release() + dpaa2_io_service_acquire() QBman portal interface (qbman-portal.c) @@ -120,7 +142,9 @@ QBman portal interface (qbman-portal.c) The qbman-portal component provides APIs to do the low level hardware bit twiddling for operations such as: -initializing Qman software portals + -building and sending portal commands + -portal interrupt configuration and processing The qbman-portal APIs are not public to other drivers, and are diff --git a/Documentation/networking/dpaa2/index.rst b/Documentation/networking/dpaa2/index.rst index 4c6586c..10bea11 100644 --- a/Documentation/networking/dpaa2/index.rst +++ b/Documentation/networking/dpaa2/index.rst @@ -6,3 +6,4 @@ DPAA2 Documentation :maxdepth: 1 overview + dpio-driver