From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.3 required=3.0 tests=BAYES_00,DKIM_ADSP_DISCARD, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D942CC07E95 for ; Wed, 7 Jul 2021 14:12:46 +0000 (UTC) Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by mail.kernel.org (Postfix) with ESMTP id 33F1061CC0 for ; Wed, 7 Jul 2021 14:12:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33F1061CC0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=oktetlabs.ru Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89968413B6; Wed, 7 Jul 2021 16:12:45 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 4645C413A8 for ; Wed, 7 Jul 2021 16:12:44 +0200 (CEST) Received: from [192.168.38.17] (aros.oktetlabs.ru [192.168.38.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id D20FA7F528; Wed, 7 Jul 2021 17:12:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru D20FA7F528 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1625667163; bh=nxwsEjioNnbxNdVnlSOio7pNFgFot7vEc8QVvhOZuHI=; h=Subject:To:References:From:Date:In-Reply-To; b=w75a8ON+S4W+ca0ssv7ELVgqHb1ts/6t6KpInax7i9FFFLq2C3BQ5/O7dgUnBmDbj OIpp08JbUh5ddu8zGKT/3bfYngc6PONMirpRTUGm0QUs9lZ/jYXfym8nP2jHH4XkNT 2T9ZC2/UMuNYAsSksq6SzANO8OW+BKl8qt1sPwKQ= To: Jiawen Wu , dev@dpdk.org References: <20210706095545.10776-1-jiawenwu@trustnetic.com> <20210706095545.10776-20-jiawenwu@trustnetic.com> From: Andrew Rybchenko Organization: OKTET Labs Message-ID: Date: Wed, 7 Jul 2021 17:12:43 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210706095545.10776-20-jiawenwu@trustnetic.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v7 19/19] net/ngbe: support to close and reset device 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 Sender: "dev" On 7/6/21 12:55 PM, Jiawen Wu wrote: > Support to close and reset device. > > Signed-off-by: Jiawen Wu > --- > drivers/net/ngbe/ngbe_ethdev.c | 63 ++++++++++++++++++++++++++++++++-- > drivers/net/ngbe/ngbe_ethdev.h | 2 ++ > drivers/net/ngbe/ngbe_rxtx.c | 20 +++++++++++ > 3 files changed, 82 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c > index 944fea6a11..1e3c11533b 100644 > --- a/drivers/net/ngbe/ngbe_ethdev.c > +++ b/drivers/net/ngbe/ngbe_ethdev.c > @@ -256,7 +256,7 @@ eth_ngbe_dev_uninit(struct rte_eth_dev *eth_dev) > > ngbe_dev_close(eth_dev); > > - return -EINVAL; > + return 0; > } > > static int > @@ -557,11 +557,66 @@ ngbe_dev_stop(struct rte_eth_dev *dev) > static int > ngbe_dev_close(struct rte_eth_dev *dev) > { > + struct ngbe_hw *hw = ngbe_dev_hw(dev); > + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); > + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; > + int retries = 0; > + int ret; > + > PMD_INIT_FUNC_TRACE(); > > - RTE_SET_USED(dev); > + ngbe_pf_reset_hw(hw); > + > + ret = ngbe_dev_stop(dev); Is it OK that the ret ignored? > + > + ngbe_dev_free_queues(dev); > + > + /* reprogram the RAR[0] in case user changed it. */ > + ngbe_set_rar(hw, 0, hw->mac.addr, 0, true); > + > + /* Unlock any pending hardware semaphore */ > + ngbe_swfw_lock_reset(hw); > + > + /* disable uio intr before callback unregister */ > + rte_intr_disable(intr_handle); > + > + do { > + ret = rte_intr_callback_unregister(intr_handle, > + ngbe_dev_interrupt_handler, dev); > + if (ret >= 0 || ret == -ENOENT) { > + break; > + } else if (ret != -EAGAIN) { > + PMD_INIT_LOG(ERR, > + "intr callback unregister failed: %d", > + ret); > + } > + rte_delay_ms(100); > + } while (retries++ < (10 + NGBE_LINK_UP_TIME)); > + > + rte_free(dev->data->mac_addrs); > + dev->data->mac_addrs = NULL; > + > + rte_free(dev->data->hash_mac_addrs); > + dev->data->hash_mac_addrs = NULL; > + > + return ret; > +} > + > +/* > + * Reset PF device. > + */ > +static int > +ngbe_dev_reset(struct rte_eth_dev *dev) > +{ > + int ret; > + > + ret = eth_ngbe_dev_uninit(dev); > + if (ret) Compare vs 0 [snip]