From patchwork Mon Nov 26 16:27:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1003318 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="nJ0veQyP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 433XQ62ClXz9s3C for ; Tue, 27 Nov 2018 03:27:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726869AbeK0DWQ (ORCPT ); Mon, 26 Nov 2018 22:22:16 -0500 Received: from mail-eopbgr80084.outbound.protection.outlook.com ([40.107.8.84]:2992 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726459AbeK0DWP (ORCPT ); Mon, 26 Nov 2018 22:22:15 -0500 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=wwmvLzECNxVhBT0Yyspeot00otuudqA5esYxgxAvHN8=; b=nJ0veQyPXRFRyYSyhdvTkQp1Ez9Z1QyLZ5aqvfjbkmNR6GgF1F50YNwvNHMyO7OLtuilb17IAT7DXGc2vYh04ymNdoGXkvycoLQLbd9x/vi6wpYLX7WqRLLAbjqpM3FQRHFQ5iSI6ei/0TvupR9O82WDiG0bEULtRSkCp6EGf6w= Received: from AM6PR04MB5000.eurprd04.prod.outlook.com (20.177.33.219) by AM6PR04MB4518.eurprd04.prod.outlook.com (20.176.242.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Mon, 26 Nov 2018 16:27:31 +0000 Received: from AM6PR04MB5000.eurprd04.prod.outlook.com ([fe80::298c:e496:4be4:3244]) by AM6PR04MB5000.eurprd04.prod.outlook.com ([fe80::298c:e496:4be4:3244%5]) with mapi id 15.20.1361.019; Mon, 26 Nov 2018 16:27:31 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei , "dsahern@gmail.com" , Camelia Alexandra Groza Subject: [PATCH v2 net-next 3/8] dpaa2-eth: Move function Thread-Topic: [PATCH v2 net-next 3/8] dpaa2-eth: Move function Thread-Index: AQHUhaTtHV0dhiRICEeiUuuUZ5qfNg== Date: Mon, 26 Nov 2018 16:27:31 +0000 Message-ID: <1543249591-14563-4-git-send-email-ruxandra.radulescu@nxp.com> References: <1543249591-14563-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1543249591-14563-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0302CA0012.eurprd03.prod.outlook.com (2603:10a6:800:e9::22) To AM6PR04MB5000.eurprd04.prod.outlook.com (2603:10a6:20b:7::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [86.34.165.90] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR04MB4518; 6:95VMjpLt21BLJzJH7QLA1A15IN/+KOqIqSLpaBhDeJD/OvZvHFp72HDp2MeCd1e5xSJASq5zgWpM5hvjq6I4QS+UwAhijKHlfJYMCRlTKUrY8Dih3pig6kzG2YauMoYKzi99xVTrB5gSGD1r5ocovMEL2O3bIGzKfn7OmlQ8QDTXOJYPsUnWA6RRHUrAyZEhSLGx8Au7NFtHWIwaWT63JjLi+ILzz0roOFbN96EOLz/wg1TYYzK9e+X2ZOkv69CZAALNzpj3FrKqOYnZK2lzBeqvkJy16EFmuObOKRdCRh844iUyLs5MojQ9wRQ+oBB2riKfsiKjokIB22NzJisRc9ceQ3b8vCrb3ZjNUII8RvxbxKD9ufu7LFE+zQK440Xp2CNC46XgkwZuDY6EEimAMF2nWEffRWQ+o2gJyK+2NbX9kviBzF4oNpYoAmbJMsCrB5yQmKmNlxc3Ps+loS6lBg==; 5:0F9jrSft6WbXZGnHxFyteF3CxRZKXCU5mruVVxgPeRHWE7adSDxf3YnYxvGjHgAGQgu+w1UzTn2YRxtoFVOIzAUXX9/aTBEc+AnttmaHAAUArKwPda2Rnw/I0xd39tImB/3/LQDF8uleoWC5BWc/ovxW2L1+5xy3+CaBxGg9tNs=; 7:T9DmavA0EoqKL8PlT3Mk9s636hmOv8to3L+Of1Rv4998kw/o9ehH0QvUhmSf8eL2cQ6gka40LDJkkj3S81TL8zeyLP/4T2+X4wQRbgDhMGm9dE/8+dDpUtYyaSbCBhpkDp+zHjCUmCV9gwDz/oINqQ== x-ms-office365-filtering-correlation-id: b18fab47-c32a-4fe3-40d0-08d653bc1022 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4518; x-ms-traffictypediagnostic: AM6PR04MB4518: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231443)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:AM6PR04MB4518; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4518; x-forefront-prvs: 086831DFB4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(396003)(366004)(376002)(346002)(136003)(39860400002)(199004)(189003)(86362001)(71200400001)(316002)(54906003)(478600001)(110136005)(66066001)(186003)(2906002)(71190400001)(5660300001)(386003)(7736002)(102836004)(26005)(76176011)(6512007)(256004)(14444005)(52116002)(2501003)(99286004)(11346002)(446003)(476003)(486006)(2616005)(6436002)(81156014)(305945005)(105586002)(106356001)(68736007)(14454004)(39060400002)(8676002)(8936002)(81166006)(6486002)(4326008)(6506007)(25786009)(97736004)(6116002)(3846002)(36756003)(53936002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4518; H:AM6PR04MB5000.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 2M10MY7eEVavfV9qSqNSYIgJSJ3nzLy+D9ivkrgkqlwIf5xhnWpg1QtGMkz0Ig7tw/stkCAnsE45VsKNsRCspBRHpyAh6SmOYVhfecVqIhEJXkXG9dr6KUA4d5yoDcjir4gqeqvjxsbjJup5zBiMK4XbjNnUpdbjX1qYCoNlfVyU/cR7Qg/5TMhMnSeCccxqH1Ro1LumgeX/EtRLFvFdJI4CAKIdC/eIzzrzn10o0godjC3btpQBOobAj4F9mgA9a+PwVaXud00/EHCfgF3ThuF0QOJCGdDJ/6xIeM58kUtBGag00qAkPx7pTY3qyzwx3fEOMEIIJXuhjFTpebSjmCyrWOyCUtDah+xc+N252DQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b18fab47-c32a-4fe3-40d0-08d653bc1022 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Nov 2018 16:27:31.2953 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4518 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We'll use function free_bufs() on the XDP path as well, so move it higher in order to avoid a forward declaration. Signed-off-by: Ioana Radulescu --- v2: no changes drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 008cdf8..174c960 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -200,6 +200,23 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv, return skb; } +/* Free buffers acquired from the buffer pool or which were meant to + * be released in the pool + */ +static void free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array, int count) +{ + struct device *dev = priv->net_dev->dev.parent; + void *vaddr; + int i; + + for (i = 0; i < count; i++) { + vaddr = dpaa2_iova_to_virt(priv->iommu_domain, buf_array[i]); + dma_unmap_single(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE, + DMA_FROM_DEVICE); + skb_free_frag(vaddr); + } +} + static u32 run_xdp(struct dpaa2_eth_priv *priv, struct dpaa2_eth_channel *ch, struct dpaa2_fd *fd, void *vaddr) @@ -797,23 +814,6 @@ static int set_tx_csum(struct dpaa2_eth_priv *priv, bool enable) return 0; } -/* Free buffers acquired from the buffer pool or which were meant to - * be released in the pool - */ -static void free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array, int count) -{ - struct device *dev = priv->net_dev->dev.parent; - void *vaddr; - int i; - - for (i = 0; i < count; i++) { - vaddr = dpaa2_iova_to_virt(priv->iommu_domain, buf_array[i]); - dma_unmap_single(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE, - DMA_FROM_DEVICE); - skb_free_frag(vaddr); - } -} - /* Perform a single release command to add buffers * to the specified buffer pool */