[dpdk-dev] [PATCH v7 19/19] net/ngbe: support to close and reset device

Jiawen Wu jiawenwu at trustnetic.com
Thu Jul 8 10:56:58 CEST 2021


On July 7, 2021 10:13 PM, Andrew Rybchenko wrote:
> On 7/6/21 12:55 PM, Jiawen Wu wrote:
> > Support to close and reset device.
> >
> > Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
> > ---
> >  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?
> 

In fact, there is no other value than 0 returned.
Maybe I should just remove 'ret'.

> > +
> > +	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]





More information about the dev mailing list