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 3F465C32C for ; Wed, 27 Jan 2016 18:39:56 +0100 (CET) Received: by mail-pa0-f46.google.com with SMTP id ho8so7964776pac.2 for ; Wed, 27 Jan 2016 09:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=eYwRODik98Ph8ORS3o2TiVTAn6sDovjuZflEfTKm2JQ=; b=08NDrC0t/Pja/QxNaW8Yq1ePyt9HxBNV1RjDCvv2QhZjTYxF7yMzw0F+T0bnB2+s8Y /mx1Fa8IuVYbQmMoxIx7DniThhITAQvS91oqMniHVmFzFCEpwNnLKa4Xo+FXmpFlf5Fv hd8JrR2WCvjraBjjuNL5RillbgcR/gxDs1P9/Me2o2WZhVARS54K6ce0PNz96Am1D1xJ 1sD3JZaGIStVCLuIHWj9L4iqFtvtU4Hlu59DAtiJfHiVlgpYBwqqCpsL8NcTtmiZXKPW RxayUxinSNJQLq1yN3uvXNg7dn39YiziWNksEZ/MfmB0qQdqBo5Wrwkhq/V6mKvAgNQP MO3A== 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; bh=eYwRODik98Ph8ORS3o2TiVTAn6sDovjuZflEfTKm2JQ=; b=JkQ6x3ufAyfg1AaIrIa6DumNYQXxruO1DyiyXy3HucZV8CrZCPmSrfMFhYeGY+wiFo LKiViUn9eoY2L2Va4WpTXjUgVUVma3/5jTOxnmhwajoTlMsYHwIyTGtWyLM2e+uKZRT+ Az/x1u8/Haeez83C5rFZWZDiEtSlqTZaNQ2KqzXGiCkqpWEwKgk3NajRJktUgaIwAX4X rABxOxRwbg24vww12ioIOjwGA96wxjk58AVuQ9p+ne0XTuqotWkCugrMvo3O/Zc2uDAy LqOAvnABhZT/rejZB1PgL2+AW3QI8GVQkWj9nsP1dC1A52dCoiEnRpTQMtLrDqak7Xts M+dw== X-Gm-Message-State: AG10YOTH+I4W8QGzOPSI3jZeyYk6q/4iSKfXpl+Rrzv/u9W+C2c9wTRph6O5Kz6ppCuP0zpl X-Received: by 10.66.197.131 with SMTP id iu3mr44245657pac.57.1453916395655; Wed, 27 Jan 2016 09:39:55 -0800 (PST) Received: from santosh-Latitude-E5530-non-vPro.mvista.com ([106.51.24.62]) by smtp.gmail.com with ESMTPSA id dg1sm10480887pad.18.2016.01.27.09.39.52 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 09:39:54 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Wed, 27 Jan 2016 23:09:46 +0530 Message-Id: <1453916386-27000-1-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.7.9.5 Subject: [dpdk-dev] [PATCH v7 08/10] virtio_pci: do not parse if interface is vfio 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: Wed, 27 Jan 2016 17:39:56 -0000 If virtio interface attached to vfio driver then do not parse for virtio resource. Instead exit with return 0; Note: Applicable for virtio spec 0.95. Signed-off-by: Santosh Shukla --- v5-->v6: - Replaced pci_dev->kdrv check from __noiommu to default; This is because patch [1] in v5 series not required. [1] http://dpdk.org/dev/patchwork/patch/9984/ v6--> v7: - Removed noiommu reference from commit message. drivers/net/virtio/virtio_pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c index 0c29f1d..deec306 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -514,7 +514,9 @@ virtio_resource_init_by_ioports(struct rte_pci_device *pci_dev) static int legacy_virtio_resource_init(struct rte_pci_device *pci_dev) { - if (virtio_resource_init_by_uio(pci_dev) == 0) + if (pci_dev->kdrv == RTE_KDRV_VFIO) + return 0; + else if (virtio_resource_init_by_uio(pci_dev) == 0) return 0; else return virtio_resource_init_by_ioports(pci_dev); -- 1.7.9.5