d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/hinic: remove optical module operation

Browse Source 
Remove the operation of optical modules in the link function, because
when device binds from dpdk to kernel, it will be linked failed. This
function does not take effect in cable mode, therefore, optimization
is required.

Fixes: 54ac33869932 ("net/hinic: set link down and up")
Cc: stable@dpdk.org

Signed-off-by: Guoyang Zhou <zhouguoyang@huawei.com>
This commit is contained in:
Guoyang Zhou 2020-11-24 14:45:34 +08:00 committed by Thomas Monjalon
parent acf4aeafce
commit c07912fe9f
3 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/hinic/base/hinic_pmd_niccfg.c
View File

@ -1658,44 +1658,6 @@ int hinic_get_link_mode(void *hwdev, u32 *supported, u32 *advertised)
return 0;
}
/**
* 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.

2
drivers/net/hinic/base/hinic_pmd_niccfg.h
View File

@ -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);

14
drivers/net/hinic/hinic_pmd_ethdev.c
View File

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