From patchwork Fri Jun 24 08:59:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongdong Liu X-Patchwork-Id: 113429 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 4737BA0032; Fri, 24 Jun 2022 11:01:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B1C4F40A89; Fri, 24 Jun 2022 11:00:41 +0200 (CEST) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id 9119240A89; Fri, 24 Jun 2022 11:00:40 +0200 (CEST) Received: from kwepemi500017.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4LTrd13pCNz1KCDN; Fri, 24 Jun 2022 16:58:29 +0800 (CST) Received: from localhost.localdomain (10.28.79.22) by kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 24 Jun 2022 17:00:38 +0800 From: Dongdong Liu To: , , , CC: , Dongdong Liu , Yisen Zhuang , Huisong Li , "Min Hu (Connor)" Subject: [PATCH 6/6] net/hns3: delete the unused code Date: Fri, 24 Jun 2022 16:59:51 +0800 Message-ID: <20220624085951.3177-7-liudongdong3@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20220624085951.3177-1-liudongdong3@huawei.com> References: <20220624085951.3177-1-liudongdong3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500017.china.huawei.com (7.221.188.110) X-CFilter-Loop: Reflected 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 The RTE_HNS3_ONLY_1630_FPGA macro is not in use, so delete the code. Fixes: 2192c428f9a6 ("net/hns3: fix firmware compatibility configuration") Fixes: bdaf190f8235 ("net/hns3: support link speed autoneg for PF") Cc: stable@dpdk.org Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_cmd.c | 33 --------------------------------- drivers/net/hns3/hns3_ethdev.c | 11 ++--------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c index 5dc874fd7a..0883df1b62 100644 --- a/drivers/net/hns3/hns3_cmd.c +++ b/drivers/net/hns3/hns3_cmd.c @@ -631,39 +631,6 @@ hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init) struct hns3_cmd_desc desc; uint32_t compat = 0; -#if defined(RTE_HNS3_ONLY_1630_FPGA) - /* If resv reg enabled phy driver of imp is not configured, driver - * will use temporary phy driver. - */ - struct rte_pci_device *pci_dev; - struct rte_eth_dev *eth_dev; - uint8_t revision; - int ret; - - eth_dev = &rte_eth_devices[hw->data->port_id]; - pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); - /* Get PCI revision id */ - ret = rte_pci_read_config(pci_dev, &revision, HNS3_PCI_REVISION_ID_LEN, - HNS3_PCI_REVISION_ID); - if (ret != HNS3_PCI_REVISION_ID_LEN) { - PMD_INIT_LOG(ERR, "failed to read pci revision id, ret = %d", - ret); - return -EIO; - } - if (revision == PCI_REVISION_ID_HIP09_A) { - struct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw); - if (hns3_dev_get_support(hw, COPPER) == 0 || pf->is_tmp_phy) { - PMD_INIT_LOG(ERR, "***use temp phy driver in dpdk***"); - pf->is_tmp_phy = true; - hns3_set_bit(hw->capability, - HNS3_DEV_SUPPORT_COPPER_B, 1); - return 0; - } - - PMD_INIT_LOG(ERR, "***use phy driver in imp***"); - } -#endif - hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_FIRMWARE_COMPAT_CFG, false); req = (struct hns3_firmware_compat_cmd *)desc.data; diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 96fde7550f..5822d4fa71 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4970,17 +4970,10 @@ hns3_set_port_link_speed(struct hns3_hw *hw, { int ret; - if (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER) { -#if defined(RTE_HNS3_ONLY_1630_FPGA) - struct hns3_pf *pf = HNS3_DEV_HW_TO_PF(hw); - if (pf->is_tmp_phy) - return 0; -#endif - + if (hw->mac.media_type == HNS3_MEDIA_TYPE_COPPER) ret = hns3_set_copper_port_link_speed(hw, cfg); - } else { + else ret = hns3_set_fiber_port_link_speed(hw, cfg); - } if (ret) { hns3_err(hw, "failed to set %s port link speed, ret = %d.",