From patchwork Mon May 22 08:04:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127141 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 7586D42B6F; Mon, 22 May 2023 10:05:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A111D427EE; Mon, 22 May 2023 10:05:31 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2135.outbound.protection.outlook.com [40.107.95.135]) by mails.dpdk.org (Postfix) with ESMTP id 88F7242D36 for ; Mon, 22 May 2023 10:05:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OEDskCkL9PM7XwoN7QThAwO4n04KrlADv2oqZIdKmrzEsUJxZkfI+axd4+24E4IfAxaX17j7j63HsL0C/wbpQ5tHeHZ144SRWMQSPC4HNfDrsc08GZb17c+Sh7wLkKdZ5zmObyOPEGGyK+LLgkDGFOUpwUy9A7e8moyBJxL9s/tc4AMzEPpD3H/3NBEU/j4qlDORfcFXm9fCFWcA5RX7PhKcoOZa4SEu4AHusiuv7te8ZQZIh22jnPkMfErXkDc0pHCdBSw3X/Ng6n1t9xlQgr7T1/i7+GRS1dA/CryH5JcdoJRXV7pyhB1ELGJADvKFLEP9h6YMdStaGeN9fjZMcA== 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=5UJAWVeqEd+xF1OgmxzqMJzRu25X26RgLFwSddE5VEU=; b=oYmmUdG+FRKhjtXBWb/0FD44sbuxEZ0USXhN0DjMEP/WSgkbWkorJ5u64JocXZZcAi2sKHbuMwHIr34BZGYhM+8gWgZVO9TMYOOvZ5GAGG7A7Q8oA8SwFSYzZUGb4EunsrtprA0YgTk2rS0I4o+vRLI+J3knYOmS1Bnu6VgHc2QEZjoUR5rtPigmKnqXbXGloxrjzEV2+SZ6B5Z+Bi17CDxDArqhefsjZwuCFRtP3tDmxxclRxrkRSV2wwuXuhTU5OW+XdFYEFfR4afG2F59ciCXmPrNiB+OvEM4Z0GdRvSZlKUOy65FRrJU5kQqiiBEkyWv++j+o6EaShXrQ5NblA== 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=5UJAWVeqEd+xF1OgmxzqMJzRu25X26RgLFwSddE5VEU=; b=AV8tz3/UMDz1FaopbouQNWIggnmBUsjKjAvpyEwwaOX9l8Q0Ourxw9MNaldr71/3UHTH4wG02aqBMK/dAWkE1ja3bKxOFJydoZM8j1rxmmo3zzmoeWqJcrLIOmb7dU59Tn2IueKmJVh0x6+PYm5OOHinC0LjxypNPZJ7uTKch0M= 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 SA3PR13MB6395.namprd13.prod.outlook.com (2603:10b6:806:3a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.13; Mon, 22 May 2023 08:05: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.027; Mon, 22 May 2023 08:05:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH 2/5] net/nfp: rename field and add comment for Rx descriptor Date: Mon, 22 May 2023 16:04:57 +0800 Message-Id: <20230522080500.2014001-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230522080500.2014001-1-chaoyong.he@corigine.com> References: <20230522080500.2014001-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0109.apcprd03.prod.outlook.com (2603:1096:4:91::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6395:EE_ X-MS-Office365-Filtering-Correlation-Id: 3940e799-f144-4193-4419-08db5a9b4e7f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qMiKQvtameRQCkBZSPCosHXHZwKYUm3FNFOid0R1I3lrqjQgU4WGhq1nYqDQBr0OrKUu2z0zTyDZ9oGOLqH4hQeOmBjXN3wrrF5bz2xWAjUs6efq0eEm7LM+aCsk9AjW6J9S2ll6CEspgTC9vTxQYStNTNADKyJJHWTgFvh+Yvmg4zqifKEGNUFsZfZEq64NlEq5+qnenhJXVCbTq96r89udxRcL90APBwjhYsDkZVnL0BURdpMEXVacnrSO6z/stTRNaF/IefUTOlFG5d6goZ2HJTHvJ18f6XbehXZOLFSx/Z89kulTxFjeaiP5rPGX5aTnaFKwgke5ttpIJNHm4NxeIg6cJ/Tu3Ek3Ty1VCCC6/HFVZhMeN5UpJpP5oF6AUbwn4b0GkUFRei2+V+UmiKl5ZQVzFJHFrHLbWcrC6xNUKi5cZRxwjihZxJboDL7PG7jBb0dFak3e6vxQq5kSk3AdipbCB/BTBKgylCDUHEb1NX0wsUD6LIS+cP9MzD3NDuWZV2AFCm4dmufD2P5IpT1YxmtbqC16mWFrNZay8hM1JWrOf2pt1oyoq8pWcWOCcNnkxvcjv23kI/1Jt94Ubok3ktZCP9ckSWzb6tXWANi3uDkGNvsfWsuMsE9wgeSo 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)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199021)(38100700002)(38350700002)(8676002)(8936002)(5660300002)(6512007)(6506007)(1076003)(26005)(186003)(2906002)(2616005)(36756003)(83380400001)(44832011)(107886003)(86362001)(54906003)(316002)(6666004)(478600001)(4326008)(66556008)(66476007)(6916009)(66946007)(52116002)(41300700001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Cd52B1B9r0xldjyYmrw6lAUrHowd?= =?utf-8?q?GzB0iLBHk/DpG1riBRCZaEZHbfA1kFHV1Ty930AnDRmVqFJw2ZvZH8Ow+FV2aLGRZ?= =?utf-8?q?ATDy1ySGVVIC1lkFmVhLm5dNDR1Fk6YmlVjzCVckY63XPoH/rL22S0mlsJ7358Szh?= =?utf-8?q?AGDqAPaNJwBGdl2Lq/gsCrwS1IzTCtVitnkibG8d8qys3QB/g127UQ0OErXc9hfTt?= =?utf-8?q?3nDrCM1Tmi6UTNu9yloCuS8mg1UdBLrja3OvNuT+n6Brlt6JRBzv9zfKavPh2Rict?= =?utf-8?q?JtDm7fcEGpVDCQao+DyVFPzbzjW9spjvYdxH77DIW6FDfiYjjh8DqmDuRnekoQ3m0?= =?utf-8?q?6k7tbAT6cTVL3DWn/ofZxB/BH9I/AaBl90kDMydomRp0DcIH9ETLWyioqWnbxs9kK?= =?utf-8?q?Lf0M4JSVaIpIdH5zAVvD86vSaUJWSQvyakAbxyGpBjK8jKYWgM9MtraQhuqc16R9a?= =?utf-8?q?cyW54lIN++Ikko/R5LwD56wC3B96PUgrqxDoMMDeUcCYcB7QZkGziHZpz7WsNyrkk?= =?utf-8?q?ffnvxB1BtoXoQ5AC2RoURSUACMeQs7j5UQQDJQVN9dQ4Ecziqb5Xdwp4eLPNaQT4X?= =?utf-8?q?4+8EIe8NfbVzF2scHA/DNSkogVwFcDy/tzBPJgDMcCgQAQ3lB3qdKzh3vkKgElaN+?= =?utf-8?q?gmB3GvkXRDraSzPbEZNxCJM3EZomReZkERGChytEJJiKvxWeO+/KfUkniol+8UDvu?= =?utf-8?q?4poJuedO9ikD1LX7iMUoX9VMvBl+WjVWnUfBd+ASkufrqZOmiFOORo5Yij/aew7HV?= =?utf-8?q?uBtDka6L5QEXGi5qlaqlPOFLv9Bq1ipu5e37D7ypHXmNV5HaU5Q6ZZ44Wii5n7qqz?= =?utf-8?q?M5Kxb5i5ErwFrdvR5VaM5s2Kam+32PvY4/KdDzspw9Z219cLU7jZI0Ta5Zy6jZ/NH?= =?utf-8?q?bR63sVAlS32ximJ1G6UPjwqeMS4zhj1Ink9MT54Ih2kLxiGpiTRJv+hmvsETlHO5A?= =?utf-8?q?aVIrrWDY9uR6P5GCdFvSX5XsaIJ9FJX586/kjsgtyo8eaB55CRi298zuISFcPTNu6?= =?utf-8?q?TNiokUnjx+y5LNbpuAZWFqMgJVPwu4LjeqBTdg6oD639SIZChFVL3LUC8XjAWt6sL?= =?utf-8?q?090eoiX3aB7D3ZaCgXLii1ltSxAFl9DSp5pzZP0+mrqImYdKc7kNFxnpYtrK17aeP?= =?utf-8?q?atsOixDO8EoqklvNNGHjKdJW1YX/82eiRW8Qaw+8bGFzRtz5teQxRUufEoeTFGwTU?= =?utf-8?q?Cn8/2la7f6wuV5QnePYi70AgxdxAavQoLyWkcKRG7K8oMilGX1nj/KF35Ze1s/rZp?= =?utf-8?q?i06HpxWFM3xoEsShiy4in4IZRfOTnzhtN5mpnTsGbrxtnQeBPVSTnVAtOTUjJKlYg?= =?utf-8?q?BmUyIQDKcz/DSqBdDgKsu1aUTq8saWBg/Ktn+pqn+TmSksvBoSVoGDNVe6b6+GJlW?= =?utf-8?q?3/SmegxCApby6cCdq5SrLinlnwiYWuunxQOHqzNpzOIr+zEwSBv8FYpiKF2HDyxwX?= =?utf-8?q?nxY8nqNuSbu0blQNcFhWIUkjDDLbppdz5M5+sko3jBk5VXejwoqAOT0c/K0ppdHPN?= =?utf-8?q?u9Sc8pUH8Vyp1jurDdOUNTxN26AgcJBiBQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3940e799-f144-4193-4419-08db5a9b4e7f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 08:05:28.8164 (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: 6HZeI9OVOyIPFX5alFYImf4x15fIUjBfgzEXJ15HM2lpcw6qZvrU/SKTT1Jlt8dNNGg/qvLFjFhGyh84uxq04gtRrjw7AvJglS10qrbd3BI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6395 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 From: Qin Ke As rxd.vlan in Rx descriptor has been out of use and can be used for packet type offload and other offloading information based on comprehensive evaluation, it is renamed to rxd.offload_info. Also adds the comment for Rx descriptor structure. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 2 +- drivers/net/nfp/nfp_rxtx.h | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 72933e55d0..294e7431b1 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -428,7 +428,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, if ((rxds->rxd.flags & PCIE_DESC_RX_VLAN) && (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) { - mb->vlan_tci = rte_cpu_to_le_32(rxds->rxd.vlan); + mb->vlan_tci = rte_cpu_to_le_32(rxds->rxd.offload_info); mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 3c78557221..2f7369315d 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -245,7 +245,7 @@ nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta, } } else if ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN) != 0) { if ((rxd->rxd.flags & PCIE_DESC_RX_VLAN) != 0) { - mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.vlan); + mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.offload_info); mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; } } diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index f72c54fb25..73ef0a7c9f 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -172,25 +172,25 @@ struct nfp_net_txq { struct nfp_net_rx_desc { union { - /* Freelist descriptor */ + /** Freelist descriptor. */ struct { - uint16_t dma_addr_hi; - uint8_t spare; - uint8_t dd; - - uint32_t dma_addr_lo; + uint16_t dma_addr_hi; /**< High bits of buffer address. */ + uint8_t spare; /**< Reserved, must be zero. */ + uint8_t dd; /**< Whether descriptor available. */ + uint32_t dma_addr_lo; /**< Low bits of buffer address. */ } __rte_packed fld; - /* RX descriptor */ + /** RX descriptor. */ struct { - uint16_t data_len; - uint8_t reserved; - uint8_t meta_len_dd; + uint16_t data_len; /**< Length of frame + metadata. */ + uint8_t reserved; /**< Reserved, must be zero. */ + uint8_t meta_len_dd; /**< Length of metadata + done flag. */ - uint16_t flags; - uint16_t vlan; + uint16_t flags; /**< RX flags. */ + uint16_t offload_info; /**< Offloading info. */ } __rte_packed rxd; + /** Reserved. */ uint32_t vals[2]; }; };