From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by dpdk.org (Postfix) with ESMTP id 55FB0B4F1 for ; Thu, 19 Feb 2015 03:50:13 +0100 (CET) Received: by pabkq14 with SMTP id kq14so6010635pab.3 for ; Wed, 18 Feb 2015 18:50:12 -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=n3lFWon+ntcaNR3t4KtSYNPlmitMcwWPMjxb14BpNNc=; b=meKKGKB5H5wvFLFTnARm8to+v58DSux/r7FrXHvAmfZWsSq8RSCadPM4AgpS4PJK3h 8RnVRPDOPlSY/CPYumIxz6NlGqU9Zz8GT/SS/dodWLPW/nQmXRqQRiQ3BYYn+pNvmHZa 3wpee7JJfx+LXokEB784eVom6cjn1BTf34DvXiLGSM7sGwnDWzd3+yFvT7ZfC15KrlFk MHa17RdKFWvpXKM5EiaOSMgFGcfibBhDg4vbuLjuG4cqeCXsFk3CFXav0GfV7YgU+lAS kViGzbBFcsHIGh4J9wLpwygjma+iJoNU9Lc1r8B2Zfw1g5sLlpxPmw1PnjeoykMaDgvH AEgw== X-Gm-Message-State: ALoCoQkd10Oqe08Txxr/RrtGnlyl67QjMgNhJvHiQxf+ZoHayqfA8bfR7+Dc5T4HqZG/zRxcjIop X-Received: by 10.70.118.234 with SMTP id kp10mr4027183pdb.20.1424314212794; Wed, 18 Feb 2015 18:50:12 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id iy1sm17860786pbb.14.2015.02.18.18.50.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Feb 2015 18:50:12 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Thu, 19 Feb 2015 11:49:34 +0900 Message-Id: <1424314187-25177-4-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424314187-25177-1-git-send-email-mukawa@igel.co.jp> References: <1424060073-23484-12-git-send-email-mukawa@igel.co.jp> <1424314187-25177-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v9 03/14] eal_pci: pci memory map work with driver type 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, 19 Feb 2015 02:50:13 -0000 From: Michael Qiu With the driver type flag in struct rte_pci_dev, we do not need to always map uio devices with vfio related function when vfio enabled. Signed-off-by: Michael Qiu Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/linuxapp/eal/eal_pci.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index e760452..3c463b2 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -556,25 +556,29 @@ pci_config_space_set(struct rte_pci_device *dev) static int pci_map_device(struct rte_pci_device *dev) { - int ret, mapped = 0; + int ret = -1; /* try mapping the NIC resources using VFIO if it exists */ + switch (dev->pt_driver) { + case RTE_PT_VFIO: #ifdef VFIO_PRESENT - if (pci_vfio_is_enabled()) { - ret = pci_vfio_map_resource(dev); - if (ret == 0) - mapped = 1; - else if (ret < 0) - return ret; - } + if (pci_vfio_is_enabled()) + ret = pci_vfio_map_resource(dev); #endif - /* map resources for devices that use igb_uio */ - if (!mapped) { + break; + case RTE_PT_IGB_UIO: + case RTE_PT_UIO_GENERIC: + /* map resources for devices that use uio */ ret = pci_uio_map_resource(dev); - if (ret != 0) - return ret; + break; + default: + RTE_LOG(DEBUG, EAL, " Not managed by known pt driver," + " skipped\n"); + ret = 1; + break; } - return 0; + + return ret; } /* -- 1.9.1