From patchwork Wed Dec 13 03:24:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135101 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 54E73436D9; Wed, 13 Dec 2023 04:24:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B2A642E92; Wed, 13 Dec 2023 04:24:42 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2117.outbound.protection.outlook.com [40.107.93.117]) by mails.dpdk.org (Postfix) with ESMTP id C691042E47 for ; Wed, 13 Dec 2023 04:24:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZKBaHVVHwJyWSw+Z37fFfpYb++VzrP0tUc4EBSjq6ojr5MBWDKZ8uGf5+x5apmUqlByPC0pJSL7T7yMdyQQu8hy6Bus4NQP7DzyBHF/hJNjpvKefLeMuc7klLGhNhhYQuwwV7+9ZjX7ThhtfeHKE6giVcLY55uS5FYGLM9UF7ajlqMqjk3Q/z/UyCky8pwOjNgme3KiyynpHTCSX07nnzQI0pfnV0D0j8mBTUxhX8Ol9+u2gBXxD/IvKceAZrJoJkVr9vyd5YIgldhUjJFCW8psEj4f+qu+0n6nL43/KW9pbLfylAUhx29WGkgfV/Vx5zbypoILle5ewUxN9ewvh3g== 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=74heoaNXUp+QDPxUyCaiJBwRGPZb8AmU2cA1q3GfK8E=; b=k6rJK4UXskfPNT7ZaqY6mGKXqhjUhcBJH/FtAGkTMncuiTcbqnFkr5WYh59MXyozDFYzg82CdG1nJQtunWu3+jiDPn3WrJnageys6uMUNMpgErgx22lMl4vd1U9vgGeoeFs5hhkrWFVWlwCro7jzqLrrxe1VCZWqNbrZkNijgVRaPOHeSeHG2vpz1PaRNrGyp1heWJvKQrjseriHMGCAAc27cCz+G5uRC/4tUEoaRcWlWaXhmBrjRbmGNgpOz2tz7i4P2/osk7NPFbx7AQ0G67yklfjDoHT6Ox6g2bPi2Gc/IzKeeQam1BnOwqn/OmQ9oRKu6xZUsq76CddyGqXkQg== 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=74heoaNXUp+QDPxUyCaiJBwRGPZb8AmU2cA1q3GfK8E=; b=vjYPKQc9PqnPgloSCyqxDyJdidff8w+Uu7xva/ts7O4y+rrh9MBxTnBDjbcgE2qyLdIX5imGFydpjZNDRk7zi1K7zX3kYFUdFrbcGKmT7O2meWigEJLd3CKC3oZqp3qbSdcg3sIfOPc87WeYhD40PLR1eucw16FyY1w4/n0OA04= 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 SA3PR13MB6259.namprd13.prod.outlook.com (2603:10b6:806:2f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Wed, 13 Dec 2023 03:24:38 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7091.022; Wed, 13 Dec 2023 03:24:38 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang , Long Wu Subject: [PATCH 1/5] net/nfp: complete the logic of print capacity Date: Wed, 13 Dec 2023 11:24:12 +0800 Message-Id: <20231213032416.1988817-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231213032416.1988817-1-chaoyong.he@corigine.com> References: <20231213032416.1988817-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0351.namprd03.prod.outlook.com (2603:10b6:a03:39c::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6259:EE_ X-MS-Office365-Filtering-Correlation-Id: 65993acd-59b7-477b-523a-08dbfb8b095a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SGdgDQY514RDMM8zL/V4SiwieSboVOz9AvN4yQda3Wa7aYp6w1GpSHCU5DirodL7mjtNPb02jMBkV+NKydDbtppCWrYoDgVl1kVpN3ji/VtP2Hlmeufp4JNvV1OaaaY4srGFTA8ug0HaCHh7PxqsX/fi5H6M4QOSBwCarFdQuj313UmxAAlrzyWBrQ82k/qyuK9PwU7115hlWcez4tvQ87QUqJDvTkGikLlOqwZAWFvGTUKLcJMn7kEyiT4+3Q5rrksRS68EzihHUWxqai1o1sRsxHIkLGNlrfrJC9HkYaNvl28VZcOmvXKt8lr8hIGkwcOl1sngm4bAtK1LTVx6aXjKuTMYW/WU8V39Sdh20jtPaqPmmDOKOSFqM9Ua26TslqTNQpsroNZIM46jYCUsqAWM5OIZqNM82Z1NhGUZvn1CWF6XZgXjI82hJeF77T5N1tfoP0PwYDE23QnkMlYDOdWWSTJ74eo/QhY9HjgQGeM1P2QCdGMPGjDLzRgXMIK2ivXtPAP0EUpJ+rSZK7tUM7m5f3AGPVrCjph1yfim3ZJPHJe0erCjkADbbztm2QJiDxLA81HSkLkvotsH4s0g6qzTSAH88odiB5S4gzMBzhZ3tImeN2ic7DhwF4tpXRzoX6NRoqJy0upLOKRvXNrcPDUzYY4irQPYN/FDdXGw5Bs= 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)(39830400003)(136003)(376002)(396003)(366004)(346002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(54906003)(66556008)(66946007)(66476007)(41300700001)(1076003)(6506007)(2616005)(107886003)(26005)(6666004)(6512007)(36756003)(38350700005)(38100700002)(52116002)(86362001)(83380400001)(478600001)(6486002)(44832011)(8676002)(8936002)(2906002)(4326008)(5660300002)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 50Ci+75n3qM/z6mg+3AveNh2sALyAF2jzkWg9izoVKSRE3XxJvUd3UQJbvmWl7U0NX0LGVGk6urCP2nuGFE9uBYjOiF7xqa5esIzM3ggpeHag6Qshs199CyDUOJ62R2w0V7jfSicmNU+k7tllS19Sj2WozK08Ed0jzwywcwv/SWqu9WWn99Q8VCHqsnnrkc766jAAzw54MkJElyQeSgHqVdnEEs4xflAnFsWRfKfNc3njc0B+HhCAiys0VJolX5s78UczsoKApodVX8s7mM54ROAkg9ePbcmgfUn+JCjNca6cHCLH1CS5tkzslsr5eF7cFxh8wK/dtrK7WEbhhrcVFY35SncuCLGF8PPp/Ij+oezOp+ysPFfPNYyv9vpxU7r15cUViqjZO00+o22p7wU2VySWBSfXUnNVx0aN6IYIKi2ja0c+EXOlLTyTGlSyk5PNufUPfOAfikJyn5BYILjB8d/llctgnKVYSm3UnUYOykyJHLNAG6Ldvj/+g2S30qzrgC51edvtRt0SD+B3nlW+NXmGmq+/QZqUC4P7M0oGY2K9M//IZrYBXcf5xAzrAXin0iYkUDY9GkHiX8KypNsmyoDctN5kgK0ytUBloRnUnlXR0dfj2JcxRv1hEDtT7SWG41BU5Z4OYX1ufg1hg+MN/ZLO+MfzY6tOfkY3wvl9RzfZLkdTqB2M2oTaBj0jBElOqiW/n1tzz94wBbI5mWqBwNSEdegDVIpNnvJNo7wuApLrOvuYlrcycxVDtgOtYcoYknDse8VMPmgONj964qQucrjTVFvdOYlW8AVlE9kv9cXY5S5uqmAMaMtSPZn7W/T7IqXOYExhx2GMa5gk5ZSRL7Z6cKHaBgYN+w1KLaUjSRDZ/QWRXaFhnjiUIL4H3cht+hU1bWiEu1yxg4VXoPLDJ0M20VyTp09lvBsGHbnShTtVjjx8eG5YwF/aNE/OG2aMO/DMF9lc19oSdvzTRquyLlmxvKa3brv8+9CjxyEgJt23w+Nc7dqaY0JD8ryTiDhiLCh9EEmpL0gueBC9cDnC178wrQZsLZ1Mf7wjRM41ahxAzSCeuzC9sDg7DBizsQ/k0GWv3RRNPWNtz21sC+oLs2QDN8441hZVDnRZNuVJR7TwXEMXq9yLU+9//nFeIL3TssaCJZ8kbj43+lVqsH2zoqb2JNfOO61TsxA2jAoekoRkmPGdxLdk6mDqY25gZmt4o+PZFaTDIpTjmEotOPR/ToamuuFIJhwLuBsCscVfbsPIVVHG2BzkfaVsX7WsgnZgiSCyPXdHtmPbI65E+TRVJKin076ldyqblgTkPMYu5gonHfJY9t83w3gxqYizugKLkmbExCktzCMdLRk1hdTRQvwGY8ouPJ5IY3H9RUp61G6sTNP0RMZHT6Uigi9t3W3KzCrOIvnbKiTvHSvS+7Ota0qJLQGPYEfF8EvYijHYyhx/yf22PyCe8AL/0Z+u1K8Uy+HlkWcmzPyULTNOGuJWdhk69AEs5IZ6LXMW4oDNUbsshk+Z43sxsS5FulaoogZxkBkrq5/UFZC7UYYJxmVjxqhyo3OC2HwgfEsyqpgVW4+wUDAqjeIBrj2zZ8NgeHyTJClIj6OrHh/KYu5WR2v1Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65993acd-59b7-477b-523a-08dbfb8b095a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2023 03:24:38.1731 (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: wuRs/P9R21l0Zc29fi88NPgYzvrqj0xEsBFFGwwgUIkD5HHX+lCbDN2YLoNtShvLww47PJwhDQLAjhk1NU8KNjiCXCqyJkRpwXY6FVBNfRw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6259 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 Complete the logic of print capacity, print all the capacity and extend capacity. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang Reviewed-by: Long Wu --- drivers/net/nfp/nfp_net_common.c | 59 ++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index eeb0aaae26..79ce1dd837 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -306,28 +306,51 @@ void nfp_net_log_device_information(const struct nfp_net_hw *hw) { uint32_t cap = hw->super.cap; + uint32_t cap_ext = hw->super.cap_ext; PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d", hw->ver.major, hw->ver.minor, hw->max_mtu); - PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", cap, - cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", - cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "", - cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "", - cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " : "", - cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " : "", - cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "", - cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "", - cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? "RXVLANv2 " : "", - cap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? "TXVLANv2 " : "", - cap & NFP_NET_CFG_CTRL_RXQINQ ? "RXQINQ " : "", - cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "", - cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "", - cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : "", - cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "", - cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "", - cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "", - cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : ""); + PMD_INIT_LOG(INFO, "CAP: %#x", cap); + PMD_INIT_LOG(INFO, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", + cap & NFP_NET_CFG_CTRL_ENABLE ? "ENABLE " : "", + cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", + cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "", + cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "", + cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " : "", + cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " : "", + cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "", + cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "", + cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "", + cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "", + cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "", + cap & NFP_NET_CFG_CTRL_RXQINQ ? "RXQINQ " : "", + cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? "RXVLANv2 " : "", + cap & NFP_NET_CFG_CTRL_RINGCFG ? "RINGCFG " : "", + cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "", + cap & NFP_NET_CFG_CTRL_IRQMOD ? "IRQMOD " : "", + cap & NFP_NET_CFG_CTRL_RINGPRIO ? "RINGPRIO " : "", + cap & NFP_NET_CFG_CTRL_MSIXAUTO ? "MSIXAUTO " : "", + cap & NFP_NET_CFG_CTRL_TXRWB ? "TXRWB " : "", + cap & NFP_NET_CFG_CTRL_L2SWITCH ? "L2SWITCH " : "", + cap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? "TXVLANv2 " : "", + cap & NFP_NET_CFG_CTRL_VXLAN ? "VXLAN " : "", + cap & NFP_NET_CFG_CTRL_NVGRE ? "NVGRE " : "", + cap & NFP_NET_CFG_CTRL_MSIX_TX_OFF ? "MSIX_TX_OFF " : "", + cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "", + cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : "", + cap & NFP_NET_CFG_CTRL_CSUM_COMPLETE ? "CSUM " : "", + cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : ""); + + PMD_INIT_LOG(INFO, "CAP_WORD1: %#x", cap_ext); + PMD_INIT_LOG(INFO, "%s%s%s%s%s%s%s", + cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE ? "PKT_TYPE " : "", + cap_ext & NFP_NET_CFG_CTRL_IPSEC ? "IPSEC " : "", + cap_ext & NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP ? "IPSEC_SM " : "", + cap_ext & NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP ? "IPSEC_LM " : "", + cap_ext & NFP_NET_CFG_CTRL_MULTI_PF ? "MULTI_PF " : "", + cap_ext & NFP_NET_CFG_CTRL_FLOW_STEER ? "FLOW_STEER " : "", + cap_ext & NFP_NET_CFG_CTRL_IN_ORDER ? "VIRTIO_IN_ORDER " : ""); PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u", hw->max_rx_queues, hw->max_tx_queues); From patchwork Wed Dec 13 03:24:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135102 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 6A1C8436D9; Wed, 13 Dec 2023 04:24:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71C1542E9E; Wed, 13 Dec 2023 04:24:43 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2102.outbound.protection.outlook.com [40.107.93.102]) by mails.dpdk.org (Postfix) with ESMTP id 2ECCB42E92 for ; Wed, 13 Dec 2023 04:24:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q2XbqEqy/8jJWmDiUaAOgCpz5WcmWatl6KmMXCoNiuOBxJB0MjnnPH8fOSmfVbBlE0frmInBfq/p5yBziePaaC5U30PXGd1+F6puoJMeo2G6NMGtmLoE8PVvsn2+kSA1lsparlb5lb0epE8YmG5P05KACLnvzDTQYMGoIuirEyXFlb+fCzg6d+OW04dqQqH3hC0VDsef/av5I7RFR4i4wT9DRlnicdtBfQpE2WbyoMQ2MOTHeuJHACnmTzwVA+1i0ZpoEkw4i3/swV4SBoTZZPV3tSurXHg1T5O9BuFLGAoAWX+iyIz1Ou4lTJBLwAo9Zx30FVUmROpbGE61glkVGw== 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=XE1FElvBQFcXStFw9V0QfuhnQwthqFhqBQl47/uCa4Q=; b=S+sS006Bq+eSlUAaDDP/hb603QdN6XqKGshgdhresJeJ9CigbCU6P1IxbgkJ6GcEwPc+vl+5Gja3B2MHZjcZTXMspWYqcluSr5N066r5bDqEV8aUi57UzBAUcLiav3s/nwfC4aCSPExAU6OlOvT7EndFW+j9ufUMc6wt74HBumLDmKAA6lVMzs+rHOKRzE2nLzRX4sXIoXhzL6hgaXbEiVBkPQd2wYvWmATp03vFl05a/pTmGBPpgHUUDzvioudHjeol1di/l2ja6KwHabU3osll8F+hJBXlwmQqqGNO3tWe89HdyvtZbWpaSAMsbOdmdmNcXxUP/GfgiwTEa5Q0aQ== 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=XE1FElvBQFcXStFw9V0QfuhnQwthqFhqBQl47/uCa4Q=; b=isBrJbQU6evcSJJcYqi4tP2RxqriWSOWnEw6glWVQeVPZMz/XQIuI5Bmk1kpwHwRTh7JIudQ7f/oXkKO7fucqMOiH0lfjCY+YU240Z3HSQAWcZepyTFNLNpW7OJQP3gSDEngpPwnIDAF0sSLerS81lLXj0wf6/h1F7d3i1zOZWc= 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 SA3PR13MB6259.namprd13.prod.outlook.com (2603:10b6:806:2f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Wed, 13 Dec 2023 03:24:40 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7091.022; Wed, 13 Dec 2023 03:24:40 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang , Long Wu Subject: [PATCH 2/5] net/nfp: modify the logic of set promisc mode Date: Wed, 13 Dec 2023 11:24:13 +0800 Message-Id: <20231213032416.1988817-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231213032416.1988817-1-chaoyong.he@corigine.com> References: <20231213032416.1988817-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0351.namprd03.prod.outlook.com (2603:10b6:a03:39c::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6259:EE_ X-MS-Office365-Filtering-Correlation-Id: d95bab97-374d-4192-e2fd-08dbfb8b0a6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sRB+V7rzdxRS77pI4G2W72ZTdc2nV7hYRTNrYoWMj3SSX3K7up3q7OemujLqeX4h3ygB2CTvU40BdOZtzOP6MRBgwLyMBPBFunmHSb/ffmKGGRl6c8CKJj3kywCgOPuV8RNTfsKCMxOzSbbfQAPvRPtBdYNa5ZC9FVoj0w4PJ8HcUKn/eVSOY3QU0PnnMSPwsGq2vBfFEzy+kGgE1HGeihmgm7eIsR7dOyBNnSSbRH/B808aNQYyyN4iA13/4AKa36Lc7EadZ+49uuca7X9ZYntTdYIXvRPADLpupxrqsatrG1kYic2GSd2RtAMZaTJsAtH4Y7w/ggRr0WkQ0S39oE+W0bhrrFyeUpzkUWrchax5PE22zPnoY4xdX8WaGTvPXJRY+clZ0ctOEIq9kkdPHqJbKPLZvX1E5ex9cJc3o/JtT3iPNjCgV4LkHxVuWqUbq8KhIFjFusg65jI3oPDPUzhExeTexDyM2NlZ5HDoA4B1+bfizZOMJ5euxa5qImxD35K6CurbHedqlVBid41DxNLQBu1QgH/MjOvpjZYWdvsxNa3X7GKieOE6UQiHZZPniajq/wlD+gwVG7qqjND9Hkx9GuhhYxvfIDyWkm7xySeYUVf4BUBe5rmJ0E2+LlpfYDdO9snUPZUDL0OOiB6PFuO2SOBrxxxj2v+G5x4swKs= 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)(39830400003)(136003)(376002)(396003)(366004)(346002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(54906003)(66556008)(66946007)(66476007)(41300700001)(1076003)(6506007)(2616005)(107886003)(26005)(6666004)(6512007)(36756003)(38350700005)(38100700002)(52116002)(86362001)(83380400001)(478600001)(6486002)(44832011)(4744005)(8676002)(8936002)(2906002)(4326008)(5660300002)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NsFSevZ8mfM3YbQ69trwD19EJ6ZgEOIoQRBfe4mqq3QsimYyjKIK3X0WdF69ybMDcezMbpQ1IsHPyaAzwvPp+kBT7DjQELcd/PUswmuU1hCtIO5BS2jAGNKuThvmF9Xh7UN3aBg+zF4vOBv3b+czrLj1HfjRGhVG5eP2f25klHpfzY04coZuK6EPeAmJQZf1Ii1WAMTyOF+oLacYZbc3abgo6zWlVcrwYlLVQsGvk+3Isg55L6+dICqfIdO9mO//hTycDYIKhgkdm1HB35vWB8uv6EyHHXUvDURPMIBUuqFFE65GOIFqizvACA+WGr2hNLiiMGDxs946AHAWRYkn3X+TDQL37tCb9njzDt2D5IqmM5pQTfnRAVeDvuJ3YST5Aa0b9zRe9GgemNWUK/CL20j2ZgFcsMgRI16zsnTSuvh0yc4sQBPq7w2FyOiSKGojyQI8FnbzruU5rGmkr89WnhBmmIZpa4iDjEdd7exdH/gbg6wpvxQbFsBOm+e7aqNpPbRxIqheqxBHsT1vFEWl2fRkkIi9CJdlvIOvXE3OSoWGv4iHYYXSuOnK5JS8hoAXZ7hZGybkQ9/+XE3n4OeQa3HfMau3n5RDHmA+imTu+zp4+IzdukHs5L6f5tvt9lC9/E9ePNu8iHO4CRVbKaISy+hPfz2WOZ1nHrg1T2fnm1vnCxr6CQX3VQgQomqwwyhMKCwEDPkGpARHEpJI9mWlWVycWv12sQGeBIdXrFXBKjeXWf9DTBfICu36guKQLjzMCyWmhC1eCzRnwgae5i8IrbEM9E9WAD0g3bfeVOn60WxnsDK/ka2bJHWAA9TdCCu4n8sNkbqcMkIgI1Zjxze2yFSrS7G1gKsDfNkhzGiKv1dKxo6UUoTGSZXJNDv0RRggZtP3H/sJPQ/cc0OGfk9T3LXi81bqQYALi05NbwZkW1oAQBbDakSb1tGR6wvnK1xwYrx9yiTTYEZjdZU7uQMcxT13Wq7kHhneRFVwW8SJ59QOadKN6GHEzmk5UkHDT7uXX4OGETOjS4trq/TlGeLDnbHo+j/JPIsWfWnIKlQ70KaLrkvdKdkHAo0P23IhrtMIeY/ev42yzLAAGkaMpAo411NLvXWjohYhewIoYJm61j4sQAentDA7aA/iywMyPkKKlUQw9z+V3Z0uWDJxMgdeHDCuD06fPN7VWti9mWsprps+eN4WF5CN+wTwjUBWTnIMetSE5FN7h43BmJjann+wbJ/DKd2abBHYGPkIm3D8qpQHpa8fnnAsakj7BM3DCi74LlUgfPxZYo39Xi8J0m1xC0x9ww69dPiZdA0njwvmJaUSZ2HaeKTYlbJe4Amnrexws+rRU8IqLZOJiDBdC1hgIKqMwBTK/aYNSHhMXQmXYA+QvuPrkY8L+n92DzT+807OhdiF4pTL1O1VKtVIleEMDewt7bHXArKyaqRl9mXOKtd/SRITk2LqUxoVyEQPxHsg4o7l0rEDa/A8qO916YcC4toFL7tuFNF/60wO8N4SY+hjsAipjfVR4tC7YeGMJpfR/ldTDBgoQ29kf5TJ+vYoWUJsZLiIUBcAYdzAMEBpR6KqumHApKTLOGZcykNY6ALSBa7lpCQL+encdM3uRJJJ0g== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d95bab97-374d-4192-e2fd-08dbfb8b0a6e X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2023 03:24:40.0026 (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: 6EWnqcMYyKy5Aw7nuDGKjzrZE7UtxqF9FSDn6rodVpZN14pjxBLdtu/+vsCKdL0qzAR3ZvdJ5uvqKo2GKx3+jRAGts8EpSqfWCjt8II1iZY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6259 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 logic of set promisc mode, add the check logic of capacity. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang Reviewed-by: Long Wu --- drivers/net/nfp/nfp_net_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 79ce1dd837..12b62c1958 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -592,6 +592,11 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev) net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; + if ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) { + PMD_DRV_LOG(ERR, "Promiscuous mode not supported"); + return -ENOTSUP; + } + if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) { PMD_DRV_LOG(INFO, "Promiscuous mode already disabled"); return 0; From patchwork Wed Dec 13 03:24:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135103 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 9F941436D9; Wed, 13 Dec 2023 04:25:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91AC942EA6; Wed, 13 Dec 2023 04:24:44 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2123.outbound.protection.outlook.com [40.107.93.123]) by mails.dpdk.org (Postfix) with ESMTP id 2E43B42E98 for ; Wed, 13 Dec 2023 04:24:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uy6ScTyL1g8ZwElLZvKM0widVpBRXtEcLoYyd85Y9fFlPSZspC7kEutwP26KawBewQz/YOQkeZppoOSeDmhrKN1PCPLbR98w8wG3ioaiqn/r0heAo5mvACBmhSMLd2O5DeztUahCxOuWD/FqCX1H9YSORMheWEx2uuk8lBLt4ypQnaJ/YT+Qx1PGU79XVMrsSNWuU2r24SALEo9CBFeFQSQ3vDqYpWp3Prxj+FYiamUr8vIU6g3sTp5LzduFHOGJEvR2C17X1rGtYM2kAcBd9wvLFeXe3ThoCzy0q+sAKkIVYzm8rDHRmAezz3jHtcKORuLAwXfYGqRxhVflclA5fw== 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=sqMUidzzypRe6ziUPzzLsMDj1zZ0xOjpQXSijQRnJv0=; b=UTH6eZfTZCkyKH5++DAqpzHPlO2lfNkMixrIZncFrTapTCtEMIJJdCM7/GFVY+e4DAbKd3kNsnja34GPKAYf8WGpkDx6CID1xX8zGhvxYRxsvEGV1PFUQuj9a3IVYxFazUCI1JUc6q4g3l+pF9cFsITi1BKs8dGFi5GzrfP/xoOVVSYzflyLfzljL89KbWm2kLeAAxJ8Rg7AQMLksSpkvHnrj6Ji1oSDZo9RbNN/Sdfk6xT8xEFPm/UQkWY7GUrrebuheWQCuwBiaqJeYBMotqjYjyGswwRgsLONu2vHT7SXYpZn84xJPEtLfca18hm2i6jYSWo/ydQjEPrMuZjTow== 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=sqMUidzzypRe6ziUPzzLsMDj1zZ0xOjpQXSijQRnJv0=; b=stnRSPUBwDIUFOSSaIr2QMDW3AayEVXqtPVXxCgSngXsCPM77+H50AoDKPULP2OErUApTQsv+8mW0kAjlhS9+yyNvxFO5sbRyQDTXcQPjU73cTk3xIkkRCfsJi5UbLMEdiV01y8bvVUOOVzAGoS21n1lSXSnrzuE+oCe9t5Dz+U= 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 SA3PR13MB6259.namprd13.prod.outlook.com (2603:10b6:806:2f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Wed, 13 Dec 2023 03:24:41 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7091.022; Wed, 13 Dec 2023 03:24:41 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang , Long Wu Subject: [PATCH 3/5] net/nfp: modify the logic of set MAC address Date: Wed, 13 Dec 2023 11:24:14 +0800 Message-Id: <20231213032416.1988817-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231213032416.1988817-1-chaoyong.he@corigine.com> References: <20231213032416.1988817-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0351.namprd03.prod.outlook.com (2603:10b6:a03:39c::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6259:EE_ X-MS-Office365-Filtering-Correlation-Id: f89b70d6-720d-42c0-9b06-08dbfb8b0b8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SIUCf+tlEpzXuf6aJSMA4X+2Ingg4IlOdUZJ7qMIMBsec9rWvx1jthPEgunkYnchsaQ2tPWbZEoOFjXdYdqFHElE+nDuf+gtVy74ZT6QVb1JfYaPRijJ4UtKR8fps3Bo6g1kd9tf9PIGfQcUPk3fT9o+HXF+zYR4crlnU8ag+LRSJmC/gSZxy696/Cn1b0pH3BgO6NIVh3Z6L+HXVU6+hzrti2hEcrGW5yGFFzrEJt2hHsKR3NrwOXL4t4Nur0LM4c9WmOVA8110tS7cE2BhWzxD/SVCbhlQO/P/FoEnMklNCni+CvNmL0pHj4KEGYgibQAUD5ex4I33Z2ZGKkm8+jdCqye/L9r3uYbtySwWUqYYV8wr4PmPS5VSUtPC4SmZz4HktdVlg7yc04pPaIONxwdq223RF2c7Ex4ToE2Lo01DFv5NNpZKwIYnXkUnsGTNhq5v9zxSuB9dKvSizHeX/L7E2Fc980uSvlQ+8mZWuy37Tcv4Xr/xooIwwjy7mX7nxiH2Sy8eomEwOtFg649+cBJrFsNwTh/I7mYb13NHmewOq2TM81RY+Ed8acjRMO57jjw5TjUlIXbxYhu2whsiyRKClP5AcRhIdA0o+waU/lVq0Tp68qPOlm7aaQvE5wguKB1j/fUwvoY2F9JuGBRSc9H4SwHSMA0s9mWQ9b4XP4g= 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)(39830400003)(136003)(376002)(396003)(366004)(346002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(54906003)(66556008)(66946007)(66476007)(41300700001)(1076003)(6506007)(2616005)(107886003)(26005)(6666004)(6512007)(36756003)(38350700005)(38100700002)(52116002)(86362001)(478600001)(6486002)(44832011)(4744005)(8676002)(8936002)(2906002)(4326008)(5660300002)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JSEj5kejtNJkvNmWFkgERBHkWFJ2SoUVh80bGQ4H/egUW+6R5JUC5hejCqmhl7oqFkCLP4WvvAI6wAgjYi4pCZgIDKL5yUpkNgeADU7zJszqTHkXx9TFQKEjX7Go5P4K3/oMGNvQMBasG3xo7JjsYmdPImfIvezLejL2wVIZaGJkvHKa3DWUSB7roUsjKaB7fimzWw187DYN2w678xK1aG7TniyQ9hbHsizcnNdcC0omM06BSKQC1MbMHyikUk1De0nQ1hBeDzeAAXRN67LE2GjacJOexcaysPdEHT8lNvq0kiaJzgdG5CKvGML/7SO/H16le+ZqBrlzIAXcNU8jQOGp6AhzG3ZSj9b3WCZUcSpdkaB+ZY0alOH4JE4h948EojI3VPKazioSffQe90B5PYeFr7r2ZyNUOGuM9lcJmUb8qtz+P5xs7LmVZJpX2dWRWGSpn1ywAlE5/z1+5Y37KeRbyUKdF6UjF8tHU7u1/aehk+hdM26zGVXziBaAWXaO+YBhgjjoxxm0AorqNrDWHEmZ6DcfhqUDpxOjgHJ04Ms1v1bGGrbe08fB4aKIl6COTAQ4ZZvjJY2EtlB5a3jrurXBHd1NGk5uBclk9KYD3JseGWHbmY4yOgMeahFsgAHKzDYm4KxD6GmI/9iMGAOHQM0/ZCWIeZiiMeB60ZDm6oQTPJGOgGk8lPrRIQEY95JWJzgDhFBCQwKanGFOQ8C7HMVhOpWL7K/ZJvlx31uKHjK8LaAJA3SjmHaV52/LOmEiUdbNo7bTKuOm4vpjzy7A9Zmst2f4tHj2XT9nkPl4FbemWETeb7LZ8Mie1zYP5h90M4QxLQC5GbpXUDs8yv2oOHETV0vFkP3h5p9MDiF+Q+RES5KeNwGJRFS5CsZ+Y/Tb0eCw9v5jtOvrGr+69kOiujMdQLyP79bkOOVx4v7MoLBOzPUzvdwiFx+W/vpX5rA2rbqIBpMDXzURKqR+Lw1mQFtUG3Nhslszg7iTDKpBGEPNbwAc6CW/msnbqi9h7qX9+4u15zpRyAvUhYdXAfbPz2vNXo+z7RMiLhGin3qu18beB5lfrcIk21mSGgZ1BAOxlZocoq4pQCZnSUXfZunUbAnRA4ix93cUdgZy3CFZZPKT5MZcfBZ4XtMaYTb+753ueSmxsvd25j45k0odgGkoWn1kM1Mi1qNo7pbPxXHE4WR748lvW0ot2V5rHTnP4o8ND9jmzt5To6bhdbFf0ri71ksw3f8Jhlvg7aFmVwBkeru4lXwKnuyO8X+wd6tHlRdwS2sQLm/JA36FheHaXVAfLdKjhkXzy5M/KZ1Rg/LA1HfuYC28WeKGvD1/r43WtgBcXfXbGD4tcdsfEKKTNv9QvpRe4a/Z3y6BDr1Ix6TycoKeA1nGH9Q8N5VSUB4VIE+5CqJiMIIIIozc4alEAntwfWCmHBCmyJdB2yPidDzaT2MTxUG+mQRaND3+5+GYpoDG17BRDietO1jz8CLmLIWI15XvaWYZ9nj/gT8YF7Zq0W9MjisCUxuTRgNTBDUyq89zuGQosQ+KEFOnc3pQhgVeOGlxmBuLVFLrLXfMKFst6w5hpJsBRT6kqeZE57yWy0lwHX7clEomWqafcY0kfTdqWg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: f89b70d6-720d-42c0-9b06-08dbfb8b0b8a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2023 03:24:41.8534 (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: u0dd/1qZ+hhYUgb7ntmQjDqUTOjqyKovl8MPA2krsW+tkk+uM3uA4R7eFnEnxhm6qN4I3bZBbDpNNMfIo7JlcR/9jWpqLpBQ9V/Z54CR7lc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6259 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 logic of set MAC address, add the check logic of MAC address. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang Reviewed-by: Long Wu --- drivers/net/nfp/nfp_net_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 12b62c1958..99e2fc54e0 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -417,6 +417,11 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, return -EBUSY; } + if (rte_is_valid_assigned_ether_addr(mac_addr) == 0) { + PMD_DRV_LOG(ERR, "Invalid MAC address"); + return -EINVAL; + } + /* Writing new MAC to the specific port BAR address */ nfp_write_mac(hw, (uint8_t *)mac_addr); From patchwork Wed Dec 13 03:24:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135104 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 663C1436D9; Wed, 13 Dec 2023 04:25:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2861542EAD; Wed, 13 Dec 2023 04:24:47 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2122.outbound.protection.outlook.com [40.107.93.122]) by mails.dpdk.org (Postfix) with ESMTP id 6259842EAA for ; Wed, 13 Dec 2023 04:24:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VShy/99SolRbG6nVctnC9fLMLkUuEavQO2Gs/bdkXIX+ck0OiwKp90NzzqjJj2idIaqVGu0kyLkTKjO2NnlTs66DA50YmLHTLScbpCCKxDt9713GxEL2WTsOKHdrPWQ9JxmyDCifAlWGwIJrGaUMiVHfRojBr9R+ydh4qDT9As7gPYiGfo963BtBG3NsUo1/ZF9fGmUuvfXjYXq6d1DzJA8R5cnhVOtnz/rv7UaGT/s5E0FGRTPGxA9U5IHM4vOv5zEGmDxPhzJpWwwLuwjivn3STLBpIrhxs7sk4UhPg9jaRyhCNgN3USAIoiKlwyjGqylVY67q50uV0xUCzElQBw== 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=ThdNf5KHcVYED1ewsXXHvTONfrEiSHLzXYgH6sLZlgc=; b=LDTWMPFdEIzWDZAOYstkkV60htSOyinp8TMzOldKCn62OE8V+s7uUlHJ451JTjD+sXUoUgOTFltvpyoTxPeS/BFft5a8DCrsXQJ9yJRMF/mskpWrmporfxdcjJSdBj24pFJLvUEdm51eVlUTGRSBxW4ps66VAENzlvrMaTVrMM2Lr3Cd85M4quXwQg/ztGcjdvy0LUOHXORbHoVuyOC9FA2NxxBbXjKqBALtGcP5lQguNmrjd9lOYTrxlwcnMc2j6+9+fuBckNj7ovwkxC3bISEeXqE1VlpG7jHh6PFRSNOatS0BJNQyN0Fpgta3JAtN15tXhxsAPsB1MWFHGjHKhg== 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=ThdNf5KHcVYED1ewsXXHvTONfrEiSHLzXYgH6sLZlgc=; b=jnfEE2CnCPnoJIJVt6/sK5hmYZ1s1FlDTpcDZjnQ/Ug2yqEJ4FVucrrNfXUUPOsUAV5gt4FFVObTGg20m8386Gh+YRwmVxehyiA7e+ywWKyZseRO5bCnn42hmZfxF+LmyjWXDQDe2HOKy6O8AtVp+2TPv0Aq3JUdEPIINjThiHM= 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 SA3PR13MB6259.namprd13.prod.outlook.com (2603:10b6:806:2f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Wed, 13 Dec 2023 03:24:43 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7091.022; Wed, 13 Dec 2023 03:24:43 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang , Long Wu Subject: [PATCH 4/5] net/nfp: use ctrl to check the mode of features Date: Wed, 13 Dec 2023 11:24:15 +0800 Message-Id: <20231213032416.1988817-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231213032416.1988817-1-chaoyong.he@corigine.com> References: <20231213032416.1988817-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0351.namprd03.prod.outlook.com (2603:10b6:a03:39c::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6259:EE_ X-MS-Office365-Filtering-Correlation-Id: 93311fd4-22b5-44f9-8e65-08dbfb8b0ca1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nYDmMNm0qT7VTS84XTpF3qiu99srNXE99wMhbI9Ysm3hurjOW9U8qCbFFYDFv5bKH9iz6lbD0r+jO74sB79WveN3GhiA1Ye5oP72Nf6MZAxDZqF/9D0mwwWm4QLt6CV/rw44QveJHzd7wMMl35zRq3CEJMg3FUDk0mPgpPE/I0/Jo4mPM6yfiyg+o9jLrn3P1muLoCppgmuT4/WpN8UsqFAGLOJHnM+w6Q19cTRf9HHJEs60Hf3VGeCFh85k2M+K4LhSEsQ/Vj6NYAV0iiuM4h+vCiiHMMI1F3z0tMJDW8NkdkBlOWh+mJX5rOHwJadhjfeu/UoqxiXtyBWI0Qp/vXaaqQ63SwThmoC3o1572xfki5x7oOCKjzfsrgJxHUjrE5+pw49/FEwA7JXQk1QXGgJc/jkw79Pet/KCYMUGzTAfFwNFQorpmGUmr+aKla/dlmBIfF7A+1VGd2kf6rmQmYWFgghNjxKn0CXHmYH95vFwc4pm1pRkNL2fJtDpRL5p2/3dUeizPvbsfzf5CQVHIlnAlEDHBIQSGzElEzgDRFwU+xtdYaaiLR2klyYaFJCZVnn5SJcvkTO4wSfHQuZuW/kTesHRTYFWg85Vi0CEjp+TtbZ4QvqWGMXxDfYWIGl8c/8BKevTpzNNFbcnptu8WqA3PTxtfFKt91jHDsqiEVo= 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)(39830400003)(136003)(376002)(396003)(366004)(346002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(54906003)(66556008)(66946007)(66476007)(41300700001)(1076003)(6506007)(2616005)(107886003)(26005)(6666004)(6512007)(36756003)(38350700005)(38100700002)(52116002)(86362001)(83380400001)(478600001)(6486002)(44832011)(8676002)(8936002)(2906002)(4326008)(5660300002)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wgGqkp5P5ouQs0lHot+StuaalfSr/uM9cD0r0DEx6fzTsmUB08XfiaS12eKOkcJOT3+97aCAyL5O/f+tTa0QkpCPyDcI81lOx77lnE3RInrMAvmFv/6B5HM1scVuUqAwFpKzfNVmoJJegTilRTFLCt4BU7UMrTIwVSI9KjJV/GXBt1lJhgZMZQLHVnHUeHFOkq8GkWDmFXeTtUJAgjBs8NkqalTvTNsWKkC/6IC3wPzqNgD5AEFFC+wuT1rRZhNMiLRCiwJVo8xyHnaJwL3JHwbW7XNxxU3rn+XjMmbsvtf+4h+VxfTdsWexqCEfhhSPJbx5VtMjks8aS+LCMCxNUPmT8X0mrFJkoySnl7wyquellozGGeuuQMQ4Zxo7R2RUkIl1779JHYG3Eg1bwFDLF48/3B8YhtyKOdcscXwP/HbMrB7+99bbMo04O7AJtBC2DXpN2wXIh90bpQY8MBNC9qvYnx0toZ3brr8OL4iTNf/sFgHt+wEUy/S7VDyDCp9gzSvxzgUAWAloMxV41bGzFD1wbYOzIJfKM8TBuTbvF+RRs4lGg8Q2p7g/UoFfxruW/Iy/Q/696qb3BgAIzQ/Eob3EcFNFzqR6a7SSLJzLlGIkigIHpoSjnOny9yYLyIiDhg5BiCeIoq/lzR0RaSeOy2c479yIJWD/eUvDsP4UO4nYmgAPRMbG8pdFNv+tbGgAK6GIruSNU9jGQab/nwVKeD+WBqAd3byvN/4zNuidYLJpFmdH2MhaaRSLCCQbqn2yhzYzQvssp25xUUOLCtsHzfx0cUJxcGt1kW4lS8Lq74fGo68gRVYdCJWN1loyGKZDdx9uLt5NDggnvAjVjGlqhJHSIjZ/Ajmaq0gl9OdHtIjm+/WRz9BFx3DmbGplqWI1BRVtt9bMovO7e8VKljZyb+GAXCFpEittSMMq5esK3ljy9So6hya5ofQ27aPS/hCEf1EEt2TevWj5ZmfVOWfCDiFNkei4//U3MwD3XdrShYSc/ZeDz3bbe6MQqDZjtKbrKUV2hQ2KpxIJ4D9h1TPDz/sGXu1fEDMtRnHAI4qkjLVgFYN5xPWp1g5QVnTam5IX6nPnae5EFF0AzPS3GBz5eXVojAZtUVHCxj+jhRnuEvykAfIlCvEHA+RNg8fe/LWKaxcfP28C4gSbbu4z1spp+1umLKjE54ulBf77C9zHSokr4c/IHMoE/xaRIze+E+azcVyyOASiVB08I2oIWQ4ycag1QepfpSVpkGOiqZ0ZZ9THs8qyWBfT2rLjAW5QlrcHmaw1mDKkZETHjO0FVkWz8AvbGQlqzUfq/iLK1bUWCKT+SpVX60KL3F3f00O9NrcFqc73KNQdF5rJ3oBCzXGaHKFbj+G6VJxTzqb3dWoCpT4gq4yVCblkvZ21mxOx9gRIi9NAK1YcxVvFx4QYfgmr32aPW+uaEaciOGzVHw6p9Ug7CSsT2YJlyI3ICZKvZxIyLZwfbqr9wEd3CaPha+Xy7XdRssciaRGOFIsfhDnqcsaU+WDcIDDR+4yrhmh9bTw+GeUl0r4TdRzKPcT/pzZvOjILAR/5HYOrjaTW2g9JroENrkbQLG68+dKTTFJGMSvv7HTqKbWN4Jf7XqoeLJGuzg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93311fd4-22b5-44f9-8e65-08dbfb8b0ca1 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2023 03:24:43.6744 (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: r0NG71r/A4Sv3oXgi+a5hexhRJAetqhDP19OTh73Mmn0ZlwaFgFaLxpZ2YbPu0iOCfWQ7wdvDRqa6uiRMYbEsPly10k5iRa0AQvgSVC0ZaY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6259 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 Use the 'ctrl' rather than 'cap' to check the switch mode of features. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang Reviewed-by: Long Wu --- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 10 +++++----- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 12 ++++++------ drivers/net/nfp/nfp_net_common.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 3 +-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index ff9b10f046..56e57abacb 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -30,7 +30,7 @@ nfp_net_nfd3_tx_tso(struct nfp_net_txq *txq, uint64_t ol_flags; struct nfp_net_hw *hw = txq->hw; - if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0) + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) == 0) goto clean_txd; ol_flags = mb->ol_flags; @@ -69,7 +69,7 @@ nfp_net_nfd3_tx_cksum(struct nfp_net_txq *txq, uint64_t ol_flags; struct nfp_net_hw *hw = txq->hw; - if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0) + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_TXCSUM) == 0) return; ol_flags = mb->ol_flags; @@ -127,8 +127,8 @@ nfp_net_nfd3_tx_vlan(struct nfp_net_txq *txq, { struct nfp_net_hw *hw = txq->hw; - if ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 || - (hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN) == 0) + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 || + (hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN) == 0) return; if ((mb->ol_flags & RTE_MBUF_F_TX_VLAN) != 0) { @@ -278,7 +278,7 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue, } if (unlikely(pkt->nb_segs > 1 && - (hw->super.cap & NFP_NET_CFG_CTRL_GATHER) == 0)) { + (hw->super.ctrl & NFP_NET_CFG_CTRL_GATHER) == 0)) { PMD_TX_LOG(ERR, "Multisegment packet not supported"); goto xmit_end; } diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 0141fbcc8f..fbf132347d 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -23,7 +23,7 @@ nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq, uint64_t ol_flags; struct nfp_net_hw *hw = txq->hw; - if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0) + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_TXCSUM) == 0) return flags; ol_flags = mb->ol_flags; @@ -57,7 +57,7 @@ nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq, txd.raw = 0; - if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0) + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) == 0) return txd.raw; ol_flags = mb->ol_flags; @@ -146,7 +146,7 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq, return -EINVAL; /* Count TSO descriptor */ - if ((txq->hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 && + if ((txq->hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) != 0 && (pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) n_descs++; @@ -325,7 +325,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, nfp_net_nfdk_set_meta_data(pkt, txq, &metadata); if (unlikely(pkt->nb_segs > 1 && - (hw->super.cap & NFP_NET_CFG_CTRL_GATHER) == 0)) { + (hw->super.ctrl & NFP_NET_CFG_CTRL_GATHER) == 0)) { PMD_TX_LOG(ERR, "Multisegment packet not supported"); goto xmit_end; } @@ -335,7 +335,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, * multisegment packet, but TSO info needs to be in all of them. */ dma_len = pkt->data_len; - if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 && + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) != 0 && (pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) { type = NFDK_DESC_TX_TYPE_TSO; } else if (pkt->next == NULL && dma_len <= NFDK_TX_MAX_DATA_PER_HEAD) { @@ -408,7 +408,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, ktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_cksum(txq, temp_pkt, metadata)); ktxds++; - if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 && + if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) != 0 && (temp_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) { ktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_tso(txq, temp_pkt)); ktxds++; diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 99e2fc54e0..fed36dac53 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -540,7 +540,7 @@ nfp_check_offloads(struct rte_eth_dev *dev) (tx_offload & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO) != 0) { if ((cap & NFP_NET_CFG_CTRL_LSO) != 0) ctrl |= NFP_NET_CFG_CTRL_LSO; - else + else if ((cap & NFP_NET_CFG_CTRL_LSO2) != 0) ctrl |= NFP_NET_CFG_CTRL_LSO2; } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 3840e2372c..f775f25cb2 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -391,8 +391,7 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta, { struct nfp_hw *hw = &rxq->hw->super; - if ((hw->ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0 || - (hw->cap & NFP_NET_CFG_CTRL_RXQINQ) == 0) + if ((hw->ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0) return; if (meta->vlan_layer < NFP_META_MAX_VLANS) From patchwork Wed Dec 13 03:24:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135105 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 E3E49436D9; Wed, 13 Dec 2023 04:25:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5018A42EAA; Wed, 13 Dec 2023 04:24:48 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2103.outbound.protection.outlook.com [40.107.93.103]) by mails.dpdk.org (Postfix) with ESMTP id D789C42EB6 for ; Wed, 13 Dec 2023 04:24:46 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kpqLEag60s3kh0QUPzIvzrPJIRWOz/pSLVC8Vza0A0aAHbiiW8QyNpY1cIEO7O6Ds/5SK1YGBNfPT4Rl+j7IQvl5vBVKl3DWneTOl3AC5LgxlE5KQB/Z93jtCesageuklVk1023aTnhFwmI4b533kwYQ4qMGOPNBNzImBZ/lHqVtr1vptCj2Ap8J5M4/tMvwrWZlGdbSeZKoiUaSA3IwluYD/0jwxLprTcBIVNpxQrKNF/TQDmHAOgjRI9JAz1Rf0wy2HlBLc7xu/AjGitWEzKwrD0XjLyDQQXTLW2zp7OJehfRvsNiVkKyQXCYwipxFCfqEdM6jIuBpySgYBp/5Tg== 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=vrN+Wc4Jo9MSspw3dinuE6wXwEbnXYKeJaQXxUVUlg4=; b=MfB59xioGMlDLFdJ30/o5dwb3AiAqlimROMCCOBLToDf/D1/B+9RWaNe62ivV9nhD+L43pdBmYxXzzoBjxg1LqSmuWIEob/Ds9gbASZb6DH6tsnVGd50lrxaD4iwZEl1Nd2ObD8zZ8cfKqjq1pgnCS0TJAW1SK800Rac9970iwf4PhUG93BQVyoT0kGGLHgDRCskT2s9GQx5gexYp2FZFha+UiwYYsBJLKmDYSOO0deEBV2xIb46WTEvTP04VG7+FGb92U64oXcAijpGIdWsc5oF4ZqjLQP8xLOG1kSraveg0d4xkvE7s/qqwAyDKIUCAo44R9ePtyY17qLwpaj2tg== 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=vrN+Wc4Jo9MSspw3dinuE6wXwEbnXYKeJaQXxUVUlg4=; b=Zqybhx749oKJYiH4son5lTSRUSJZrASlAL7UIwlA1Hjb+wSrlfKdRuYSpFECsmbqHhFM+kyqBqBklXEpaQFdtkGFKpAKVieApXpH7GgD5cHxBScj3hYNVXoumOe2EInTj6xdTiFaBLyDrorIqUNjVjbbaeEjEZq/9Dwwil68Hys= 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 SA3PR13MB6259.namprd13.prod.outlook.com (2603:10b6:806:2f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Wed, 13 Dec 2023 03:24:45 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7091.022; Wed, 13 Dec 2023 03:24:45 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang , Long Wu Subject: [PATCH 5/5] net/nfp: use ctrl extend to check the mode of features Date: Wed, 13 Dec 2023 11:24:16 +0800 Message-Id: <20231213032416.1988817-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231213032416.1988817-1-chaoyong.he@corigine.com> References: <20231213032416.1988817-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0351.namprd03.prod.outlook.com (2603:10b6:a03:39c::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6259:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b8337a2-112a-4060-81f3-08dbfb8b0db8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2hL4oQKmVm8FZ+DBvkdHhwiZEwCOIPaFqex/5z9edzWoQMLL55nGQATb7eHzTK+kQG8BdKsZZ3irD1UQf+mLax4KgN6kDq2pZcAFlWc8aU5EwTOk0ZxzABXC9NKx+nt4ZZZqBZIYJnpCtlxJPyr6aQNVzPS1o3ovD4UHuG6N9s//JKAfTdbZAZvvrlRZ7obpe3u9Av/Ww+cHr1d4veNn9lA+MkNJJea6oUS29IugrVYVE5LRygUEkVwnQUa1Wly/o92kGJsLbl4fdJeOIx5Oh3fiHu62z7nfFRS0vcs5Uly9pO7k/+JQmZuK5kgCEiR2vijSHPVu3Gf88Gs/RJoroVe1Be/no5/Tgm+FjweXrnKfguJUipruIy8ix0qBf/noL7N67jdLhE3HaPG0mpn3ON3ZjBnbwMce6EF7D9ioK4/WO5gl6Y14sBbmilmQyCS1yb3DZtpC7cuB66O5bDzhFt07kzVJT6njIdnA4BwZPHjVSqkf24Pe1UPzds20sbaPc/ANghdeKM189GSm64JynfYL/uqPa8eRX4Efz5gkqEGdnmwWEZooc78JhcY6p1j2VrWTQNAOcVBikOr8L1TmLBcb2Gk0hnnq9eLIn9xRa8g5Dexuuw8X2OLs9IH0pmV5vVr2G3zuDv9cxaozEPgFR488nlWslameyjyxsyZJ+j4= 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)(39830400003)(136003)(376002)(396003)(366004)(346002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(54906003)(66556008)(66946007)(66476007)(41300700001)(1076003)(6506007)(2616005)(107886003)(26005)(6666004)(6512007)(36756003)(38350700005)(38100700002)(52116002)(86362001)(83380400001)(478600001)(6486002)(44832011)(8676002)(8936002)(2906002)(4326008)(5660300002)(6916009)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N8apJyZkqpHscg3ZIKRzuK8XsY+bPHdvoqkrPhwJk+tnwjfNwiAStxiVnAQ84fpSiVgO1JTCn09f8a/2CPXz9EQADHUkInlkQ111K/kzMWkjfEjtdQpzkTA4XXUJBsTExUZho0OKj/+UqfqABt2lO9ti5+b6a2VG+7m0Ta7E/PPO6KoVPBFcYjBpr+PKFIKscfR8RDhJ7aA4nuLmf/mIdTE/itievoNfyfKeIc3dAkhw/4YGy1QFYQWuH8x9WrlKw7Kz+jpUK7YO0+1WZAKW9b0QUzFX6rdfFPv2SbeR7peW2/RkFyk0XXjdq8fu9A4KdVhIfV+sYwRreB8EnEaeHpbojWwWMCA8Mv1TPnTvDWgZ9wd5QLtPBxjx6AVA/UNU+Y2ddHfZTAJmiwmkE/gYgbETkUITsClpAnKh4s8MwH6YwOxsH71fFq+hwktKc5eKSZKKvrkL52ythMEZIbyaiX3xiE0D9fK9DW43pjhevy7/RRDslC3rIuwDDDLksAig9ZKEeySYzIjnblQCEv0PfnN9dvZ0CjiYJZHNVfMvsFDDm9kduG9PDV0k6nt+iK60XHRKhyAOOZlzZw7sQrJLpNT/xHUEZUHNt2ZR9yOjHXNM52HOYY9TLeZWmHhhnEO0ByiRhZExx/M219MW7yz2rel6wpIQE03v39mh0logBRtorm6DT6xJlMHPfogImHLj2gBgpC8s4oXQGDPAy5o1Hj+M1uZAq0hgRKUmq4YR4+Ma1gE7Y7YJ7jlN62L/WLpMuNkTFCSXMkkp8rQmn2KZzL1PW4RFYxFOFEqHo+cY14+dg6FYvMVT2JSVXMZUEfPvHmA5VkdwurNdT0PxOxjdfA4xqL9xhYJ1YokGn8PICZP/jJnGu5MsO43jr0G8l2+EInSOSvBox/pea1UO+IQDmSdqxDbXC5blWgsgFqUbqMawfZ8viejvnOKpKYF/wdCIzIHN3ysVOog5JCXsdFQm78Z0vfAfoLnoxadZtFN2/J6ndYU7C6Wp9ZasoPfYgDToyLUa46LDnEulHYvBFM0oZTAi64GamdX3RcL0DZdmsIl425NDt31xJMBQDboNYzsLfz9iUIhX6lCFxZJlh/jwJNHAhYtsvSpQ+YCSQSP2ViqpyIUqWKL++7Dq3j0HzUIEM8An+myOtV7SBAtwtAHy/7z5EKBQMPshW/sM46G1fVjUzkMdY+YKKdfpM0nSmHe9B5hJN3QoAI5p+Q8QTXa2yyCSjOW9Nt/4iCkCYognWdoih8fX7+tsP9AeV4gLOtm9w7kATk2Mec3D19YjFrYh4K26/gL5xiK9SrOqsV2NdksFu50i+ivBi+NwMAZqKb9n8MyijK/e7P8NYV/c5z1n7sThQsskhxgvIVqyu2Cj8CDRrtQhSpd6KqAs23orIuMzlL1LQbGMcS9HE4WPh7DTgp7dN3fz1fW+mLpWpcHMgbcExcpDM7FP10408KrM0vB32hAfK8/Kx894y8qCrHi0ButF+MfmaZwIbbPasvcFGU2eOx5ExC9twXN3+ByOEwuzGi8FfGMrbE+JGJI8HGAl+RB+T7ynyLpqp/mJqltQMGGqmFX/tPLhs0WM05yDIiAtthGbHbyiGcvYZ8IrTA7yHg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b8337a2-112a-4060-81f3-08dbfb8b0db8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2023 03:24:45.4818 (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: M/pyi5AuoBh89uwYuDS4dqQh3wqOi2Kgutq+YtcKdti/qnl69WaKyTXSpIQ8wK6+FColT0a1JOgYNLwQH9E7lVsTbCLLhFiNW+XqDB0XAJk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6259 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 Use the 'ctrl_extend' rather than 'cap_extend' to check the switch mode of features. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang Reviewed-by: Long Wu --- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 4 +--- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 4 +--- drivers/net/nfp/nfp_ethdev.c | 5 +++-- drivers/net/nfp/nfp_net_common.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 56e57abacb..fbc2dbedf4 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -145,13 +145,11 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, char *meta; uint8_t layer = 0; uint32_t meta_info; - uint32_t cap_extend; struct nfp_net_hw *hw; uint8_t vlan_layer = 0; uint8_t ipsec_layer = 0; hw = txq->hw; - cap_extend = hw->super.cap_ext; if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 && (hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) { @@ -162,7 +160,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, } if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 && - (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) { + (hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) { uint32_t ipsec_type = NFP_NET_META_IPSEC | NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE | NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE); diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index fbf132347d..72efbffb42 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -175,7 +175,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, char *meta; uint8_t layer = 0; uint32_t meta_type; - uint32_t cap_extend; struct nfp_net_hw *hw; uint32_t header_offset; uint8_t vlan_layer = 0; @@ -184,7 +183,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, memset(&meta_data, 0, sizeof(meta_data)); hw = txq->hw; - cap_extend = hw->super.cap_ext; if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 && (hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) { @@ -195,7 +193,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, } if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 && - (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) { + (hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) { uint32_t ipsec_type = NFP_NET_META_IPSEC | NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE | NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 185b570892..886b568d96 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -303,8 +303,9 @@ nfp_net_start(struct rte_eth_dev *dev) ctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE; if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) - ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP - | NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP; + ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC | + NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP | + NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP; /* Enable flow steer by extend ctrl word1. */ if ((cap_extend & NFP_NET_CFG_CTRL_FLOW_STEER) != 0) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index fed36dac53..a438eb5871 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -1371,7 +1371,7 @@ nfp_net_supported_ptypes_get(struct rte_eth_dev *dev) return NULL; net_hw = dev->data->dev_private; - if ((net_hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) + if ((net_hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) return NULL; return ptypes; diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index f775f25cb2..cbcf57d769 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -617,7 +617,7 @@ nfp_net_parse_ptype(struct nfp_net_rxq *rxq, struct nfp_ptype_parsed nfp_ptype; uint16_t rxd_ptype = rxds->rxd.offload_info; - if ((hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) + if ((hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) return; if (rxd_ptype == 0 || (rxds->rxd.flags & PCIE_DESC_RX_VLAN) != 0)