From patchwork Thu Jan 7 16:33:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shukla X-Patchwork-Id: 9772 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 8B923C1CC; Thu, 7 Jan 2016 17:34:35 +0100 (CET) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by dpdk.org (Postfix) with ESMTP id E9639C1C6 for ; Thu, 7 Jan 2016 17:34:33 +0100 (CET) Received: by mail-pa0-f48.google.com with SMTP id uo6so244124109pac.1 for ; Thu, 07 Jan 2016 08:34:33 -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:in-reply-to:references; bh=0X/9g0ZbU5JxUYNstA3anQznzwqLLcYrTiiXlMixJDU=; b=tn/mk37tnACuRPTVMUO/7vkP9sEreQTcJR3TQFsNtZv7Vfi6BaccGMTkwf/0jQW36B p0bQqNu0fO9lWeR3DBXkwv0mGUYZdYry5ADzuWcLYmR0CJozFgtxC/o6ErS6n4H62Ykx BrRaVEGRPwRUol9ogQWPIhKp2I3APSlrfnNd3VDFdnRmkY4KXx/jKuzgJID/2+gk7bUs eOYm4Z2nm80Fam+wYL+hA4bkde8+axS+HWOVEKMAj00I5KPZQ2ugUuF5HMvrjIeTleYH kI0fwdCIPezzPl4lxE4BkEm3PGIfpm6aldDL3BCc1cnhx9PrtY4/YH5MeNaJw8Chj589 x1Cw== 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=0X/9g0ZbU5JxUYNstA3anQznzwqLLcYrTiiXlMixJDU=; b=FnEeS/kJtOdP48HP5u66yoHrXsNylcg+0Ilc9z/CeLSJVgxhvwiIuNftZLfawAYPlL tt1yURYosXDKgZoUSq955o+oJoHgxJkSo0dO7cbMJMlNXAW1Eip5BGTmEoTd2f6CyNzV f9Bcpv0p06TP+oB1I2AguVa2hhlN12dCWpwQJ1fgkQRFQTLUKIp/b97fBbb/7olT//VS +l1qqya9GJda8NOsiNftwByn+cB1Hd5PJaxHdsZ4eLVdrYgdO3s1QLtRum+vnjc3pC/V ruHSWgQ/1vv0Nj3xRjpnmzOYYhKkpyyqL2trmASyK+2Vrv0S1joq8YZoZh9DAPETwqhO 4bEw== X-Gm-Message-State: ALoCoQkNLenyszbjE1Kqe8/Fm3U3s7fI+lYUX+ziophPOpl7psol+xIvX9zwygxw73MoZ1z7LCkV+pbpvnHCS0ijbeJVHb/wPg== X-Received: by 10.66.140.14 with SMTP id rc14mr110959888pab.65.1452184473364; Thu, 07 Jan 2016 08:34:33 -0800 (PST) Received: from santosh-Latitude-E5530-non-vPro.mvista.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id yn8sm159454163pac.32.2016.01.07.08.34.30 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 08:34:32 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Thu, 7 Jan 2016 22:03:05 +0530 Message-Id: <1452184390-5994-9-git-send-email-sshukla@mvista.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1452184390-5994-1-git-send-email-sshukla@mvista.com> References: <1452184390-5994-1-git-send-email-sshukla@mvista.com> Cc: Rakesh Krishnamurhty , Rizwan Ansari Subject: [dpdk-dev] [PATCH v3 08/12] virtio: Add capability to initialize driver for vfio interface 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" - adding pci_dev member in struct virtio_hw{} to track vfio_dev_fd per virtio interface, required for ioport rd/wr operation. - Masked default VIRTIO_READ/WRITE for vfio case. Signed-off-by: Santosh Shukla Signed-off-by: Rizwan Ansari Signed-off-by: Rakesh Krishnamurhty --- drivers/net/virtio/virtio_ethdev.c | 11 ++++++++++- drivers/net/virtio/virtio_pci.h | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index d928339..9ca99d5 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1287,9 +1287,18 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) pci_dev = eth_dev->pci_dev; +#ifdef RTE_EAL_VFIO + hw->pci_dev = pci_dev; + + /* For debug use only */ + const struct rte_intr_handle *intr_handle __rte_unused = &pci_dev->intr_handle; + PMD_INIT_LOG(DEBUG, "hw->pci_dev %p intr_handle %p vfio_dev_fd %d\n", + hw->pci_dev, intr_handle, + intr_handle->vfio_dev_fd); +#endif + if (virtio_resource_init(pci_dev) < 0) return -1; - hw->use_msix = virtio_has_msix(&pci_dev->addr); hw->io_base = (uint32_t)(uintptr_t)pci_dev->mem_resource[0].addr; diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h index 8b5b031..6dabede 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -47,6 +47,10 @@ #include +#ifdef RTE_EAL_VFIO +#include "virtio_vfio.h" +#endif + struct virtqueue; /* VirtIO PCI vendor/device ID. */ @@ -176,6 +180,9 @@ struct virtio_hw { uint8_t use_msix; uint8_t started; uint8_t mac_addr[ETHER_ADDR_LEN]; +#ifdef RTE_EAL_VFIO + const struct rte_pci_device *pci_dev; +#endif }; /* @@ -228,6 +235,7 @@ outl_p(unsigned int data, unsigned int port) } #endif +#ifndef RTE_EAL_VFIO #define VIRTIO_PCI_REG_ADDR(hw, reg) \ (unsigned short)((hw)->io_base + (reg)) @@ -245,6 +253,7 @@ outl_p(unsigned int data, unsigned int port) inl((VIRTIO_PCI_REG_ADDR((hw), (reg)))) #define VIRTIO_WRITE_REG_4(hw, reg, value) \ outl_p((unsigned int)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg)))) +#endif static inline int vtpci_with_feature(struct virtio_hw *hw, uint32_t bit)