From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by dpdk.org (Postfix) with ESMTP id 955048E97 for ; Thu, 21 Jan 2016 12:08:14 +0100 (CET) Received: by mail-pa0-f53.google.com with SMTP id cy9so21731182pac.0 for ; Thu, 21 Jan 2016 03:08:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=VwY/8Mqn8Spto+7hAGHhUsugKg8CPD0utHQV/Yk00ro=; b=hVGaDDfIVwF6+ZojLEdLwk22VXaWZyXbq945m3dlXRwVQN4G4OKolpqedhl8v1HEl2 BAfq2pkI4Ptn9Tue4edbw+2JN1tXKSJtvh257CSH83PpVHhQ4860rxPSy27K1VXeczNf fulu7LDarpzRcnw9/7XDM+4uDmuqsihIsnigSXwmsUkOIco9ZHf/BBCIKjeUAna6vATn m+kq8M1otV5rtJbUxZ5Vtz1bHJiTi8DlXCAmA/j72S/6Mk4fI9sZDSpOxtqHvjjrvZ7P ZAXXDrZqZUJ1+vny29UE9OqqrJtX4Ul159ngv5/FqaEsZh7LkXvts38o74hIutra68N0 baFg== 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:in-reply-to:references; bh=VwY/8Mqn8Spto+7hAGHhUsugKg8CPD0utHQV/Yk00ro=; b=WYzkScKE/1GqZ+JMLnw2HUx64tCoDsSaxxeIPsnsK7qF254l7XUM4mHmWLsNjt2CUD n0LHbf+hSo/usndKlqj9PC67+jHcqNjWkj3jaZ91VFRrdzHz2rfSYcch0/eyfccqD+M6 F2pZgRdpn5ndzirI5JLCe/quvIxbdIQf6Ezsv/fNun1KmFesWjJiWG6rIHkEx4fI/6zu PGUtLNQhBc/LwwAEwFtYU++CFbXcM5d5M6jjSupP32U518CUbukjvWSKHNWuoSoHibcq jIfAWl2iB/gZxMveCzr+HTy2btuQkMX3dlIgrycw4xk4PCtHyCEfA/UWdH4kzFvzWtBD WA8A== X-Gm-Message-State: ALoCoQld5luSsgdl4InclZy51JBcUlB8t0LJmvLQD3qYs0FHOX86KS1Zd0eajhH6xe8EKpiRg4/kO2o/fh8aU7QyDCPK8MdoVw== X-Received: by 10.66.164.102 with SMTP id yp6mr59288708pab.25.1453374494029; Thu, 21 Jan 2016 03:08:14 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id wa17sm1792640pac.38.2016.01.21.03.08.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Jan 2016 03:08:13 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org, yuanhan.liu@linux.intel.com, jianfeng.tan@intel.com Date: Thu, 21 Jan 2016 20:07:55 +0900 Message-Id: <1453374478-30996-3-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453374478-30996-1-git-send-email-mukawa@igel.co.jp> References: <1453374478-30996-1-git-send-email-mukawa@igel.co.jp> In-Reply-To: <1453108389-21006-2-git-send-email-mukawa@igel.co.jp> References: <1453108389-21006-2-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [RFC PATCH 2/5] virtio: move rte_eal_pci_unmap_device() to virtio_pci.c 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, 21 Jan 2016 11:08:14 -0000 To abstract pci access method, the patch moves below function to "virtio_pci.c". - rte_eal_pci_unmap_device() Signed-off-by: Tetsuya Mukawa --- drivers/net/virtio/virtio_ethdev.c | 2 +- drivers/net/virtio/virtio_pci.c | 11 +++++++++++ drivers/net/virtio/virtio_pci.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index deb0382..37833a8 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1177,7 +1177,7 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) rte_intr_callback_unregister(&pci_dev->intr_handle, virtio_interrupt_handler, eth_dev); - rte_eal_pci_unmap_device(pci_dev); + vtpci_uninit(pci_dev, hw); PMD_INIT_LOG(DEBUG, "dev_uninit completed"); diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c index 0aeffb7..7d7ef06 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -878,3 +878,14 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw) return 0; } + +void +vtpci_uninit(struct rte_pci_device *dev, struct virtio_hw *hw) +{ + hw->dev = NULL; + hw->vtpci_ops = NULL; + hw->use_msix = 0; + hw->io_base = 0; + hw->modern = 0; + rte_eal_pci_unmap_device(dev); +} diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h index 0544a07..17c7972 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -328,6 +328,7 @@ vtpci_with_feature(struct virtio_hw *hw, uint64_t bit) * Function declaration from virtio_pci.c */ int vtpci_init(struct rte_pci_device *, struct virtio_hw *); +void vtpci_uninit(struct rte_pci_device *dev, struct virtio_hw *); void vtpci_reset(struct virtio_hw *); void vtpci_reinit_complete(struct virtio_hw *); -- 2.1.4