From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6DA0A45909; Thu, 5 Sep 2024 08:26:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4709042DD6; Thu, 5 Sep 2024 08:25:53 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2137.outbound.protection.outlook.com [40.107.92.137]) by mails.dpdk.org (Postfix) with ESMTP id 91FDF42D92 for ; Thu, 5 Sep 2024 08:25:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=L/UhHw1/XUXvD+KsMbL+jDKAjrMt6GNbCxmOvVcqV/0qp728ZmB8e3B2gibFdhISRDl+IWCuXsjTMRG1ofdFhHsHn1gwLckpwt5l93Rs2BszpAbYGBzGlGakH/qmEHZOz+Jenv9nZ5yrOqLeTRH24R5NnmO+FQJqml/3jhcpXkpL3UT3jvcIfGN73mt2AHNpElSGj76blZSVBDJRD8mnjtgVNS9AeVqoi9IYrvd9KjOgLBwE9bQQBoiMKDg4Bb83ZiuS+JGcU6jqS5Ttwp3CBrfbtb5DHP7DypKIhhDQ+94o+dn9EtQ6JtlmTaq7BnTJX0Qs8ZzA/rYiqC9xQd51gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=VjGvxn5EnIit67nd2uOjNaYsPi7InB/goVhEYIsOv0c=; b=TBk4KrAnVMZiv0LjMhaM/xpJV2QCDP7anO6Ing0sOJORG0+R34yQqyXOi6mNlRqce2esPLkPSwxpZ9d4x0EII1nC3krnTn+gOinskhKjCGJpMyjGJK4YUiAYqf3j7u+k9IshcqBYbgpsws2F65bDc4eodUcWgbR0dX8jLC5JX5NwhqooKHnp6Xp2lApVAHmIQ9q9a4eC7mKLBPqeyF6gLfN5Yvip2s8lyBHO26UjpE17NkQvJLLKvoPy/RwP2EoIGjKW8i2KkpcN+22+vw+6xf8BfDscIgZUB0rgg4/5Kj49lSzo78VEKoBfkFOUe43g93R4MeO3gjxhiND3TJnfLw== 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=VjGvxn5EnIit67nd2uOjNaYsPi7InB/goVhEYIsOv0c=; b=SCb3+Pxd940vNIQuLAxTRUWqzp55KoQh/fAUriZZ4wC06sXqDiZL2zbr42eu2XLUasXZJYfTh6f4853axgC0RCaE5OHMkRPdFmM1M15Wqa9AcoE0oWOZLYqQJZHSieFLi397dCTqR56WcyIIqMBfOd14F1KhMRW+DkcJ60q65o4= 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 DM6PR13MB4147.namprd13.prod.outlook.com (2603:10b6:5:2a0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Thu, 5 Sep 2024 06:25:50 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%4]) with mapi id 15.20.7918.024; Thu, 5 Sep 2024 06:25:50 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 7/8] net/nfp: standardize the use of port index in some functions Date: Thu, 5 Sep 2024 14:25:10 +0800 Message-Id: <20240905062511.2710102-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240905062511.2710102-1-chaoyong.he@corigine.com> References: <20240905062511.2710102-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGAP274CA0017.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::29) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4147:EE_ X-MS-Office365-Filtering-Correlation-Id: 911db632-5fca-4913-3f2e-08dccd7395f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|366016|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?H1JMi+wrIvl5A27YXdkk9Mumz4nO/5Aue5U88j6nje7/aFMdmGCl4DnyW/KK?= =?us-ascii?Q?qSek0wiFDPGhhAeGEUN51kdrp/ur406NR2Sj9VTKDShQSd9EBGS7yOw1P7Hy?= =?us-ascii?Q?oKLCo2RNqHBx7XpWPGZ8zP3G1HGj3Ez3OhwKt5uda+y2tHpjPRa4xbuTF9sU?= =?us-ascii?Q?qj8tE1ssKfUV3qzVhrDGrFvBBfaje0q9w6NDmGsYIYXeJSslk8+C9pcmsqpK?= =?us-ascii?Q?e2rjYyZyZDOFu6kqTjW61NK7EmS636SvzkZqhaOrxOIpwq4+lLkmGpJgZyi+?= =?us-ascii?Q?2SEcXJGTg9CGFAsoFe5xhGK1OPumGrcDEl9OjEE7cO0WdzKbWTfRDZL8cAPG?= =?us-ascii?Q?0hI4XA8/xl9oUyKLRysRxKoRQuSuwas+Gew+ZaOHwDNe5phlFSkKDRN1QTI3?= =?us-ascii?Q?MzilISKPWXH5FErM0dOAEKSsvdyJD4fn7NmMervo1FdD3Atxq8YsWnW6dxGO?= =?us-ascii?Q?HLb9n2C6rY4v2wwRIA/g695Pwm0FD4vz74sYRyO1K/Y0vO9ftQiALxgcPjYh?= =?us-ascii?Q?7h4AeQxImpGw4ChuoIKaLVZ5hMFAxAkxnuGrs9wmpSo1Zb8DFL8TraMmQE9g?= =?us-ascii?Q?/NOT0eJIT3H9qMwtRFW9I9oedTIBtDqRnEKID7kFhMIJ9obgm8pdYUlpwh+x?= =?us-ascii?Q?Z5gBI1AWQfWFzE6tWu8S9k/hWkri+ORK55No4SEngiThfYBHN3f4CNcW1W0F?= =?us-ascii?Q?ZIWxCwmS0umEUCBsoZj18lDZtX5xmlLxq20BHcfaSQ1baaRb9+dgUp//U4p+?= =?us-ascii?Q?TySSLTmVsNDPXG2I4adQdJwXxFu2GTpeRL7FDbGrNZYGSWX44VzL4974g5Kl?= =?us-ascii?Q?/Z4YR7ufzTWODQY8QWdpkPnbrudQNUzg1eGU3rq0Ty1SsgRkpj0R7O/tF89T?= =?us-ascii?Q?UWfAywT/xUwnjG6LgyNT6hOgMJ94v/IyMIE6EpIiKOgGqZ+beAqe2clE1Wtz?= =?us-ascii?Q?96FTwjv64WMphDWTsvaolI0pTW63o9cY/7N5X7XRtzxvjXoEFsZ8kEEfXmbu?= =?us-ascii?Q?9o78iMFLnBmR8QXSNOpfZ/7Lpi7HG7EUQfEjCVDRQ6CJTRwkfbHJFOxcFrDb?= =?us-ascii?Q?3S/nazQm/JpXktzCFJ+PPijisIDvuW4V0vMOjws4erL2fnUlg3itx9E8Q+lc?= =?us-ascii?Q?CA4xYPJIA1VRUzZ77sriUhNVCi+cES/1xZJRVgDONrOkJxy83ts6ye7kE38K?= =?us-ascii?Q?Dwp0DnuUABW9WqEaMf3n2vFaICLS/mGY9jYojv83PyX3KgHQ3s4281oF0q1d?= =?us-ascii?Q?WYOEZlh3uD4Mdlmdkl+x5HWSI+QTsMCvYKom9RTQMPFsZ6AtIdrl9wg101HA?= =?us-ascii?Q?absYr/4V8t2ERs452RdSqzowLAebiubXvvUik3t7VTwjaV86L1DVDfo9ZSY7?= =?us-ascii?Q?RdYTj6QK4QsMlaBusmdVZi+aUme0XKpid9aXTiO9VKJQKOSjCg=3D=3D?= 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:(13230040)(1800799024)(376014)(366016)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IVl4CMkhufZ05xfSatuUSHmzGnYGXsRV4gcTxm18L+u049SxS9N1LooDkBWz?= =?us-ascii?Q?BvtsLHFtNOAWWBwXUtn/Ow5Y8rs6eGyIroHOcWgurOiz2jvTzzJBAap+6ic2?= =?us-ascii?Q?h7Y6IWwMqbalG6+Vok4WJCYkzupCBwFGaa1sTl3vr3CGM2bUtHN1+KfcvGQq?= =?us-ascii?Q?dHhHjuogoLceoeZf7BTRgp9sNY45lwxiuyw14OBRU4coidYZiX0AFhM/9oFi?= =?us-ascii?Q?nw/xx0iqPrNA+6thySSVaajk70WVzh549/wt08AFGH57Ob5XzM0mP5J1kpyF?= =?us-ascii?Q?na1ki03f+Ldihp+nvaDVHWSknO5o2VvBEkUZAz6TibOYFbhVxyu6qPMIoAyf?= =?us-ascii?Q?svQ1QKYm8S00O/jKxy55/NB4p7VPNFHUZw9ymkN9KgWEWndDoXs8mGp9ZUfa?= =?us-ascii?Q?dhLGRGaLIPGCvALeiSP4BaYjshXRVIBhpUoHsmvrOQVd80d4l/jvC1qr97JI?= =?us-ascii?Q?lRzIk6VeLMiXUPKpctbVI7Uy7BuqjP1pEaVB7IlyBiKtvK6b3612bA7tHGQA?= =?us-ascii?Q?sTjE2lDpFABtyL8U4UQqytX+XNl9JQhV7qwmXDss2VOflSbCJKoFGuNPjsfi?= =?us-ascii?Q?3zxC2eOfqkdzR8xsiCVPtIMSB2UBl7wbR1I6zsA+4urbbbwIYy1eWNIDTDsw?= =?us-ascii?Q?Z77IGNgyxo9Ra2jICG4aSMV4KIqeAcfru7VV1OB0+cg5T5XhT21KqN11lcmk?= =?us-ascii?Q?+HnuwSo0go21aHtN2iSOuM4iJbt7+Y21xoHMyDfpCXZK7MhXmK+4SJi0htIT?= =?us-ascii?Q?TZakge0qha7odt8haAKRLHfhVgKeNaChZ9+iq4ddbCEo1LqnFlpOH5pavbcy?= =?us-ascii?Q?YOwzr4Br2p88vkSIL7fgZebjkRSBAOzyQlwje46CvF/cXOoi8SoI2dGlNcut?= =?us-ascii?Q?/jPnj2iIrN0CMpvB5RWGXn6YLfpBtS+8eLy9YVV9PYIrOz1bGGdBLy/xy1Wk?= =?us-ascii?Q?vU57djRl2CmKKw6IS6y+1Q4rYDGGjfCRBqQ50nlS2F4boKCOmpnC/H8bYS0S?= =?us-ascii?Q?zDz0iHo5q9wi1G05xMD1WTKGZ25I6jNUpdtcX3/6/BqfZnSEUG3sPmI8VRNn?= =?us-ascii?Q?vfRL1ZSKncp/MgD1jKIQoEmZP30wD/QHwudg4sEy4k4MO7prjaiZnRHmFLgl?= =?us-ascii?Q?hwTI0Rms0GQYZrOTZ9SGQiSPt+xo4Lpc/IaBkvkeZ23KY//hgFEvnwFtWyul?= =?us-ascii?Q?wQd2KBvlaEDT5lVc/UfPjVx6+eY8yLUevbyJn154ytocM0n+mP1pn98KiBpH?= =?us-ascii?Q?/s1wvND742JW5c90S1tfdcjQDFQ7M1izablOgE4+hL1Wr/iN9N6kI58c9SEz?= =?us-ascii?Q?UoNKACrCbwozYtnnrqs9KqCIeEHqFwyRALPk0vh2wzC7WTSKhySrEneiJTYb?= =?us-ascii?Q?j/zzjZif3LOl2KHQjqXXZjCrah7OyiL4OFRasC8JgyW+RzN7y2TJXJPtXdM5?= =?us-ascii?Q?IsIvTX1PvQVrTHJXL+lPW+6VSBYF/BiXE2oX+xPBTTAZsJVPkw3VkoaEhzQ+?= =?us-ascii?Q?PhU4M8ITVde3Eh26SG+1/jz5RW7BfO3FKBSmF3p2xGsvOTAjKjkc0MURdNdv?= =?us-ascii?Q?vTeuTkDP3a7aqWbnhlDTkWxrL3jfK8Rz8maUh/4fIeF4fQV8eva6OaMQFn5K?= =?us-ascii?Q?GQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 911db632-5fca-4913-3f2e-08dccd7395f6 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2024 06:25:50.2237 (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: gum22qjXB8xRFDhjF3HfuHsr4KkqBX6KCIJY7ydSvdlhDOh7TYyWk7P8J/ps7BTwEzWqL9v5KOVzG/DdHQI9SxzOC2LGZ5vUmQqC+3gW4YA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4147 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 Standardize the use of 'idx' in some functions which could be used for both flower and coreNIC firmware. Signed-off-by: Qin Ke Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 6 ++++-- drivers/net/nfp/nfp_net_common.c | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index b35e40a7d0..2ddfdcd048 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -281,6 +281,7 @@ static int nfp_net_speed_configure(struct rte_eth_dev *dev) { int ret; + uint8_t idx; uint32_t speed_capa; uint32_t link_speeds; uint32_t configure_speed; @@ -289,8 +290,9 @@ nfp_net_speed_configure(struct rte_eth_dev *dev) struct nfp_net_hw *net_hw = dev->data->dev_private; struct nfp_net_hw_priv *hw_priv = dev->process_private; + idx = nfp_net_get_idx(dev); nfp_eth_table = hw_priv->pf_dev->nfp_eth_table; - eth_port = &nfp_eth_table->ports[net_hw->idx]; + eth_port = &nfp_eth_table->ports[idx]; speed_capa = hw_priv->pf_dev->speed_capa; if (speed_capa == 0) { @@ -308,7 +310,7 @@ nfp_net_speed_configure(struct rte_eth_dev *dev) /* NFP4000 does not allow the port 0 25Gbps and port 1 10Gbps at the same time. */ if (net_hw->device_id == PCI_DEVICE_ID_NFP4000_PF_NIC) { - ret = nfp_net_nfp4000_speed_configure_check(net_hw->idx, + ret = nfp_net_nfp4000_speed_configure_check(idx, configure_speed, nfp_eth_table); if (ret != 0) { PMD_DRV_LOG(ERR, "Failed to configure speed for NFP4000."); diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index daed57e374..f440f31a4d 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -2489,20 +2489,20 @@ nfp_net_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) { int ret; - struct nfp_net_hw *net_hw; + uint8_t idx; enum rte_eth_fc_mode set_mode; struct nfp_net_hw_priv *hw_priv; enum rte_eth_fc_mode original_mode; struct nfp_eth_table *nfp_eth_table; struct nfp_eth_table_port *eth_port; - net_hw = nfp_net_get_hw(dev); + idx = nfp_net_get_idx(dev); hw_priv = dev->process_private; if (hw_priv == NULL || hw_priv->pf_dev == NULL) return -EINVAL; nfp_eth_table = hw_priv->pf_dev->nfp_eth_table; - eth_port = &nfp_eth_table->ports[net_hw->idx]; + eth_port = &nfp_eth_table->ports[idx]; original_mode = nfp_net_get_pause_mode(eth_port); set_mode = fc_conf->mode; @@ -2526,20 +2526,20 @@ nfp_net_fec_get_capability(struct rte_eth_dev *dev, struct rte_eth_fec_capa *speed_fec_capa, __rte_unused unsigned int num) { + uint8_t idx; uint16_t speed; - struct nfp_net_hw *hw; uint32_t supported_fec; struct nfp_net_hw_priv *hw_priv; struct nfp_eth_table *nfp_eth_table; struct nfp_eth_table_port *eth_port; - hw = nfp_net_get_hw(dev); + idx = nfp_net_get_idx(dev); hw_priv = dev->process_private; if (hw_priv == NULL || hw_priv->pf_dev == NULL) return -EINVAL; nfp_eth_table = hw_priv->pf_dev->nfp_eth_table; - eth_port = &nfp_eth_table->ports[hw->idx]; + eth_port = &nfp_eth_table->ports[idx]; speed = eth_port->speed; supported_fec = nfp_eth_supported_fec_modes(eth_port); @@ -2587,24 +2587,24 @@ int nfp_net_fec_get(struct rte_eth_dev *dev, uint32_t *fec_capa) { - struct nfp_net_hw *hw; + uint8_t idx; struct nfp_net_hw_priv *hw_priv; struct nfp_eth_table *nfp_eth_table; struct nfp_eth_table_port *eth_port; - hw = nfp_net_get_hw(dev); + idx = nfp_net_get_idx(dev); hw_priv = dev->process_private; if (hw_priv == NULL || hw_priv->pf_dev == NULL) return -EINVAL; if (dev->data->dev_link.link_status == RTE_ETH_LINK_DOWN) { nfp_eth_table = nfp_eth_read_ports(hw_priv->pf_dev->cpp); - hw_priv->pf_dev->nfp_eth_table->ports[hw->idx] = nfp_eth_table->ports[hw->idx]; + hw_priv->pf_dev->nfp_eth_table->ports[idx] = nfp_eth_table->ports[idx]; free(nfp_eth_table); } nfp_eth_table = hw_priv->pf_dev->nfp_eth_table; - eth_port = &nfp_eth_table->ports[hw->idx]; + eth_port = &nfp_eth_table->ports[idx]; if (!nfp_eth_can_support_fec(eth_port)) { PMD_DRV_LOG(ERR, "NFP can not support FEC."); @@ -2648,20 +2648,20 @@ int nfp_net_fec_set(struct rte_eth_dev *dev, uint32_t fec_capa) { + uint8_t idx; enum nfp_eth_fec fec; - struct nfp_net_hw *hw; uint32_t supported_fec; struct nfp_net_hw_priv *hw_priv; struct nfp_eth_table *nfp_eth_table; struct nfp_eth_table_port *eth_port; - hw = nfp_net_get_hw(dev); + idx = nfp_net_get_idx(dev); hw_priv = dev->process_private; if (hw_priv == NULL || hw_priv->pf_dev == NULL) return -EINVAL; nfp_eth_table = hw_priv->pf_dev->nfp_eth_table; - eth_port = &nfp_eth_table->ports[hw->idx]; + eth_port = &nfp_eth_table->ports[idx]; supported_fec = nfp_eth_supported_fec_modes(eth_port); if (supported_fec == 0) { -- 2.39.1