From patchwork Sun Nov 20 10:05:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Blunck X-Patchwork-Id: 17102 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 2C9D668F2; Sun, 20 Nov 2016 11:08:28 +0100 (CET) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 203B3558B for ; Sun, 20 Nov 2016 11:07:15 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id a20so18303954wme.2 for ; Sun, 20 Nov 2016 02:07:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=27C1aYr9nIq0w2zRR3dHopzvOKOmG1t7h6Zy0kvJ+eM=; b=IkK1CeEMnAdNZhDfWiJPKyD6DWSUcWdZbYv/JtIBA4e2HE0Ue4p92Ml+UDtyJbQwXe GgSUyq8Jy1SFKr7XMDkOvm+POojHfCPUo7HdbUIwSsnMNVxWvLzZLEO6ZwoiU+tWeL00 c2zx2ptNZKwxQpjdaCy2jPmg5PlSKGDUiORfysUNdEGlIPoHritaKOeaTfeAWdyHogz6 /16iWbyyoMwgSK1aC32mwvjd85T3nUtJWnjauZ9BXnl4v05Z6ne2RCDls3pL799Ehofo hG1YjstiVwhQmA1pJN3Ews+8msupB6g03wVcFaYiA6coPBTjOtCyVlMbjTBPyQuV6vSd hqRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=27C1aYr9nIq0w2zRR3dHopzvOKOmG1t7h6Zy0kvJ+eM=; b=nGAUADaZNhmGY3SsZ/4e8LY6dZmDpF7b7RZQLKtdtKGoqo0wpJ9Rptx2WzEx4sQiw5 aJLjGcToMJttHnB/67qR1bCMqbseR32NdFqE9IQedtSzXbPqiYIfdoyQQ4RBJACsQfIs EnDLgIiL32kFtFFxLw708oIq2cfGqjqXIBlrhl+IIaHh4vXzMBVmyKj89GYdBBoviQ39 XNHRZvdIfw+O65S7q+MPv6kqMDecoCTI+RoFcKdLayL8ab/attLY/01VATHKacIFbewf 4K59Q1sCXMU465yUkc9oGtkFgOyS2wNu228yGyhw6B0aLpAiYpHmPxDXULrmrg15Pk74 GSJw== X-Gm-Message-State: AKaTC00+Y0bCLRHdg+bpNV5c9Zs0TUIOtHVFxK5EBuhbd/LfSOMt6gKLYo/t72CRIAu3YA== X-Received: by 10.28.209.67 with SMTP id i64mr8569221wmg.48.1479636434702; Sun, 20 Nov 2016 02:07:14 -0800 (PST) Received: from weierstrass.local.net ([91.200.110.70]) by smtp.gmail.com with ESMTPSA id d184sm13235434wmd.8.2016.11.20.02.07.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Nov 2016 02:07:13 -0800 (PST) From: Jan Blunck To: dev@dpdk.org Cc: shreyansh.jain@nxp.com Date: Sun, 20 Nov 2016 11:05:26 +0100 Message-Id: <1479636327-4166-6-git-send-email-jblunck@infradead.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479636327-4166-1-git-send-email-jblunck@infradead.org> References: <1479636327-4166-1-git-send-email-jblunck@infradead.org> Subject: [dpdk-dev] [PATCH 6/7] virtio: Don't depend on struct rte_eth_dev's pci_dev 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" We don't need to depend on rte_eth_dev->pci_dev to differentiate between the virtio_user and the virtio_pci case. Instead we can use the private virtio_hw struct to get that information. Signed-off-by: Jan Blunck --- drivers/net/virtio/virtio_ethdev.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index da9668e..023101d 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -483,11 +483,11 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx) hw->cvq = cvq; } - /* For virtio_user case (that is when dev->pci_dev is NULL), we use + /* For virtio_user case (that is when hw->dev is NULL), we use * virtual address. And we need properly set _offset_, please see * VIRTIO_MBUF_DATA_DMA_ADDR in virtqueue.h for more information. */ - if (dev->pci_dev) + if (hw->dev) vq->offset = offsetof(struct rte_mbuf, buf_physaddr); else { vq->vq_ring_mem = (uintptr_t)mz->addr; @@ -1190,7 +1190,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) struct virtio_hw *hw = eth_dev->data->dev_private; struct virtio_net_config *config; struct virtio_net_config local_config; - struct rte_pci_device *pci_dev = eth_dev->pci_dev; + struct rte_pci_device *pci_dev = hw->dev; int ret; /* Reset the device although not necessary at startup */ @@ -1294,7 +1294,6 @@ int eth_virtio_dev_init(struct rte_eth_dev *eth_dev) { struct virtio_hw *hw = eth_dev->data->dev_private; - struct rte_pci_device *pci_dev; uint32_t dev_flags = RTE_ETH_DEV_DETACHABLE; int ret; @@ -1317,10 +1316,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) return -ENOMEM; } - pci_dev = eth_dev->pci_dev; - - if (pci_dev) { - ret = vtpci_init(pci_dev, hw, &dev_flags); + /* For virtio_user case the hw->virtio_user_dev is populated by + * virtio_user_eth_dev_alloc() before eth_virtio_dev_init() is called. + */ + if (!hw->virtio_user_dev) { + ret = vtpci_init(ETH_DEV_PCI_DEV(eth_dev), hw, &dev_flags); if (ret) return ret; } @@ -1343,7 +1343,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) static int eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) { - struct rte_pci_device *pci_dev; struct virtio_hw *hw = eth_dev->data->dev_private; PMD_INIT_FUNC_TRACE(); @@ -1353,7 +1352,6 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) virtio_dev_stop(eth_dev); virtio_dev_close(eth_dev); - pci_dev = eth_dev->pci_dev; eth_dev->dev_ops = NULL; eth_dev->tx_pkt_burst = NULL; @@ -1367,7 +1365,8 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) rte_intr_callback_unregister(vtpci_intr_handle(hw), virtio_interrupt_handler, eth_dev); - rte_eal_pci_unmap_device(pci_dev); + if (hw->dev) + rte_eal_pci_unmap_device(hw->dev); PMD_INIT_LOG(DEBUG, "dev_uninit completed");