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 93D6041D8D for ; Mon, 27 Feb 2023 08:11:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80CA740A84; Mon, 27 Feb 2023 08:11:54 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2071.outbound.protection.outlook.com [40.107.237.71]) by mails.dpdk.org (Postfix) with ESMTP id 6A1E3410D3 for ; Mon, 27 Feb 2023 08:11:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LSb4mo9qbhnYj54KcSVf3S+1/NJTCg4Q0HkT0bDahP1lFJHF6oWJskDYlPDJSyrJE7y1uCXMsg2mKjG5iveDJgQwzmBakFkoQPsueLwXpCUnuZvZtPVFWRE8T6d3c/7CiuJnw8aPUZkiwU3RixvZHFVujcFo/c5n8dOYBOvFPpwgpYRsAqNCRoW4WJq7ZVKQBJsvj3B+ryrx2q5vL/46moIG3b1MFszTKdmzTS8bEUBcoufPyNcsIy7yrqkZ6Mro5hv0OXuMsFKsZapkZeLuYs2mHgt1mTespdQETbwiyUGjN3cxRsxHkUhBALmpsLmUjDxcfybYAG2TT1dB74U65w== 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=VdrcnS0rszys3tGZ4JDNTBDHui7rKQkKimXDOysNK7I=; b=KTnDPLl1QMiC68Tb/MyI0SjCsFEOO6HyDUly9bV5ku2irJUPb0jICceK7LhXIL2gGJLgoaZSvapq0UdL1O9R5q4sUufkDhL+Kl/Wk+84SLhblapJuDjpRdrY+05pLzTZHuqo/7KMZ8Ccs+eEzj8a8eaCW/GgReJ2QhnCTpa7V5HlDE5PlPf0UfiVNSkq+yyNiDllfoh3+XVJhZ6H1kxNAlzwdtooJor0s61Y+xPgBWWxaZ870DFycoaZxf0uBIFMnZxTzhBIgok579qeCYrhCngI4vxKbI02zwI4c+dsaVq7/vBdzCWXakq9l7FOm5XocR6hw5IYIUMeX+04dn+bmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VdrcnS0rszys3tGZ4JDNTBDHui7rKQkKimXDOysNK7I=; b=IpBDWJiDLbEC2xiMg1521ejACOJEA/8+Jr+KUVoT+Yd31xpwkrj67jMFUWKUwHk0P7+EhPPIuJCFFALuZVe6yDZRVZ0F1IjkJDAvFy+h3b5EeWQXY6u9vuKl98AkYRxhfStUAZ+Ba/hb5YRNO2HbwnzYmvl/rnxZEaH0Rn4MGbGfyfeDkffRInw8EMgb1HfcNELpT8oeKzWHL4nPXOvhwkgMQvuzR4AY3v2Mi9IKfrS4qo6VzpYpX4/wF6ndQJ8zEwr4rhBHPvVMDEnrAudZnww0fyCobdfuzscr9kiL4r3yBgdRlSGHjeU0708DiTjS+0UjxgKE8y6fwfJDXdK1SA== Received: from DM6PR06CA0015.namprd06.prod.outlook.com (2603:10b6:5:120::28) by PH0PR12MB7959.namprd12.prod.outlook.com (2603:10b6:510:282::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:11:51 +0000 Received: from DM6NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::a5) by DM6PR06CA0015.outlook.office365.com (2603:10b6:5:120::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:11:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT027.mail.protection.outlook.com (10.13.172.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:11:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:11:38 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:11:36 -0800 From: Xueming Li To: Huisong Li CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: extract common function to query device' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:05 +0800 Message-ID: <20230227070107.15664-97-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT027:EE_|PH0PR12MB7959:EE_ X-MS-Office365-Filtering-Correlation-Id: a286bc8c-64db-42d2-52cf-08db1891e5db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JXEgv86hlvfgtO0qHkUvNZgnNy3IkdyqZWX82BSjcliG4R3OEUd+lkGr8SEVs4q/K5OP3TrLfj7tkrJjhTXrguq84ffs/pAaK2qh+c0R6gUd5UoBahk7I1wgOOdZT7m3yqwQjnxFYj5ACzsfNkgF+6vL0QmOUoVjVqLEIHHT3D+/rmcZ6pHDp4JA483MzB05ZnbTmc9P13ufsGzpqN7HabPtaZklVcBOexLTO5xB1dEf7fr8DLlZ016tjdkJAVsE2YWt1GPIQNxIPgvzt3lmTwWSVR93MRfRyDAHyUEBBZms86ph/SlpH6mzHGvINtkgcxTadUb9kiBppbIhDCpqS4thPBQXs29Po2lFENts80rtnGgdtjp58+IHf57bz/lfX5UHhKEEdrZGwhA7i34kV3c9gsQ2Q7Asr9YciTTx/V0ggSod9pzRULgj0aIbkfGc1D54+iWcAe96DD4oxV/oPPXk2ibap6STZrnWlBB/gV+jH9cU43863eJ+C8hJTlEfnOBev5fwsQAgEOa5YaqNbQPh3YDE4t1xdIakjuSCZ1dM1w+8BcMyECoLitcLzr0DHsm5lc3oR7xtp47gauUeugy1raMUc1U7+6iw5Q9yZWaWK16d9NGP5l4u9Hkd35pUyGFunDcwLpHkUI+Mg3XfpyhCMXM3VZbzUTmbDbmhsrG959GhG2+W+JTbpLLIvysx3dSvWePQlorSYiWKQYnP3d398pFoBS1pOIUq7qo2CbzzwaBQZlWngpZBCODjq8Satai/0TVMR5dnh+6eLd36aGUjmPm7cbXfuYotRdzaCdTbBF+awKS1lEKopxoxy+AG X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(396003)(346002)(39860400002)(136003)(376002)(451199018)(36840700001)(46966006)(40470700004)(356005)(336012)(2616005)(86362001)(316002)(966005)(40480700001)(70206006)(70586007)(36756003)(6666004)(55016003)(478600001)(40460700003)(7696005)(54906003)(4326008)(41300700001)(6916009)(53546011)(8676002)(1076003)(6286002)(16526019)(26005)(186003)(7636003)(36860700001)(34020700004)(2906002)(82740400003)(8936002)(47076005)(426003)(30864003)(83380400001)(5660300002)(82310400005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:11:50.7175 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a286bc8c-64db-42d2-52cf-08db1891e5db X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7959 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=14d988ad25a775f3f0ebad992770426184222713 Thanks. Xueming Li --- >From 14d988ad25a775f3f0ebad992770426184222713 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 31 Jan 2023 21:02:52 +0800 Subject: [PATCH] net/hns3: extract common function to query device Cc: Xueming Li [ upstream commit 52a4e960b49c526dd1ad7c1e91ebcfa664a38e6d ] Extract common function to query device specifications used by VF and PF. Fixes: 9c740336f024 ("net/hns3: get device specifications from firmware") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_common.c | 75 +++++++++++++++++++++++++++++++ drivers/net/hns3/hns3_common.h | 2 + drivers/net/hns3/hns3_ethdev.c | 63 -------------------------- drivers/net/hns3/hns3_ethdev_vf.c | 65 +-------------------------- 4 files changed, 79 insertions(+), 126 deletions(-) diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c index da0a481f15..74d537d8d0 100644 --- a/drivers/net/hns3/hns3_common.c +++ b/drivers/net/hns3/hns3_common.c @@ -10,6 +10,7 @@ #include "hns3_logs.h" #include "hns3_regs.h" #include "hns3_rxtx.h" +#include "hns3_dcb.h" #include "hns3_common.h" int @@ -846,3 +847,77 @@ hns3_get_pci_revision_id(struct hns3_hw *hw, uint8_t *revision_id) return 0; } + +void +hns3_set_default_dev_specifications(struct hns3_hw *hw) +{ + struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); + + hw->max_non_tso_bd_num = HNS3_MAX_NON_TSO_BD_PER_PKT; + hw->rss_ind_tbl_size = HNS3_RSS_IND_TBL_SIZE; + hw->rss_key_size = HNS3_RSS_KEY_SIZE; + hw->intr.int_ql_max = HNS3_INTR_QL_NONE; + + if (hns->is_vf) + return; + + hw->max_tm_rate = HNS3_ETHER_MAX_RATE; +} + +static void +hns3_parse_dev_specifications(struct hns3_hw *hw, struct hns3_cmd_desc *desc) +{ + struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); + struct hns3_dev_specs_0_cmd *req0; + struct hns3_dev_specs_1_cmd *req1; + + req0 = (struct hns3_dev_specs_0_cmd *)desc[0].data; + req1 = (struct hns3_dev_specs_1_cmd *)desc[1].data; + + hw->max_non_tso_bd_num = req0->max_non_tso_bd_num; + hw->rss_ind_tbl_size = rte_le_to_cpu_16(req0->rss_ind_tbl_size); + hw->rss_key_size = rte_le_to_cpu_16(req0->rss_key_size); + hw->intr.int_ql_max = rte_le_to_cpu_16(req0->intr_ql_max); + hw->min_tx_pkt_len = req1->min_tx_pkt_len; + + if (hns->is_vf) + return; + + hw->max_tm_rate = rte_le_to_cpu_32(req0->max_tm_rate); +} + +static int +hns3_check_dev_specifications(struct hns3_hw *hw) +{ + if (hw->rss_ind_tbl_size == 0 || + hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) { + hns3_err(hw, "the indirection table size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)", + hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); + return -EINVAL; + } + + return 0; +} + +int +hns3_query_dev_specifications(struct hns3_hw *hw) +{ + struct hns3_cmd_desc desc[HNS3_QUERY_DEV_SPECS_BD_NUM]; + int ret; + int i; + + for (i = 0; i < HNS3_QUERY_DEV_SPECS_BD_NUM - 1; i++) { + hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_QUERY_DEV_SPECS, + true); + desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); + } + hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_QUERY_DEV_SPECS, true); + + ret = hns3_cmd_send(hw, desc, HNS3_QUERY_DEV_SPECS_BD_NUM); + if (ret) + return ret; + + hns3_parse_dev_specifications(hw, desc); + + return hns3_check_dev_specifications(hw); +} diff --git a/drivers/net/hns3/hns3_common.h b/drivers/net/hns3/hns3_common.h index 5aa001f0cc..8eaeda26e7 100644 --- a/drivers/net/hns3/hns3_common.h +++ b/drivers/net/hns3/hns3_common.h @@ -60,5 +60,7 @@ void hns3_unmap_rx_interrupt(struct rte_eth_dev *dev); int hns3_restore_rx_interrupt(struct hns3_hw *hw); int hns3_get_pci_revision_id(struct hns3_hw *hw, uint8_t *revision_id); +void hns3_set_default_dev_specifications(struct hns3_hw *hw); +int hns3_query_dev_specifications(struct hns3_hw *hw); #endif /* HNS3_COMMON_H */ diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index eb809cd8c9..ab565ce128 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2647,69 +2647,6 @@ hns3_parse_speed(int speed_cmd, uint32_t *speed) return 0; } -static void -hns3_set_default_dev_specifications(struct hns3_hw *hw) -{ - hw->max_non_tso_bd_num = HNS3_MAX_NON_TSO_BD_PER_PKT; - hw->rss_ind_tbl_size = HNS3_RSS_IND_TBL_SIZE; - hw->rss_key_size = HNS3_RSS_KEY_SIZE; - hw->max_tm_rate = HNS3_ETHER_MAX_RATE; - hw->intr.int_ql_max = HNS3_INTR_QL_NONE; -} - -static void -hns3_parse_dev_specifications(struct hns3_hw *hw, struct hns3_cmd_desc *desc) -{ - struct hns3_dev_specs_0_cmd *req0; - struct hns3_dev_specs_1_cmd *req1; - - req0 = (struct hns3_dev_specs_0_cmd *)desc[0].data; - req1 = (struct hns3_dev_specs_1_cmd *)desc[1].data; - - hw->max_non_tso_bd_num = req0->max_non_tso_bd_num; - hw->rss_ind_tbl_size = rte_le_to_cpu_16(req0->rss_ind_tbl_size); - hw->rss_key_size = rte_le_to_cpu_16(req0->rss_key_size); - hw->max_tm_rate = rte_le_to_cpu_32(req0->max_tm_rate); - hw->intr.int_ql_max = rte_le_to_cpu_16(req0->intr_ql_max); - hw->min_tx_pkt_len = req1->min_tx_pkt_len; -} - -static int -hns3_check_dev_specifications(struct hns3_hw *hw) -{ - if (hw->rss_ind_tbl_size == 0 || - hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) { - hns3_err(hw, "the indirection table size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)", - hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); - return -EINVAL; - } - - return 0; -} - -static int -hns3_query_dev_specifications(struct hns3_hw *hw) -{ - struct hns3_cmd_desc desc[HNS3_QUERY_DEV_SPECS_BD_NUM]; - int ret; - int i; - - for (i = 0; i < HNS3_QUERY_DEV_SPECS_BD_NUM - 1; i++) { - hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_QUERY_DEV_SPECS, - true); - desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); - } - hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_QUERY_DEV_SPECS, true); - - ret = hns3_cmd_send(hw, desc, HNS3_QUERY_DEV_SPECS_BD_NUM); - if (ret) - return ret; - - hns3_parse_dev_specifications(hw, desc); - - return hns3_check_dev_specifications(hw); -} - static int hns3_get_capability(struct hns3_hw *hw) { diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index e43815607a..d3c1bdf2c5 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -688,67 +688,6 @@ hns3vf_interrupt_handler(void *param) hns3vf_enable_irq0(hw); } -static void -hns3vf_set_default_dev_specifications(struct hns3_hw *hw) -{ - hw->max_non_tso_bd_num = HNS3_MAX_NON_TSO_BD_PER_PKT; - hw->rss_ind_tbl_size = HNS3_RSS_IND_TBL_SIZE; - hw->rss_key_size = HNS3_RSS_KEY_SIZE; - hw->intr.int_ql_max = HNS3_INTR_QL_NONE; -} - -static void -hns3vf_parse_dev_specifications(struct hns3_hw *hw, struct hns3_cmd_desc *desc) -{ - struct hns3_dev_specs_0_cmd *req0; - struct hns3_dev_specs_1_cmd *req1; - - req0 = (struct hns3_dev_specs_0_cmd *)desc[0].data; - req1 = (struct hns3_dev_specs_1_cmd *)desc[1].data; - - hw->max_non_tso_bd_num = req0->max_non_tso_bd_num; - hw->rss_ind_tbl_size = rte_le_to_cpu_16(req0->rss_ind_tbl_size); - hw->rss_key_size = rte_le_to_cpu_16(req0->rss_key_size); - hw->intr.int_ql_max = rte_le_to_cpu_16(req0->intr_ql_max); - hw->min_tx_pkt_len = req1->min_tx_pkt_len; -} - -static int -hns3vf_check_dev_specifications(struct hns3_hw *hw) -{ - if (hw->rss_ind_tbl_size == 0 || - hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) { - hns3_err(hw, "the indirection table size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)", - hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); - return -EINVAL; - } - - return 0; -} - -static int -hns3vf_query_dev_specifications(struct hns3_hw *hw) -{ - struct hns3_cmd_desc desc[HNS3_QUERY_DEV_SPECS_BD_NUM]; - int ret; - int i; - - for (i = 0; i < HNS3_QUERY_DEV_SPECS_BD_NUM - 1; i++) { - hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_QUERY_DEV_SPECS, - true); - desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); - } - hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_QUERY_DEV_SPECS, true); - - ret = hns3_cmd_send(hw, desc, HNS3_QUERY_DEV_SPECS_BD_NUM); - if (ret) - return ret; - - hns3vf_parse_dev_specifications(hw, desc); - - return hns3vf_check_dev_specifications(hw); -} - void hns3vf_update_push_lsc_cap(struct hns3_hw *hw, bool supported) { @@ -826,7 +765,7 @@ hns3vf_get_capability(struct hns3_hw *hw) return ret; if (hw->revision < PCI_REVISION_ID_HIP09_A) { - hns3vf_set_default_dev_specifications(hw); + hns3_set_default_dev_specifications(hw); hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_RSV_ONE; hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_2US; hw->tso_mode = HNS3_TSO_SW_CAL_PSEUDO_H_CSUM; @@ -837,7 +776,7 @@ hns3vf_get_capability(struct hns3_hw *hw) return 0; } - ret = hns3vf_query_dev_specifications(hw); + ret = hns3_query_dev_specifications(hw); if (ret) { PMD_INIT_LOG(ERR, "failed to query dev specifications, ret = %d", -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:44.022828600 +0800 +++ 0098-net-hns3-extract-common-function-to-query-device.patch 2023-02-27 14:08:40.839237000 +0800 @@ -1 +1 @@ -From 52a4e960b49c526dd1ad7c1e91ebcfa664a38e6d Mon Sep 17 00:00:00 2001 +From 14d988ad25a775f3f0ebad992770426184222713 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 52a4e960b49c526dd1ad7c1e91ebcfa664a38e6d ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org