From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751827AbdJ0OMJ (ORCPT ); Fri, 27 Oct 2017 10:12:09 -0400 Received: from mail-bl2nam02on0083.outbound.protection.outlook.com ([104.47.38.83]:10942 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751593AbdJ0OMD (ORCPT ); Fri, 27 Oct 2017 10:12:03 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; driverdev.osuosl.org; dkim=none (message not signed) header.d=none;driverdev.osuosl.org; dmarc=fail action=none header.from=nxp.com; From: Bogdan Purcareata To: , , , Subject: [PATCH 3/5] staging: fsl-dpaa2/eth: Don't account SWA in tx_data_offset Date: Fri, 27 Oct 2017 14:11:34 +0000 Message-ID: <1509113496-10810-4-git-send-email-bogdan.purcareata@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509113496-10810-1-git-send-email-bogdan.purcareata@nxp.com> References: <1509113496-10810-1-git-send-email-bogdan.purcareata@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131535871202806794;(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)(39860400002)(376002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(81166006)(356003)(8676002)(81156014)(8936002)(305945005)(76176999)(104016004)(2906002)(5003940100001)(36756003)(50986999)(53936002)(50466002)(189998001)(48376002)(16586007)(50226002)(106466001)(6666003)(105606002)(15650500001)(2201001)(316002)(86362001)(97736004)(68736007)(33646002)(2950100002)(49486002)(498600001)(110136005)(5660300001)(77096006)(85426001)(47776003)(8656006);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR03MB2699;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11OLC004;1:Sl947lqUKPOGLnwsvARHjEKRRLrN25tBp7vI7/vu+ogKGaBTQHpVQ+ehk9IgLK9fVBQx86QHMmrWho83kEtZcDXO+FZEdlFER+EutDaI+fVr2cdsg2L/wvW0tDoP0u2a MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3144874c-95d9-490d-6aad-08d51d44b0b8 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603199);SRVR:DM5PR03MB2699; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2699;3:TU4PJ01DqUWGrhb90Dqulpbdp4A881+B7KmV+mwSnMEQpMS1ie0P84YzEy2sFQ/NMO5fAItMtYHMvOxLDUkHeA180kpasIVKE7kFipIWFcUf+KMRrtiUVgWn0EKhdcsVzmRyLHkSUBHILPu8TlrTubGG6TkVkTL9YJSgBhjzaTuS0MP3ZX7z1qiWR4+jSYu/2havnZsVpa8LEQC5F3h3VUVFTlSgzOqxB5gs3TkY1AS8onFkLnSnD8gTIvs9cT3CVUByTcjN/qswUUMC0yFbAVCN8hKoJKIx/7zahol7OKjl44Gy9QIA2aIaJYFEUFjOnZ+PPWF0RLzfgxbuH9ku4RNIDUy4Xizeu5VeXMQEt/U=;25:2dJv+SVdP0kV/FidjQCUWKBV2TlxkQmQKL3IWVpO3EDusT7leGzp5ifl33/b4xaCB3akq5CR6RKnAIqRm3fAHtEI06uqV411QufDnJYF9kAta4y/TYzvIDCixguSxfOqauUYgQHv/LS2V1DaMOhrSsHEAKIvGAq9930g4cw0AoTmQkxdeAbWRGQTputjzQ7h3b+PPECa3zTac7I29HfJHXYyETGHuu9FIn81daQtaLhZA48sOA5AZXvCORcVZeGl3XvFo9T6k0kZKX7pMFTklPAY66Pyx0xfdLHk9Mnh8y5Jk1mSSRNgSznKVgQEp9gpYiskiUIqBenslwOlGlA1bQ== X-MS-TrafficTypeDiagnostic: DM5PR03MB2699: X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2699;31:qdsT1XLQAOFReohqPHoK3QmtDLAV7E+FHgaxk96h5Al2UcE50X+20uc9mNmCmo+7Wnj0p5N2wIYH4o1wEBgsuXWCvcbMLiBsZOQ9NgOwHlV6Q0SeczhXlVYgwe1eLjX9AJunnFKsbe8qn9jsLxzrGiG/xs5I/lNU5up+DBM7JseEY3YQSRH+zVeB2i9F2lKD6POjLf0nH2bJfVk1FpIHCkPOllDdCx2kvUOfWsm+Bn0=;4:sibSDzTevwo1zefJi0gxzTa9ivfDo4oSBH5rmvMIivWX/xOR517LHgRZ6R8h55AYWX6mca0Njny/249epbYDIztMS/gxraoskiJoEvVMSxNAmsC8PrvZCE0Bgdu7gw95rae4L/3DBA8ewJG5xhI0NFmtO0X7CaAHKVfTt5aQkdDV3tPAlCjoiqzveuXENgtxRyfqcqAltDcQp1XfNAg4zlDjgxOe9mHLH95sQDFciV+h8MkOOb9/q5ixy4jyKBv3RbLtLIDJb+d51px807TumfiCXrP9ZVfnNO/YYZEHC1c= 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)(93006095)(93001095)(100000703101)(100105400095)(3231020)(10201501046)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123559100)(20161123563025)(20161123556025)(20161123561025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM5PR03MB2699;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM5PR03MB2699; X-Forefront-PRVS: 0473A03F3F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR03MB2699;23:M0Nj0/h358YjqhEv4lGDVqNd9uxdEbveforf8Z+hg?= =?us-ascii?Q?0GQU0zMwlGh/6I7An+BG2ZbNFYzuLxMsR5eGIjW7FcDwqNfz3aF5LBgujy9Z?= =?us-ascii?Q?D6IqfZ5eRqN5x5rw9XOG9m7UJ/qUIX87siVCRPoTyfT/llL5ewEjNrao1mgO?= =?us-ascii?Q?yKSfRlNau08oy0+5ijedP0U/dnvnpn6Jtb6dBgwGbw+IMiekdNfF3QZiRqlk?= =?us-ascii?Q?V2nGpRxQxvYBqLQdeTE8alUQSzYJ8pxwe406rhf5d8fPIyFi5HcvIw3TTGOq?= =?us-ascii?Q?7GKTFkabbECrK+SFvbRAUUHPJU8L/364Mnb7wzSxWtEjAsLGhDl44UT532Ra?= =?us-ascii?Q?fWbundc+2yvCLbFMP1iBxwDqBlQ+e7KiykCQqRC6kSyKfoI8Fg+6DgpZ2aP6?= =?us-ascii?Q?x3mP5RiVUvZ322Aw6zrG6lcwQ6NR+F8Cg0akNDSgu/dGM9RTwXarxX2rxk7T?= =?us-ascii?Q?/azACfn8GICXjszQSZXeQbO8Js1uA84ztA+BASiDf5mFgFZxY4fkJd0qZ7Gl?= =?us-ascii?Q?I3PgQ+tMQhQ1EAt8Ol4lDbnFXrg9zwLXtmPjYXdvwV4x8wNeSKTIyUjtLlrJ?= =?us-ascii?Q?2WUlQzrttiWeodBr5y48FvTc+GapnmMi6jCe7WKZLEmMXZMUHoyvEnD1jnK9?= =?us-ascii?Q?xH//KSSC2RSIx6r5CpkCndmSRAjllNBj1M6T8wNYjAlMn548FdJKADMBt0Zz?= =?us-ascii?Q?Mdz2wC5m0g5Nqfxz7JDtrwPy5/Ta49DShiS1vln4yiol90OQqq9D3uAgbMxm?= =?us-ascii?Q?Pven85UlGmrOarSVExsTAkt6IyazOjon0PFTSG8NZ4eDcwxTUP6lO5opISgL?= =?us-ascii?Q?SwrhcAW+PQKC5yjz9FWJHJPPT5xq3gOsMZsfW7D/68fVMa2mb3o6uHV3bWpC?= =?us-ascii?Q?4mZAK/0pB3hK0/ViMvRka83sgKaiXDcg5PRCS2cr39KHCZrkZhBO/OYfFxR2?= =?us-ascii?Q?i46ayyypmx1j05hRziAM8tlgtmZ78EYTtRcJ1Y9Q+QVLEHL6+UHyaLjyY3ej?= =?us-ascii?Q?hNZ5vR1PN2NQE+4iVvnDDabaeL63yNb0E4Hl2OA232FAW+0cF9c1K0hG+vYo?= =?us-ascii?Q?dfhLSfhKRtgVUVq6CMXm5QhPKWb254Z2rFxMVzGAonfsLxwF6rjRM/+mrDdU?= =?us-ascii?Q?HZrq07DjqxFOuuJtWoV0s0MS2BZhfgBeuia+Ce52pqQ0AvxT9fMj3c0GOAMo?= =?us-ascii?Q?OpDzZMsjGw8KrM=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2699;6:7SHKcrrFsty+0jNwODNDuWO8vD/qZba53d65OlptKpfiXvYMshgWYslLlsdJEAQoIxQs//I+g73d2E49CXLItC5QKhK6+gp8PnN5CQtTHprKikvCkzvaPjm1d6ngo1ACqiSTIq+jgSwf2V1udWEf4WPWFIRlQ+Q95Xc0WbRjAG8SJy9s3XsqOWJB/imwrulw5vo9816NuDXyEN3ZyO5gqMqjQQFLhiL8xSPibFURxkn0cBUVGvIh5mmHC8XjKR+0u79GhSNcWD3X6s31/4Y1x25tJjvlVUyNGoNpfokrsVgTCRyzL9PW34QBFTjvJQ6PSW6BEapipAIFbnoke6U7lQ==;5:VF80qySsqzXMSuu/xzDzfqbEIDbKBTBHe4Qjh+8SkEcwoKscOhodM/9Csew0HQ277eNbEBT7Zvpsk/uzDSwFNZiMNfYA4uQLEHRsHWpbfSiwWKjZs9alQHYT8JY9+qpyIGhuxVBUc5C0KrFySeRcEA==;24:ZNOV5oC0Ez9htEB8tdVvuQ1dqz3K3rptBhfqA9luy8Ya+AGwAorajUVM68qNtboBvBzewE5nRYXbbnetlVbMcaBd7rxVOCLulgv6EQ89Im4=;7:H99BkIlAq4oJMUjAl2H1/u6N1EgoGiGCYVkIXqvaEK+38d63hnLd+QOXxYnShipLiaUJh1wiJ8SIUt6/p7T5Xp3eObHmzC9pX1EynpJWgvQFEkQpxmOTG64RoribUmY0rvoMbIi9nwqMn5UlG9HSwzkKM0XjlOApg9IN4KZRFJ9h2NzsJEOgZfQkJmFgtvudLmWawm5hWvabK6OJKMhZ5bhywQerfxbXckYhTZCxYIE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2017 14:12:00.0934 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3144874c-95d9-490d-6aad-08d51d44b0b8 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: DM5PR03MB2699 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When configuring the Tx buffer layout, the software annotation size is mentioned, and MC accounts for it when configuring the frame tx_data_offset. No need to handle it in the driver as well. Signed-off-by: Bogdan Purcareata --- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 92faaaf..d68c1f5 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -1872,9 +1872,6 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) dev_warn(dev, "Tx data offset (%d) not a multiple of 64B\n", priv->tx_data_offset); - /* Accommodate software annotation space (SWA) */ - priv->tx_data_offset += DPAA2_ETH_SWA_SIZE; - return 0; close: -- 2.7.4