From patchwork Tue Oct 24 13:16:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 30795 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 2EB8F1B801; Tue, 24 Oct 2017 15:16:51 +0200 (CEST) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 852681B801 for ; Tue, 24 Oct 2017 15:16:46 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id r196so3325857wmf.2 for ; Tue, 24 Oct 2017 06:16:46 -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=IykcmzxOMOBHOnefxyb4yQfoOfHzOmu60cn87IgriRc=; b=NshKj/xzu7Cg3b2oM4H9r4o0mAFzGQKSXOGiPl6DL82CJQrhW+8yTgyXr1pB/ruKgS Ex1pWfeXfDdhHDpX3FZyO7wOVYngZ/FGSW052P79DO9IjNaC4/d1qxQAB24d/JLBCfMu KTxbYJ319qh8vUW5J8H7KBPq3qbKRAAZg+UrUBMEHB5fjQ6dIEna0neS5hHc7DQ3Ev8Y +8Qg7aSmLVoQTgBY9DII/05CzQt3ikxyJI1/nmIL7Lao4HYqONJTeVMV7fdZtfAcG5VY 4tQTQZuPSNXWwz5gYq0GbxBpQKBELDJ5K+/SdZaX8MEKOgo3M8Zi8u2SsYF0M89R3GJ+ q1iw== 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=IykcmzxOMOBHOnefxyb4yQfoOfHzOmu60cn87IgriRc=; b=AzHJ/Yh42zZXlSZERLfsI71qbZ6B09qtnhMqIdPad6O1xGGqa9kgtkAQjV+LOykB3K /qV8K3fTS1JDoGvnnZjo/LPkuiQ86mJEFZf0f7BT/CNYJIR+fVsH/iM3HEvHMjYMyImN /+Sl9k0eFquNzO5UbW1gDPWrB1pS1Q3AAYAFVr6JpPWhmDDBRlJYnKvadtFyQBkYFX+a n3X0xeqIMVsR3cwBFMm4l6eDpAlarJy1dV7ZfQk+VJN95Ue7E1XTYPx3kK7gPf91sHZ/ nNzwrxJl0NJzo5lgF7v03Y3lsEOtmtzyVbHtfhxn7XlEhOCfwWvR518/5vOW+FVDZo+7 7tQg== X-Gm-Message-State: AMCzsaUdZkz99N5zNllrezAiuTsjZ6iGkz68flvYhHpbl5YVOX3HF2rk ZTcLsB426nk6ZuakCjA0Prm5kK9D X-Google-Smtp-Source: ABhQp+RK8RhE1GSW7UCxlw2xijtosrrpg+tdUrwH2hZk+Enw/ktQensdxAVNgP4Dof/8Yu7CUg51FA== X-Received: by 10.80.173.227 with SMTP id b32mr21286336edd.65.1508851005997; Tue, 24 Oct 2017 06:16:45 -0700 (PDT) Received: from localhost ([213.251.34.151]) by smtp.gmail.com with ESMTPSA id h16sm179232edj.33.2017.10.24.06.16.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Oct 2017 06:16:45 -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:29 +0100 Message-Id: <20171024131630.16595-3-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 2/3] net/e1000: 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/e1000/igb_ethdev.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 003bdf0f6..1211d5371 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -280,6 +280,7 @@ static void eth_igb_configure_msix_intr(struct rte_eth_dev *dev); static void eth_igbvf_interrupt_handler(void *param); static void igbvf_mbx_process(struct rte_eth_dev *dev); static int igb_filter_restore(struct rte_eth_dev *dev); +static int igbvf_dev_reset(struct rte_eth_dev *dev); /* * Define VF Stats MACRO for Non "cleared on read" register @@ -468,6 +469,7 @@ static const struct eth_dev_ops igbvf_eth_dev_ops = { .txq_info_get = igb_txq_info_get, .mac_addr_set = igbvf_default_mac_addr_set, .get_reg = igbvf_get_regs, + .dev_reset = igbvf_dev_reset, }; /* store statistics names and its offset in stats structure */ @@ -2975,6 +2977,63 @@ void igbvf_mbx_process(struct rte_eth_dev *dev) } static int +igbvf_dev_reset(struct rte_eth_dev *dev) +{ + struct e1000_hw *hw = + E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int diag = 0; + uint32_t eiam; + /* Reference igbvf_intr_enable */ + uint32_t eiam_mbx = 1 << E1000_VTIVAR_MISC_MAILBOX; + + /* Nothing needs to be done if the device is not started. */ + if (!dev->data->dev_started) + return -EAGAIN; + + PMD_DRV_LOG(DEBUG, "Link up/down event detected."); + + /* Performance VF reset. */ + do { + dev->data->dev_started = 0; + igbvf_dev_stop(dev); + if (dev->data->dev_conf.intr_conf.lsc == 0) + diag = eth_igb_link_update(dev, 0); + if (diag) { + PMD_INIT_LOG(INFO, "Igb VF reset: " + "Failed to update link."); + } + rte_delay_ms(1000); + + diag = igbvf_dev_start(dev); + dev->data->dev_started = 1; + if (diag) { + PMD_INIT_LOG(ERR, "Igb VF reset: " + "Failed to start device."); + return -EAGAIN; + } + eth_igbvf_stats_reset(dev); + if (dev->data->dev_conf.intr_conf.lsc == 0) + diag = eth_igb_link_update(dev, 0); + if (diag) { + PMD_INIT_LOG(INFO, "Igb VF reset: " + "Failed to update link."); + } + + /** + * 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, in other words, until the + * registers can be written. + */ + eiam = E1000_READ_REG(hw, E1000_EIAM); + } while (!(eiam & eiam_mbx)); + + return 0; +} + +static int eth_igbvf_interrupt_action(struct rte_eth_dev *dev, struct rte_intr_handle *intr_handle) { struct e1000_interrupt *intr =