From patchwork Thu Oct 19 06:17:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132969 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 2241D431A6; Thu, 19 Oct 2023 08:18:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1186A40263; Thu, 19 Oct 2023 08:18:21 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2139.outbound.protection.outlook.com [40.107.243.139]) by mails.dpdk.org (Postfix) with ESMTP id 693D74021F for ; Thu, 19 Oct 2023 08:18:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ci0h5ucmEJqaaOZN4eNsDSFPSPDE8lCIVuCwv8fNjWhInz+tLY7Rq4ZrufVi4xLNj+Jo+Y0tPItXA26C1zDrSsd44sAYYO2vsZeM2Y6w/jlDoElHz4PDwP9f3FsnHJbs43H9cBg4zrKDKwovLpqK7QqkmKGv3jeDqGkDI1JLhLzIabYRd5Q9g0U8NQQRlaaYPxkAb4HM0D1AEWxCHRW7JCdABHzRN4TCoeMJdaaeq+hyZblezsGSBH3fcAcjWBIU+LAhEjaOXM7zwzxrD5pgAncX3bODnkwtn0ns2QwGVX6o11od7snwB2eO9EjH9T1dT0FvzJf3kHAGw9S+aX8hBg== 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=8elHKvXHOvqSgYO1qeUu/ci1KG9Fz7SNcc/cNzafsc8=; b=UGTLNWPAwYzc44UKae8BwzTYEuJPBKj2lcUKsMyT8AEVeXWjJHukF0UzKiQuXItjBGON3ASisG8eeft/n6hHpIEXloa0EIKVuN0F14362ohoCcMzmEGvHo79iEgkE0KL2UPiScPaBEveeDvwLymJL1Kc08d1HVPHbYg0ohDuU1YurpkL82zTWbtS0Wgx3YoBQuXF5GZhpwqsgG+2kdfLI7WjxoRzhsMx36D5sfBLTLibNJUUDAMwyTl6NpfK4DVdm2jMIWKeF516gfV/NFlmA4wOt9kgT4AUXq4PUXxvOBb9OaYFreJ0xDuDQc9OHXphi4W5OZ+oAxpC3y5yITWK7Q== 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=8elHKvXHOvqSgYO1qeUu/ci1KG9Fz7SNcc/cNzafsc8=; b=SogQIutVcdWVJI32fxAzDe5NFnxNbJtfv3BIBF6gv3unsmDiuXi+S/4RmrjHiq8Dko9kGjc5fv4Mf/v5/ciMV5gbBPnSbRnNFl8x3hQoTbXpyu47XlMCO3aKgsRKLEjSXlY6qeI7SwXKWYhTNH3MserXHm+WLkNsl4Mxbx64x00= 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 CO1PR13MB4886.namprd13.prod.outlook.com (2603:10b6:303:f5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.24; Thu, 19 Oct 2023 06:18:16 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Thu, 19 Oct 2023 06:18:16 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH] net/nfp: update the supported list of packet types Date: Thu, 19 Oct 2023 14:17:51 +0800 Message-Id: <20231019061751.2018518-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: BY3PR05CA0036.namprd05.prod.outlook.com (2603:10b6:a03:39b::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB4886:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d076284-fe82-4a59-e8f3-08dbd06b2e13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L+SsoZg+Ytft6tNhJmGXjnRVB74AhnjHuuM/kPO0W3xAMLQX5umRcYDw99yOfMrKCd0Z/flwM7wLyexASIK1MKdlmXBk76daBsuTkOgCA0pXVC19ckmLWCxvnHoGZHB8mOzY/Ljsql/S72OjuYcUGUw0H0nO81VZMfaHMaGhzUVUJeYwxKuePF/GVViqAqWLK/gjJ+3nfmI0A0RXcp63SEpy1yn9CJi8f6qwL0Wgd5Qhd0rxzyx6H7vl/xB7B+fD/diveyAburUwan62NTFC22tme4ifKWM91F/4piaFgNEho7wJ2JYWbwocMEsbfirJkNtMh19rW1BatqiLfo/F5UTrqOOaDocfa4+iKuE/DnG9d/H8XTMI4fg6E0Vor8xW2w5NsS7fHe57Qdc06FF1a4sN0YqYcYDk5a2c7DmSAZeI2xFWQidumkaXP4VOWhAWY7x2ig0ELz9lqdZTVBgt/LBGmh7KbeHtT6ZE6RRkvYlWcca+8geqC9rmFeRycULqFj6bRCnsZvVL0e/fZSgpK49EjaY6UdONZNRptr4/sOzctuPDgiUm1HpGMXbt9mc3kkybJ7fukNkBzzLASep0t3Jm7Fzxqa8aBjHceelcrroQaosgOW02Yj/5TSek8AbqPTuX1rF/4pt2gtuV1p1DjZ7KUSFxjI3fwXz424iuujM= 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:(13230031)(396003)(376002)(39830400003)(366004)(346002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(83380400001)(41300700001)(38100700002)(107886003)(6512007)(36756003)(2616005)(2906002)(1076003)(86362001)(478600001)(6916009)(54906003)(316002)(8676002)(66946007)(44832011)(66556008)(8936002)(5660300002)(66476007)(4326008)(6506007)(52116002)(6666004)(6486002)(26005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ANtcMMaG2td1VDFcmjV7zRvl4ckzl2dKWuV7qkQWYSbbuegVHeavqWswN885zCdHDgvKWpANyXMArF7+jSd0YhMvpBAki0wWiSvqT3L/hCGzC0uqBLGvdBUMIEjK/x/3jY+ZRunhha0zxEkJMi0sa3cuI+c7jGAma5D4eDsHBoIoaE4emHfM22mRD+neLQiMhxy/jslHTqpVpZR5D11UNqpd7vUasftkVqdSp44mFKEN62enKTBz6qlXwFIEmSPDJBHs/ZmL3/O1n/g411rq9P3J9+fdegke/qjHCp5sRIApD7oTVh3PYBRkRhLxmh2G/ol2ksPQDkw/+PsaTQGOMWbx1byw2Q10j6MxmWkKxIfvuKawvpeqMxVPzgTxNLkx+yRrJyS2f967yBUsNvSSh8l3dkEwdfLH0+ebiVFMEMv7ebSNGZj7goUS4qn0nyNmVcAFyn3r/RZ9wRgbUojFmvlB80qOYXKinMlzQ653IpFPOlcnfTbp9GJUe/M/yFyVTyZJlxRdEBYSQmYQvokdrcQ4wrWxsj763l8/IXCR81VoCWrO/t9SsFGXfeMyZcMtLTiqgb/+vvWAa0U6NOk7sFr4hbJgbz1O4OllHWVUWLj48PBDCA0fozZyASJFU/V/z3VPg8pibC9v7p9nK9KOSlVMvt9KE/HvIOdCj+0kXm1oONTOKT4gqmhChIEgxKOsULyeg+351kHIZrqpkUX7wG1631AvKtJ8x+yuY6fy5utzWlSNDVb3vRyPTwrbN9US2LQhKaSV6dC21NNfgpeSOgT2HIXAoRW7I9QEvGR0DtZUX5tARj5Vo1TDK31vy11WNRzbkIQGsM7e0maNHEjhLsUfpxxr+dY+CJnDkzvCbAGNVCEuyckdnknffD/3YDflKMpWlHd/TBlEklBOKvltUWy3geyPpeUP5PaBFHgJlPgF5FbjNCvGG/3ZeMHxfcfeZLod7vAJZgHHduuAecg1FmHQY3406PRLDzCOexaJxFWn0YB/Hp6eZzV1Ow/75ReVDyxcXKz7BVwVwKC1Le5W7wyOMv+SuFnfThx0VIpLbtSzqqHJ0CnWT5xQ2AWb7geckAwwBuKqeJwRDRskyKNlmPKzWaa7j8jsu4L2SAZHnv5AUXfVHdOLu21WaC9Zax0sW688IzVYLe/X0Cus69UtYPAl0AwntYjhWsOsJFIcqf3CiL0pF219M8I/HdBW5Ae09NwNcjVPikaU1r0LkyCZus7fmaC05yAmQzpEfRrVTiM6WwdFH41mqKul8i6NKFH9+W78pY0ACm6cfKV/B1RxCTMq4Pu6zgZBd0AMr0Bjzmy/ubDT2oO8KjgaAXMvcDLYK+ta6nO20GMCYHEmlwj5ehmMddiGHbxdtNcZiq+x9IFTxC91/JCuOXY6OobylznZL/yHCDL+HAx7IO6o8+6FtcJNPHwUD/DFoDiGIh420zoesOijlLEinsy/e841IoIQu9g3AIFtShGgpBlGUt/LHNnUbINFl/3NfJJvkdaeo1MYq28SSt2C8CcuO42XCbcYtC2u9ShgstYOfYaDQva+ZQfa2vYiN+EyJzYIG2dyXPF1ZaqyFF/OI7eMn7R5S9g6gNUAiThu8Dy33+6Y0IqvFg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d076284-fe82-4a59-e8f3-08dbd06b2e13 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 06:18:15.9253 (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: 61L+CWXIsBGj4GFNNJp9y4uD+ax++FKGwG3rBxq3UTErQ7RmlUnYtVN0lHyc4xmI8Okt4XgZwygatKG1lCE89LD//Is7H6v0QVG8R6wrsNY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4886 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 The NFP PMD supports reporting more packet types then previously claimed, extend the list of supported types. While at it add a check to only list supported packet types if the firmware supports the feature. Signed-off-by: Qin Ke Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 39 +++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 2d4a7635ab..10a2941fc9 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -1357,18 +1357,47 @@ nfp_net_common_init(struct rte_pci_device *pci_dev, const uint32_t * nfp_net_supported_ptypes_get(struct rte_eth_dev *dev) { + struct nfp_net_hw *net_hw; static const uint32_t ptypes[] = { + RTE_PTYPE_L2_ETHER, + RTE_PTYPE_L3_IPV4, + RTE_PTYPE_L3_IPV4_EXT, + RTE_PTYPE_L3_IPV6, + RTE_PTYPE_L3_IPV6_EXT, + RTE_PTYPE_L3_IPV4_EXT_UNKNOWN, + RTE_PTYPE_L3_IPV6_EXT_UNKNOWN, + RTE_PTYPE_L4_TCP, + RTE_PTYPE_L4_UDP, + RTE_PTYPE_L4_FRAG, + RTE_PTYPE_L4_NONFRAG, + RTE_PTYPE_L4_ICMP, + RTE_PTYPE_L4_SCTP, + RTE_PTYPE_TUNNEL_VXLAN, + RTE_PTYPE_TUNNEL_NVGRE, + RTE_PTYPE_TUNNEL_GENEVE, + RTE_PTYPE_INNER_L2_ETHER, RTE_PTYPE_INNER_L3_IPV4, + RTE_PTYPE_INNER_L3_IPV4_EXT, RTE_PTYPE_INNER_L3_IPV6, RTE_PTYPE_INNER_L3_IPV6_EXT, - RTE_PTYPE_INNER_L4_MASK, - RTE_PTYPE_UNKNOWN + RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN, + RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN, + RTE_PTYPE_INNER_L4_TCP, + RTE_PTYPE_INNER_L4_UDP, + RTE_PTYPE_INNER_L4_FRAG, + RTE_PTYPE_INNER_L4_NONFRAG, + RTE_PTYPE_INNER_L4_ICMP, + RTE_PTYPE_INNER_L4_SCTP, }; - if (dev->rx_pkt_burst == nfp_net_recv_pkts) - return ptypes; + if (dev->rx_pkt_burst != nfp_net_recv_pkts) + return NULL; + + net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + if ((net_hw->cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) + return NULL; - return NULL; + return ptypes; } int