From: Dongdong Liu <liudongdong3@huawei.com>
To: <dev@dpdk.org>, <ferruh.yigit@xilinx.com>,
<andrew.rybchenko@oktetlabs.ru>, <thomas@monjalon.net>
Cc: <stable@dpdk.org>, Dongdong Liu <liudongdong3@huawei.com>,
Yisen Zhuang <yisen.zhuang@huawei.com>,
Huisong Li <lihuisong@huawei.com>,
"Min Hu (Connor)" <humin29@huawei.com>
Subject: [PATCH 6/6] net/hns3: delete the unused code
Date: Fri, 24 Jun 2022 16:59:51 +0800 [thread overview]
Message-ID: <20220624085951.3177-7-liudongdong3@huawei.com> (raw)
In-Reply-To: <20220624085951.3177-1-liudongdong3@huawei.com>
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 <liudongdong3@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 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.",
--
2.22.0
next prev parent reply other threads:[~2022-06-24 9:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-24 8:59 [PATCH 0/6] some bugfixes for hns3 Dongdong Liu
2022-06-24 8:59 ` [PATCH 1/6] net/hns3: cancel heartbeat alarm when VF reset Dongdong Liu
2022-06-24 8:59 ` [PATCH 2/6] net/hns3: fix received unknown event print when PTP enable Dongdong Liu
2022-06-24 8:59 ` [PATCH 3/6] net/hns3: fix statistic lock Dongdong Liu
2022-06-24 8:59 ` [PATCH 4/6] net/hns3: fix nb-desc not verified when using SVE Dongdong Liu
2022-06-24 8:59 ` [PATCH 5/6] net/hns3: make code more clean Dongdong Liu
2022-06-24 8:59 ` Dongdong Liu [this message]
2022-06-24 12:37 ` [PATCH 0/6] some bugfixes for hns3 Andrew Rybchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220624085951.3177-7-liudongdong3@huawei.com \
--to=liudongdong3@huawei.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@xilinx.com \
--cc=humin29@huawei.com \
--cc=lihuisong@huawei.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).