From: Guoyang Zhou <zhouguoyang@huawei.com>
To: <dev@dpdk.org>
Cc: <ferruh.yigit@intel.com>, <bluca@debian.org>,
<cloud.wangxiaoyun@huawei.com>, <luoxianjun@huawei.com>,
<yin.yinshi@huawei.com>, <luojiachen@huawei.com>,
<zhouguoyang@huawei.com>, <chenlizhong@huawei.com>,
<zhaohui8@huawei.com>, <chenchanghu@huawei.com>,
<stable@dpdk.org>
Subject: [dpdk-stable] [PATCH v1 2/2] net/hinic: remove the operation of optical modules
Date: Mon, 23 Nov 2020 21:12:46 +0800 [thread overview]
Message-ID: <7c825b53c73d6e02c3cec24afb9a3f9d3f42e8fc.1606136884.git.zhouguoyang@huawei.com> (raw)
In-Reply-To: <cover.1606136884.git.zhouguoyang@huawei.com>
In the link up and link down functions, they do not need
to operate the optical module.
Fixes: 511b7371d32b ("net/hinic: fix hugepage memory leaks")
Cc: stable@dpdk.org
Signed-off-by: Guoyang Zhou <zhouguoyang@huawei.com>
---
drivers/net/hinic/base/hinic_pmd_niccfg.c | 38 -------------------------------
drivers/net/hinic/base/hinic_pmd_niccfg.h | 2 --
drivers/net/hinic/hinic_pmd_ethdev.c | 14 ------------
3 files changed, 54 deletions(-)
diff --git a/drivers/net/hinic/base/hinic_pmd_niccfg.c b/drivers/net/hinic/base/hinic_pmd_niccfg.c
index be6445d..8c08d63 100644
--- a/drivers/net/hinic/base/hinic_pmd_niccfg.c
+++ b/drivers/net/hinic/base/hinic_pmd_niccfg.c
@@ -1659,44 +1659,6 @@ int hinic_get_link_mode(void *hwdev, u32 *supported, u32 *advertised)
}
/**
- * hinic_set_xsfp_tx_status - Enable or disable the fiber in
- * tx direction when set link up or down.
- *
- * @param hwdev
- * The hardware interface of a nic device.
- * @param enable
- * Enable or Disable.
- *
- * @return
- * 0 on success.
- * negative error value otherwise.
- */
-int hinic_set_xsfp_tx_status(void *hwdev, bool enable)
-{
- struct hinic_set_xsfp_status xsfp_status;
- u16 out_size = sizeof(struct hinic_set_xsfp_status);
- int err;
-
- memset(&xsfp_status, 0, sizeof(xsfp_status));
- xsfp_status.mgmt_msg_head.resp_aeq_num = HINIC_AEQ1;
- xsfp_status.port_id = hinic_global_func_id(hwdev);
- xsfp_status.xsfp_tx_dis = ((enable == 0) ? 1 : 0);
-
- err = l2nic_msg_to_mgmt_sync(hwdev, HINIC_PORT_CMD_SET_XSFP_STATUS,
- &xsfp_status, sizeof(struct hinic_set_xsfp_status),
- &xsfp_status, &out_size);
- if (err || !out_size || xsfp_status.mgmt_msg_head.status) {
- PMD_DRV_LOG(ERR,
- "Failed to %s port xsfp status, err: %d, status: 0x%x, out size: 0x%x\n",
- enable ? "Disable" : "Enable", err,
- xsfp_status.mgmt_msg_head.status, out_size);
- return -EIO;
- }
-
- return 0;
-}
-
-/**
* hinic_flush_qp_res - Flush tx && rx chip resources in case of set vport
* fake failed when device start.
*
diff --git a/drivers/net/hinic/base/hinic_pmd_niccfg.h b/drivers/net/hinic/base/hinic_pmd_niccfg.h
index 73b16b4..04cd374 100644
--- a/drivers/net/hinic/base/hinic_pmd_niccfg.h
+++ b/drivers/net/hinic/base/hinic_pmd_niccfg.h
@@ -909,8 +909,6 @@ int hinic_set_link_status_follow(void *hwdev,
int hinic_get_link_mode(void *hwdev, u32 *supported, u32 *advertised);
-int hinic_set_xsfp_tx_status(void *hwdev, bool enable);
-
int hinic_flush_qp_res(void *hwdev);
int hinic_init_function_table(void *hwdev, u16 rx_buf_sz);
diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index 378f2c8..6264235 100644
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -939,13 +939,6 @@ static int hinic_dev_set_link_up(struct rte_eth_dev *dev)
struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
int ret;
- ret = hinic_set_xsfp_tx_status(nic_dev->hwdev, true);
- if (ret) {
- PMD_DRV_LOG(ERR, "Enable port tx xsfp failed, dev_name: %s, port_id: %d",
- nic_dev->proc_dev_name, dev->data->port_id);
- return ret;
- }
-
/* link status follow phy port status, up will open pma */
ret = hinic_set_port_enable(nic_dev->hwdev, true);
if (ret)
@@ -969,13 +962,6 @@ static int hinic_dev_set_link_down(struct rte_eth_dev *dev)
struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
int ret;
- ret = hinic_set_xsfp_tx_status(nic_dev->hwdev, false);
- if (ret) {
- PMD_DRV_LOG(ERR, "Disable port tx xsfp failed, dev_name: %s, port_id: %d",
- nic_dev->proc_dev_name, dev->data->port_id);
- return ret;
- }
-
/* link status follow phy port status, up will close pma */
ret = hinic_set_port_enable(nic_dev->hwdev, false);
if (ret)
--
1.8.3.1
prev parent reply other threads:[~2020-11-23 13:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1606136884.git.zhouguoyang@huawei.com>
2020-11-23 13:12 ` [dpdk-stable] [PATCH v1 1/2] net/hinic/base: remove the limitation for max queue num Guoyang Zhou
2020-11-23 13:12 ` Guoyang Zhou [this message]
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=7c825b53c73d6e02c3cec24afb9a3f9d3f42e8fc.1606136884.git.zhouguoyang@huawei.com \
--to=zhouguoyang@huawei.com \
--cc=bluca@debian.org \
--cc=chenchanghu@huawei.com \
--cc=chenlizhong@huawei.com \
--cc=cloud.wangxiaoyun@huawei.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=luojiachen@huawei.com \
--cc=luoxianjun@huawei.com \
--cc=stable@dpdk.org \
--cc=yin.yinshi@huawei.com \
--cc=zhaohui8@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).