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: 947881 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pdFFLM5N"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="vo8iXNml"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Z77K6PhYz9s0R for ; Tue, 24 Jul 2018 03:01:33 +1000 (AEST) 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 1fheDD-0008KA-Da; Mon, 23 Jul 2018 17:01:31 +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=3AC8Up?= =?utf-8?q?vdGBGx1cLF3nbHjaaQTgSzBJxeGbItD48IDbcGqhzyLOQihBWvvej7N4?= =?utf-8?q?DYbJGAxOAVKli7wYzBR5Z7vQxOiopGWFZwZfhX5fHoDi1+PAoxlT5kSt?= =?utf-8?q?Jr2NKJGQ4gtcvA5YMAfUJLf4PMBcxxgDq8AsmFygI84TnwhILz63CYwB?= =?utf-8?q?R9VeclEf0Fv4gkGWCmV8h45XE7r9ut6NXQYJZV84efs3ZfjbkKiNWECK?= =?utf-8?q?3+DWHBmR+ZDsbOAV5GcHe9fRleEVQwp0ySN1T2zNyLYYFov+nJJBfEuf?= =?utf-8?q?lSb25iUUqn6a5R0eDDWrS7rcE5Y82VvSNOlynOow3XUok2WwEJnzhjFQ?= =?utf-8?q?33+j3gVA0DhD3kuiV0Q5uNRa4UjaGPhevwhq1Xuv7AE6Oj/xsVll4dNZ?= =?utf-8?q?6wj9GYXdnaklYRcO92Omeoi/0r4EKcXhQyPn/wOV29KwX0bOHe5Zr1Gy?= =?utf-8?q?cjzlm7XwvTOgqZN3/0N6oeQMnX6MnyZfD+wKtV52D+9ibERGwfbi+2qI?= =?utf-8?q?/mpYQLHkKecctCz6A97zKq3tP3qvwtTG8b6GP/v1FpyU/ol62Cr9+0Dz?= =?utf-8?q?TW0aF+9Y5xldDy6AYWRYlGeHhSNjYsbHJsK0sU/kqJ0f77OiYbjpsOlY?= =?utf-8?q?YoB0rGjJzfoNOZ4BsqH2KXzJVCGs07ilv1/ozBa0IJNaFhqf/SB5Lh0X?= =?utf-8?q?C+MRJOY+rDMxtpFGyYT/C+PQe8cZpuGW1/GsSXuVdXkU6Tb+JQP9Duf1?= =?utf-8?q?uEeoNjbpFO+ClozkKU7gQhQKFrZ7wKCgP+CDijPHI4qckVmXLahmV5Nr?= =?utf-8?q?AVsdAES43aEcC5kGmSOGlZsgGzOPUQG6lRAPq3Ws8iMJiBwsfO2VA6xW?= =?utf-8?q?iVIFuiyzdFflrQt8eGfh7bFr8xOIUK7zhrHt9mXdfNh79YFCBEPl+iNo?= =?utf-8?q?gcaTmaUF6wtPbpFaNQdBxyyDtcVslBQeOZ02ETojCT7nCQ/qwIPpNe7W?= =?utf-8?q?ATdxSacFJiGRmJKzU7eIavh9c7o8n2SnasnTVZYYTs2EkaKl2l650FS5?= =?utf-8?q?jgn0P3M+ec/pd1mq2nINUaBrsOijST0hPWc87E38hCJ/pEBhFo0iC+Wo?= =?utf-8?q?tQFNZmFqnEpYm2Jjk95erQftOMfMqwoLb+S/QZjP4ClPXAG0dV7WLSmc?= =?utf-8?q?9oaV1VjYOngo340Y9D6V0CtjlxcEhS8zwitWX26fKY7945zeqkC3H5UN?= =?utf-8?q?aSXoVnPju6G0wZ+nza/v1Y0aVKE4V3yOTn0x4WjYtQVsUFIcfIiiFsVx?= =?utf-8?q?E7YtHY5AYjNCxYMf3pQ3091f4WVlbQMdaJ+rp57O7pGrPYel/1NNXoDB?= =?utf-8?q?iTzCdmck4w=3D=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-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [40.107.4.84 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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,