[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210429190926.5086-17-smalin@marvell.com>
Date: Thu, 29 Apr 2021 22:09:15 +0300
From: Shai Malin <smalin@...vell.com>
To: <netdev@...r.kernel.org>, <linux-nvme@...ts.infradead.org>,
<sagi@...mberg.me>, <hch@....de>, <axboe@...com>,
<kbusch@...nel.org>
CC: David S . Miller davem @ davemloft . net --cc=Jakub Kicinski
<kuba@...nel.org>, <smalin@...vell.com>, <aelior@...vell.com>,
<mkalderon@...vell.com>, <okulkarni@...vell.com>,
<pkushwaha@...vell.com>, <malin1024@...il.com>,
Arie Gershberg <agershberg@...vell.com>
Subject: [RFC PATCH v4 16/27] qedn: Add qedn - Marvell's NVMeTCP HW offload vendor driver
This patch will present the skeleton of the qedn driver.
The new driver will be added under "drivers/nvme/hw/qedn" and will be
enabled by the Kconfig "Marvell NVM Express over Fabrics TCP offload".
The internal implementation:
- qedn.h:
Includes all common structs to be used by the qedn vendor driver.
- qedn_main.c
Includes the qedn_init and qedn_cleanup implementation.
As part of the qedn init, the driver will register as a pci device and
will work with the Marvell fastlinQ NICs.
As part of the probe, the driver will register to the nvme_tcp_offload
(ULP).
Acked-by: Igor Russkikh <irusskikh@...vell.com>
Signed-off-by: Arie Gershberg <agershberg@...vell.com>
Signed-off-by: Prabhakar Kushwaha <pkushwaha@...vell.com>
Signed-off-by: Omkar Kulkarni <okulkarni@...vell.com>
Signed-off-by: Michal Kalderon <mkalderon@...vell.com>
Signed-off-by: Ariel Elior <aelior@...vell.com>
Signed-off-by: Shai Malin <smalin@...vell.com>
---
MAINTAINERS | 10 ++
drivers/nvme/Kconfig | 1 +
drivers/nvme/Makefile | 1 +
drivers/nvme/hw/Kconfig | 8 ++
drivers/nvme/hw/Makefile | 3 +
drivers/nvme/hw/qedn/Makefile | 5 +
drivers/nvme/hw/qedn/qedn.h | 19 +++
drivers/nvme/hw/qedn/qedn_main.c | 201 +++++++++++++++++++++++++++++++
8 files changed, 248 insertions(+)
create mode 100644 drivers/nvme/hw/Kconfig
create mode 100644 drivers/nvme/hw/Makefile
create mode 100644 drivers/nvme/hw/qedn/Makefile
create mode 100644 drivers/nvme/hw/qedn/qedn.h
create mode 100644 drivers/nvme/hw/qedn/qedn_main.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 0d85ae9e61e2..2d6f50523db8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14688,6 +14688,16 @@ S: Supported
F: drivers/infiniband/hw/qedr/
F: include/uapi/rdma/qedr-abi.h
+QLOGIC QL4xxx NVME-TCP-OFFLOAD DRIVER
+M: Shai Malin <smalin@...vell.com>
+M: Ariel Elior <aelior@...vell.com>
+L: linux-nvme@...ts.infradead.org
+S: Supported
+W: http://git.infradead.org/nvme.git
+T: git://git.infradead.org/nvme.git
+F: drivers/nvme/hw/qedn/
+F: include/linux/qed/
+
QLOGIC QLA1280 SCSI DRIVER
M: Michael Reed <mdr@....com>
L: linux-scsi@...r.kernel.org
diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig
index 87ae409a32b9..827c2c9f0ad1 100644
--- a/drivers/nvme/Kconfig
+++ b/drivers/nvme/Kconfig
@@ -3,5 +3,6 @@ menu "NVME Support"
source "drivers/nvme/host/Kconfig"
source "drivers/nvme/target/Kconfig"
+source "drivers/nvme/hw/Kconfig"
endmenu
diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
index fb42c44609a8..14c569040ef2 100644
--- a/drivers/nvme/Makefile
+++ b/drivers/nvme/Makefile
@@ -2,3 +2,4 @@
obj-y += host/
obj-y += target/
+obj-y += hw/
\ No newline at end of file
diff --git a/drivers/nvme/hw/Kconfig b/drivers/nvme/hw/Kconfig
new file mode 100644
index 000000000000..374f1f9dbd3d
--- /dev/null
+++ b/drivers/nvme/hw/Kconfig
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config NVME_QEDN
+ tristate "Marvell NVM Express over Fabrics TCP offload"
+ depends on NVME_TCP_OFFLOAD
+ help
+ This enables the Marvell NVMe TCP offload support (qedn).
+
+ If unsure, say N.
diff --git a/drivers/nvme/hw/Makefile b/drivers/nvme/hw/Makefile
new file mode 100644
index 000000000000..7780ea5ab520
--- /dev/null
+++ b/drivers/nvme/hw/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_NVME_QEDN) += qedn/
diff --git a/drivers/nvme/hw/qedn/Makefile b/drivers/nvme/hw/qedn/Makefile
new file mode 100644
index 000000000000..cb169bbaae18
--- /dev/null
+++ b/drivers/nvme/hw/qedn/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_NVME_QEDN) := qedn.o
+
+qedn-y := qedn_main.o
\ No newline at end of file
diff --git a/drivers/nvme/hw/qedn/qedn.h b/drivers/nvme/hw/qedn/qedn.h
new file mode 100644
index 000000000000..bcd0748a10fd
--- /dev/null
+++ b/drivers/nvme/hw/qedn/qedn.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright 2021 Marvell. All rights reserved.
+ */
+
+#ifndef _QEDN_H_
+#define _QEDN_H_
+
+/* Driver includes */
+#include "../../host/tcp-offload.h"
+
+#define QEDN_MODULE_NAME "qedn"
+
+struct qedn_ctx {
+ struct pci_dev *pdev;
+ struct nvme_tcp_ofld_dev qedn_ofld_dev;
+};
+
+#endif /* _QEDN_H_ */
diff --git a/drivers/nvme/hw/qedn/qedn_main.c b/drivers/nvme/hw/qedn/qedn_main.c
new file mode 100644
index 000000000000..31d6d86d6eb7
--- /dev/null
+++ b/drivers/nvme/hw/qedn/qedn_main.c
@@ -0,0 +1,201 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2021 Marvell. All rights reserved.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ /* Kernel includes */
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+/* Driver includes */
+#include "qedn.h"
+
+#define CHIP_NUM_AHP_NVMETCP 0x8194
+
+static struct pci_device_id qedn_pci_tbl[] = {
+ { PCI_VDEVICE(QLOGIC, CHIP_NUM_AHP_NVMETCP), 0 },
+ {0, 0},
+};
+
+static int
+qedn_claim_dev(struct nvme_tcp_ofld_dev *dev,
+ struct nvme_tcp_ofld_ctrl_con_params *conn_params)
+{
+ /* Placeholder - qedn_claim_dev */
+
+ return 0;
+}
+
+static int qedn_create_queue(struct nvme_tcp_ofld_queue *queue, int qid,
+ size_t q_size)
+{
+ /* Placeholder - qedn_create_queue */
+
+ return 0;
+}
+
+static void qedn_drain_queue(struct nvme_tcp_ofld_queue *queue)
+{
+ /* Placeholder - qedn_drain_queue */
+}
+
+static void qedn_destroy_queue(struct nvme_tcp_ofld_queue *queue)
+{
+ /* Placeholder - qedn_destroy_queue */
+}
+
+static int qedn_poll_queue(struct nvme_tcp_ofld_queue *queue)
+{
+ /*
+ * Poll queue support will be added as part of future
+ * enhancements.
+ */
+
+ return 0;
+}
+
+static int qedn_init_req(struct nvme_tcp_ofld_req *req)
+{
+ /*
+ * tcp-offload layer taking care of everything,
+ * Nothing required from qedn driver, hence empty.
+ */
+
+ return 0;
+}
+
+static void qedn_commit_rqs(struct nvme_tcp_ofld_queue *queue)
+{
+ /* Placeholder - queue work */
+}
+
+static int qedn_send_req(struct nvme_tcp_ofld_req *req)
+{
+ /* Placeholder - qedn_send_req */
+
+ return 0;
+}
+
+static struct nvme_tcp_ofld_ops qedn_ofld_ops = {
+ .name = "qedn",
+ .module = THIS_MODULE,
+ .required_opts = NVMF_OPT_TRADDR,
+ .allowed_opts = NVMF_OPT_TRSVCID | NVMF_OPT_NR_WRITE_QUEUES |
+ NVMF_OPT_HOST_TRADDR | NVMF_OPT_CTRL_LOSS_TMO |
+ NVMF_OPT_RECONNECT_DELAY,
+ /* These flags will be as part of future enhancements
+ * NVMF_OPT_HDR_DIGEST | NVMF_OPT_DATA_DIGEST |
+ * NVMF_OPT_NR_POLL_QUEUES | NVMF_OPT_TOS
+ */
+ .claim_dev = qedn_claim_dev,
+ .create_queue = qedn_create_queue,
+ .drain_queue = qedn_drain_queue,
+ .destroy_queue = qedn_destroy_queue,
+ .poll_queue = qedn_poll_queue,
+ .init_req = qedn_init_req,
+ .send_req = qedn_send_req,
+ .commit_rqs = qedn_commit_rqs,
+};
+
+static void __qedn_remove(struct pci_dev *pdev)
+{
+ struct qedn_ctx *qedn = pci_get_drvdata(pdev);
+
+ pr_notice("Starting qedn_remove\n");
+ nvme_tcp_ofld_unregister_dev(&qedn->qedn_ofld_dev);
+ kfree(qedn);
+ pr_notice("Ending qedn_remove successfully\n");
+}
+
+static void qedn_remove(struct pci_dev *pdev)
+{
+ __qedn_remove(pdev);
+}
+
+static void qedn_shutdown(struct pci_dev *pdev)
+{
+ __qedn_remove(pdev);
+}
+
+static struct qedn_ctx *qedn_alloc_ctx(struct pci_dev *pdev)
+{
+ struct qedn_ctx *qedn = NULL;
+
+ qedn = kzalloc(sizeof(*qedn), GFP_KERNEL);
+ if (!qedn)
+ return NULL;
+
+ qedn->pdev = pdev;
+ pci_set_drvdata(pdev, qedn);
+
+ return qedn;
+}
+
+static int __qedn_probe(struct pci_dev *pdev)
+{
+ struct qedn_ctx *qedn;
+ int rc;
+
+ pr_notice("Starting qedn probe\n");
+
+ qedn = qedn_alloc_ctx(pdev);
+ if (!qedn)
+ return -ENODEV;
+
+ qedn->qedn_ofld_dev.ops = &qedn_ofld_ops;
+ INIT_LIST_HEAD(&qedn->qedn_ofld_dev.entry);
+ rc = nvme_tcp_ofld_register_dev(&qedn->qedn_ofld_dev);
+ if (rc)
+ goto release_qedn;
+
+ return 0;
+release_qedn:
+ kfree(qedn);
+
+ return rc;
+}
+
+static int qedn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+ return __qedn_probe(pdev);
+}
+
+static struct pci_driver qedn_pci_driver = {
+ .name = QEDN_MODULE_NAME,
+ .id_table = qedn_pci_tbl,
+ .probe = qedn_probe,
+ .remove = qedn_remove,
+ .shutdown = qedn_shutdown,
+};
+
+static int __init qedn_init(void)
+{
+ int rc;
+
+ rc = pci_register_driver(&qedn_pci_driver);
+ if (rc) {
+ pr_err("Failed to register pci driver\n");
+
+ return -EINVAL;
+ }
+
+ pr_notice("driver loaded successfully\n");
+
+ return 0;
+}
+
+static void __exit qedn_cleanup(void)
+{
+ pci_unregister_driver(&qedn_pci_driver);
+ pr_notice("Unloading qedn ended\n");
+}
+
+module_init(qedn_init);
+module_exit(qedn_cleanup);
+
+MODULE_LICENSE("GPL v2");
+MODULE_SOFTDEP("pre: qede nvme-fabrics nvme-tcp-offload");
+MODULE_DESCRIPTION("Marvell 25/50/100G NVMe-TCP Offload Host Driver");
+MODULE_AUTHOR("Marvell");
--
2.22.0
Powered by blists - more mailing lists