From patchwork Mon Nov 23 13:12:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoyang Zhou X-Patchwork-Id: 84469 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BBB30A04B1; Mon, 23 Nov 2020 14:09:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E78A8C90A; Mon, 23 Nov 2020 14:09:06 +0100 (CET) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by dpdk.org (Postfix) with ESMTP id 45855C8F2; Mon, 23 Nov 2020 14:09:03 +0100 (CET) Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4CfnXZ2lrlzhYVG; Mon, 23 Nov 2020 21:08:46 +0800 (CST) Received: from tester.localdomain (10.175.119.39) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Mon, 23 Nov 2020 21:08:50 +0800 From: Guoyang Zhou To: CC: , , , , , , , , , , Date: Mon, 23 Nov 2020 21:12:46 +0800 Message-ID: <7c825b53c73d6e02c3cec24afb9a3f9d3f42e8fc.1606136884.git.zhouguoyang@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.119.39] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH v1 2/2] net/hinic: remove the operation of optical modules X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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)