From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by dpdk.org (Postfix) with ESMTP id 2C50EBE7C for ; Thu, 7 Jan 2016 17:34:27 +0100 (CET) Received: by mail-pa0-f53.google.com with SMTP id uo6so244121931pac.1 for ; Thu, 07 Jan 2016 08:34:27 -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=sYDGp9TH6vXcF8R29zdLBybgX5rrzgZ1M83l2OtSpTU=; b=KV4s6G1WCKWeNaCICaXuiuXFjLqpjv2SxJ0yt+Y+O95+WZvQscWXml7ESss9zWLqOZ f63pBzd5VywXtUewjppoXv5R0TZM4sxXgFUam3ohGcW9wcMjjUEDftmUiAvD6uDX+RJW cBjv5QWCSAarzbXLwCgv5sgOtoBPKSYTPrDRXnc7TVJJmo7Wss/WJ2LtnpGlJe38kw3E mILEKDdaxVPVxVrHIK91eKvCsjZNH0zIEOUNMc4hXIRFPB9tQWXWSxmfNPaV6kAYpjTo N0cxQrFTX//YVAZjVJrIjhOGuI/7OuouK0AuZVilHY3m136Ju1kh19Ggr/4hrIG4/lPD lUBg== 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=sYDGp9TH6vXcF8R29zdLBybgX5rrzgZ1M83l2OtSpTU=; b=RTgw5qtsBys6fTz45f5BKeZ/K34/Z4jglRdD9nrp/WUoeFOhK0hlgtG+ZYd4lCB0pr WNCDQxrX9J1ou7nAxEFJ+hMnH/pJV9mf3+TFt0IVb7izodA9hX+NIs1CG0ONxSsKksvb JphEgTihuf1pdDrKBlJ8v06TPNWJnPsndQW+0l3BVeSbdcOoSBNxbNT+OVRK5Q2rFBbc 1WUDrBGtKcJjjbHjJUaN83WREZQP+IH0DFZ/u0hf+GFCV7VKmBvYsXAeYyWXBhPe6C+k f2xcp2W5kWfp8bdFM8ta+3Dsitbh0UVTAlK/aWMVNp1tFs9jacsQjq8I+skTfF3LWPMj 84Pw== X-Gm-Message-State: ALoCoQnWFG1jOpQhmNfAUfOkDc9wnNPetZ2WOakpUkrnK/qz7LCMlVXVTHWAt42J8J/C/7CKLQ3ZbF93bLSmMoAZd5ECJZ3kiw== X-Received: by 10.66.236.162 with SMTP id uv2mr152283357pac.101.1452184466582; Thu, 07 Jan 2016 08:34:26 -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.23 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 08:34:25 -0800 (PST) From: Santosh Shukla To: dev@dpdk.org Date: Thu, 7 Jan 2016 22:03:03 +0530 Message-Id: <1452184390-5994-7-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> Subject: [dpdk-dev] [PATCH v3 06/12] eal: pci: vfio: add rd/wr func for pci bar space 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, 07 Jan 2016 16:34:27 -0000 Introducing below api for pci bar space rd/wr. Currently used for pci iobar rd/wr. Api's are: - rte_eal_pci_read_bar - rte_eal_pci_write_bar virtio when used for vfio-mode then virtio driver will use these api to do rd/wr operation on ioport pci bar. Signed-off-by: Santosh Shukla --- lib/librte_eal/common/include/rte_pci.h | 38 ++++++++++++++++++++++++++++ lib/librte_eal/linuxapp/eal/eal_pci.c | 28 ++++++++++++++++++++ lib/librte_eal/linuxapp/eal/eal_pci_init.h | 6 +++++ lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 28 ++++++++++++++++++++ 4 files changed, 100 insertions(+) diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 334c12e..53437cc 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -471,6 +471,44 @@ int rte_eal_pci_read_config(const struct rte_pci_device *device, void *buf, size_t len, off_t offset); /** + * Read PCI bar space. + * + * @param device + * A pointer to a rte_pci_device structure describing the device + * to use + * @param buf + * A data buffer where the bytes should be read into + * @param len + * The length of the data buffer. + * @param offset + * The offset into PCI bar space + * @param bar_idx + * The pci bar index (valid range is 0..5) + */ +int rte_eal_pci_read_bar(const struct rte_pci_device *device, + void *buf, size_t len, off_t offset, int bar_idx); + +/** + * Write PCI bar space. + * + * @param device + * A pointer to a rte_pci_device structure describing the device + * to use + * @param buf + * A data buffer containing the bytes should be written + * @param len + * The length of the data buffer. + * @param offset + * The offset into PCI config space + * @param bar_idx + * The pci bar index (valid range is 0..5) +*/ +int rte_eal_pci_write_bar(const struct rte_pci_device *device, + const void *buf, size_t len, off_t offset, + int bar_idx); + + +/** * Write PCI config space. * * @param device diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index bc5b5be..22d3321 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -621,6 +621,34 @@ int rte_eal_pci_write_config(const struct rte_pci_device *device, } } +int rte_eal_pci_read_bar(const struct rte_pci_device *device __rte_unused, + void *buf __rte_unused, + size_t len __rte_unused, + off_t offset __rte_unused, + int bar_idx __rte_unused) +{ +#ifdef VFIO_PRESENT + const struct rte_intr_handle *intr_handle = &device->intr_handle; + return pci_vfio_read_bar(intr_handle, buf, len, offset, bar_idx); +#else + return 0; /* UIO's not applicable */ +#endif +} + +int rte_eal_pci_write_bar(const struct rte_pci_device *device __rte_unused, + const void *buf __rte_unused, + size_t len __rte_unused, + off_t offset __rte_unused, + int bar_idx __rte_unused) +{ +#ifdef VFIO_PRESENT + const struct rte_intr_handle *intr_handle = &device->intr_handle; + return pci_vfio_write_bar(intr_handle, buf, len, offset, bar_idx); +#else + return 0; /* UIO's not applicable */ +#endif +} + /* Init the PCI EAL subsystem */ int rte_eal_pci_init(void) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_init.h b/lib/librte_eal/linuxapp/eal/eal_pci_init.h index a17c708..3bc592b 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_init.h +++ b/lib/librte_eal/linuxapp/eal/eal_pci_init.h @@ -68,6 +68,12 @@ int pci_vfio_read_config(const struct rte_intr_handle *intr_handle, int pci_vfio_write_config(const struct rte_intr_handle *intr_handle, const void *buf, size_t len, off_t offs); +int pci_vfio_read_bar(const struct rte_intr_handle *intr_handle, + void *buf, size_t len, off_t offs, int bar_idx); + +int pci_vfio_write_bar(const struct rte_intr_handle *intr_handle, + const void *buf, size_t len, off_t offs, int bar_idx); + /* map VFIO resource prototype */ int pci_vfio_map_resource(struct rte_pci_device *dev); int pci_vfio_get_group_fd(int iommu_group_fd); diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c index 4077eb6..7ec203c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c @@ -93,6 +93,34 @@ pci_vfio_write_config(const struct rte_intr_handle *intr_handle, VFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) + offs); } +int +pci_vfio_read_bar(const struct rte_intr_handle *intr_handle, + void *buf, size_t len, off_t offs, int bar_idx) +{ + if (bar_idx < VFIO_PCI_BAR0_REGION_INDEX + || bar_idx > VFIO_PCI_BAR5_REGION_INDEX) { + RTE_LOG(ERR, EAL, "invalid bar_idx!\n"); + return -1; + } + + return pread64(intr_handle->vfio_dev_fd, buf, len, + VFIO_GET_REGION_ADDR(bar_idx) + offs); +} + +int +pci_vfio_write_bar(const struct rte_intr_handle *intr_handle, + const void *buf, size_t len, off_t offs, int bar_idx) +{ + if (bar_idx < VFIO_PCI_BAR0_REGION_INDEX + || bar_idx > VFIO_PCI_BAR5_REGION_INDEX) { + RTE_LOG(ERR, EAL, "invalid bar_idx!\n"); + return -1; + } + + return pwrite64(intr_handle->vfio_dev_fd, buf, len, + VFIO_GET_REGION_ADDR(bar_idx) + offs); +} + /* get PCI BAR number where MSI-X interrupts are */ static int pci_vfio_get_msix_bar(int fd, int *msix_bar, uint32_t *msix_table_offset, -- 1.7.9.5