patch 'net/hns3: delete unused code' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 06/30/22. 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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/8bbab0b5a5bf9320b67ad6e71c03bb1b09227e9c

Thanks.

Kevin

---
>From 8bbab0b5a5bf9320b67ad6e71c03bb1b09227e9c Mon Sep 17 00:00:00 2001
From: Dongdong Liu <liudongdong3 at huawei.com>
Date: Fri, 24 Jun 2022 16:59:51 +0800
Subject: [PATCH] net/hns3: delete unused code

[ upstream commit 4545a803e2e0d9a7e2d04c5d44a4b69f0ef74097 ]

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")

Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 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 5b42d38aa5..3495e2acc1 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -636,37 +636,4 @@ hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init)
 	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 20dac85559..40a33549e0 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4998,15 +4998,8 @@ 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) {
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-28 16:18:04.460479652 +0100
+++ 0018-net-hns3-delete-unused-code.patch	2022-06-28 16:18:04.044387175 +0100
@@ -1 +1 @@
-From 4545a803e2e0d9a7e2d04c5d44a4b69f0ef74097 Mon Sep 17 00:00:00 2001
+From 8bbab0b5a5bf9320b67ad6e71c03bb1b09227e9c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4545a803e2e0d9a7e2d04c5d44a4b69f0ef74097 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index eadc15093f..bdfc85f934 100644
+index 5b42d38aa5..3495e2acc1 100644
@@ -22 +23 @@
-@@ -632,37 +632,4 @@ hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init)
+@@ -636,37 +636,4 @@ hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init)
@@ -61 +62 @@
-index e84cf51d07..6b1d1a5fb1 100644
+index 20dac85559..40a33549e0 100644
@@ -64 +65 @@
-@@ -4970,15 +4970,8 @@ hns3_set_port_link_speed(struct hns3_hw *hw,
+@@ -4998,15 +4998,8 @@ hns3_set_port_link_speed(struct hns3_hw *hw,