From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by dpdk.org (Postfix) with ESMTP id 5EA495AA2 for ; Fri, 30 Jan 2015 06:44:45 +0100 (CET) Received: by mail-pa0-f46.google.com with SMTP id lj1so48073753pab.5 for ; Thu, 29 Jan 2015 21:44:44 -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=M3kFGFQL5QSzS/BOo3w3nHlM9Sr4UsdZEIAqc/Rcepw=; b=DAwBvKHu9ozR0CeFxO9egowSV8c1c4G/NGDEuf/K0fzg9PapThVXa+JPL61uLYvtKb PYr8MvuIQkW+Xg9QmgvKT/lYO/K+SlUvoThQSdEmC9BpHr1xgSXh2djQ7VBpG/q2ADJB 0jGI0DgZRlUOHH5uTUPQN5g2IrAkkEWnjpOaoI3fyPMqfmaG7Vq74jqqpc9xGJaogOoK cib6OSjJlEojdyCrEOlKqIjw+ADluOvLa+AgpK/fEv2i1JIvp5Gc/PGfSFQ6+vuN1muB FJBaKEpBkT7vQnlUkOa6EsVfW0QHC0IXDetnZJJTPsN8KvEDBrVR9YSkBrFT6486HOXa mN8A== X-Gm-Message-State: ALoCoQkJ+HKlyEjFDV3TIIANFZIfFd/BkRcRr4w4VQ26HSfXa9Q5hT+dMX7dWIUybnXaIp7O4Oad X-Received: by 10.66.250.134 with SMTP id zc6mr6629597pac.2.1422596684776; Thu, 29 Jan 2015 21:44:44 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id ki4sm9482266pdb.34.2015.01.29.21.44.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jan 2015 21:44:44 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Fri, 30 Jan 2015 14:42:30 +0900 Message-Id: <1422596563-26310-3-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422596563-26310-1-git-send-email-mukawa@igel.co.jp> References: <1421664027-17971-9-git-send-email-mukawa@igel.co.jp> <1422596563-26310-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v5 02/13] 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: Fri, 30 Jan 2015 05:44:46 -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 bd3f77d..c0ca5a5 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -549,25 +549,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