From patchwork Tue Oct 24 13:16:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 30796 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A15401B808; Tue, 24 Oct 2017 15:16:52 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id E4B691B7EB for ; Tue, 24 Oct 2017 15:16:49 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id m72so12261597wmc.0 for ; Tue, 24 Oct 2017 06:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xWPIQDdogdkOB2KKAOKAzoZqR2U620m/JlhkDB1tJHs=; b=PuI7kDyeU3Oa80TW9DlMZKAeKNG+iAHu7jrXmIOiLH/ObtpLAyFD7hMhUU61qtY5My rKWkR+SR2rh+QQAxbs8ihDiTwHeivJKCVJNa5BD/27Sl4qCEECpQwVlLn0CO9+X2cJig t5/2/8tI4Ohscd9ee1vN5cZyreQ/MwoGggrd1L/lrFTRxQYqC243zyMeSws1vuD1rlZ0 7EvLiUTBLcJIz2lUrxbOkLgmgP4OdA/kB+g1YLFxJaHkxAblcpJUM0yiDTOFrdwsMUt6 RHIS4MtHoWURwpiLTkh+mTJaR0OCo+znQd8TEbKp/MYbB7ACZfSpH7zlnPJUt9r+qVi5 +cNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xWPIQDdogdkOB2KKAOKAzoZqR2U620m/JlhkDB1tJHs=; b=jm4ERL8Ge1VzERGG+yj+DpGMxOse5paFF4WWbFUmG5URlwUeWP7PmmrDKvHR8857wt CbQO2HXTA5uMSnqHxyVClkypPsuIWyB19x01RimayP5fDxt5Ae+cagS8zlVfgHp0bs9V w1wETSfheMGZ2ca8Med1QYh10OJWNpFXEvnQrKNTBo0H5tG65QOj7IIs1HgRcJFsbi+0 +v1k3Cmtrn08svIxki1NZyKE3u3RXK/3DGDwJakDoiLa7zxP6L4uXhDBQsbTTfa/OMrH K1WYCN5IA9qI5IVon5IXmj0S3Y2ODMiI6Vb/B7SNTsX8VQMNKZP6528u7X4COI9Pk32J IhMA== X-Gm-Message-State: AMCzsaWcBJu+c+zLlZGAmpRfC3Mbm+ILNYQEur6RyBVl2zHRPOK3b/Rj LmEMfwAFjSg/eejCOPQEZvMWc5c+ X-Google-Smtp-Source: ABhQp+ScqZKHj7hwxUbYG3w25tjufHh8MydzVpvpaZ6VuGyxkJMfAwoVGQYaJGYp4ys/DEmIt0iNNg== X-Received: by 10.80.194.65 with SMTP id t1mr20213310edf.304.1508851009029; Tue, 24 Oct 2017 06:16:49 -0700 (PDT) Received: from localhost ([213.251.34.151]) by smtp.gmail.com with ESMTPSA id q6sm172372edk.55.2017.10.24.06.16.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Oct 2017 06:16:48 -0700 (PDT) From: luca.boccassi@gmail.com To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, wei.dai@intel.com, remy.horton@intel.com, Luca Boccassi Date: Tue, 24 Oct 2017 14:16:30 +0100 Message-Id: <20171024131630.16595-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171024131630.16595-1-luca.boccassi@gmail.com> References: <20171024131630.16595-1-luca.boccassi@gmail.com> Subject: [dpdk-dev] [PATCH 3/3] net/ixgbe: implement VF reset 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" From: Luca Boccassi This reset function will stop and restart the device, and then reset the stats and check that the registers have been updated. Signed-off-by: Luca Boccassi --- drivers/net/ixgbe/ixgbe_ethdev.c | 60 +++++++++++++++++++++++++++++++++++----- drivers/net/ixgbe/ixgbe_ethdev.h | 2 +- drivers/net/ixgbe/ixgbe_rxtx.c | 12 ++++++-- 3 files changed, 63 insertions(+), 11 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 14b9c5303..13307466b 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5026,7 +5026,9 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) ETH_VLAN_EXTEND_MASK; ixgbevf_vlan_offload_set(dev, mask); - ixgbevf_dev_rxtx_start(dev); + err = ixgbevf_dev_rxtx_start(dev); + if (err) + return err; /* check and configure queue intr-vector mapping */ if (dev->data->dev_conf.intr_conf.rxq != 0) { @@ -5127,15 +5129,59 @@ ixgbevf_dev_close(struct rte_eth_dev *dev) static int ixgbevf_dev_reset(struct rte_eth_dev *dev) { - int ret; + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int diag = 0; + uint32_t vteiam; - ret = eth_ixgbevf_dev_uninit(dev); - if (ret) - return ret; + /* Nothing needs to be done if the device is not started. */ + if (!dev->data->dev_started) + return -EAGAIN; - ret = eth_ixgbevf_dev_init(dev); + PMD_DRV_LOG(DEBUG, "Link up/down event detected."); - return ret; + /* Performance VF reset. */ + do { + dev->data->dev_started = 0; + ixgbevf_dev_stop(dev); + if (dev->data->dev_conf.intr_conf.lsc == 0) + diag = ixgbe_dev_link_update(dev, 0); + if (diag) { + PMD_INIT_LOG(INFO, "Ixgbe VF reset: " + "Failed to update link."); + } + rte_delay_ms(1000); + + diag = ixgbevf_dev_start(dev); + /* If fail to start the device, need to stop/start it again. */ + if (diag) { + PMD_INIT_LOG(ERR, "Ixgbe VF reset: " + "Failed to start device."); + dev->data->dev_started = 1; + return -EAGAIN; + } + dev->data->dev_started = 1; + ixgbevf_dev_stats_reset(dev); + if (dev->data->dev_conf.intr_conf.lsc == 0) + diag = ixgbe_dev_link_update(dev, 0); + if (diag) { + PMD_INIT_LOG(INFO, "Ixgbe VF reset: " + "Failed to update link."); + diag = 0; + } + + /** + * When the PF link is down, there is a chance + * that the VF cannot operate its registers. + * Check if the registers are written + * successfully. If not, repeat stop/start until + * the PF link is up, or in other words, until the + * registers can be written. + */ + vteiam = IXGBE_READ_REG(hw, IXGBE_VTEIAM); + /* Reference ixgbevf_intr_enable when checking */ + } while (diag || vteiam != IXGBE_VF_IRQ_ENABLE_MASK); + + return 0; } static void ixgbevf_set_vfta_all(struct rte_eth_dev *dev, bool on) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index e28c8567e..87b929518 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -595,7 +595,7 @@ int ixgbevf_dev_rx_init(struct rte_eth_dev *dev); void ixgbevf_dev_tx_init(struct rte_eth_dev *dev); -void ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev); +int ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev); uint16_t ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 0038dfbb4..5a0be2cfe 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -5419,7 +5419,7 @@ ixgbevf_dev_tx_init(struct rte_eth_dev *dev) /* * [VF] Start Transmit and Receive Units. */ -void __attribute__((cold)) +int __attribute__((cold)) ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) { struct ixgbe_hw *hw; @@ -5455,8 +5455,10 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) rte_delay_ms(1); txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(i)); } while (--poll_ms && !(txdctl & IXGBE_TXDCTL_ENABLE)); - if (!poll_ms) + if (!poll_ms) { PMD_INIT_LOG(ERR, "Could not enable Tx Queue %d", i); + return -1; + } } for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -5472,12 +5474,16 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) rte_delay_ms(1); rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i)); } while (--poll_ms && !(rxdctl & IXGBE_RXDCTL_ENABLE)); - if (!poll_ms) + if (!poll_ms) { PMD_INIT_LOG(ERR, "Could not enable Rx Queue %d", i); + return -1; + } rte_wmb(); IXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), rxq->nb_rx_desc - 1); } + + return 0; } /* Stubs needed for linkage when CONFIG_RTE_IXGBE_INC_VECTOR is set to 'n' */