From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 97FA142CAC; Wed, 14 Jun 2023 04:38:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 53F0942D55; Wed, 14 Jun 2023 04:37:28 +0200 (CEST) Received: from smtpbgeu1.qq.com (smtpbgeu1.qq.com [52.59.177.22]) by mails.dpdk.org (Postfix) with ESMTP id F241542D1D; Wed, 14 Jun 2023 04:37:25 +0200 (CEST) X-QQ-mid: bizesmtp73t1686710240tscfd40o Received: from wxdbg.localdomain.com ( [183.159.171.58]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 14 Jun 2023 10:37:20 +0800 (CST) X-QQ-SSF: 01400000000000J0Z000000A0000000 X-QQ-FEAT: r/cTxDoDoiFjl74n7Kz5T9qZVHvLSHS/xd5DpfBjoJ9KF7DaxsWu6f5S0btj/ 5oFUumW6mU+HL7mKFeyYBeGKGWP81dnTZCQDLYka7wDFdctASq7e90mIJbOn6AymALiJ0yy aFKck9+VeExUjDpivVcBicX6WvGXF6WOdjk9A7rqAEoClry1b5gHe5Z/DBG47uptMH5Dkv8 gsTQ7BNoRmCcpHyqk3uAnMTY7KMP11eHhoe1/l1DngQ5OZx7RFbOvSOFcW+SHW/ZXiuiCRX BwL88v0bU84qC7K3equVDD40TtvEqK9tLJ5vU8OV6UmRrR79M8BhHVVkHK+6PAQ1ytbp/8T HZRwae97VtCi6daoWKoiHpob5+cDk+kooxzRs41unWYWdDtoMbEyI6Vnym87eyomK7Nua0w X-QQ-GoodBg: 2 X-BIZMAIL-ID: 8237490454165844769 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 9/9] net/ngbe: remove redundant codes Date: Wed, 14 Jun 2023 10:34:29 +0800 Message-Id: <20230614023429.1002071-10-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230614023429.1002071-1-jiawenwu@trustnetic.com> References: <20230614023429.1002071-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz5a-1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove redundant function ngbe_dev_setup_link_alarm_handler() and related codes. Fixes: b9246b8fa280 ("net/ngbe: support link update") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 28 ---------------------------- drivers/net/ngbe/ngbe_ethdev.h | 1 - 2 files changed, 29 deletions(-) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 317ad6999c..af77081d9a 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -974,9 +974,6 @@ ngbe_dev_start(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); - /* Stop the link setup handler before resetting the HW. */ - rte_eal_alarm_cancel(ngbe_dev_setup_link_alarm_handler, dev); - /* disable uio/vfio intr/eventfd mapping */ rte_intr_disable(intr_handle); @@ -1172,8 +1169,6 @@ ngbe_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); - rte_eal_alarm_cancel(ngbe_dev_setup_link_alarm_handler, dev); - if (hw->gpio_ctl) { /* gpio0 is used to power on/off control*/ wr32(hw, NGBE_GPIODATA, NGBE_GPIOBIT_0); @@ -1895,24 +1890,6 @@ ngbe_dev_overheat(struct rte_eth_dev *dev) } } -void -ngbe_dev_setup_link_alarm_handler(void *param) -{ - struct rte_eth_dev *dev = (struct rte_eth_dev *)param; - struct ngbe_hw *hw = ngbe_dev_hw(dev); - struct ngbe_interrupt *intr = ngbe_dev_intr(dev); - u32 speed; - bool autoneg = false; - - speed = hw->phy.autoneg_advertised; - if (!speed) - hw->mac.get_link_capabilities(hw, &speed, &autoneg); - - hw->mac.setup_link(hw, speed, true); - - intr->flags &= ~NGBE_FLAG_NEED_LINK_CONFIG; -} - /* return 0 means link status changed, -1 means not changed */ int ngbe_dev_link_update_share(struct rte_eth_dev *dev, @@ -1922,7 +1899,6 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, struct rte_eth_link link; u32 link_speed = NGBE_LINK_SPEED_UNKNOWN; u32 lan_speed = 0; - struct ngbe_interrupt *intr = ngbe_dev_intr(dev); bool link_up; int err; int wait = 1; @@ -1936,9 +1912,6 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, hw->mac.get_link_status = true; - if (intr->flags & NGBE_FLAG_NEED_LINK_CONFIG) - return rte_eth_linkstatus_set(dev, &link); - /* check if it needs to wait to complete, if lsc interrupt is enabled */ if (wait_to_complete == 0 || dev->data->dev_conf.intr_conf.lsc != 0) wait = 0; @@ -1953,7 +1926,6 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev, if (!link_up) return rte_eth_linkstatus_set(dev, &link); - intr->flags &= ~NGBE_FLAG_NEED_LINK_CONFIG; link.link_status = RTE_ETH_LINK_UP; link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; diff --git a/drivers/net/ngbe/ngbe_ethdev.h b/drivers/net/ngbe/ngbe_ethdev.h index 330f476f6f..3cde7c8750 100644 --- a/drivers/net/ngbe/ngbe_ethdev.h +++ b/drivers/net/ngbe/ngbe_ethdev.h @@ -342,7 +342,6 @@ void ngbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on); void ngbe_config_vlan_strip_on_all_queues(struct rte_eth_dev *dev, int mask); -void ngbe_dev_setup_link_alarm_handler(void *param); void ngbe_read_stats_registers(struct ngbe_hw *hw, struct ngbe_hw_stats *hw_stats); -- 2.27.0