From patchwork Fri May 19 02:59:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127056 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7210742B42; Fri, 19 May 2023 05:00:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FEA142B71; Fri, 19 May 2023 05:00:18 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2113.outbound.protection.outlook.com [40.107.92.113]) by mails.dpdk.org (Postfix) with ESMTP id C02DA40A82 for ; Fri, 19 May 2023 05:00:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TCMEz2kBKKJSHT7Ep1ys6qA5NzVY11gA5RRjYyj7rCydE7SoCeBTJmUtFWSP5VwnL85PBduC8uJMB+Q/lgJtiLhm7u5Yn0bgfl8nFZrebYKb7fBw9xZyIQzX+GUJDt10srVquqwwvF8cDkidbPbhys8S5Er6pDJkRD5mndBaJqG7vS+pudhr+eqUdPJCLPos5lTZ8o2a0cDtiHIFwB7iNzCjoYB8UEBRVRGMgQheZ3eFO1ONWoK0IiiIRMTbgkm3ETRXRUvHMyy5JLjEFl23xKOxM85rGQBSo6dbCHC/DELIdLGCEpkJR9Oih7WOMe3zNB0zjKP0X9O3BQ87pUslwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qHlPrJ0wSzG1SIcBEbcoKp/gYzNgC4iZSBeJeD3xYcg=; b=AV4yPuDiwz+Yjj+aSNOmywEzyt2/t49mUHkXiMCbrlTFWh+6Mv9Jrxsh6yZ0ZAj32R9iqz4SQnJ4+Ev1c6MruQZp6LqLwI2cUmx0FAtqs6jaJdCDl3edZK3ihGa4NQHoudfhV7r9GfqFMD7L2FWD58QFrryVs8EthbI/9pI/ugfIrWxVUmym7UPd9vQJplCr2Cy24rWJF7R3evCYiLIo7LEZg6ykn5e+ERXXpqXz6qdE9VjXJ+CaY1s+m2rDcjaIaRVFutI7cxf+43l+cko8yUl9eq917/TneQxjeeePHNLOqMPUVPEUvvjjgjwfg0hZgj3zveYNGbFWLPytZBTBEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qHlPrJ0wSzG1SIcBEbcoKp/gYzNgC4iZSBeJeD3xYcg=; b=AeIxMeBmq3pxhJgL6T14467a+i93/qTt08YFSnfE33iiktmxC5Wq5/+IutkOJa9z6qJFxoep1hXt7S4co1fUQbcRc2Fymw6nqSN6hB3zClpYc0fX/gT2c2Sw7KXwgGxwVXxvF+4kiPEuwvn+HKfjPrmnCtuzVh2+gL4uTRkx1BM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:13 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:13 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 1/8] net/nfp: reuse the ring buffer struct Date: Fri, 19 May 2023 10:59:43 +0800 Message-Id: <20230519025950.1642943-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: 3647df98-6ee0-4b5f-d392-08db58152a35 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nv3fKy+Q4oY7PTi5bCShMCVsI6/GDUVwztiraEoU6S/XqfakFv84qEOYBfxGv6eFn5tgsqiVgfvpVQWbON2SRKxhkFHljVx63L6eFhh5UiEWyYl9NW4s1V8AMOfebJF3nce0JLcxxxMOBR5A0qmmdKAsTfbf4zaJ4zAixKfCO0LLehaPDRmxUu5m24LIdbgAaPCXu1wCbV/lztfRuAc0Yd3sROMWKFlZHEDeaSqkFgpZ/9yO9OGUZD/UnZ/x7XP0h2pEPgyiQZhhp4gFzzJrbF0p16hcmUUuyBmNErZpWw0JuCqF82nYi2G/102QHYdKp3HaXr8ABP3mwy5Bw1fiQy0+JHveYqcspVjAOf0qGsZ3sqz0ywtQFg5zH/htbhHdQp8odmdp6pV8DhZLUqxeB2yOYkKfTreXFONy2AiGkW+002LZYaBXtMAeE866EbXyrCxUymgQ26r7YSFseawG5hGRrUKB223laxJiQiSbkW2PTHa/0ibCey3gA3MpCGpiVQ/ecWXk3SROSNWvV4iQhDy/oM1KFVCmTnVODcV1mqU+vtDqv4SDFcyinNEOXIbw8NsDilT9TGIgGPTcOmh8gHwBQt+t/n3xCwqrQ4PxQdIrRT1fevLR/+cTWnkUkgwF X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(66476007)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?hrdXriI+SCGFjUyFdC3mAPlgsfRb?= =?utf-8?q?j1H/PN8W/DfNX1cO60dstXHkr9qvA49C2oVb6hV2lCXe5RtkMm3Hm6n9SmAlmD8xr?= =?utf-8?q?bgZq66r0YoXJzNzscGsWpF5RhM00dvL/cAg+1vZVyxQlULTyrQ+P7tXSNkyuE/itz?= =?utf-8?q?ZY7U6iOXgmJtm4b+SOwgQbhLKagxozL1CLNPg5YH64BKrhOpI726AZtzus5PO1kwd?= =?utf-8?q?oVRoUonGQ+pjlSwFPo9vUYGhfA/Ob05EwAZFzSP33/xQvAWXE/IrXR2bbWiNupD3L?= =?utf-8?q?4AOX2SulQFU6ZA2rEZ0GRqOFFjuIszKK/QHIY0squhZvkxtuQYXygSWlqZsey/yW6?= =?utf-8?q?pGXRoRvQvkOaISvKqFt0zxH5o0sRuHKRCvDVf4owNfpmU7hwbIOggryTHB/ZI1meA?= =?utf-8?q?lYW95k3jXw9wJqmJWjVsLFBFEcehL6bPRz0B6QCWR3MZoLV54timrrP33KQ7ToC3J?= =?utf-8?q?VjWplGh5WGHVdklMwZ3pfvzeXrOL9bYgeBl9pEcCrZ9ZCo/1m3bWddIvksW2WAoET?= =?utf-8?q?ptzIjLWBNXrJkY1fE3rvKqJWpwZDvelg0+Pe+fOVAhmMDnA8FS0x51I6oLD+udL/p?= =?utf-8?q?bgQoWSpKxSaPCU6L7jE8j9rlzBQzujMCtNdKjYFYkTZyGl3EhulZK/IhpBGelLvcB?= =?utf-8?q?TXGd6FfaYcl0u0awuUfp6QUQDaqogUSKdAGEeYRN6uZpNn20hhWEx3wlUz4eaj4e2?= =?utf-8?q?BsPdpHWh2ZV0SVl0UGti2GYGStwUa9DvOAGHb+V4IuccP41LH9qU81K0bZ3dmKMOe?= =?utf-8?q?auVJXu8wt6lHwglI9eOmPKVrvyxQDJQQChQr1SxvtFU0aaz7S9kIoIkL7QMcFp8rs?= =?utf-8?q?HPc4P6LYsrREHmAgVQWPO3MxmPlpv1FaMfY2wvB/tCPWhuZrZZRN/uUQRYNb1yPVK?= =?utf-8?q?KiDmbF2IYfU1frS+t/l2HQgiDj6GkFQWntPptCBAvq6XaN6+fz9Gxmtn2B+bVoyR0?= =?utf-8?q?0tIUONseKBNu+1xa22I7euMFME/l/Ocjlp7fR5sfea/b4ue+DDM9mSeoqoYQLid7G?= =?utf-8?q?MOJLAH1+v5W6X29FBh1Zxt1PO2pF+v1yVJbBERJm8PhapFWuGiEMpYAkUAB05Tp2D?= =?utf-8?q?TJ7UmfvD+1FWRFr/KX3rmWxSl9OOjmAK0xPHhWd4c8K7a3XdGeJdxZ5TW4UCQrLyB?= =?utf-8?q?ktVI7S++Yx+PRl6pNuTWgcY6VNcHhAt8dJJU60xTctCB5/aB6GnmZ2Q0+kKeA1YFt?= =?utf-8?q?1ImVinRPf2rgWgK+IaqAJpICQQqMvlCeDO62zXH7oEz/m5uwdbq1HtNmcDfpWk33C?= =?utf-8?q?4cbj1Ttl7tj2hihixXIp3PHt9li6HIXP8S1l3dJOleETTMNGNpgaiSxM3fpWWbGTt?= =?utf-8?q?Y03LuYBFEk7P2JM09n0EDUEkwCsRO1r+aIRs3FxeE38rSq8BFhi5if7SwecGw91vv?= =?utf-8?q?PUGXR0+AmNdLFDoZHC/cm9WKZkT70dRsA4mjntpCTosKy2SUFnTil9s5LaeOUWHfz?= =?utf-8?q?dvBFBIlthhiYJP+1rNKoLagJ2doLkF4acT/KodiaSADJQs3nCsE3YdnMH9hX1k62t?= =?utf-8?q?SjTCSCmUCWt+7gaWjAICyAr2AlgwutT3cg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3647df98-6ee0-4b5f-d392-08db58152a35 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:13.1475 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: l6NGGIPf+qxP5cQkmA1kpjloIab5uyoWqGeqqwSPS8KfUtFGEuM90mQRG6CmanJTgwPlhqjlLTRLHCmvzIx/Rprt68zoEN+kenZXOkg16CA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Reuse the ring buffer struct, make the code more readable. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 2 +- drivers/net/nfp/flower/nfp_flower_ctrl.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 4 ++-- drivers/net/nfp/nfp_rxtx.h | 14 ++++++-------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 159f88f5ae..4d60660a77 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -320,7 +320,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, struct nfp_net_hw *hw; struct rte_mbuf *new_mb; struct nfp_net_rxq *rxq; - struct nfp_net_rx_buff *rxb; + struct nfp_net_dp_buf *rxb; struct nfp_net_rx_desc *rxds; struct nfp_flower_representor *repr; diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 937829c23c..1855e73c14 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -30,7 +30,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, struct nfp_net_hw *hw; struct nfp_net_rxq *rxq; struct rte_mbuf *new_mb; - struct nfp_net_rx_buff *rxb; + struct nfp_net_dp_buf *rxb; struct nfp_net_rx_desc *rxds; rxq = rx_queue; diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 9eaa0b89c1..190498abc7 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -28,7 +28,7 @@ static int nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq) { - struct nfp_net_rx_buff *rxe = rxq->rxbufs; + struct nfp_net_dp_buf *rxe = rxq->rxbufs; uint64_t dma_addr; unsigned int i; @@ -371,7 +371,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) { struct nfp_net_rxq *rxq; struct nfp_net_rx_desc *rxds; - struct nfp_net_rx_buff *rxb; + struct nfp_net_dp_buf *rxb; struct nfp_net_hw *hw; struct rte_mbuf *mb; struct rte_mbuf *new_mb; diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 4d0c88529b..235f083dcf 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -98,6 +98,10 @@ struct nfp_meta_parsed { #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +struct nfp_net_dp_buf { + struct rte_mbuf *mbuf; +}; + struct nfp_net_txq { struct nfp_net_hw *hw; /* Backpointer to nfp_net structure */ @@ -128,9 +132,7 @@ struct nfp_net_txq { * For each descriptor keep a reference to the mbuf and * DMA address used until completion is signalled. */ - struct { - struct rte_mbuf *mbuf; - } *txbufs; + struct nfp_net_dp_buf *txbufs; /* * Information about the host side queue location. @txds is @@ -210,10 +212,6 @@ struct nfp_net_rx_desc { }; }; -struct nfp_net_rx_buff { - struct rte_mbuf *mbuf; -}; - struct nfp_net_rxq { struct nfp_net_hw *hw; /* Backpointer to nfp_net structure */ @@ -238,7 +236,7 @@ struct nfp_net_rxq { * For each buffer placed on the freelist, record the * associated SKB */ - struct nfp_net_rx_buff *rxbufs; + struct nfp_net_dp_buf *rxbufs; /* * Information about the host side queue location. @rxds is From patchwork Fri May 19 02:59:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127057 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1307742B42; Fri, 19 May 2023 05:00:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1DCED42D32; Fri, 19 May 2023 05:00:19 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2090.outbound.protection.outlook.com [40.107.92.90]) by mails.dpdk.org (Postfix) with ESMTP id D4796406B5 for ; Fri, 19 May 2023 05:00:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HE7h9ZX5sslabhY6oc58d2j1ub3IZiBuaKHXOFfFC6M2HK+8tnu0Rs3g9V4OxHoU4lqT1VdGbDLJ5ubDq1Jj/J4JLfkErpGQWEdOkZ3kvm8ebfxzZkgyC+YDaoRIalJytd2pWy7ljlDrrx3JlFevodxCxJiSqSUvJ7oTD95u69ZG+C4e4WS/SfpoQ+4N9AayptrmEpNKMnVZGta53fC+nxJzhh0agtoOxCWnyjM+GGvpxZADQxB7UV9azC1bl0yBDzS4zpukLzMrmspsh49y/qHAUPCr+fiH592VSMh4buRgEQ4gmn4PEIOtotszqrntGqz69/bFgHPPD9UObKjKtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u9dUCnza3ys6HQVn1b9dJahywzGPk8OipyrP16oFxcI=; b=jMPIu3bGehch3jG7w5IILwoKccHCJjMy+CtbxXH285i0GWZLXM7f1guu6raAKPioKc7EH3h7/j+/msugQTIwofuCKE8U+6S1Oy6C15dGgr6oCc4pwmVb3KuOMms71OcNI+9h6FGBQXFA/wR2mGeVn/RMAxyDQ9zB+Tb0xGL50ma7crzT43Ip/93d7ziWbmuijs1v47o14pS78zvmMbiqzBBARbNQnfhNYtJ+iw3io9OWBHt28AHNxvNZ2GvqfEpuWeSEenNXsen3T2yempBpIp6esOfWdmO8S1TrUJO8v9sAQkSK89kMS8zMU8BKZV0bSTsa45xwDf9yDNt1HEY36g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u9dUCnza3ys6HQVn1b9dJahywzGPk8OipyrP16oFxcI=; b=jo3GX7r/eWKSPcQuUL/9KOJV6truVwV1msRZRgaK2vbSHhy8ZXflsx72+PzzsfmhM5mhSBuCvzvqDZDygal7XecfPkWZw93OglS5uv83hfGnGLy2OXJloxYyU56lgrwf8k0oI3PUJqJv/d7cOGGwqKsmfKymeBIJsANgntSXge0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:15 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:15 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 2/8] net/nfp: modify the rxq struct Date: Fri, 19 May 2023 10:59:44 +0800 Message-Id: <20230519025950.1642943-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: 293e75cc-d401-4309-65a7-08db58152b7c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y7ETmPrncc9BH2pWSNyv12nUkKankpFfdfiadWq2N7NC9K5htnyaGGMvSM2yBboSPw8nciQ41d2oLwX764LQLoGnJNEYjzKbB/LV/fc4azHBLmTFs/KOQxWRGmWINLCJnnwFL004fYV1al6+qFt7UK2SXHK8yPCrBisrLd5xGrZwbuJIF/hcPDJal6nxJ7Faqj5OS66Zd+JdTsvKNZO2qa8V6uLS5T3B8eQP5rtkpKgpVGDdG6eAML8LfM60NiJ3NUpP1PrZwATQDJBKFzxOwgRR9Z2ZhR51KF1avyL+hfDGVy1QwZojK1nOMyQK6u1TsGU7Prkse3NGlhXT9yY/qmeplo0Oi4CGvLFslgUj9qiTn7m3nAEX5MNFxVCrDqubdlbBZA+Ufmppruyj+h35hQBnHbM6eBSou7u9EQvnqPxyx9+iVEeHArWOkyJA3HC7IfIS7V0Y/oUp3rMAmmtf09fEeHUdMTxzPMZ47Jkfz3GSlKHFHftYb3rs2euZpSbEoIedRQ2TUWSvN9pxW70vL5Wm0Ue87QAAs4Kj+8kLTZcdE8tZR4QG86DHyTlGM3TPK1GOkVBiCOFCM/sI6pXGztS8g8Opm2AIw6E7+9891qrwfZW2aOLZL5CsmRc197R1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(30864003)(66476007)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?K6Z9toQrH3E07b9GEK9IreUnHxYW?= =?utf-8?q?9nGBeRWSyec7AyFPZq1Z/cgXsJrnEWhiqODox06Hz5jWUhMyZz3sTZgpbmwj6DXWB?= =?utf-8?q?Lp5J0ImA+HybadTPkdrjic8r4uX24U1ApybOsOpbnB8IO6cKrEFUbhMLCdtVuMqFF?= =?utf-8?q?zEE5hDeVrUozyQfpkIF2OADrHMzqLCYvE1Lbl0NsflWmDESP9du+oEz6jhJg3pJFn?= =?utf-8?q?tryH6LUhDFljcAqICIOwjpNkAvYxBUoPiqQs+HLDdgIjmTOHkO8UBIeGwqu5OekCX?= =?utf-8?q?e83uzUmjMkdB++aJAPlfhQXhUgt90d3rKGyWYT9GZ1f4vT6cxcSBUzIkQ9bmSqbJQ?= =?utf-8?q?8pKmredMlcKS/m7tEi0Q6XXPNi5nOq94Mh9tgqtpts02oJNumDdQ8I7qtOxB2wKmD?= =?utf-8?q?fFi6Kuyvmy+iwz/W3aqgxEYC8NanUzkQAc1hnTEzwhq6IPaJmCf1ntynOOLKZD+mI?= =?utf-8?q?gM02GNZUHzISs8e1Z4IbkJRxfGO3fnzn4vzVE4O5wT1cz1HDTC+dxe9ftvoAirmnC?= =?utf-8?q?7FXMiAyAgrgVJjM4X0a1gV/OakLH+2/Yt77wJTv9Y+AERgnhRc5ibIpWK4QtMWiNO?= =?utf-8?q?RSuCzA4Y0ffYe9v9tCSNkVxyLJBDSOBxf/I6nsTtJ3DU91ra0R7Kfej14/Iq9S/MR?= =?utf-8?q?VXkFQ/Nkx6DKe35hJIKgMdWBDdvYTfamPzIP0iLwb5u7CD+yC2PsrmY191LzH4Uaj?= =?utf-8?q?8DabOh+0breFbGBfI4dCYwPnLd1q8ZaaPDjd/pce/w4qf1v6Wfsta+VtR+yWoBHBB?= =?utf-8?q?6PbKaadqEl2GNrflhenfe0IyZeU9F3bnLd/sVZOR3C2TUlGKIbRjFjGJGIjUc8kIT?= =?utf-8?q?hqCgvr4rZowONEQTtN9md684OvRSmDG2IUlsBvx7zPrh3+pE6TSqnOjSB1sUn5ikx?= =?utf-8?q?ae4LO1EANxuKQjzDcyG1SXTgGXQB3eLFpBjhM4i8KmGBsVQT5jYFI60vI7/w6tKf7?= =?utf-8?q?MMXsyVIyEW7dBXQxIVjPmz9xfPALxLTZGxriVKEHUZY4LJt71EvmSGiD6OtUqGvAf?= =?utf-8?q?vaPKhiyHOjteWgtqHcDNfpU7aCfmQv6oSbGsf7f/kSylXrLmfCx1UVr3/Bb0hcnWg?= =?utf-8?q?Ix6sAANCGFbGpYrs7jY+z7qFgK9THQSNHSoEKNUFh1VcakRTdqE2OGO80GXsIYaA1?= =?utf-8?q?xj4duqkP06Ytjz+qY/sxkVdEJyUbKV86F+2N3vRGzcpTSv7CgpX25Y4xyMvxBk6fC?= =?utf-8?q?cCWl2R+dZTHgszIh6eAz8n/czN6h2sjkURT2+8FouL/fxemMI8tUcQ7eZZF0sfzdU?= =?utf-8?q?hWjy86tKDU3gnv/Xu/1bOyBhpFlJv+JKlaxJ65BQNInOEM3bdUibNQdBp9LCNo5mA?= =?utf-8?q?fXh+TXeErNFMvTlw2xBfOiGqy/faE3l8h4kJGP/h9XnFrNORpcvQtkjQYEhvoiBrS?= =?utf-8?q?Q0LIpVGM4N0BKv0mMTNVlrvf5huRsob/tJk9QcNrweB9OLJK4yIk4Q8/tMI7VB1My?= =?utf-8?q?GIpptX4HLFqXfZVoSI/OXsZu4WrfBrKUOVY7ARC6/eLzkUGr0zqyWMhPntDOjze/q?= =?utf-8?q?R8Sy/9FKNcX5Hj/PI0HtZVTdDriDQ6gCSQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 293e75cc-d401-4309-65a7-08db58152b7c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:15.3691 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LKIFKjhSkYeOGYlxc+bBRBcqi7LKwtVo/Eaqp6FJaE8xILC0ybn5NtPQvsuKJWC7LoUH1f1F5JYHoIeFoKR5c7n032JNQ1D9NtW6tkRjrG4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Modify the struct nfp_net_rxq, remove the unused fields, change the type of some fields and make the comment message more suitable. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 13 ++- drivers/net/nfp/flower/nfp_flower_ctrl.c | 6 +- .../net/nfp/flower/nfp_flower_representor.c | 3 - drivers/net/nfp/nfp_rxtx.c | 26 +++--- drivers/net/nfp/nfp_rxtx.h | 80 +++++++++---------- 5 files changed, 55 insertions(+), 73 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 4d60660a77..8847849adc 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -311,8 +311,8 @@ nfp_flower_pf_recv_pkts(void *rx_queue, * We need different counters for packets given to the caller * and packets sent to representors */ - int avail = 0; - int avail_multiplexed = 0; + uint16_t avail = 0; + uint16_t avail_multiplexed = 0; uint64_t dma_addr; uint32_t meta_portid; uint16_t nb_hold = 0; @@ -364,7 +364,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, new_mb = rte_pktmbuf_alloc(rxq->mem_pool); if (unlikely(new_mb == NULL)) { PMD_RX_LOG(DEBUG, - "RX mbuf alloc failed port_id=%u queue_id=%d", + "RX mbuf alloc failed port_id=%hu queue_id=%hu", rxq->port_id, rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); break; @@ -464,7 +464,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, if (nb_hold == 0) return nb_hold; - PMD_RX_LOG(DEBUG, "RX port_id=%u queue_id=%d, %d packets received", + PMD_RX_LOG(DEBUG, "RX port_id=%hu queue_id=%hu, %hu packets received", rxq->port_id, rxq->qidx, nb_hold); nb_hold += rxq->nb_rx_hold; @@ -475,7 +475,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, */ rte_wmb(); if (nb_hold > rxq->rx_free_thresh) { - PMD_RX_LOG(DEBUG, "port=%u queue=%d nb_hold=%u avail=%d", + PMD_RX_LOG(DEBUG, "port=%hu queue=%hu nb_hold=%hu avail=%hu", rxq->port_id, rxq->qidx, nb_hold, avail); nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold); nb_hold = 0; @@ -783,9 +783,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) /* Hw queues mapping based on firmware configuration */ rxq->qidx = i; rxq->fl_qcidx = i * hw->stride_rx; - rxq->rx_qcidx = rxq->fl_qcidx + (hw->stride_rx - 1); rxq->qcp_fl = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->fl_qcidx); - rxq->qcp_rx = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->rx_qcidx); /* * Tracking mbuf size for detecting a potential mbuf overflow due to @@ -798,7 +796,6 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) rxq->rx_count = CTRL_VNIC_NB_DESC; rxq->rx_free_thresh = DEFAULT_RX_FREE_THRESH; - rxq->drop_en = 1; /* * Allocate RX ring hardware descriptors. A memzone large enough to diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 1855e73c14..72c0d5e7d9 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -68,8 +68,8 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, new_mb = rte_pktmbuf_alloc(rxq->mem_pool); if (unlikely(new_mb == NULL)) { PMD_RX_LOG(ERR, - "RX mbuf alloc failed port_id=%u queue_id=%u", - rxq->port_id, (unsigned int)rxq->qidx); + "RX mbuf alloc failed port_id=%u queue_id=%hu", + rxq->port_id, rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); break; } @@ -143,7 +143,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, */ rte_wmb(); if (nb_hold >= rxq->rx_free_thresh) { - PMD_RX_LOG(DEBUG, "port=%hu queue=%d nb_hold=%hu avail=%hu", + PMD_RX_LOG(DEBUG, "port=%hu queue=%hu nb_hold=%hu avail=%hu", rxq->port_id, rxq->qidx, nb_hold, avail); nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold); nb_hold = 0; diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 3eb76cb489..94a04e6235 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -46,9 +46,7 @@ nfp_pf_repr_rx_queue_setup(struct rte_eth_dev *dev, /* Hw queues mapping based on firmware configuration */ rxq->qidx = queue_idx; rxq->fl_qcidx = queue_idx * hw->stride_rx; - rxq->rx_qcidx = rxq->fl_qcidx + (hw->stride_rx - 1); rxq->qcp_fl = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->fl_qcidx); - rxq->qcp_rx = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->rx_qcidx); /* * Tracking mbuf size for detecting a potential mbuf overflow due to @@ -62,7 +60,6 @@ nfp_pf_repr_rx_queue_setup(struct rte_eth_dev *dev, rxq->rx_count = nb_desc; rxq->port_id = dev->data->port_id; rxq->rx_free_thresh = rx_conf->rx_free_thresh; - rxq->drop_en = rx_conf->rx_drop_en; /* * Allocate RX ring hardware descriptors. A memzone large enough to diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 190498abc7..b34a9b9374 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -40,8 +40,8 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq) struct rte_mbuf *mbuf = rte_pktmbuf_alloc(rxq->mem_pool); if (mbuf == NULL) { - PMD_DRV_LOG(ERR, "RX mbuf alloc failed queue_id=%u", - (unsigned int)rxq->qidx); + PMD_DRV_LOG(ERR, "RX mbuf alloc failed queue_id=%hu", + rxq->qidx); return -ENOMEM; } @@ -379,7 +379,6 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) uint64_t dma_addr; uint16_t avail; - avail = 0; rxq = rx_queue; if (unlikely(rxq == NULL)) { /* @@ -387,12 +386,13 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) * enabled. But the queue needs to be configured */ PMD_RX_LOG(ERR, "RX Bad queue"); - return avail; + return 0; } hw = rxq->hw; - nb_hold = 0; + avail = 0; + nb_hold = 0; while (avail < nb_pkts) { rxb = &rxq->rxbufs[rxq->rd_p]; if (unlikely(rxb == NULL)) { @@ -417,8 +417,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) new_mb = rte_pktmbuf_alloc(rxq->mem_pool); if (unlikely(new_mb == NULL)) { PMD_RX_LOG(DEBUG, - "RX mbuf alloc failed port_id=%u queue_id=%u", - rxq->port_id, (unsigned int)rxq->qidx); + "RX mbuf alloc failed port_id=%u queue_id=%hu", + rxq->port_id, rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); break; } @@ -495,8 +495,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) if (nb_hold == 0) return nb_hold; - PMD_RX_LOG(DEBUG, "RX port_id=%u queue_id=%u, %d packets received", - rxq->port_id, (unsigned int)rxq->qidx, nb_hold); + PMD_RX_LOG(DEBUG, "RX port_id=%hu queue_id=%hu, %hu packets received", + rxq->port_id, rxq->qidx, avail); nb_hold += rxq->nb_rx_hold; @@ -506,9 +506,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) */ rte_wmb(); if (nb_hold > rxq->rx_free_thresh) { - PMD_RX_LOG(DEBUG, "port=%u queue=%u nb_hold=%u avail=%u", - rxq->port_id, (unsigned int)rxq->qidx, - (unsigned int)nb_hold, (unsigned int)avail); + PMD_RX_LOG(DEBUG, "port=%hu queue=%hu nb_hold=%hu avail=%hu", + rxq->port_id, rxq->qidx, nb_hold, avail); nfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold); nb_hold = 0; } @@ -605,9 +604,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev, /* Hw queues mapping based on firmware configuration */ rxq->qidx = queue_idx; rxq->fl_qcidx = queue_idx * hw->stride_rx; - rxq->rx_qcidx = rxq->fl_qcidx + (hw->stride_rx - 1); rxq->qcp_fl = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->fl_qcidx); - rxq->qcp_rx = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->rx_qcidx); /* * Tracking mbuf size for detecting a potential mbuf overflow due to @@ -621,7 +618,6 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev, rxq->rx_count = nb_desc; rxq->port_id = dev->data->port_id; rxq->rx_free_thresh = rx_conf->rx_free_thresh; - rxq->drop_en = rx_conf->rx_drop_en; /* * Allocate RX ring hardware descriptors. A memzone large enough to diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 235f083dcf..c433e084c5 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -213,81 +213,73 @@ struct nfp_net_rx_desc { }; struct nfp_net_rxq { - struct nfp_net_hw *hw; /* Backpointer to nfp_net structure */ + /** Backpointer to nfp_net structure */ + struct nfp_net_hw *hw; - /* - * @qcp_fl and @qcp_rx are pointers to the base addresses of the - * freelist and RX queue controller peripheral queue structures on the - * NFP - */ + /** + * Point to the base addresses of the freelist queue + * controller peripheral queue structures on the NFP. + */ uint8_t *qcp_fl; - uint8_t *qcp_rx; - /* - * Read and Write pointers. @wr_p and @rd_p are host side - * pointer, they are free running and have little relation to - * the QCP pointers. @wr_p is where the driver adds new - * freelist descriptors and @rd_p is where the driver start - * reading descriptors for newly arrive packets from. + /** + * Host side read pointer, free running and have little relation + * to the QCP pointers. It is where the driver start reading + * descriptors for newly arrive packets from. */ uint32_t rd_p; - /* + /** + * The index of the QCP queue relative to the RX queue BAR + * used for the freelist. + */ + uint32_t fl_qcidx; + + /** * For each buffer placed on the freelist, record the - * associated SKB + * associated mbuf. */ struct nfp_net_dp_buf *rxbufs; - /* - * Information about the host side queue location. @rxds is - * the virtual address for the queue + /** + * Information about the host side queue location. + * It is the virtual address for the queue. */ struct nfp_net_rx_desc *rxds; - /* + /** * The mempool is created by the user specifying a mbuf size. * We save here the reference of the mempool needed in the RX * path and the mbuf size for checking received packets can be - * safely copied to the mbuf using the NFP_NET_RX_OFFSET + * safely copied to the mbuf using the NFP_NET_RX_OFFSET. */ struct rte_mempool *mem_pool; uint16_t mbuf_size; - /* + /** * Next two fields are used for giving more free descriptors - * to the NFP + * to the NFP. */ uint16_t rx_free_thresh; uint16_t nb_rx_hold; - /* the size of the queue in number of descriptors */ + /** The size of the queue in number of descriptors */ uint16_t rx_count; - /* - * Fields above this point fit in a single cache line and are all used - * in the RX critical path. Fields below this point are just used - * during queue configuration or not used at all (yet) - */ - - /* referencing dev->data->port_id */ + /** Referencing dev->data->port_id */ uint16_t port_id; - uint8_t crc_len; /* Not used by now */ - uint8_t drop_en; /* Not used by now */ - - /* DMA address of the queue */ - __le64 dma; + /** The queue index from Linux's perspective */ + uint16_t qidx; - /* - * Queue information: @qidx is the queue index from Linux's - * perspective. @fl_qcidx is the index of the Queue - * Controller peripheral queue relative to the RX queue BAR - * used for the freelist and @rx_qcidx is the Queue Controller - * Peripheral index for the RX queue. + /** + * At this point 60 bytes have been used for all the fields in the + * RX critical path. We have room for 4 bytes and still all placed + * in a cache line. */ - int qidx; - int fl_qcidx; - int rx_qcidx; + + /** DMA address of the queue */ + uint64_t dma; } __rte_aligned(64); static inline void From patchwork Fri May 19 02:59:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127058 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 55C7142B42; Fri, 19 May 2023 05:00:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9630342D3F; Fri, 19 May 2023 05:00:21 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2098.outbound.protection.outlook.com [40.107.92.98]) by mails.dpdk.org (Postfix) with ESMTP id 53FF942D35 for ; Fri, 19 May 2023 05:00:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=chcHL0Px/TarkMLlPMh0dWa36ikbLWszfqoR2Gue5Mhy+Rp/8exWJBvyXV4/tVRQQh3gKqy8MPJoMy646w7g6KvbzPdVxYa9WnS2W+olmsi1G0R6AOGD+lVkqgXidSwtt+vw5Swi64W4eSAvlLIl/B15Mn/JS7KZrsU8mlue8Zrwbjr7+eMuecuwo6IENbrnUOXEqE65aIVZu0Y4u6gHOP/BXdWN6WYwll3HcJspt8V3isLvQw0e0i1EJAI2pgkAGwfrptLeTARYMFpd03HClgV0MinASmR1KBOAlj3GmFQUWlhOf9j63ovFjOQqMOcVK9YEqS5c2WcwBjyvateQEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jiefXhLxuClTw+jsf6oF+LRuUstyrE+cJ8dAUmaCipQ=; b=oGG3IVLOyhbrIT8GiPhcXXk8F/2Xt6B9YrmH1s/wzwDqQjOCcEIuvXhicmuR6yuUcrh8nCl1gHI2pPpnguSl0hl01HhBWlJLXo96m9u+tHWSxkLHQauK3GPOv/S0IDf4DC/5Sfs9XdqozNpPk0XsQKlITqGJTWOQOX4+ZPyIE4C3Hwl5GVgik/Ow4XIzNU17/UokNp7uRbl/WGe3gpYQ2+eBgVErlgW1G1Oz5MIAWsxrXTY0119zDh6G0IVP8TqGHvkAxORTzatcmaQ8qZcXdegdYZg70UFe3849DHMpj0lHLV5vIvIgGeme17qF56ZsqUu27z3eQuHCl+k7RJ+xuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jiefXhLxuClTw+jsf6oF+LRuUstyrE+cJ8dAUmaCipQ=; b=HoheCaoSG8ea9TC32/Px/o5KkJ3WEV4LSfb4jWz4Dtpy/UM71/+d27cvZRj+2OWM4Sd49kP+kJTNex75AFbF1QavdkSKTG0kXJ8TXyQg4ZzQUmtUV+Ec8kP0AmgUijukiWZpU8db6lpAcHfwkwG9GJv1th9kxtQ+/439srG9FUg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:17 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:17 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 3/8] net/nfp: modify the Rx descriptor struct Date: Fri, 19 May 2023 10:59:45 +0800 Message-Id: <20230519025950.1642943-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: ff7cb1e0-2943-414f-a6f8-08db58152cd3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z+QoabkD9shPZNJPbUsheS5pkJfGaYI2+mFPCOfb5/I2kCw+GX3Y/s518D+tr+GN6efrlbY1cknVkgNBr2UuhTK2W8B3FZhwW6uVycXa8aLe2qEYsk5e4Pv5gqbpebOG6qibgPK2QsbhcOqEBsI2ikenWuUndPQZ8JNJB/keM1H1iedLB4c97HBovdWW1ELe/OgA6iZIE3pGwXhCu32KSTAaei7cih5bK0sTBby4xX0Hv2nDzLGSCF433eowqJbtvAj1Kcaqd0j95xRdGxTcGeh+E+uOVsnaVGrsnxhDIPFrfVYwpdF1AgLGO4sagMFTfFJsBeUDujwNti0x/C/1hkCPGxSMxTu1XzakxERvA6HwSonR0s1nudBE3gyRfztMM4f4XD5W1BIXJ3CuiUt50CYB8L6IsRI3oZxEw3bpv+rJ6GtreugeeHzWiZD3sj5QvLV2MbePxbr5HXGzVd1Gr0hf6C8caP0FGrpfUb5aohivcWwIo+dbdEgJTb9ZtJQypvO658DXeirmke6bdVkalq6Iooz0MMpY3pdx/HKkaM2dYvuz6Gml0QSJWE8RYh77GdcA4WAv1TPIV3bMp0aqSjgqUEA0gp32lw3PASHxr8G24PvMounliF12tclIbUds X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(66476007)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(4744005)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?iCAQkngVz3K8uEC22/UEEuNQ1JWa?= =?utf-8?q?ya8npGiTcJ3M1aj9xsWCEGqfcEa8kSmrhnms80oMMBxdcMFqtMr6f2q4Z0t+mt3p7?= =?utf-8?q?/+n68CgszjJQSzNK4JOuwy8ojHyoTh1OOq+sja1gs9crNbt69jalJQ/IwCrwb3V5I?= =?utf-8?q?7Y1KgcMOinaKw1b+J5pLFaPW6tvEtaZ2Bsdc92rvUQYbyMWGN/uzXX3/vy8H6DttJ?= =?utf-8?q?f7zU/fCAfqFHFOr0vqPv7Ho+Vs8z/VoOga84FUnk99vMUg+5MVL0lbs9zfaeHmU/A?= =?utf-8?q?Hh75jQd51M35w2rZLdQJg03DjOLfN8OUgpfSCEsU+Mrtodu2jY+XCtKYJCpLBeaIM?= =?utf-8?q?dkd7j1hHYD/W3kNnexzRFmmnYTJBlL+q2S0f/NIqrUD24yZTMhLRX84swus/Ilah6?= =?utf-8?q?COkCcUt2j9+6RZyV/OuDWIzQuNV3jL/SlWrr1xbDEPhB1ILUESXCUpNhQpzDIMMp+?= =?utf-8?q?0BxhOKg7zWnKkm2oOuwhSl3kgUvixWvkv2xiwapdnSskUDSYkszeHBNwHMMvRqnIK?= =?utf-8?q?dvF0U/uLpaeQSnJuzZGDGAZbXzcqoeF8u2weE6mCXiswpoFeH4QeMMrDYyRXoA6EI?= =?utf-8?q?4Og2rjDy7CldjYQJgESFcMBZgSnU2PJwUp2X9Lb9FE1O3vewORAni2nH6xVO5CYxH?= =?utf-8?q?ioCAAIDmp0p0fkHHCDXek3v9YqzcllqiFG7zDSEQSE5luZEHDQHW9u1tcMeRiP5dh?= =?utf-8?q?yhgsJK1fR7DerE8xkUmIQUh7+X5+Y2fA0dTeFE5MkzXJjWNOU8vL8jjKgbl6FHD3q?= =?utf-8?q?arw8xAgq4y2j2DYrdk1nj7c7RYDaF+tJjXJ9Yn+QmhANbWroe+4Ib5U2HfYb33Bgr?= =?utf-8?q?/UCYQamN3YnS2dG9prBjU1ye7jB6T5FOi9DMQfV4xaA2bvuB8JPZkr2JN7laN/prL?= =?utf-8?q?Q15WN2k0zAkEYhhOYJUOBwaU+I6W5Ky5ajFzcmdf1qf64Gq+kuA/eeilyGXH23qiI?= =?utf-8?q?4uc2PVPWUk2cLfHrZBzCYIcx7mRloQvwkHDmpNmzjJMb3dOn5Yeks6PjydXLq1nlh?= =?utf-8?q?r0KM5T1A9Ifj8i35EcQalU4O+yr/LzeQ0LVx11SNgK8nTVAakOCGoBZDbXbovr1aq?= =?utf-8?q?ChXKP9HW02EuDyvBDRuQyhpw9XCZTzz3QF7srrVRbON0CqJcgroWDrJeavzDIJDCx?= =?utf-8?q?pMyM88aMsEkni0Dqq/QLDErCbKZ0SActL1uE7YXWM+6laaLnQU0wC9EHq1IxdEdZ8?= =?utf-8?q?fdKMAsosYif784cJQzQJ76PcUmwSm0KSGt133RkZS+oyDDYxboQHeIV4ZdcGRDbYl?= =?utf-8?q?ABDWdOCCcXZUeO8AbPniu9q73Bm+8KosS11fylMLxZJVnX9o4HcVCRkQ79YEqlZ08?= =?utf-8?q?a9shGGnxi8CDDWCCSIJCn2IIBoC+coDDqUDcXDDPdJn8TQJByD0IIuooR95OD7C4c?= =?utf-8?q?J0eC5+dXpwToCj/DgdESH4fcnv5dV2ONIzEZDjowht1Xt1ELF1Eww01Q1ACobeqtj?= =?utf-8?q?mzFae8TL4efqth7x0n4bUmHWDegWBK3zMGpyT3tf3bil0taY9AI16XQY/dAYLxAUW?= =?utf-8?q?kAOH92jBouBXoU9DHj34y7uN7+Mf3z2JEw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff7cb1e0-2943-414f-a6f8-08db58152cd3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:17.6192 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: k49Z8edrZEsoREFZIngIFNNETzPUjo4jFFpMxZLzjWUS0l/lhvxblXtCVts5TAeI6hNxZ0oKvpglXEo82Ohj2U/d0Okvq++m9dtZHMyzufM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Modify the struct nfp_net_rx_desc, change the type of the fields, make it meet the DPDK coding style. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_rxtx.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index c433e084c5..83dc9960e8 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -191,24 +191,24 @@ struct nfp_net_rx_desc { union { /* Freelist descriptor */ struct { - __le16 dma_addr_hi; + uint16_t dma_addr_hi; uint8_t spare; uint8_t dd; - __le32 dma_addr_lo; + uint32_t dma_addr_lo; } __rte_packed fld; /* RX descriptor */ struct { - __le16 data_len; + uint16_t data_len; uint8_t reserved; uint8_t meta_len_dd; - __le16 flags; - __le16 vlan; + uint16_t flags; + uint16_t vlan; } __rte_packed rxd; - __le32 vals[2]; + uint32_t vals[2]; }; }; From patchwork Fri May 19 02:59:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127059 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EA97342B42; Fri, 19 May 2023 05:00:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B98EF42D44; Fri, 19 May 2023 05:00:22 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2129.outbound.protection.outlook.com [40.107.92.129]) by mails.dpdk.org (Postfix) with ESMTP id 24CA04282D for ; Fri, 19 May 2023 05:00:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4d6Z00UnkkgWdcmJyVfAPno9j3SE2kL89XbhtzU0lXqrrx410HPnIJGCDMXx3dV1ufTnDWKiuyCNZqC25VPkzwYCewYbaWo86xwOfjPbRsV440i7SLvU+jJ1NLPCbfioVOMIof2oIRg45/oYA4UKO8y2ArYpmRJmDHOc4+7kpSp4UlpEeGHx5gwuV67U6aWoC0H4gWdugrGyDMLDi2CmfG2RIlL7Uzs0fRFjlo9ptZcDdAgHEa4AmJHH4EFWlrm2QOr/FrKZg3zdrNrCmb43edlwUrbF4rmiI1h1VzBidOOF1yWL5V0mIh66F9bgx2TMzMYgJ0Myu45kGQRnhoDRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MxvGQHWRFVxfMJUUd+qyLPCxzeFEBX4LWTNv+Qg9JQs=; b=WjcNDLDGAsh0rO4jzANjTsg0YluVk4YQmEmAMRhu59HVrYBvns+OIvA8BTnKju8pXfb5+oXKMWt+MzzHrX4HxGer/jTBxq0NajvMP9RXw/jqiKwzPp48dncXbCheSFiJ2JlCCNTVXfdboPTW57u7bm56rWVuTpb/W3zbxodDvR93YMpygwqd3iZ8JfXWUphZK6J3Ug1jZRiQdBARTfjoABWRWDMvbg6nxpcOjzsBlu8N+ky9P6pY/B1EwpOiKr1i+W8Yb5ijjr5LZ38iGkaG1L8rLMqMYOvwbw6894PZ/crY5SP9c29W31XHqDZwQm/XQ8plmDJcuTVPGCxPdZaQVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MxvGQHWRFVxfMJUUd+qyLPCxzeFEBX4LWTNv+Qg9JQs=; b=tZufMDMNGofOLAZCa2mt7VRPg9yHLSBZY/r3/xWmwjjDPzYDBOaET04RO2iWRd30GLGJALLzi6ucrUWHtTaczk0Y2Pjei7ihlNG5gdG7MyyHBMhk+1bsD/htGzVBT7+jls4PCneSWSKr5WNzpxVeLsONyHcywlh+2bCodDSauY0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:19 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:19 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 4/8] net/nfp: modify the txq struct Date: Fri, 19 May 2023 10:59:46 +0800 Message-Id: <20230519025950.1642943-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: 78b088c5-4915-482b-8638-08db58152e28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6S0jTo1rGjIRwGCMSNXaNe51pfM8fRJiHS2psp9LMyv3w3meQ2WNeItYsCLbdlfaLRdxsXk0uVgr0+pLD8GovXw1W3sBBKh41O75585vRaiMK3brkgronVPR1g8FAnG7OdGp3q6VTWU7BERyedgwWorYIEdXbkrD+z3X3Z2T2JeG8X0t/aF2hvMCmAhV4bq6sKYaTD0Tp+1TnuoiWZHfki5rI9ABokwcL5oSYSxJ0ZgXd0NbO7N5+D+xU57+/v9Oc58HTQNkDWASLv4JXXMu2iyNgyI/yjqdV3b/U2AAxlm70VaU2OQNTWsYbz1a6M6QShEytWwpaecZrw6Fsonvj0HG9WmNaMVnrxnYDojC1IOzkFHmio0IcKEAnQ50SP7L2YSDnuHIf6hgatiKHNqhuWetz2sZmNqVXEKTSDfWTJwCrmanzI4txeMubsAzhK3SFY3FceSH0mAY5Mti10rqVX3TS17luOHfpPOVQcu66Gu7DOhy1DKnHnz+xXy29uvBwdr1EMrZJB76xESMsFLPYFuRX4DnhAE2aNwLUqM/5KyWxaKcRsgvvFRR4HSiclkUyutpl1buikoHib5gAntgGch9K1VK6hQKXgZYY9MBB9nmhJKw/QD6uGlL3jgk8hFr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(66476007)(66574015)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?mt32cnb07AJh0jk6PAmiHyXq1WEm?= =?utf-8?q?xDWzoY9LkRjvt01Nva2aTw8gnM9/K9jmQZSaAtKXc9Vz6iLVDVRZiOd6t/uzocge0?= =?utf-8?q?nQaGBoq+Mn3idvqarNmLYvAk/X31wYLht4fZEpmJwz1E7CpcK3nF8cz0vKaZXw1Re?= =?utf-8?q?4jdL+euvXlkdpsXfPQ81TTerWCMWUBjm9Q/xsaqQj/P9spezNXVTbCcXuqsYM//iU?= =?utf-8?q?4mb6QWJUJKDlvKuAKg/Z2UfDN8i+dlM1MYy3pSHZpjl39/2cHSd4Wxlu+aTBtDwnD?= =?utf-8?q?XfmQUzXCVn6dhzQf85hiSQBidrcOW4AkKoypTn57mmYa6OQCnIRpeMP8pQqwakNIv?= =?utf-8?q?dnXpe+WyRYxR0P8M3c1a6xYliVS8UJ7cIXfYH72Jxmb5KVMm7WOQBh3+CzxTcoh35?= =?utf-8?q?XYeZMWsHIrIYfPnTEFXf0SIWeSlgwUE0U/3zFtQYYKTLzSsANcHF6t3s7sfREXX5C?= =?utf-8?q?7EcHtyYsZWXDplmWOYiI9Nqbag+kvhh0mlvGlzXVDjtEkba5iuPBSHtX1IrlJ2N7R?= =?utf-8?q?DwAD1YLpvkRVa7RxbBOja9qDm3hWP4R7ppeks/DG/avu4Ccky457svAmNOuGoUmIB?= =?utf-8?q?VO3zt87ZhFHpu9Ggg/ri9tIEQosXrD8n1ZGWvD6xVAt1t0xhlIZMaXzXfG9RgDkMH?= =?utf-8?q?j83S/McB+Lh+EzDamJHqY3WqS1fEiffcywnU+Fa0pHdd1FZKnq3y/SotByAvCGljG?= =?utf-8?q?qOJTdOajz4U6auR9X0RhOi0N9zu66qsT0icBpnoidwIaOEBC+aYI374fGQQqvX8cI?= =?utf-8?q?Y3ceZl5M1YLgd5wYwCetDAXFEfmLrk7xAWwRE8NUE6gZhNIEeuPrdeoEFW07MczbP?= =?utf-8?q?mjArILThEHNKd/Imykm4g1w2ddZkmUNnyN17UpcaTqw2WmqOTX9aQNwVXG5hwnFFr?= =?utf-8?q?U5draqXC7E7vN62jLZY7zxiWQpRykwqNiV3jea++ERaaqDEBlOiWXerbD5JBDDmDO?= =?utf-8?q?8H7PPOMFvB4fUTq5J4wTjXUU8qeT5hrdT9PZR8wR1CIzNQostuJj7DSKBVVkyTp0U?= =?utf-8?q?iTKSne8B03FxndlUpTNp2QHg8XVotc5GfhCa9VikI4/RSGQq6bxkRdfdYmuMWHEB1?= =?utf-8?q?AdCB1DgdwV8f6rkfx1Yw7ziWxZhx+8xxwnwRuIUC+PwjonVMKguO4qclNldo0NBG5?= =?utf-8?q?raiAFjQm6o0lw+FXPeHZ2adEyyc1/TFpS5tLdskfFgSsGuY6Zb+9GF+mcTwgMiEsS?= =?utf-8?q?n2WtJU3vNdKuAa4z4srLs44WWufwaIwSS+NisJcXbnmpkvEeDnrNPEBrzr61+cjcb?= =?utf-8?q?kOBkO5YTp7+nHsqkB5ZYTkvLcazy54yoyDjV4swxfryWsa8fmYfCKR6xLi/qbZgfg?= =?utf-8?q?iuiBMuTPC19YVZ6yrN6pOmkAxR+sY1tlEc8QTB/Q1yOaDeNFmkh4hGrR280dbDL74?= =?utf-8?q?uqitwBxPoVOUAv6rV+KpHioZah8tuee3T9oTqW2hf2i99HTGKeZ3y7aWMKT2KFp4D?= =?utf-8?q?FeWXI/+QEy5RnZuzBhPakl6IN3ccqFa2YGHIQicUwmWLZsUmyCHi5t4rNSWYm2acT?= =?utf-8?q?ZMtZtLn3cZNpW9wqgGfIP/45jIRK+a8X/g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78b088c5-4915-482b-8638-08db58152e28 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:19.7361 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nYz8wgJe51nxZh0jcEdRaDYNyr5Ye51jZiqNwvcMCMG4koVU6kcLt5C96DqfdIJa1egnRPYQiqfNt5owUkvVFX9zAWqgug+vqz+fuJQWpzQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Modify the struct nfp_net_txq, remove the unused fields, change the type of some fields and make the comment message more suitable. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 7 +-- .../net/nfp/flower/nfp_flower_representor.c | 3 - drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 7 +-- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 7 +-- drivers/net/nfp/nfp_rxtx.c | 4 +- drivers/net/nfp/nfp_rxtx.h | 63 ++++++++----------- 6 files changed, 35 insertions(+), 56 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 8847849adc..9a08ae3b75 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -508,7 +508,7 @@ nfp_flower_pf_xmit_pkts(void *tx_queue, hw = txq->hw; txds = &txq->txds[txq->wr_p]; - PMD_TX_LOG(DEBUG, "working for queue %d at pos %u and %u packets", + PMD_TX_LOG(DEBUG, "working for queue %hu at pos %u and %hu packets", txq->qidx, txq->wr_p, nb_pkts); if ((nfp_net_nfd3_free_tx_desc(txq) < nb_pkts) || (nfp_net_nfd3_txq_full(txq))) @@ -685,7 +685,7 @@ nfp_flower_init_vnic_common(struct nfp_net_hw *hw, const char *vnic_type) static int nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) { - uint32_t i; + uint16_t i; int ret = 0; uint16_t n_txq; uint16_t n_rxq; @@ -869,9 +869,6 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) txq->tx_count = CTRL_VNIC_NB_DESC; txq->tx_free_thresh = DEFAULT_RX_FREE_THRESH; - txq->tx_pthresh = DEFAULT_TX_PTHRESH; - txq->tx_hthresh = DEFAULT_TX_HTHRESH; - txq->tx_wthresh = DEFAULT_TX_WTHRESH; /* Queue mapping based on firmware configuration */ txq->qidx = i; diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 94a04e6235..0479eb4792 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -151,9 +151,6 @@ nfp_pf_repr_tx_queue_setup(struct rte_eth_dev *dev, txq->tx_count = nb_desc; txq->tx_free_thresh = tx_free_thresh; - txq->tx_pthresh = tx_conf->tx_thresh.pthresh; - txq->tx_hthresh = tx_conf->tx_thresh.hthresh; - txq->tx_wthresh = tx_conf->tx_thresh.wthresh; /* queue mapping based on firmware configuration */ txq->qidx = queue_idx; diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 909156d69c..1a960fbe63 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -112,7 +112,7 @@ nfp_net_nfd3_xmit_pkts(void *tx_queue, hw = txq->hw; txds = &txq->txds[txq->wr_p]; - PMD_TX_LOG(DEBUG, "working for queue %u at pos %d and %u packets", + PMD_TX_LOG(DEBUG, "working for queue %hu at pos %d and %hu packets", txq->qidx, txq->wr_p, nb_pkts); if (nfp_net_nfd3_free_tx_desc(txq) < NFD3_TX_DESC_PER_PKT * nb_pkts || @@ -126,7 +126,7 @@ nfp_net_nfd3_xmit_pkts(void *tx_queue, pkt = *tx_pkts; issued_descs = 0; - PMD_TX_LOG(DEBUG, "queue: %u. Sending %u packets", txq->qidx, nb_pkts); + PMD_TX_LOG(DEBUG, "queue: %hu. Sending %hu packets", txq->qidx, nb_pkts); /* Sending packets */ for (i = 0; i < nb_pkts && free_descs > 0; i++) { @@ -304,9 +304,6 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, txq->tx_count = nb_desc * NFD3_TX_DESC_PER_PKT; txq->tx_free_thresh = tx_free_thresh; - txq->tx_pthresh = tx_conf->tx_thresh.pthresh; - txq->tx_hthresh = tx_conf->tx_thresh.hthresh; - txq->tx_wthresh = tx_conf->tx_thresh.wthresh; /* queue mapping based on firmware configuration */ txq->qidx = queue_idx; diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 12233393fc..b35aa9a610 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -164,7 +164,7 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue, txq = tx_queue; hw = txq->hw; - PMD_TX_LOG(DEBUG, "working for queue %u at pos %d and %u packets", + PMD_TX_LOG(DEBUG, "working for queue %hu at pos %d and %hu packets", txq->qidx, txq->wr_p, nb_pkts); if (nfp_net_nfdk_free_tx_desc(txq) < NFDK_TX_DESC_PER_SIMPLE_PKT * nb_pkts || @@ -175,7 +175,7 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue, if (unlikely(free_descs == 0)) return 0; - PMD_TX_LOG(DEBUG, "queue: %u. Sending %u packets", txq->qidx, nb_pkts); + PMD_TX_LOG(DEBUG, "queue: %hu. Sending %hu packets", txq->qidx, nb_pkts); /* Sending packets */ while (npkts < nb_pkts && free_descs > 0) { @@ -398,9 +398,6 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, txq->tx_count = nb_desc * NFDK_TX_DESC_PER_SIMPLE_PKT; txq->tx_free_thresh = tx_free_thresh; - txq->tx_pthresh = tx_conf->tx_thresh.pthresh; - txq->tx_hthresh = tx_conf->tx_thresh.hthresh; - txq->tx_wthresh = tx_conf->tx_thresh.wthresh; /* queue mapping based on firmware configuration */ txq->qidx = queue_idx; diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index b34a9b9374..8283953702 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -679,14 +679,14 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq) uint32_t qcp_rd_p; int todo; - PMD_TX_LOG(DEBUG, "queue %u. Check for descriptor with a complete" + PMD_TX_LOG(DEBUG, "queue %hu. Check for descriptor with a complete" " status", txq->qidx); /* Work out how many packets have been sent */ qcp_rd_p = nfp_qcp_read(txq->qcp_q, NFP_QCP_READ_PTR); if (qcp_rd_p == txq->rd_p) { - PMD_TX_LOG(DEBUG, "queue %u: It seems harrier is not sending " + PMD_TX_LOG(DEBUG, "queue %hu: It seems harrier is not sending " "packets (%u, %u)", txq->qidx, qcp_rd_p, txq->rd_p); return 0; diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 83dc9960e8..4a310c0083 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -14,7 +14,6 @@ #ifndef _NFP_RXTX_H_ #define _NFP_RXTX_H_ -#include #include #define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & PCIE_DESC_RX_META_LEN_MASK) @@ -103,63 +102,55 @@ struct nfp_net_dp_buf { }; struct nfp_net_txq { - struct nfp_net_hw *hw; /* Backpointer to nfp_net structure */ - - /* - * Queue information: @qidx is the queue index from Linux's - * perspective. @tx_qcidx is the index of the Queue - * Controller Peripheral queue relative to the TX queue BAR. - * @cnt is the size of the queue in number of - * descriptors. @qcp_q is a pointer to the base of the queue - * structure on the NFP - */ + /** Backpointer to nfp_net structure */ + struct nfp_net_hw *hw; + + /** Point to the base of the queue structure on the NFP. */ uint8_t *qcp_q; - /* - * Read and Write pointers. @wr_p and @rd_p are host side pointer, - * they are free running and have little relation to the QCP pointers * - * @qcp_rd_p is a local copy queue controller peripheral read pointer + /** + * Host side read and write pointer, they are free running and + * have little relation to the QCP pointers. */ - uint32_t wr_p; uint32_t rd_p; + /** The size of the queue in number of descriptors. */ uint32_t tx_count; uint32_t tx_free_thresh; - /* + /** * For each descriptor keep a reference to the mbuf and * DMA address used until completion is signalled. */ struct nfp_net_dp_buf *txbufs; - /* - * Information about the host side queue location. @txds is - * the virtual address for the queue, @dma is the DMA address - * of the queue and @size is the size in bytes for the queue - * (needed for free) + /** + * Information about the host side queue location. + * It is the virtual address for the queue. */ union { struct nfp_net_nfd3_tx_desc *txds; struct nfp_net_nfdk_tx_desc *ktxds; }; - /* - * At this point 48 bytes have been used for all the fields in the - * TX critical path. We have room for 8 bytes and still all placed - * in a cache line. We are not using the threshold values below but - * if we need to, we can add the most used in the remaining bytes. - */ - uint32_t tx_rs_thresh; /* not used by now. Future? */ - uint32_t tx_pthresh; /* not used by now. Future? */ - uint32_t tx_hthresh; /* not used by now. Future? */ - uint32_t tx_wthresh; /* not used by now. Future? */ + /** The index of the QCP queue relative to the TX queue BAR. */ + uint32_t tx_qcidx; + + /** The queue index from Linux's perspective. */ + uint16_t qidx; uint16_t port_id; - uint16_t data_pending; /* used by nfdk only */ - int qidx; - int tx_qcidx; - __le64 dma; + + /** Used by NFDk only */ + uint16_t data_pending; + + /** + * At this point 58 bytes have been used for all the fields in the + * TX critical path. We have room for 6 bytes and still all placed + * in a cache line. + */ + uint64_t dma; } __rte_aligned(64); /* RX and freelist descriptor format */ From patchwork Fri May 19 02:59:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127060 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BE68A42B42; Fri, 19 May 2023 05:00:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E78B742D4A; Fri, 19 May 2023 05:00:24 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2118.outbound.protection.outlook.com [40.107.92.118]) by mails.dpdk.org (Postfix) with ESMTP id 6E51842D4A for ; Fri, 19 May 2023 05:00:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hm6078yD4duj+aNSUQjacMBbXDzDjZv7k91EMSFVNkRmsc8JSANJK6IK8faeAOipARnTxetWC3x+29AxJP69XAyF+cZsIvkR+U8ULL63yXG+IAO/K3ilLwasw4huTWcteV/O0xXcB9OwQ+KPJdN3rKblA3vB8DqXaIyiNXcJSDkmkvo36s4ZuClyfbPlLGPCMIGvjWc+SRaGsfZVZuy2HKAjQv7LqDFmAWC5JI5vG8W7IIQOcY6+CF7BmxJLYyr2NCtLi662rIUg0JfvN7/d6iREG8Y/XYh7g4SNgCUCRHRKeajEeaXOW9hfWhmg/zo4tWEw7KXFkty4TFftkv3g3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ToHuNOugHxj2ko1g8FeYGq0F4MlDT1IHCY7gTRkOwYU=; b=DLn2emaB2Ou9DhhiL3TQrPixYGuH+S1ajl3ND2EPstQW1LiD4hKlYDpuk87UMoHG876s42IwbqA4tOSyMCQ25zJ9ye9zY564GeGJAL80b0Zx4OkbxA6WBUGSkktkd09ZaSAF4Q7BtEVvjLWf8eqZbaCoeYBRn5q5lth/eigHS+eCnZGBtasJYlgJlTBiHnXlbgt+8WOZ3L7RV8COZOv1e0OqhRAUU+6S+ZqAMWjwG9tdt7UZCy7X/m71VB/6/fMbSoGug/bXNRkdJvbViMXncfX9aZbcSAQBgIdEi1Sig21G7sjZkutDwIwMR4EH1t/7QZpp0tL7IPIGLeNJiaJCNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ToHuNOugHxj2ko1g8FeYGq0F4MlDT1IHCY7gTRkOwYU=; b=ALtigWkQmB0Gyh55Pn+X63jIXyo+Lf1CJZ9pIkgXOF1mN0+ZLLRAMlCyiH1OJ0+ZsLrpMBucBYIONRafSyzsploWjKlC8UliMEOKFA6ZZ+zlPuR65bJLVmvZl+gi/1nikyMYqichnaFdJJRcJbKzfzaUOUkzVwOk+Iu3NA/xPCw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:21 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:21 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 5/8] net/nfp: remove the custom round macro Date: Fri, 19 May 2023 10:59:47 +0800 Message-Id: <20230519025950.1642943-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d1584db-f823-4ccf-539b-08db58152f6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ewT0OEw5d6OBTqpdn+NAlhRF0c9rzaOhcGqk6tBFTTgM5XLB9RIMCFL+5dkc41mCvOovlBecKOooMhj/583xv44NEs44hh80sVr1p6hfPSYXfJaPr/lg1rp9BRubXeseDgEaVOAJBpGMVFsGa3FgATyeWa/XPYQhy+mp9OTnZf3N1ecsIEo6nABQM/o0KOUm4wl/pVOAfVjVSmFQyyWxLA8LGCV2fUdTPKy3zGK1jxU/t/4CPxf240WT6DWGU1/ypaAE/7hisXTUGNDp8XplZIe2i3qwWDhqke49Iru2D/QU7HXr18mFpeQG+4IxcIzLmOKea+VoKR7aUGB6jOL2gUGTV9bSp3sLp9CihIa//LGQ3ykMUcZOgAarRnVH00Q4UwN1ZMMcKjCfi+gzG1hDMgFwQbttNrBuewayhY/boFd5DAdsLrsNx7CJQVbPGyijQiL2L5POZoJYS41BNRDrAzoSNcGCFFFyaHkja1lkPRwLFvuEfw76wR3EdKLb9RPGgkxdy6dgcbevC7J6ENMFQcz57av4yedqAa3BLSflKIxghWHMtdGcnwosh0pcW43kQj+j2jGVFYQqsPJNkmeOHTRCqvjVTGhny5Z7ykDNYEaj/BFpyxPTwpAnXjHDcO8U X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(66476007)(66574015)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?WF8vqUQ1hUaylvVe7tkq9VtzBKvi?= =?utf-8?q?ZKMWYyJ3IiYVwERdf/virHa8Zgkh2QA756XdRtSxiKr8JNsz4a6BxLcj2BiVn7M1g?= =?utf-8?q?njWMhelSwAWi/wXXVv70YX5mbHaiVdpjWbGb+2P9+Ba0hd9Ez4Gu2zYomotuBom2r?= =?utf-8?q?IVNLyh4WZzz2IGY8lDx4w3Qniz9UDaGefXE2+aC5shuV1LfoeQe3WW4088wIS79NV?= =?utf-8?q?gdMi3TQiJNdVhJ3xmdBOT/ZBzX0lsE85ggTNfq9M0KpwxgnLcFc+0rsaXrAjni0A8?= =?utf-8?q?u2Isp+9fob7PA0Nv2oeDlrKXbm1NPf2Hthkyb9wQjoRKTRqrkOZb2MVI+/dL1aWW+?= =?utf-8?q?afwX4yp0aBz6ne8fy8MEyZeh8brdWyipQwbbfY8F+slydinbt2BfvIglzZI7BUmH8?= =?utf-8?q?6w2stD776JxYEX5HFNlkRZSEeOxB3a4vUVR12GQg5LAKBzKYel1el7m5lyWjWQJCi?= =?utf-8?q?4VZF93f0VPCfzB2Fi0QwYYfB467380jYlHdn3igew2PeVwSQe3TivT8HZpo+NgDq1?= =?utf-8?q?StLYXEaesT2eVnJTY9J4Ub3aaEFwaiNUFOPoRPqPd4NdgIc+iS1FqqGt9a9l4CB0h?= =?utf-8?q?GnemymO+unfjjRWzm+hq/AIRJYQR8k6F5yEcaV3XtBGzIg8KdhCpxH3c8HaNPjiye?= =?utf-8?q?qGoLRnUKFW4b5Gd2Mq5sdsZNBWRtNbmFDwNBwsysWo+0r/ETOue3Cf3rDxmyU+92I?= =?utf-8?q?0nisn9nmrm+8fGRy/ccKDjb3S01NcSD+vyupJelK67LUUsboZbQpg/wiUDKL+CuXB?= =?utf-8?q?w55sHzvxGVtnTgOyrhrE5BeiyBUcl/VoNQsC1uGR1LQYs4op4D9UuFyVK26wbOBAt?= =?utf-8?q?qMP7tSpPBqRyaZtnheZ+lGwndppJyoW11029Zgsix4tbqi4iOdI1152WP2YgaBx/L?= =?utf-8?q?SYz5MiaFK3yCcEMw8XjT9d+ASMw3J5HN93Gh2euk9qU2d9unCLNf0V6QEz1oupNey?= =?utf-8?q?3RCfphQYURfOd9mJnU5584s6DySgqkKl/8FfBE6J3iLRITxB8KK+4Y1MEgcbZ+Uc8?= =?utf-8?q?oQfa+t55YrmKdefFtqwH9KEHDPhwkayRRwJSYZiCTs70AW6BdEn1bVAVTlFot0ECn?= =?utf-8?q?nDyBWLvTEcwwCJnVTPXTn7/7xFaROfQ/5jDfaJqQFLHfYQ2IweN7CBo8EeMiTK+nD?= =?utf-8?q?mcIpcKuvW0nC6UzbocV1Xgv25FARljNOi7sv0qm06nqDjXuNwjsETDMaK6OmN3ARj?= =?utf-8?q?bptA/4Rbm4HbM4tGHvZZhpvMlTjUvgq6dTbsHz5tdGA9o55ohz6U/C96C1TD0Z1hK?= =?utf-8?q?G+8ThEHnpw/foUv+r1u5tQFrtWTry7VPQx/hVMY+ubC8j5gEc8ztGkCxjVTs3/LIo?= =?utf-8?q?Q2yt3q17VF145KQncBTXdj+qxFxesLB+nNph8uvLL3fEsuW7WLsnJaqClV2paKreo?= =?utf-8?q?q+b2ja+S33qagxJfYCGCfjEwCQTn3G429kW6Fj990aZjE/gl9ggnEYIB7fnH8kAcu?= =?utf-8?q?nYQDg8+1AQFc7CM3CAxu6JszXBDsgxsGXmr/NWg/a/jKJewBema+8fvA464+RmJFR?= =?utf-8?q?HtK2+gKNhhwlaq7/1ZaWOAcxB6hMAKrW1A=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d1584db-f823-4ccf-539b-08db58152f6a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:21.8383 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UnTgeKj/8WU2ZXKyum9G+P+03VWTPraOkUTav+DZZv2KoFTiwOioDVb6Qog9bhvDlQvPojJuEW9MrhrOKTfLBPUPOOrLFC6ITUIyReljLrk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove the custom round macro, use the macro provide by the DPDK. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 9 +++++---- drivers/net/nfp/nfpcore/nfp_rtsym.c | 4 ++-- drivers/net/nfp/nfpcore/nfp_rtsym.h | 19 ------------------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index b35aa9a610..9b815800bb 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -70,8 +70,8 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq, n_descs++; /* Don't count metadata descriptor, for the round down to work out */ - if (round_down(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) != - round_down(txq->wr_p + n_descs, NFDK_TX_DESC_BLOCK_CNT)) + if (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) != + RTE_ALIGN_FLOOR(txq->wr_p + n_descs, NFDK_TX_DESC_BLOCK_CNT)) goto close_block; if (txq->data_pending + pkt->pkt_len > NFDK_TX_MAX_DATA_PER_BLOCK) @@ -293,8 +293,9 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue, } used_descs = ktxds - txq->ktxds - txq->wr_p; - if (round_down(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) != - round_down(txq->wr_p + used_descs - 1, NFDK_TX_DESC_BLOCK_CNT)) { + if (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) != + RTE_ALIGN_FLOOR(txq->wr_p + used_descs - 1, + NFDK_TX_DESC_BLOCK_CNT)) { PMD_TX_LOG(INFO, "Used descs cross block boundary"); goto xmit_end; } diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c index 850667adf8..9713605580 100644 --- a/drivers/net/nfp/nfpcore/nfp_rtsym.c +++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c @@ -113,8 +113,8 @@ __nfp_rtsym_table_read(struct nfp_cpp *cpp, const struct nfp_mip *mip) return NULL; /* Align to 64 bits */ - symtab_size = round_up(symtab_size, 8); - strtab_size = round_up(strtab_size, 8); + symtab_size = RTE_ALIGN_CEIL(symtab_size, 8); + strtab_size = RTE_ALIGN_CEIL(strtab_size, 8); rtsymtab = malloc(symtab_size); if (rtsymtab == NULL) diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h index d2856e19c3..8b494211bc 100644 --- a/drivers/net/nfp/nfpcore/nfp_rtsym.h +++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h @@ -15,25 +15,6 @@ #define NFP_RTSYM_TARGET_LMEM -1 #define NFP_RTSYM_TARGET_EMU_CACHE -7 -/* - * This looks more complex than it should be. But we need to get the type for - * the ~ right in round_down (it needs to be as wide as the result!), and we - * want to evaluate the macro arguments just once each. - */ -#define __round_mask(x, y) ((__typeof__(x))((y) - 1)) - -#define round_up(x, y) \ - (__extension__ ({ \ - typeof(x) _x = (x); \ - ((((_x) - 1) | __round_mask(_x, y)) + 1); \ - })) - -#define round_down(x, y) \ - (__extension__ ({ \ - typeof(x) _x = (x); \ - ((_x) & ~__round_mask(_x, y)); \ - })) - /* * Structure describing a run-time NFP symbol. * From patchwork Fri May 19 02:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127061 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CAE5742B42; Fri, 19 May 2023 05:00:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB4AF42D5C; Fri, 19 May 2023 05:00:26 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2092.outbound.protection.outlook.com [40.107.92.92]) by mails.dpdk.org (Postfix) with ESMTP id C78A742D4E for ; Fri, 19 May 2023 05:00:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dp68fvaziRJXIbFLtnuFc8O45nKZhaDKmd+/ox6cVrVxxUjAnQthVSR/Pqy7Dsq9lwHOmvCqgr8XZsOqrXTOk5vNPcXJtXV8cbcYaESyHsQGoBHB+SXtB2IeC+HYmKs5PmAXVnQTrAZ4eJjiUpdNWQ1dahal8oqVeEh/5FqZXPha2qNLb4XTjYLAXamvPShboRIAJEBycQpFN0+Se8tO0sk+5WsPgihdHS9/z9kVmFf8YVSLKnXvTcBhdaO74SIxjYZIGRAjPrMoXDAWQM6y07A+OkzFCAGtpADSZ3ovJN8pDUCbz36dwOXzWQV9X8ag38+8+QzSM4hXwuVlFPUZGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=V7V18Ft/UZKE1wm8/N7SBGoWYi3dhHayuRcH4xWhO68=; b=QqPjikXzxvCCvFA4W42hKcCMY8wUg3AkvTMmfhbQZneY4yk70go3Ryc8goc7G8OtSzLmR32wo+S7dfDzptTWCEZuSvnR9rHKa+pc1lwV90STQt8hj/bHErpLBwuoFmVbVLAagitfUwiyEZrtyP7pGzVlbGNYaeqOYjIkgPq+QIib01pTI06ZA/mI0Gp1LLuxaU37wxU3WD8HPsEaN1nMndRXQgqkH5WWs2qIt4mdIYpGmCVNfe4bphDAlqS+e1nloIiYcIytwzXGJ1tNG6CD0xoB752GYwbX2MFs5ATnsyc0qLU8XavGsu5CrxcryKOxeflboUZhRVmZuZBaTPXrJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V7V18Ft/UZKE1wm8/N7SBGoWYi3dhHayuRcH4xWhO68=; b=dH0JrTsyX0Lo73AxlXDMUzWIpyQeuTgCO4nXKtCDxPBAPeQC7RisbiUaVNRNwcOoxUJs7hiqpeAuVvbs8FjBZKU2gekSjNEmxa97LcMwVkFJ1gRk2Bi3rNduqSTb+AP2rFbXK3ppj5KQm627EmKRwtFkAaVwqul1qFq3zCT0OhA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:24 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:24 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 6/8] net/nfp: remove the unneeded comment Date: Fri, 19 May 2023 10:59:48 +0800 Message-Id: <20230519025950.1642943-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: cac58067-a8f5-429a-c169-08db581530a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S7eccILpymH65oCJKTBcCcCn+nHZHihhQo2UsOFvCkt+f3bkAg0eFIQ/kAQlPvQln8PTrfKY+RHslyM8ZkkfRkqknRNwRQVUs/WTs7COO34AF247FNlWeWn+1Bn2jtXvJQ9UssQI/A089I4AGXamJXfK7oJ/f7IFwqv1zTq0OJXFmucOa2nixXon2WSZeElh4F22zeHstDGUkBMGGuARNmpAXZ/Hprp6NksnUrigfkognA2/j7ZOQPpxzxZQFag7790sBe3yKYIUpz3ETMhxDGxug9u4Y1PdHGcf+S8JC1mIa2XpMhBuMQozduejaY7eShM4y4b60y6H4bi3vT0hFE4CfQrs6eWF5d1IyyZLQGdAJqpXXQB0MaHZKV5S6gFLtyGxMy3mI2wE8DhSDqtxaJ35IzgNFo17soeLBXuPripaOJ2tyt02YHtG8n4SudonN8moDpBTA3PcPPgvCorxO1Nf6RaBkIW7vhiOZLTtFQVtJYCEbmI0SiYILn5phS+OID+J7EfMzad+M80ornegJQG4GvXvfopParj5pXzle+4CQ0HQhUMIauathK9cWJrI1kTN26TE/htBO82WWZtqxPinCxPzfbXV43AtIGA0ARf6tE0OxjtT1iUgHttv45Ck X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(66476007)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?puTDWAni1Th6bbarwWrb6gJHSuFq?= =?utf-8?q?lLlQqS7I49CfybBpZwG9dAdLLjo2Xi1cv8UF6wiRTdFuNnQaXzudIStIrSFUV92AU?= =?utf-8?q?Ii+F0J94gKrj9pRxQF9iVnOPEPdxI0OnXLHQklynhYrlIGiozaiszj97pRS49NVtD?= =?utf-8?q?QmA/DlLq3FpP9aBIIzeg3+iA5QpsQL4C0rg/cTw9xqFPn0d+umM92blaWu76AwoXB?= =?utf-8?q?7e9CQBEYbmMXKLYtcpgEbsrY4ZVqRrWceUk75bISA0MF7pHGPsPN6YSaHtUnHTrXI?= =?utf-8?q?sqc+AmKRu6ZLV2JZoyfAbmFMHEbQzIbD4zk5eipPpLQ78t4wBVCoJBJ5ReAeX+4O0?= =?utf-8?q?hWlnDyPq1XB1ZtwNPdg6E3QUeiIJ7rD8pm8rd5ZqGu+mqB3u0ewBpqSR+d/gzUj7x?= =?utf-8?q?NePObZy79/1mlCu0czYJZXk5q5X0NkcJn+hkRT51/yvu4POiNqQEw3IXOrtzfudkM?= =?utf-8?q?+5TrM/jmS6HyJBKxuFIFoWJKjuEITcrcb5DV8Dzy4SGUdeCqyErekIOYA9Y7V2H5V?= =?utf-8?q?jDIA+i7UeyzQQC7FmNBxsVeiWAogIcSTrx6EnF0lLZSr/UdWpZke/9I2hlNu4n0X3?= =?utf-8?q?s5ZA8ybtuyPuWFLx7vo3+VMv90jnMSzQllgi1c7KYRBSUY7vKNiaBZviO/5K7ylB2?= =?utf-8?q?/9JdXCY4cWt4E+pd9TAG/q/JGPD1lbs1/33i34JAw3dYsqVyN3sKqGmP5RBAjaFtu?= =?utf-8?q?OMY7ktlZRLm+gG7S0dpT8sCGzsN04lO8GginjDc/fDFCzDt5xzRjDAslMUA6lRRYp?= =?utf-8?q?6HCQbc8alL4NPQP8ykOYWRuO/XmkGyStFZ4ogMpMnd8TRP9/jjMHUeHzRJn0wdd/m?= =?utf-8?q?FdoQirOiFRzWMavvTMQVf7qUuwuR3c/1+N0MIePbaS6WCR8CUK8ZIXVg97G/xOpL1?= =?utf-8?q?j9HgLGbk11vDaAD9844AJnMaZac9q/SOx6C+idJAhIZOke6K/SPij4Pc8SU5pCzW6?= =?utf-8?q?sn4Msv/33fQi0XSSOWnBU4VYIcny+Jmvjrq2YMJTg8lOED+hkbrunbnVKw5TZuoSQ?= =?utf-8?q?PtpHUwyCGC5llSjESgXtIXy7NkqqOfSjhVxM+yG5sZi81wEKQv5pA/XlTCCTPX8Ri?= =?utf-8?q?vWYtWj0tJldDJ1sTEihTrqSooEkvT+/J+uoqE4HLPRBSQ79GjqumR/un5kJnOWq/s?= =?utf-8?q?Z5+KABeXOM0n4sRIBhGSHHtqVLjkoGUgBHn+VH9I5UJW226gjIcJYxcxSp6Fgsoha?= =?utf-8?q?wAFQsIilevDm5MkTNif5jThhAB6mIdMrV3AP0wuiCPpiouJTt0zqsYHrZhE6JDVlp?= =?utf-8?q?Rn9gK0IuFBN5uPY5mq9m1CddLmXNgL3Xy2DM5SJopwi8jY0Ovbdis8KaAqXQaI8xj?= =?utf-8?q?iYdlQDdW2BUe7v2rRSTVHrl1FFxDXSdfKyMxUPxx5+ei9uM2ZqA/IQLGf7Z2HeGMo?= =?utf-8?q?wfB5t5IuNiwK5JQAdX1kFA8KNWYAGgBszFusPrdfZxQjTcefVFGNQZ436rE98b3gl?= =?utf-8?q?5yyj0qiYoaskeWiv6eDG0bCvGcvFVHMjvvoJUNcVvCiEABzIe6MoXQB9vvc1M8Zsn?= =?utf-8?q?L6VuMvOqkoKtsw5Y1W9OTCS1srle8DH40w=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: cac58067-a8f5-429a-c169-08db581530a9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:24.2173 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xUBuzyqcfAubU9Hvxf2KBNKFBRth11dQ315b/Slla4NlJG0hJBGF/ZCLwg4luZY9aIRB42c6UyknuVsSbC0V89ZMMNl71gerA0LMrcwVlWI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove the unneeded comment at the head and tail of some source files. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_common.c | 15 --------------- drivers/net/nfp/nfp_common.h | 14 -------------- drivers/net/nfp/nfp_cpp_bridge.c | 14 -------------- drivers/net/nfp/nfp_cpp_bridge.h | 14 -------------- drivers/net/nfp/nfp_ctrl.h | 11 ----------- drivers/net/nfp/nfp_ethdev.c | 14 -------------- drivers/net/nfp/nfp_ethdev_vf.c | 14 -------------- drivers/net/nfp/nfp_rxtx.c | 8 -------- drivers/net/nfp/nfp_rxtx.h | 14 -------------- 9 files changed, 118 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index de05fe8e95..634afbf1b5 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -5,14 +5,6 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_common.c - * - * Netronome vNIC DPDK Poll-Mode Driver: Common files - */ - #include #include #include @@ -1963,10 +1955,3 @@ nfp_net_init_metadata_format(struct nfp_net_hw *hw) hw->meta_format = NFP_NET_METAFORMAT_SINGLE; } } - -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 76f4eef980..914903f587 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -3,14 +3,6 @@ * All rights reserved. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_net_pmd.h - * - * Netronome NFP_NET PMD - */ - #ifndef _NFP_COMMON_H_ #define _NFP_COMMON_H_ @@ -514,9 +506,3 @@ void nfp_net_init_metadata_format(struct nfp_net_hw *hw); ((struct nfp_app_fw_flower *)app_fw_priv) #endif /* _NFP_COMMON_H_ */ -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c index 78a680453b..88cd1aa572 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.c +++ b/drivers/net/nfp/nfp_cpp_bridge.c @@ -5,14 +5,6 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_cpp_bridge.c - * - * Netronome vNIC DPDK Poll-Mode Driver: CPP Bridge - */ - #include #include @@ -453,9 +445,3 @@ nfp_cpp_bridge_service_func(void *args) return 0; } -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ diff --git a/drivers/net/nfp/nfp_cpp_bridge.h b/drivers/net/nfp/nfp_cpp_bridge.h index 8ff7a22fbd..85289e158b 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.h +++ b/drivers/net/nfp/nfp_cpp_bridge.h @@ -5,14 +5,6 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_cpp_bridge.h - * - * Netronome vNIC DPDK Poll-Mode Driver: CPP Bridge header file - */ - #ifndef _NFP_CPP_BRIDGE_H_ #define _NFP_CPP_BRIDGE_H_ @@ -30,9 +22,3 @@ int nfp_enable_cpp_service(struct nfp_pf_dev *pf_dev); int nfp_map_service(uint32_t service_id); #endif /* _NFP_CPP_BRIDGE_H_ */ -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h index c8ca14e017..bca31ac311 100644 --- a/drivers/net/nfp/nfp_ctrl.h +++ b/drivers/net/nfp/nfp_ctrl.h @@ -3,11 +3,6 @@ * All rights reserved. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * Netronome network device driver: Control BAR layout - */ #ifndef _NFP_CTRL_H_ #define _NFP_CTRL_H_ @@ -434,9 +429,3 @@ nfp_net_cfg_ctrl_rss(uint32_t hw_cap) } #endif /* _NFP_CTRL_H_ */ -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index d48534fd61..3a56726388 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -5,14 +5,6 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_ethdev.c - * - * Netronome vNIC DPDK Poll-Mode Driver: Main entry point - */ - #include #include #include @@ -1295,9 +1287,3 @@ static struct rte_pci_driver rte_nfp_net_pf_pmd = { RTE_PMD_REGISTER_PCI(net_nfp_pf, rte_nfp_net_pf_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_nfp_pf, pci_id_nfp_pf_net_map); RTE_PMD_REGISTER_KMOD_DEP(net_nfp_pf, "* igb_uio | uio_pci_generic | vfio"); -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 7521a6ec90..f8135fa0c8 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -5,14 +5,6 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_ethdev_vf.c - * - * Netronome vNIC VF DPDK Poll-Mode Driver: Main entry point - */ - #include #include "nfpcore/nfp_mip.h" @@ -510,9 +502,3 @@ static struct rte_pci_driver rte_nfp_net_vf_pmd = { RTE_PMD_REGISTER_PCI(net_nfp_vf, rte_nfp_net_vf_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_nfp_vf, pci_id_nfp_vf_net_map); RTE_PMD_REGISTER_KMOD_DEP(net_nfp_vf, "* igb_uio | uio_pci_generic | vfio"); -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 8283953702..2409f63205 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -5,14 +5,6 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_rxtx.c - * - * Netronome vNIC DPDK Poll-Mode Driver: Rx/Tx functions - */ - #include #include diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 4a310c0083..f72c54fb25 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -3,14 +3,6 @@ * All rights reserved. */ -/* - * vim:shiftwidth=8:noexpandtab - * - * @file dpdk/pmd/nfp_rxtx.h - * - * Netronome NFP Rx/Tx specific header file - */ - #ifndef _NFP_RXTX_H_ #define _NFP_RXTX_H_ @@ -331,9 +323,3 @@ void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, uint8_t layer); #endif /* _NFP_RXTX_H_ */ -/* - * Local variables: - * c-file-style: "Linux" - * indent-tabs-mode: t - * End: - */ From patchwork Fri May 19 02:59:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127062 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 244C342B42; Fri, 19 May 2023 05:01:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E486342D51; Fri, 19 May 2023 05:00:30 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2096.outbound.protection.outlook.com [40.107.243.96]) by mails.dpdk.org (Postfix) with ESMTP id CC61C42D55 for ; Fri, 19 May 2023 05:00:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CdGe6unhi08FnRwOvEpXRFMj0xnNwksTdd9R1u+8Ofy4I+5ISlYWoQqNkGD2M/B/YgjrtyQREIcUph0yDhwh0J5cL2XOGCjzISpXd6di5pKCR5fPtOUtunqwS6kMG75MvFucvv3Iosp2T7d/5JaF4llAuhlOnM6fNW/7R5ytJgLbRrTs6xLCVKzBdwThzRC4h1eG1pTbnG9dY8lbiaF3udg336cwf/R7RLnjdvv+R+9NmHV1ed6h98VTn6UgTER1QsItrtZC4kovCkST8Jfoquan8vJ7k+zsnezBp5nX9FXrNgfBOPacMCe059ftHsDgUyAuMk7Z/mS0qXQiU4YgQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/wgDvtOoFIpcFGqTcwKVAGdxkRzfSfQpvJV6n/sJMIE=; b=UPM6BBnPbFbsgYacA6+u0TU3Go4xcnxp4V0DmFSB4TpmvkPc8IwrCUcEx9eeOGE1j0qB0VzyAPXI1F5ef98A5gJvnh4x62XrIQhTVZSJJRcLkR2N+KWLfbMWmpSfWRr9nMlOZ2JCpeHppSFnBfxve7vzP1Ss4qAcWLgZAECCh6/IxEZ957oIMdn1opF5vK3hicyKa+wp4gYJKL/Ii13LQjXgsPeDGD7myIn5PtV3dVA75qf2I3+TJ9VVs+Ddw7TLa1LKOzx5vzCfq7CTDsRSfKLDmWuUU/EdonYk/LakuuFq+YQr5N6MeqDVMOeKoNOpavOx2UXkFKCL+5RU5u3QOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/wgDvtOoFIpcFGqTcwKVAGdxkRzfSfQpvJV6n/sJMIE=; b=CQ4ezzliAcFjEb2tujOzUdB+cg+DErE3XgE9njLe6LUnkm2UxHP39oV5rVnVJ1BvEDg3Ezw73HQAx7QWPUemO7PNlhCCVevzJFeyvfCD6Mm2H8mq+UpLhKCRUjavns2J6a1a0cc2esVVYDfD7A4YfnF06Ej++BjQ752GjEkgbrE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:26 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:26 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 7/8] net/nfp: revise cast from void pointer Date: Fri, 19 May 2023 10:59:49 +0800 Message-Id: <20230519025950.1642943-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f73a7de-2ca0-4b4e-d68f-08db58153218 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jdD1XKiaCobAc3QH92qEMnZhfeYO3c0GK1YxsIbqfKNFiLxU3MoCrptGvyfgNnrV0Bb009dTGpD5Wc9IZiVQLCsn4+czt/R9zqvn8JPf5KE/yl0v/GdarIzLjI9zr6Py1PcX6tirj7O4rN62Cu64UfvT9DhDj7jADuZSs2gmYoSfkqYkrQpyZ90sxganG4AvkuVB4DEbEiF/AkUBKauP4WjXPrgS3oqh8TZ22v0lyCj9piSd8ujHfwc/QWLLxhZSWSHeMTOZ4G+IxMAl6tH2j+KaN0E1sdnvpsRuDpncMxAB+ofwuaE+7LhNkwFr2rpDr+tEu4wB+EUDmterD9d8F+Yc/jFGBvmMIA/02JqBgLWOh0l/Jnv1ZupqZyXiPU13tdUlLTjExfof6fYMZwzSJBhcmciwjmvtZnWTi2h9rtoO1xFLz1x2kkZDBZ0xW8ipB1jc7cOLtS4IAMo6oGGd1C8Rg7ueti7Ds6GsZpui9X9aMrWLkp4CGCDWmIsBm7oz1Fxgs5Ke8/RzNChC9p6+6HfkzLX1saTmcogQCl1mS5xg7Lwq1RPRpCGxSnauirw0e0t3d0iD/IpF53hCBFIwJfFSnj/FcMxr0f/pAjbsfl9HE+kC7zH5sAbsKN9vmn5M X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(30864003)(66476007)(66574015)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?vBVMXUICPZiRHluMOsxvLSYFFl3S?= =?utf-8?q?btJ+OcGJcCsN+1WX1EO3opaYAFLHQZpf5OxgWvSZ+eRgS66JHuFtIHM8VlGMzmlk5?= =?utf-8?q?dap09h5hVy3ZXZENIDFy+35CDtv8pijTH2Pi1IRYHP21aChfkES6J9Fdk/vfx9q1c?= =?utf-8?q?4Crki0aJCONsP4ZW4oWKZ4E1sROeyJJ5gSQdWT8Op+GAcu0M6hctUZpTE6De4hdlP?= =?utf-8?q?gzMWpUwKjpXSFg22AsnIWjsjlTsTT6zhkebFp+DbHAsMSMVX9wVNpxjJGOxLKip/L?= =?utf-8?q?sNYj5+y/wv/46j2mQpnUCBHzxwttI5DjJdfrcsj0VNUQnhyqUTpwsfo7T4ynuQ9+k?= =?utf-8?q?9/gO1R7u1EIDrtzzfunEv6SMwTCxGX86ArqnfWQ+5UbcjYrce7MOYnJdEoEOp/RkY?= =?utf-8?q?uQ2gFGRVAzE+QFkv6yHxYashNGzz+pVZQRP79ai/TXkOpG8/UKN0OU1npYUv4Gg+t?= =?utf-8?q?MWUFrwraYrBNKhUJtylms7zt8lLZZGbs29204cmlk5bl1M5zVtOlugDagyoIrC1W8?= =?utf-8?q?2H+bfn3nm31VIsuwqR7wu9XTkPEVG9P7V1uA5Flhkqm/FOp2DsWMfJCErR6KlLgPh?= =?utf-8?q?N16Vsne9SmlOehkMUPJfEeJzAXCV6nPQxb2anYzpwIVUc7dS/bAgZLQ7PInz/qSlY?= =?utf-8?q?5T6hDP4kenbplqGcJN/OSdCBLcKKTAxO4YeI0DMH5dKXthd7lh059Auix/ibEGIsx?= =?utf-8?q?wpAOBkPjQ0v7CfedueRuf0afbi9Cwdpw8yX6sLlqFbJ36/T5vlNWt7VvsLPJ4CY4B?= =?utf-8?q?ehoQJV1/DwU7Gf638BfYsxt3U6zVUOgGb6iRumy44YYvXs235LuGvd7NGEV7wgd4Z?= =?utf-8?q?3o0pNpuXbqodEZ9ARxlI/OU5LyswWg6si0JGesuyYRzBqbX+HDMiY/0m8LBm+3thr?= =?utf-8?q?WZdAlWq7dvuVCIbv+BHKChUk5RdDBn01O2IUlCcim5KxP4RySleB6Xccj93Oz7mKU?= =?utf-8?q?2EAQer/z79G4bZsq2sJErwVsOUS+bFrf+9fj7UV8woCIDay3CYoDMLMwnrNmM9iaN?= =?utf-8?q?nL7rcHMkP2EwAQv4o75jJnbIn1ERwv1cN5vG2X/c2PLR23pPzElUhjAtpTdurdtpz?= =?utf-8?q?75rVTIArgfcuJ7iL5pYlmmJEkWP6FLfFtQVxlDdBo/eyVAyNQUgvA+f9OC5ABS9pA?= =?utf-8?q?cC7uwuLwIwBugOTJAcMFmWqGGVhjyR4cpf02YKgY1aSac/N6apT+T+ZLhucMeXaHg?= =?utf-8?q?N0zTXTivKqIranMFWdac2A+ljus7zMFexmHHPRU+bhJaYHJU+sA1rKXEf6dRKsUkt?= =?utf-8?q?b+E0OhSAGzB/2eW9no+H1ReRtpkGtbOOQ7ZASZvpj9LW8gw+5PEl1ViA1t4QczYbF?= =?utf-8?q?PiEo0ERGJPIBW2pgU7u/8JwxJgtQ+FC5FiAUHmVRgbdzRFglIpyJaJDcWYHdDc0w/?= =?utf-8?q?ZbDYFEFODKHOcOo94niI8INsOfrmf9o+wKcVe2zieCRdnTEUGqP3ALoaHXoBeFp8e?= =?utf-8?q?KYB8BFHiIN3Nc/YAH3C+ydBQWQ1/HLc9W/PTO7RPot3fy5GXIH8ARb+TmIx6xwHGO?= =?utf-8?q?RbVhj1GcRLG5o45LgEe2LDWzPrUj1XDVQw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f73a7de-2ca0-4b4e-d68f-08db58153218 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:26.4782 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /UmCKUGmhG10AylECSlapweOQ4ZP2IXakG5yrZ6E/Iurj7NgkVx9N8zE6d98dz9zp6WoDNFDLhOqh4yMzzQNSiG3f7ts7EDJzcrSOcth++M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When cast from void pointer to other pointer type, there is not need to use '()' for force cast. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 20 +++---- .../net/nfp/flower/nfp_flower_representor.c | 30 +++++------ drivers/net/nfp/nfp_common.c | 12 ++--- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev_vf.c | 2 +- drivers/net/nfp/nfp_flow.c | 54 +++++++++---------- drivers/net/nfp/nfp_rxtx.c | 2 +- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 2 +- 8 files changed, 60 insertions(+), 64 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 9a08ae3b75..72933e55d0 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -60,7 +60,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev) uint32_t update = 0; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; hw = repr->app_fw_flower->pf_hw; nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, 0); @@ -89,7 +89,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) struct nfp_net_hw *hw; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; hw = repr->app_fw_flower->pf_hw; /* Disabling queues just in case... */ @@ -149,19 +149,19 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev) struct nfp_net_rxq *this_rx_q; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; hw = repr->app_fw_flower->pf_hw; nfp_pf_repr_disable_queues(dev); /* Clear queues */ for (i = 0; i < dev->data->nb_tx_queues; i++) { - this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; + this_tx_q = dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); } for (i = 0; i < dev->data->nb_rx_queues; i++) { - this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; + this_rx_q = dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); } @@ -189,7 +189,7 @@ nfp_flower_pf_close(struct rte_eth_dev *dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; hw = repr->app_fw_flower->pf_hw; pf_dev = hw->pf_dev; app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv); @@ -204,12 +204,12 @@ nfp_flower_pf_close(struct rte_eth_dev *dev) /* Clear queues */ for (i = 0; i < dev->data->nb_tx_queues; i++) { - this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; + this_tx_q = dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); } for (i = 0; i < dev->data->nb_rx_queues; i++) { - this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; + this_rx_q = dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); } @@ -814,7 +814,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) /* Saving physical and virtual addresses for the RX ring */ rxq->dma = (uint64_t)tz->iova; - rxq->rxds = (struct nfp_net_rx_desc *)tz->addr; + rxq->rxds = tz->addr; /* Mbuf pointers array for referencing mbufs linked to RX descriptors */ rxq->rxbufs = rte_zmalloc_socket("rxq->rxbufs", @@ -877,7 +877,7 @@ nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) /* Saving physical and virtual addresses for the TX ring */ txq->dma = (uint64_t)tz->iova; - txq->txds = (struct nfp_net_nfd3_tx_desc *)tz->addr; + txq->txds = tz->addr; /* Mbuf pointers array for referencing mbufs linked to TX descriptors */ txq->txbufs = rte_zmalloc_socket("txq->txbufs", diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 0479eb4792..86b7d1a220 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -32,7 +32,7 @@ nfp_pf_repr_rx_queue_setup(struct rte_eth_dev *dev, const struct rte_memzone *tz; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; hw = repr->app_fw_flower->pf_hw; /* Allocating rx queue data structure */ @@ -78,7 +78,7 @@ nfp_pf_repr_rx_queue_setup(struct rte_eth_dev *dev, /* Saving physical and virtual addresses for the RX ring */ rxq->dma = (uint64_t)tz->iova; - rxq->rxds = (struct nfp_net_rx_desc *)tz->addr; + rxq->rxds = tz->addr; /* mbuf pointers array for referencing mbufs linked to RX descriptors */ rxq->rxbufs = rte_zmalloc_socket("rxq->rxbufs", @@ -116,7 +116,7 @@ nfp_pf_repr_tx_queue_setup(struct rte_eth_dev *dev, const struct rte_memzone *tz; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; hw = repr->app_fw_flower->pf_hw; tx_free_thresh = (tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh : @@ -161,7 +161,7 @@ nfp_pf_repr_tx_queue_setup(struct rte_eth_dev *dev, /* Saving physical and virtual addresses for the TX ring */ txq->dma = (uint64_t)tz->iova; - txq->txds = (struct nfp_net_nfd3_tx_desc *)tz->addr; + txq->txds = tz->addr; /* mbuf pointers array for referencing mbufs linked to TX descriptors */ txq->txbufs = rte_zmalloc_socket("txq->txbufs", @@ -207,7 +207,7 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev, [NFP_NET_CFG_STS_LINK_RATE_100G] = RTE_ETH_SPEED_NUM_100G, }; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; link = &repr->link; pf_hw = repr->app_fw_flower->pf_hw; @@ -273,7 +273,7 @@ nfp_flower_repr_dev_configure(struct rte_eth_dev *dev) struct rte_eth_rxmode *rxmode; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; pf_hw = repr->app_fw_flower->pf_hw; dev_conf = &dev->data->dev_conf; @@ -295,7 +295,7 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev) struct nfp_flower_representor *repr; struct nfp_app_fw_flower *app_fw_flower; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; app_fw_flower = repr->app_fw_flower; if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT) { @@ -314,7 +314,7 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev) struct nfp_flower_representor *repr; struct nfp_app_fw_flower *app_fw_flower; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; app_fw_flower = repr->app_fw_flower; nfp_flower_cmsg_port_mod(app_fw_flower, repr->port_id, false); @@ -339,7 +339,7 @@ nfp_flower_repr_rx_queue_setup(struct rte_eth_dev *dev, struct nfp_net_hw *pf_hw; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; pf_hw = repr->app_fw_flower->pf_hw; /* Allocating rx queue data structure */ @@ -367,7 +367,7 @@ nfp_flower_repr_tx_queue_setup(struct rte_eth_dev *dev, struct nfp_net_hw *pf_hw; struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; pf_hw = repr->app_fw_flower->pf_hw; /* Allocating tx queue data structure */ @@ -390,7 +390,7 @@ nfp_flower_repr_stats_get(struct rte_eth_dev *ethdev, { struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)ethdev->data->dev_private; + repr = ethdev->data->dev_private; rte_memcpy(stats, &repr->repr_stats, sizeof(struct rte_eth_stats)); return 0; @@ -401,7 +401,7 @@ nfp_flower_repr_stats_reset(struct rte_eth_dev *ethdev) { struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)ethdev->data->dev_private; + repr = ethdev->data->dev_private; memset(&repr->repr_stats, 0, sizeof(struct rte_eth_stats)); return 0; @@ -413,7 +413,7 @@ nfp_flower_repr_mac_addr_set(struct rte_eth_dev *ethdev, { struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)ethdev->data->dev_private; + repr = ethdev->data->dev_private; rte_ether_addr_copy(mac_addr, &repr->mac_addr); rte_ether_addr_copy(mac_addr, ethdev->data->mac_addrs); @@ -584,7 +584,7 @@ nfp_flower_pf_repr_init(struct rte_eth_dev *eth_dev, struct nfp_flower_representor *init_repr_data; /* Cast the input representor data to the correct struct here */ - init_repr_data = (struct nfp_flower_representor *)init_params; + init_repr_data = init_params; /* Memory has been allocated in the eth_dev_create() function */ repr = eth_dev->data->dev_private; @@ -639,7 +639,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, struct nfp_flower_representor *init_repr_data; /* Cast the input representor data to the correct struct here */ - init_repr_data = (struct nfp_flower_representor *)init_params; + init_repr_data = init_params; app_fw_flower = init_repr_data->app_fw_flower; /* Memory has been allocated in the eth_dev_create() function */ diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 634afbf1b5..b7a7296999 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -1404,7 +1404,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev) void nfp_net_dev_interrupt_delayed_handler(void *param) { - struct rte_eth_dev *dev = (struct rte_eth_dev *)param; + struct rte_eth_dev *dev = param; nfp_net_link_update(dev, 0); rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL); @@ -1420,7 +1420,7 @@ nfp_net_dev_interrupt_handler(void *param) { int64_t timeout; struct rte_eth_link link; - struct rte_eth_dev *dev = (struct rte_eth_dev *)param; + struct rte_eth_dev *dev = param; PMD_DRV_LOG(DEBUG, "We got a LSC interrupt!!!"); @@ -1840,7 +1840,7 @@ nfp_net_stop_rx_queue(struct rte_eth_dev *dev) struct nfp_net_rxq *this_rx_q; for (i = 0; i < dev->data->nb_rx_queues; i++) { - this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; + this_rx_q = dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); } } @@ -1852,7 +1852,7 @@ nfp_net_close_rx_queue(struct rte_eth_dev *dev) struct nfp_net_rxq *this_rx_q; for (i = 0; i < dev->data->nb_rx_queues; i++) { - this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; + this_rx_q = dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); nfp_net_rx_queue_release(dev, i); } @@ -1865,7 +1865,7 @@ nfp_net_stop_tx_queue(struct rte_eth_dev *dev) struct nfp_net_txq *this_tx_q; for (i = 0; i < dev->data->nb_tx_queues; i++) { - this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; + this_tx_q = dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); } } @@ -1877,7 +1877,7 @@ nfp_net_close_tx_queue(struct rte_eth_dev *dev) struct nfp_net_txq *this_tx_q; for (i = 0; i < dev->data->nb_tx_queues; i++) { - this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; + this_tx_q = dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); nfp_net_tx_queue_release(dev, i); } diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 3a56726388..06146050ff 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -542,7 +542,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); - hw->ctrl_bar = (uint8_t *)pci_dev->mem_resource[0].addr; + hw->ctrl_bar = pci_dev->mem_resource[0].addr; if (hw->ctrl_bar == NULL) { PMD_DRV_LOG(ERR, "hw->ctrl_bar is NULL. BAR0 not configured"); diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index f8135fa0c8..bac8df6142 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -289,7 +289,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); - hw->ctrl_bar = (uint8_t *)pci_dev->mem_resource[0].addr; + hw->ctrl_bar = pci_dev->mem_resource[0].addr; if (hw->ctrl_bar == NULL) { PMD_DRV_LOG(ERR, "hw->ctrl_bar is NULL. BAR0 not configured"); diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index fdf5c0f40e..b46acf6a39 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -93,7 +93,7 @@ nfp_flow_dev_to_priv(struct rte_eth_dev *dev) { struct nfp_flower_representor *repr; - repr = (struct nfp_flower_representor *)dev->data->dev_private; + repr = dev->data->dev_private; return repr->app_fw_flower->flow_priv; } @@ -726,8 +726,7 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[], if (port_id->id >= RTE_MAX_ETHPORTS) return -ERANGE; ethdev = &rte_eth_devices[port_id->id]; - representor = (struct nfp_flower_representor *) - ethdev->data->dev_private; + representor = ethdev->data->dev_private; key_ls->port = rte_cpu_to_be_32(representor->port_id); break; case RTE_FLOW_ITEM_TYPE_VLAN: @@ -2047,7 +2046,7 @@ nfp_flow_action_output(char *act_data, return -ERANGE; ethdev = &rte_eth_devices[port_id->id]; - representor = (struct nfp_flower_representor *)ethdev->data->dev_private; + representor = ethdev->data->dev_private; act_size = sizeof(struct nfp_fl_act_output); output = (struct nfp_fl_act_output *)act_data; @@ -2083,7 +2082,7 @@ nfp_flow_action_set_mac(char *act_data, set_eth->head.len_lw = act_size >> NFP_FL_LW_SIZ; set_eth->reserved = 0; - set_mac = (const struct rte_flow_action_set_mac *)action->conf; + set_mac = action->conf; if (mac_src_flag) { rte_memcpy(&set_eth->eth_addr[RTE_ETHER_ADDR_LEN], set_mac->mac_addr, RTE_ETHER_ADDR_LEN); @@ -2133,7 +2132,7 @@ nfp_flow_action_set_ip(char *act_data, set_ip->head.len_lw = act_size >> NFP_FL_LW_SIZ; set_ip->reserved = 0; - set_ipv4 = (const struct rte_flow_action_set_ipv4 *)action->conf; + set_ipv4 = action->conf; if (ip_src_flag) { set_ip->ipv4_src = set_ipv4->ipv4_addr; set_ip->ipv4_src_mask = RTE_BE32(0xffffffff); @@ -2154,7 +2153,7 @@ nfp_flow_action_set_ipv6(char *act_data, const struct rte_flow_action_set_ipv6 *set_ipv6; set_ip = (struct nfp_fl_act_set_ipv6_addr *)act_data; - set_ipv6 = (const struct rte_flow_action_set_ipv6 *)action->conf; + set_ipv6 = action->conf; if (ip_src_flag) set_ip->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV6_SRC; @@ -2191,7 +2190,7 @@ nfp_flow_action_set_tp(char *act_data, set_tp->head.len_lw = act_size >> NFP_FL_LW_SIZ; set_tp->reserved = 0; - set_tp_conf = (const struct rte_flow_action_set_tp *)action->conf; + set_tp_conf = action->conf; if (tp_src_flag) { set_tp->src_port = set_tp_conf->port; set_tp->src_port_mask = RTE_BE16(0xffff); @@ -2223,12 +2222,9 @@ nfp_flow_action_push_vlan(char *act_data, push_vlan->head.len_lw = act_size >> NFP_FL_LW_SIZ; push_vlan->reserved = 0; - push_vlan_conf = (const struct rte_flow_action_of_push_vlan *) - action->conf; - vlan_pcp_conf = (const struct rte_flow_action_of_set_vlan_pcp *) - (action + 1)->conf; - vlan_vid_conf = (const struct rte_flow_action_of_set_vlan_vid *) - (action + 2)->conf; + push_vlan_conf = action->conf; + vlan_pcp_conf = (action + 1)->conf; + vlan_vid_conf = (action + 2)->conf; vid = rte_be_to_cpu_16(vlan_vid_conf->vlan_vid) & 0x0fff; pcp = vlan_pcp_conf->vlan_pcp & 0x07; @@ -2256,7 +2252,7 @@ nfp_flow_action_set_ttl(char *act_data, ttl_tos->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_TTL_TOS; ttl_tos->head.len_lw = act_size >> NFP_FL_LW_SIZ; - ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf; + ttl_conf = action->conf; ttl_tos->ipv4_ttl = ttl_conf->ttl_value; ttl_tos->ipv4_ttl_mask = 0xff; ttl_tos->reserved = 0; @@ -2280,7 +2276,7 @@ nfp_flow_action_set_hl(char *act_data, tc_hl->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV6_TC_HL_FL; tc_hl->head.len_lw = act_size >> NFP_FL_LW_SIZ; - ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf; + ttl_conf = action->conf; tc_hl->ipv6_hop_limit = ttl_conf->ttl_value; tc_hl->ipv6_hop_limit_mask = 0xff; tc_hl->reserved = 0; @@ -2304,7 +2300,7 @@ nfp_flow_action_set_tos(char *act_data, ttl_tos->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_TTL_TOS; ttl_tos->head.len_lw = act_size >> NFP_FL_LW_SIZ; - tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; + tos_conf = action->conf; ttl_tos->ipv4_tos = tos_conf->dscp; ttl_tos->ipv4_tos_mask = 0xff; ttl_tos->reserved = 0; @@ -2328,7 +2324,7 @@ nfp_flow_action_set_tc(char *act_data, tc_hl->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV6_TC_HL_FL; tc_hl->head.len_lw = act_size >> NFP_FL_LW_SIZ; - tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; + tos_conf = action->conf; tc_hl->ipv6_tc = tos_conf->dscp; tc_hl->ipv6_tc_mask = 0xff; tc_hl->reserved = 0; @@ -2719,9 +2715,9 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, size_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun); size_t act_set_size = sizeof(struct nfp_fl_act_set_tun); - eth = (const struct rte_flow_item_eth *)vxlan_data->items[0].spec; - ipv4 = (const struct rte_flow_item_ipv4 *)vxlan_data->items[1].spec; - vxlan = (const struct rte_flow_item_vxlan *)vxlan_data->items[3].spec; + eth = vxlan_data->items[0].spec; + ipv4 = vxlan_data->items[1].spec; + vxlan = vxlan_data->items[3].spec; pre_tun = (struct nfp_fl_act_pre_tun *)actions; memset(pre_tun, 0, act_pre_size); @@ -2756,9 +2752,9 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, size_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun); size_t act_set_size = sizeof(struct nfp_fl_act_set_tun); - eth = (const struct rte_flow_item_eth *)vxlan_data->items[0].spec; - ipv6 = (const struct rte_flow_item_ipv6 *)vxlan_data->items[1].spec; - vxlan = (const struct rte_flow_item_vxlan *)vxlan_data->items[3].spec; + eth = vxlan_data->items[0].spec; + ipv6 = vxlan_data->items[1].spec; + vxlan = vxlan_data->items[3].spec; pre_tun = (struct nfp_fl_act_pre_tun *)actions; memset(pre_tun, 0, act_pre_size); @@ -3626,7 +3622,7 @@ nfp_flow_process(struct nfp_flower_representor *representor, nfp_flower_update_meta_tci(nfp_flow->payload.unmasked_data, new_mask_id); /* Calculate and store the hash_key for later use */ - hash_data = (char *)(nfp_flow->payload.unmasked_data); + hash_data = nfp_flow->payload.unmasked_data; nfp_flow->hash_key = rte_jhash(hash_data, nfp_flow->length, priv->hash_seed); /* Find the flow in hash table */ @@ -3716,7 +3712,7 @@ nfp_flow_validate(struct rte_eth_dev *dev, struct nfp_flow_priv *priv; struct nfp_flower_representor *representor; - representor = (struct nfp_flower_representor *)dev->data->dev_private; + representor = dev->data->dev_private; priv = representor->app_fw_flower->flow_priv; nfp_flow = nfp_flow_setup(representor, attr, items, actions, error, true); @@ -3751,7 +3747,7 @@ nfp_flow_create(struct rte_eth_dev *dev, struct nfp_app_fw_flower *app_fw_flower; struct nfp_flower_representor *representor; - representor = (struct nfp_flower_representor *)dev->data->dev_private; + representor = dev->data->dev_private; app_fw_flower = representor->app_fw_flower; priv = app_fw_flower->flow_priv; @@ -3813,7 +3809,7 @@ nfp_flow_destroy(struct rte_eth_dev *dev, struct nfp_app_fw_flower *app_fw_flower; struct nfp_flower_representor *representor; - representor = (struct nfp_flower_representor *)dev->data->dev_private; + representor = dev->data->dev_private; app_fw_flower = representor->app_fw_flower; priv = app_fw_flower->flow_priv; @@ -3949,7 +3945,7 @@ nfp_flow_stats_get(struct rte_eth_dev *dev, return; } - query = (struct rte_flow_query_count *)data; + query = data; reset = query->reset; memset(query, 0, sizeof(*query)); diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 2409f63205..3c78557221 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -630,7 +630,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev, /* Saving physical and virtual addresses for the RX ring */ rxq->dma = (uint64_t)tz->iova; - rxq->rxds = (struct nfp_net_rx_desc *)tz->addr; + rxq->rxds = tz->addr; /* mbuf pointers array for referencing mbufs linked to RX descriptors */ rxq->rxbufs = rte_zmalloc_socket("rxq->rxbufs", diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index edf4088747..9d63e0ee73 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -835,7 +835,7 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) if (nfp6000_set_barsz(dev, desc) < 0) goto error; - desc->cfg = (char *)dev->mem_resource[0].addr; + desc->cfg = dev->mem_resource[0].addr; nfp_enable_bars(desc); From patchwork Fri May 19 02:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127063 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D67DF42B42; Fri, 19 May 2023 05:01:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B15542D61; Fri, 19 May 2023 05:00:32 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2096.outbound.protection.outlook.com [40.107.243.96]) by mails.dpdk.org (Postfix) with ESMTP id EAACA42D61 for ; Fri, 19 May 2023 05:00:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oWY+KP6rGCtkgkO5ZPlAqGEQ6h3ZJQGwUgGUswvVnXMpAufSXXkxRhS+c7Qr14mW/DdedurtHvMLr7Qe67HyAkPt/y5fcrtYlNk/NJgZQvjPZvLXgwar1y5cghbsnjGkgwV1XGXdDki/qaC2Q5llQQ/wCNoKu2Dg5+S99o/cmpfg3NvCoIbjvbAxAu/6kCMIpQfPD2h3i5qPpMbxC0KQYC0gFh1RxzOs7oGMFzxeDCHlTow3348Bg6NnouMunh2IgYJ55INmQG40QkKVk9uFDqwczpqWlQ1E6S4nO2Z0ZtZvoss+dNpneLHvN/ny3RkEVUosOT5ND75U4EIJer11ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9pyln5Nd0iSUFQYbVUhKNH7mJBGbic/KSb+FG03Ding=; b=OUVr194TzCYBvx1ABS4gltzln2UNiGnUqPrQ2TXDY8677uXX6juJYqNc9bEOTpxJ4VbfYE23BXRFIaA3oN/ePGNJPahy8mfSdRqA/0EoL2HytdB3NyaG/L0h3eb0OdGzI2sHp/5auiOrMZlNmP7AI6zWMpWtq9Wtijb0cmk8q7EXiGA73TxB3q97Du2E+RS8zWTlJUfERm4clIwADUyfkiGXkYCMF8cQOeInhjpxzSw/GuKqB6K09UMqvp/iQo0nWOpg6th06F+vbHnE6/IRdmmyYqqan+SadoTznlwIk/3AkXfP/FneHtsZ18UT3al3u8uORkMALYiY46Pe9aotfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9pyln5Nd0iSUFQYbVUhKNH7mJBGbic/KSb+FG03Ding=; b=Yid6xLzW1w+U53NEcJ1SklhbGMVVfqbrhSUAQdd1RcQ/Tl+GOTZUa2bM1FOknCnoTpE6tVNSegcvsSrZFeoVSPkb3LesMvTOOp1gyDzZAJKOcLOHuqiBp60PNipX0CUAtCJ7t/ruF4izv6MosfGSo5Admx/NL54w+F50HnxvCoU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May 2023 03:00:28 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023 03:00:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 8/8] net/nfp: revise the logic of MAC address Date: Fri, 19 May 2023 10:59:50 +0800 Message-Id: <20230519025950.1642943-9-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230519025950.1642943-1-chaoyong.he@corigine.com> References: <20230519025950.1642943-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f936bb3-9104-49ea-1807-08db58153370 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +KG+PsIiIJlySwYpItbA0XMwgVVHWr4yMJuZjCJlJGpy4mjr00yGUGFjMoyTahJOZ6UXLT0uLTNLdYFpDqlP7ZrjWkT6Z1xRLKeQ69eZFs6Te260sUnDQyzpiIzO8/2Uc4BItrK7othqHeVJEC6/P2Q6C8NUtZwoZ83k9l71CXh3PefXOh0fJXgoFnoAvIPddPW319JtWmkcujluLXPrI0Nw4Zo7rK/gY1OwHXOC7xS9mIEcAlxYoB2VxcsGP+FEmRwalRfBDJb8L1o3/SxjZNjoBNWOFUufbcJaQRW9xEBkqYjZ8peA9LGWSPOlwNlHusn03gdJisAm/RJNk4SSUPLQVz0eTCswlOOyK3liHcx43Gl0P9doCQcILjn3KfOuTZh5v5uhehVifgulNNhfUckVSAe46yd+H20m/rSK8Kk3ve4RJplisDkVL1az04qzCtiCXo+MhL/kY9RUvmtO2FXN81ZRL2p8I+d4LB3hPWGXWLxUly3ko22H2g71QkrqAFgFCWEgnwDv84q3/gpDOP8IlWo/Fzd9JuGVPNX/ZnKsL3+EjcaFp4zLJnwS4fVb6ep8XGGtp0LA9RwbyyWWcnEUoN2U7iGkYQzph/SR6XxZ6hUfiYhhSF7Wjb71MG8H X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(66476007)(66574015)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Wann7cpXJPhY6PvjwPBCkhpC2LOD?= =?utf-8?q?sAJzeXRyZddTxwQwPOh36CgbJhsyZu2rjtKQdqmrVp4kwr3IjxMShRJpgSjRPOSQm?= =?utf-8?q?mDBOQ/hfNxJUEpY6INXGvxC/J+W7JYL4BsSKGaiGhZjwIz/1BhQ/NUj3rj0hotsOM?= =?utf-8?q?67qH9GvadTaO95z8yY3mtTNdk6jzfN7K/OIFZYOI+Ijow/OIoKCI6AIfE9mbwkQzp?= =?utf-8?q?dLjhfzbgoi2hrj/NjgBomH0bUNj0sDEPlc9F7istw0pwi8oN8rnIpxNK6bDzzP3JV?= =?utf-8?q?6H4dSoY1ymU0HNqLkVBe7NqmgaXWgRN7dy+N1SjK5Dl1mkmpz5INgwKYW848xs2Gq?= =?utf-8?q?vnMGqmEp731RilyEhjlDyUx9+gNhAWyOGZgjdvYQfKaCinPem4N5jAXZJKFXXLfQp?= =?utf-8?q?Ota/PxI0HYGOjhcTCg0U9ujgOJUWhFq4HBefaF7If6LPhaDQVyd3bkqTkcEhyRUjh?= =?utf-8?q?m3VVqAKqOjuNc6ieEuYQ0Y73nsV5dX6odxHgxSEI09GU6uxghRfshus2sHlBrhvQK?= =?utf-8?q?AEAkjTTrvxmWwI5zWy5ZiMVnMyJJmSFHZH0l0fApVLkMFjYNqwtzcXFH7NkoYAki3?= =?utf-8?q?o70DAxPl5wioCB79PEV/uj4GyT2BCbBgGk+4VYamodsns2YhVyRzuuBExLgl2uh62?= =?utf-8?q?q5eeGOxPZZaEybKeku/NPImr7Zt2FjyD18QPPKDunt1FU0K086loY5rtZQC2CY/LW?= =?utf-8?q?iVRFQE9tSD34HPUm5qWhKuEP/hx76+fZmOb7XMn1apTrZp2L5j708ABcIF4uakkok?= =?utf-8?q?kQcIk65etL37A1VT38KsAKgY5ipParQljRADjLHMPKh3gHiwmh4P0ak1D6XdXLDTR?= =?utf-8?q?5aRG8oaa+updypaHF5YIltehZt26yD0/i33ipXfOHrkuLsgBK/a1wYqpGJxxRQjC8?= =?utf-8?q?zlzMYiKp7RdE0KGmuxqsMyo88EWG52y3TID4ww7RCKGoJ51v21+90B7siyCdamtZF?= =?utf-8?q?1onC0UpTSOYnaY/mhuRSMzsjEE3qOREV9EOPPFC1av2ktF9m1adIsi2p3u+K8Cbqw?= =?utf-8?q?YAeeTu+mQq42KrWXEOWsqPcS+5vnkfkb4MaZPbwDizPyHUv1tVBAT0pkWVvgRlfr1?= =?utf-8?q?TKlexNgFyC99UxLgAo4sLHi9ktKLtRCHoqqGRQpFjStPwYECM6MjqZVrXr5fUMNmj?= =?utf-8?q?3tjTT4ZZOE/hIYMH74m9JINO/wPqw3D/q2tkxO522177pLrItYdOVNXlkCQFu+mTZ?= =?utf-8?q?0lnogCU0UroWqXxHNlBHwu4gS3oyBX351A/arDZy1DNWmudyQetfp4XOszXyZCAQj?= =?utf-8?q?gj4Xxo6wLN7aYZ5riy89S5ohFLA78DEMJs9rPWs2wMCGokK72631bipTkOuEWGZvm?= =?utf-8?q?bnBZftbc2rLH4qrtOhcZDwEqt9eg0g1hd54M30e+gv0cE808vpFgUOj2Yxm5EFIHo?= =?utf-8?q?UWAcXmXDbO7+47T7KoerVLGWQagXKiMP82F+JONgb/xs3EmBRwxLG8mVtdZdjoQHn?= =?utf-8?q?W7E71mitq2nyeXZ4elUBKk7TmAWbhRZ8j+6ngObXaZ/14nsZlpfJR2CiSZ/X2XUnX?= =?utf-8?q?7RD/WbsXbPC9Qz0iUHZye/bHbEglBODhQA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f936bb3-9104-49ea-1807-08db58153370 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 03:00:28.6003 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U/rPAcOQLtge7NaMqk3s48j0CVy6n18KaPHk72b0Hy3e569ufnGPGdIuSKLLIN2l6YEY+G4n+UOqw9oN7fH3qZrYcf9/Xty/GNdUac7sQAA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5769 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Drop the usage of customed macro and function about MAC address, using the macro and function from framework. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- .../net/nfp/flower/nfp_flower_representor.c | 3 +-- drivers/net/nfp/nfp_common.c | 11 ----------- drivers/net/nfp/nfp_common.h | 4 +--- drivers/net/nfp/nfp_ethdev.c | 17 +++++++---------- drivers/net/nfp/nfp_ethdev_vf.c | 18 ++++++++---------- drivers/net/nfp/nfp_flow.c | 6 +++--- drivers/net/nfp/nfpcore/nfp_nsp.h | 4 +--- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 8 ++++---- 8 files changed, 25 insertions(+), 46 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 86b7d1a220..c3764b4de7 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -768,8 +768,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) flower_repr.vf_id = i + 1; /* Copy the real mac of the interface to the representor struct */ - rte_ether_addr_copy((struct rte_ether_addr *)eth_port->mac_addr, - &flower_repr.mac_addr); + rte_ether_addr_copy(ð_port->mac_addr, &flower_repr.mac_addr); sprintf(flower_repr.name, "flower_repr_p%d", i); /* diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index b7a7296999..c9fea765a4 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -453,17 +453,6 @@ nfp_net_cfg_queue_setup(struct nfp_net_hw *hw) hw->qcp_cfg = hw->tx_bar + NFP_QCP_QUEUE_ADDR_SZ; } -#define ETH_ADDR_LEN 6 - -void -nfp_eth_copy_mac(uint8_t *dst, const uint8_t *src) -{ - int i; - - for (i = 0; i < ETH_ADDR_LEN; i++) - dst[i] = src[i]; -} - void nfp_net_write_mac(struct nfp_net_hw *hw, uint8_t *mac) { diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 914903f587..47df0510c5 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -232,7 +232,7 @@ struct nfp_net_hw { #endif #endif - uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; + struct rte_ether_addr mac_addr; /* Records starting point for counters */ struct rte_eth_stats eth_stats_base; @@ -428,7 +428,6 @@ void nfp_net_log_device_information(const struct nfp_net_hw *hw); void nfp_net_enable_queues(struct rte_eth_dev *dev); void nfp_net_disable_queues(struct rte_eth_dev *dev); void nfp_net_params_setup(struct nfp_net_hw *hw); -void nfp_eth_copy_mac(uint8_t *dst, const uint8_t *src); void nfp_net_write_mac(struct nfp_net_hw *hw, uint8_t *mac); int nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr); int nfp_configure_rx_interrupt(struct rte_eth_dev *dev, @@ -463,7 +462,6 @@ int nfp_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id); int nfp_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id); void nfp_net_params_setup(struct nfp_net_hw *hw); void nfp_net_cfg_queue_setup(struct nfp_net_hw *hw); -void nfp_eth_copy_mac(uint8_t *dst, const uint8_t *src); void nfp_net_dev_interrupt_handler(void *param); void nfp_net_dev_interrupt_delayed_handler(void *param); int nfp_net_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 06146050ff..722ec17dce 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -45,8 +45,7 @@ nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic, int port) nfp_eth_table = nfp_eth_read_ports(app_fw_nic->pf_dev->cpp); - nfp_eth_copy_mac((uint8_t *)&hw->mac_addr, - (uint8_t *)&nfp_eth_table->ports[port].mac_addr); + rte_ether_addr_copy(&nfp_eth_table->ports[port].mac_addr, &hw->mac_addr); free(nfp_eth_table); return 0; @@ -654,19 +653,18 @@ nfp_net_init(struct rte_eth_dev *eth_dev) } nfp_net_pf_read_mac(app_fw_nic, port); - nfp_net_write_mac(hw, (uint8_t *)&hw->mac_addr); + nfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]); - tmp_ether_addr = (struct rte_ether_addr *)&hw->mac_addr; + tmp_ether_addr = &hw->mac_addr; if (!rte_is_valid_assigned_ether_addr(tmp_ether_addr)) { PMD_INIT_LOG(INFO, "Using random mac address for port %d", port); /* Using random mac addresses for VFs */ - rte_eth_random_addr(&hw->mac_addr[0]); - nfp_net_write_mac(hw, (uint8_t *)&hw->mac_addr); + rte_eth_random_addr(&hw->mac_addr.addr_bytes[0]); + nfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]); } /* Copying mac address to DPDK eth_dev struct */ - rte_ether_addr_copy((struct rte_ether_addr *)hw->mac_addr, - ð_dev->data->mac_addrs[0]); + rte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs); if ((hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR; @@ -677,8 +675,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) "mac=" RTE_ETHER_ADDR_PRT_FMT, eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id, - hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2], - hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]); + RTE_ETHER_ADDR_BYTES(&hw->mac_addr)); /* Registering LSC interrupt handler */ rte_intr_callback_register(pci_dev->intr_handle, diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index bac8df6142..ce55e3b728 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -23,10 +23,10 @@ nfp_netvf_read_mac(struct nfp_net_hw *hw) uint32_t tmp; tmp = rte_be_to_cpu_32(nn_cfg_readl(hw, NFP_NET_CFG_MACADDR)); - memcpy(&hw->mac_addr[0], &tmp, 4); + memcpy(&hw->mac_addr.addr_bytes[0], &tmp, 4); tmp = rte_be_to_cpu_32(nn_cfg_readl(hw, NFP_NET_CFG_MACADDR + 4)); - memcpy(&hw->mac_addr[4], &tmp, 2); + memcpy(&hw->mac_addr.addr_bytes[4], &tmp, 2); } static int @@ -406,18 +406,17 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) nfp_netvf_read_mac(hw); - tmp_ether_addr = (struct rte_ether_addr *)&hw->mac_addr; + tmp_ether_addr = &hw->mac_addr; if (!rte_is_valid_assigned_ether_addr(tmp_ether_addr)) { PMD_INIT_LOG(INFO, "Using random mac address for port %d", port); /* Using random mac addresses for VFs */ - rte_eth_random_addr(&hw->mac_addr[0]); - nfp_net_write_mac(hw, (uint8_t *)&hw->mac_addr); + rte_eth_random_addr(&hw->mac_addr.addr_bytes[0]); + nfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]); } /* Copying mac address to DPDK eth_dev struct */ - rte_ether_addr_copy((struct rte_ether_addr *)hw->mac_addr, - ð_dev->data->mac_addrs[0]); + rte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs); if ((hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR; @@ -425,11 +424,10 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; PMD_INIT_LOG(INFO, "port %d VendorID=0x%x DeviceID=0x%x " - "mac=%02x:%02x:%02x:%02x:%02x:%02x", + "mac=" RTE_ETHER_ADDR_PRT_FMT, eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id, - hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2], - hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]); + RTE_ETHER_ADDR_BYTES(&hw->mac_addr)); if (rte_eal_process_type() == RTE_PROC_PRIMARY) { /* Registering LSC interrupt handler */ diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index b46acf6a39..cb7073f361 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -85,7 +85,7 @@ struct nfp_mask_id_entry { struct nfp_pre_tun_entry { uint16_t mac_index; uint16_t ref_cnt; - uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; + struct rte_ether_addr mac_addr; } __rte_aligned(32); static inline struct nfp_flow_priv * @@ -2894,7 +2894,7 @@ nfp_pre_tun_table_check_add(struct nfp_flower_representor *repr, } entry->ref_cnt = 1U; - memcpy(entry->mac_addr, repr->mac_addr.addr_bytes, RTE_ETHER_ADDR_LEN); + rte_ether_addr_copy(&repr->mac_addr, &entry->mac_addr); /* 0 is considered a failed match */ for (i = 1; i < NFP_TUN_PRE_TUN_RULE_LIMIT; i++) { @@ -2954,7 +2954,7 @@ nfp_pre_tun_table_check_del(struct nfp_flower_representor *repr, } entry->ref_cnt = 1U; - memcpy(entry->mac_addr, repr->mac_addr.addr_bytes, RTE_ETHER_ADDR_LEN); + rte_ether_addr_copy(&repr->mac_addr, &entry->mac_addr); /* 0 is considered a failed match */ for (i = 1; i < NFP_TUN_PRE_TUN_RULE_LIMIT; i++) { diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h index 50cdec3a58..9905b2d3d3 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.h +++ b/drivers/net/nfp/nfpcore/nfp_nsp.h @@ -157,8 +157,6 @@ enum nfp_eth_fec { #define NFP_FEC_REED_SOLOMON RTE_BIT32(NFP_FEC_REED_SOLOMON_BIT) #define NFP_FEC_DISABLED RTE_BIT32(NFP_FEC_DISABLED_BIT) -#define ETH_ALEN 6 - /** * struct nfp_eth_table - ETH table information * @count: number of table entries @@ -205,7 +203,7 @@ struct nfp_eth_table { enum nfp_eth_fec fec; enum nfp_eth_aneg aneg; - uint8_t mac_addr[ETH_ALEN]; + struct rte_ether_addr mac_addr; uint8_t label_port; uint8_t label_subport; diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index f8d1416d4b..01b4652280 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -115,7 +115,7 @@ union eth_table_entry { struct { uint64_t port; uint64_t state; - uint8_t mac_addr[6]; + uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; uint8_t resv[2]; uint64_t control; }; @@ -163,8 +163,8 @@ nfp_eth_copy_mac_reverse(uint8_t *dst, const uint8_t *src) { int i; - for (i = 0; i < (int)ETH_ALEN; i++) - dst[ETH_ALEN - i - 1] = src[i]; + for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) + dst[RTE_ETHER_ADDR_LEN - i - 1] = src[i]; } static void @@ -194,7 +194,7 @@ nfp_eth_port_translate(struct nfp_nsp *nsp, const union eth_table_entry *src, dst->interface = FIELD_GET(NSP_ETH_STATE_INTERFACE, state); dst->media = FIELD_GET(NSP_ETH_STATE_MEDIA, state); - nfp_eth_copy_mac_reverse(dst->mac_addr, src->mac_addr); + nfp_eth_copy_mac_reverse(&dst->mac_addr.addr_bytes[0], src->mac_addr); dst->label_port = FIELD_GET(NSP_ETH_PORT_PHYLABEL, port); dst->label_subport = FIELD_GET(NSP_ETH_PORT_LABEL, port);