From patchwork Fri Nov 23 16:56:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1002477 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="m4OvvRuJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 431jC64QWyz9s1c for ; Sat, 24 Nov 2018 03:56:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2633142AbeKXDlu (ORCPT ); Fri, 23 Nov 2018 22:41:50 -0500 Received: from mail-eopbgr10064.outbound.protection.outlook.com ([40.107.1.64]:22029 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2633124AbeKXDlt (ORCPT ); Fri, 23 Nov 2018 22:41:49 -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=D/yXeRB9rpvUip3LzFbIcBVthEQgQEntyEtYAQDHdTw=; b=m4OvvRuJRlTGkJagA7KyGra/lYrCXkm+tE1mqt4qlZUpI68+3WJo6ZatA5+H+RJmyV1MyOwJi9vk0q4NqAbo59pfMB5GDXOOCxyVVxzIu9Sf+xfeyFpyKrAF6DghRHVd122Oprs0MjfuSpLmR1LuEPmPmJm7IHCzDdxNj7vLO9s= Received: from AM0PR04MB4994.eurprd04.prod.outlook.com (20.177.40.15) by AM0PR04MB5041.eurprd04.prod.outlook.com (20.177.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.27; Fri, 23 Nov 2018 16:56:33 +0000 Received: from AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::c426:6b56:b6d2:c8f2]) by AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::c426:6b56:b6d2:c8f2%3]) with mapi id 15.20.1339.030; Fri, 23 Nov 2018 16:56:33 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei Subject: [PATCH net-next 3/8] dpaa2-eth: Move function Thread-Topic: [PATCH net-next 3/8] dpaa2-eth: Move function Thread-Index: AQHUg019dPJFohq1JkaDSzCPmh3aIw== Date: Fri, 23 Nov 2018 16:56:33 +0000 Message-ID: <1542992186-26028-4-git-send-email-ruxandra.radulescu@nxp.com> References: <1542992186-26028-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1542992186-26028-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: VI1PR0802CA0024.eurprd08.prod.outlook.com (2603:10a6:800:aa::34) To AM0PR04MB4994.eurprd04.prod.outlook.com (2603:10a6:208:c7::15) 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; AM0PR04MB5041; 6:6ZspRYXU37KKCq/7Ji+JYY3QRMUZhYhkIyHvr6ld1qkFAL4CSIeb8irCxUfms/rqUAz9t4Zfm1XmZWYOSJPS+ClJ+UgVUHLoMOZQVm6tifDqjy3hUpKFOXGxjkSFHhE8Vi0CXjPmTpl8syyicAztZO1pcTq7fKYMM+k7b2LaJA3k3eTlcwnm2m5Q80hkYRaDoAV6ZB5db6mdermjSy7+UC8P0KcfaX9n7CeQHFb85CBlq+CHBNogGkEcRwjiW8yGCZXASg5BtFUFNnRAEOLIRZDylNrlK3DVqHfmQKd+hAEXquxUzJlQS3ZsWsTEGY01VhHPKASlH1EvzstvcYzYO7dUS1rQSiUuDcJ6QxPVxW7OxCHJS5Re/1oA3eRXAWtwD1rdXIC9XLR0fwRmW3OCtfFfaUZJ7YL/cOgVF8UcjLcX4E5zd+Z8WTNYFdcUc8P7qp8oAVVft4yKkmfrsu2H6w==; 5:BCQSy2f1NidqWCCuCxR0bjBn2VH3kBqiZOloTw4A+QxajXIGeDULy+V1r+OwAERi5sEbgfkZqrG7rmgMzXoVgXGphVnn/s1XBkFHOsncTQEpbNuxExKXYpRx+H7hSruUEiDAC1U4BdJ9Pc6QyV4qErrwsKL9ER/XMeUmxsDmEuQ=; 7:ASyMvxJKfwIkj/cc8TTYoFIkNDeYgmLm50c1UbD8bFCF/3bsZEmxXczycZcg0hT5gVWsanOQTDF5P6PcFxOoeJp7yNlz0rxW4w/G90mzZp/zRyZNLjMjtGh/GiIZFIwRkeVxDpigY09dtLSKOoBAKg== x-ms-office365-filtering-correlation-id: 770752e9-d00d-4b47-80c4-08d651649f6e 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:AM0PR04MB5041; x-ms-traffictypediagnostic: AM0PR04MB5041: 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)(3002001)(3231442)(944501410)(52105112)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB5041; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB5041; x-forefront-prvs: 086597191B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(376002)(396003)(39860400002)(366004)(189003)(199004)(68736007)(8676002)(66066001)(81166006)(2616005)(446003)(11346002)(486006)(476003)(2906002)(3846002)(7736002)(6116002)(305945005)(25786009)(110136005)(6486002)(81156014)(14444005)(53936002)(316002)(6512007)(478600001)(8936002)(2900100001)(71200400001)(71190400001)(4326008)(5660300001)(86362001)(256004)(186003)(106356001)(52116002)(76176011)(386003)(6436002)(97736004)(102836004)(2501003)(6506007)(105586002)(36756003)(99286004)(26005)(14454004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5041; H:AM0PR04MB4994.eurprd04.prod.outlook.com; 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-antispam-message-info: D+YCX31a7XpRW87u9xnQCY2F4lYQj+XPM7EYvgxZZT3b9IN3JQK/ApDE/wRAN4x9rrczMzPdvkzJjows1dKzJWc+XN0RfLPu8b4uT5gFxR07uzWgMB0X58xWdL9j07q4hOiWMqSAL/ANo23U17yqvFQ3+guCw/1l2rHnZ6QZQCJ+jn46RShQ/HM6jFlcPf4u3r/Z4dXdo05AhCsLUPhzU/JoKYYsypX8kN+qx0T47fNL/762bDMhjwBIHeji7zqSHr9hJTOd1/8wlFjPf+gWnHYAem0cbIkfSt939VY09vgglCA2wI1ZO9hsFjkJSoGXvGMmTAtxU4lA104qB3ffAblJuYtuXYJzhfCKqXjGsf4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 770752e9-d00d-4b47-80c4-08d651649f6e X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Nov 2018 16:56:33.5558 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5041 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 --- 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 5be3008..9ed4d8e 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) @@ -794,23 +811,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 */