From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ie0-f171.google.com (mail-ie0-f171.google.com [209.85.223.171]) by dpdk.org (Postfix) with ESMTP id 9C5D35A54 for ; Thu, 26 Feb 2015 03:32:09 +0100 (CET) Received: by iebtr6 with SMTP id tr6so10427068ieb.10 for ; Wed, 25 Feb 2015 18:32:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UpAdEQJfFy8PVT/j3BR6+s6/I6+iSqrC0LKOY5PUxvk=; b=Vb8PeQsILtd/Ewe4zZtsf2rw9CItHEUFEykL8GKic/oWHc7KzkYEG9zaakDnKGNcsb ko9r8ZnMg8i5ObUla6s5AkGS/SF0KrhPxRZUJcxvixdFTSA/TRp60t9Y4nWSG3eGQfIO bM3HvzmCtcquOgxXltJTY/6fzdwiiRjdmxahPhTSoWS3yu30szV8kjQ9AhGpSOM1cPen 5KOOyNWXeYLFlgRHV9bZ7N837XRQ2zdhsJCI3Gs2hZH65tjlM9vPCBnoV9eGPj1fHHPm XHncbdDiVcYVfF9kpxvOHB0DFhSPvVMEB6HvZN9qUD9aaObbdpv/V46Fd/RgRCxudHsI yQqg== X-Gm-Message-State: ALoCoQlq9bp7bS16x/3FLOW4YPrt5TdjYKqq9v5zPgNwakVkvMPeCTWdRAmVIfvntnK6E9XFe6ed X-Received: by 10.42.71.194 with SMTP id l2mr7129899icj.71.1424917929168; Wed, 25 Feb 2015 18:32:09 -0800 (PST) Received: from urahara.brocade.com (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id y5sm336741ign.7.2015.02.25.18.32.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Feb 2015 18:32:08 -0800 (PST) From: Stephen Hemminger To: Yong Wang Date: Wed, 25 Feb 2015 18:32:00 -0800 Message-Id: <1424917922-1979-5-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1424917922-1979-1-git-send-email-stephen@networkplumber.org> References: <1424917922-1979-1-git-send-email-stephen@networkplumber.org> Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH 5/7] vmxnet3: fix link state handling X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 02:32:10 -0000 The Intel version of VMXNET3 driver does not handle link state properly. The VMXNET3 API returns 1 if connected and 0 if disconnected. Also need to return correct value to indicate state change. Signed-off-by: Stephen Hemminger Acked-by: Yong Wang --- lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c | 54 ++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c index 570565a..35bb561 100644 --- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c +++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c @@ -157,9 +157,36 @@ gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size, * - On success, zero. * - On failure, negative value. */ -static inline int -rte_vmxnet3_dev_atomic_write_link_status(struct rte_eth_dev *dev, - struct rte_eth_link *link) + +static int +vmxnet3_dev_atomic_read_link_status(struct rte_eth_dev *dev, + struct rte_eth_link *link) +{ + struct rte_eth_link *dst = link; + struct rte_eth_link *src = &(dev->data->dev_link); + + if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, + *(uint64_t *)src) == 0) + return -1; + + return 0; +} + +/** + * Atomically writes the link status information into global + * structure rte_eth_dev. + * + * @param dev + * - Pointer to the structure rte_eth_dev to write to. + * - Pointer to the buffer to be saved with the link status. + * + * @return + * - On success, zero. + * - On failure, negative value. + */ +static int +vmxnet3_dev_atomic_write_link_status(struct rte_eth_dev *dev, + struct rte_eth_link *link) { struct rte_eth_link *dst = &(dev->data->dev_link); struct rte_eth_link *src = link; @@ -391,6 +418,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) devRead->misc.driverInfo.vmxnet3RevSpt = 1; devRead->misc.driverInfo.uptVerSpt = 1; + devRead->misc.mtu = rte_le_to_cpu_32(dev->data->mtu); devRead->misc.queueDescPA = hw->queueDescPA; devRead->misc.queueDescLen = hw->queue_desc_len; devRead->misc.numTxQueues = hw->num_tx_queues; @@ -576,7 +604,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) /* Clear recorded link status */ memset(&link, 0, sizeof(link)); - rte_vmxnet3_dev_atomic_write_link_status(dev, &link); + vmxnet3_dev_atomic_write_link_status(dev, &link); } /* @@ -659,28 +687,24 @@ static int vmxnet3_dev_link_update(struct rte_eth_dev *dev, __attribute__((unused)) int wait_to_complete) { struct vmxnet3_hw *hw = dev->data->dev_private; - struct rte_eth_link link; + struct rte_eth_link old, link; uint32_t ret; + memset(&link, 0, sizeof(link)); + vmxnet3_dev_atomic_read_link_status(dev, &old); + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK); ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD); - if (!ret) { - PMD_INIT_LOG(ERR, "Link Status Negative : %s()", __func__); - return -1; - } - if (ret & 0x1) { link.link_status = 1; link.link_duplex = ETH_LINK_FULL_DUPLEX; link.link_speed = ETH_LINK_SPEED_10000; - - rte_vmxnet3_dev_atomic_write_link_status(dev, &link); - - return 0; } - return -1; + vmxnet3_dev_atomic_write_link_status(dev, &link); + + return (old.link_status == link.link_status) ? -1 : 0; } /* Updating rxmode through Vmxnet3_DriverShared structure in adapter */ -- 2.1.4