From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <jblunck@gmail.com>
Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com
[209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 54D7D5927
for <dev@dpdk.org>; Mon, 6 Mar 2017 11:01:02 +0100 (CET)
Received: by mail-wr0-f193.google.com with SMTP id u108so17052449wrb.2
for <dev@dpdk.org>; Mon, 06 Mar 2017 02:01:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=sender:from:to:subject:date:message-id:in-reply-to:references;
bh=Ma9BXl3JweEJnlpUo5ammgqMDetjDp26Pdjkwc2msIo=;
b=UFqtoJKcnNwLFW6CpCR2kgS92R+m0H+ir6Y6wOqVyU9GN4HCfTEv45V91W5lmwF7W/
9J2kZ19ZSB3RdJKR6inVGaOQ2I71DK4vWWC0ZUb9dn3jNGiiKU725LDQi8cZaZQGRiLw
sfu/21vXUdvEbrXf1RwLYcxl9apcfh3rmc6J7z5l0RfpyU7PJFXJodFEFVncL4Kp/a6Y
r8SNq7IHU3iWizwEgPYwTXaQnpa0Y66JfQFLy+BTLRLCOPqs3DYA2Gxq31wtzq4yoA0v
SwhCP7+M4ycHNBuXGX1Fbx88F5xibmJjUJEYnCJa6Kg7G3epMakGo6p9zRTkc2BcnhTV
fQCQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:sender:from:to:subject:date:message-id
:in-reply-to:references;
bh=Ma9BXl3JweEJnlpUo5ammgqMDetjDp26Pdjkwc2msIo=;
b=j3Z3fCEo1hcYss30Na5XFZuNCjCCXNiTmwha21xHqtoTxIHgShKZJGA21eXlD7lUdd
qkWtNzCwDHRMCwkCXxKGvoCHMAW1Bi8hQ38ixtq1Qh5s8CVTg2kagRR+IEhoI4A8GeaQ
fqaqAJd28aX+aGIYMyTZ6qpsLfJX6ltkedykpZix8Yx5TnD6Ni/OoTq2a9ENAF7YaRI2
lkUOhjxpkOz8z/tQrhgmRrm7qNMtuAeAfCnfhbhhIqw9EGF0fbJyba0RuVyl9IogknXs
60A5RHK2olh7//uWgKkLvtE5TW3AJEVPywebNJkNfXJe2uLhYUsIfrg2JKeXvYlx8PYe
aX7Q==
X-Gm-Message-State: AMke39kb3Gab4QF2HBGKFPv3Q4heejirsq7YETSWE+dIfD1SjJJJ4SmQQ472YuXgfIkdwg==
X-Received: by 10.223.162.205 with SMTP id t13mr14761026wra.155.1488794461578;
Mon, 06 Mar 2017 02:01:01 -0800 (PST)
Received: from weierstrass.local.net ([91.200.109.169])
by smtp.gmail.com with ESMTPSA id u145sm3829237wmu.1.2017.03.06.02.01.00
for <dev@dpdk.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 06 Mar 2017 02:01:00 -0800 (PST)
Sender: Jan Blunck <jblunck@gmail.com>
From: Jan Blunck <jblunck@infradead.org>
To: dev@dpdk.org
Date: Mon, 6 Mar 2017 11:00:07 +0100
Message-Id: <1488794430-25179-16-git-send-email-jblunck@infradead.org>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1488794430-25179-1-git-send-email-jblunck@infradead.org>
References: <1488794430-25179-1-git-send-email-jblunck@infradead.org>
Subject: [dpdk-dev] [PATCH 15/38] ethdev: add PCI driver helpers
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Mar 2017 10:01:02 -0000
This adds the following helper intended to be used by rte_pci_driver
implementations working with ethdev:
- rte_eth_dev_pci_allocate
- rte_eth_dev_pci_release
- rte_eth_dev_pci_generic_probe
- rte_eth_dev_pci_generic_remove
Signed-off-by: Jan Blunck <jblunck@infradead.org>
---
lib/librte_ether/Makefile | 1 +
lib/librte_ether/rte_ethdev_pci.h | 151 ++++++++++++++++++++++++++++++++++++++
2 files changed, 152 insertions(+)
create mode 100644 lib/librte_ether/rte_ethdev_pci.h
diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile
index 31e6ba7..a6fff5e 100644
--- a/lib/librte_ether/Makefile
+++ b/lib/librte_ether/Makefile
@@ -50,6 +50,7 @@ SRCS-y += rte_flow.c
# Export include files
#
SYMLINK-y-include += rte_ethdev.h
+SYMLINK-y-include += rte_ethdev_pci.h
SYMLINK-y-include += rte_ethdev_vdev.h
SYMLINK-y-include += rte_eth_ctrl.h
SYMLINK-y-include += rte_dev_info.h
diff --git a/lib/librte_ether/rte_ethdev_pci.h b/lib/librte_ether/rte_ethdev_pci.h
new file mode 100644
index 0000000..4b728db
--- /dev/null
+++ b/lib/librte_ether/rte_ethdev_pci.h
@@ -0,0 +1,151 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2017 Brocade Communications Systems, Inc.
+ * Author: Jan Blunck <jblunck@infradead.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_ETHDEV_PCI_H_
+#define _RTE_ETHDEV_PCI_H_
+
+#include <rte_malloc.h>
+#include <rte_pci.h>
+#include <rte_ethdev.h>
+
+/**
+ * @internal
+ * Allocates a new ethdev slot for an ethernet device and returns the pointer
+ * to that slot for the driver to use.
+ *
+ * @param dev
+ * Pointer to the PCI device
+ *
+ * @param private_data_size
+ * Size of private data structure
+ *
+ * @return
+ * A pointer to a rte_eth_dev or NULL if allocation failed.
+ */
+static inline struct rte_eth_dev *
+rte_eth_dev_pci_allocate(struct rte_pci_device *dev, size_t private_data_size)
+{
+ struct rte_eth_dev *eth_dev;
+ const char *name;
+
+ if (!dev)
+ return NULL;
+
+ name = dev->device.name;
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ eth_dev = rte_eth_dev_allocate(name);
+ if (!eth_dev)
+ return NULL;
+
+ if (private_data_size) {
+ eth_dev->data->dev_private = rte_zmalloc_socket(name,
+ private_data_size, RTE_CACHE_LINE_SIZE,
+ dev->device.numa_node);
+ if (!eth_dev->data->dev_private) {
+ rte_eth_dev_release_port(eth_dev);
+ return NULL;
+ }
+ }
+ } else {
+ eth_dev = rte_eth_dev_attach_secondary(name);
+ if (!eth_dev)
+ return NULL;
+ }
+
+ eth_dev->device = &dev->device;
+ eth_dev->driver = NULL;
+ eth_dev->intr_handle = &dev->intr_handle;
+ rte_eth_copy_pci_info(eth_dev, dev);
+ return eth_dev;
+}
+
+static inline void
+rte_eth_dev_pci_release(struct rte_eth_dev *eth_dev)
+{
+ /* free ether device */
+ rte_eth_dev_release_port(eth_dev);
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ rte_free(eth_dev->data->dev_private);
+
+ eth_dev->data->dev_private = NULL;
+
+ eth_dev->device = NULL;
+ eth_dev->driver = NULL;
+ eth_dev->intr_handle = NULL;
+}
+
+typedef int (*eth_dev_pci_callback_t)(struct rte_eth_dev *eth_dev);
+
+static inline int
+rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev,
+ size_t private_data_size, eth_dev_pci_callback_t dev_init)
+{
+ struct rte_eth_dev *eth_dev;
+ int ret;
+
+ eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size);
+ if (!eth_dev)
+ return -ENOMEM;
+
+ RTE_FUNC_PTR_OR_ERR_RET(*dev_init, -EINVAL);
+ ret = dev_init(eth_dev);
+ if (ret)
+ rte_eth_dev_pci_release(eth_dev);
+
+ return ret;
+}
+
+static inline int
+rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev,
+ eth_dev_pci_callback_t dev_uninit)
+{
+ struct rte_eth_dev *eth_dev;
+ int ret;
+
+ eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
+ if (!eth_dev)
+ return -ENODEV;
+
+ if (dev_uninit) {
+ ret = dev_uninit(eth_dev);
+ if (ret)
+ return ret;
+ }
+
+ rte_eth_dev_pci_release(eth_dev);
+ return 0;
+}
+
+#endif /* _RTE_ETHDEV_PCI_H_ */
--
2.7.4