From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by dpdk.org (Postfix) with ESMTP id CD0BAB419 for ; Mon, 23 Feb 2015 06:09:54 +0100 (CET) Received: by pdjz10 with SMTP id z10so22799858pdj.0 for ; Sun, 22 Feb 2015 21:09:54 -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=WsiiVmVEnrvGyUrksWdZ41McpIsTvJVryk6qIgJiJ70=; b=JiuLfW9QV8YrOrFfcCYBCEHlfZYwVGnNzKIENbNvhQfvybJVnGdfUr4gKKEdDxia3K 17rC0rPel8io4Vwuc3olriDgLatm/edvgNa+thuH0X1KxfXPRWBlA1dNWI0EM5IGU9Xs 6hlLtB25J7s/KzZ3G7FJZaoVtEE5jl/jxh50yfGPd3tfatH8VgSQoMNDbtNxo0XNrKl3 jweOJgUPZCPRqC3j6vvJBZR4fBqB/jVM1sJusPpSWplraUAKxEAZrHQH5Mz3Q2oqse4Z WqCbE1kw1h4ohQqPUEmd7OBQ6Dbuv/ygV5nVX4O2ht3CpqKT+6UNXHpsHAOyXd9hLv5G st3A== X-Gm-Message-State: ALoCoQmcJuZRMcRBda2OMx+yriLjmVQr6hl4Gyh4YpYk2fC3Fjtvfc+/4oBcmTxDpnepwtYE5joc X-Received: by 10.70.34.14 with SMTP id v14mr16323692pdi.132.1424668194282; Sun, 22 Feb 2015 21:09:54 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id dc4sm12978066pbb.55.2015.02.22.21.09.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Feb 2015 21:09:52 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Mon, 23 Feb 2015 14:09:19 +0900 Message-Id: <1424668171-8695-4-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424668171-8695-1-git-send-email-mukawa@igel.co.jp> References: <1424414390-18509-6-git-send-email-mukawa@igel.co.jp> <1424668171-8695-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v11 03/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: Mon, 23 Feb 2015 05:09:55 -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 9fe2851..c04f897 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -554,25 +554,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 uio_pci_generic or 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