From: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
To: linux-scsi@vger.kernel.org,
James Bottomley <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
"Matthew R. Ochs" <mrochs@linux.vnet.ibm.com>,
"Manoj N. Kumar" <manoj@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
Frederic Barrat <fbarrat@linux.vnet.ibm.com>,
Christophe Lombard <clombard@linux.vnet.ibm.com>
Subject: [PATCH 05/38] cxlflash: Hardware AFU for OpenCXL
Date: Thu, 22 Feb 2018 16:23:04 -0600 [thread overview]
Message-ID: <1519338184-51964-1-git-send-email-ukrishn@linux.vnet.ibm.com> (raw)
In-Reply-To: <1519338010-51782-1-git-send-email-ukrishn@linux.vnet.ibm.com>
When an adapter is initialized, transport specific configuration and MMIO
mapping details need to be saved. For CXL, this data is managed by the
underlying kernel module. To maintain a separation between the cxlflash
core and underlying transports, introduce a new structure to store data
specific to an OpenCXL AFU.
Initially only the pointers to underlying PCI and generic devices are
added to this new structure - it will be expanded further in future
commits. Services to create and destroy this hardware AFU are added and
integrated in the probe and exit paths of the driver.
Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
---
drivers/scsi/cxlflash/backend.h | 1 +
drivers/scsi/cxlflash/cxl_hw.c | 6 ++++++
drivers/scsi/cxlflash/main.c | 9 +++++++--
drivers/scsi/cxlflash/ocxl_hw.c | 40 ++++++++++++++++++++++++++++++++++++++++
drivers/scsi/cxlflash/ocxl_hw.h | 19 +++++++++++++++++++
5 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 drivers/scsi/cxlflash/ocxl_hw.h
diff --git a/drivers/scsi/cxlflash/backend.h b/drivers/scsi/cxlflash/backend.h
index a60f051..f675bcb 100644
--- a/drivers/scsi/cxlflash/backend.h
+++ b/drivers/scsi/cxlflash/backend.h
@@ -36,6 +36,7 @@ struct cxlflash_backend_ops {
int (*allocate_afu_irqs)(void *ctx_cookie, int num);
void (*free_afu_irqs)(void *ctx_cookie);
void * (*create_afu)(struct pci_dev *dev);
+ void (*destroy_afu)(void *afu_cookie);
struct file * (*get_fd)(void *ctx_cookie, struct file_operations *fops,
int *fd);
void * (*fops_get_context)(struct file *file);
diff --git a/drivers/scsi/cxlflash/cxl_hw.c b/drivers/scsi/cxlflash/cxl_hw.c
index db1cada..a1d6d12 100644
--- a/drivers/scsi/cxlflash/cxl_hw.c
+++ b/drivers/scsi/cxlflash/cxl_hw.c
@@ -110,6 +110,11 @@ static void *cxlflash_create_afu(struct pci_dev *dev)
return cxl_pci_to_afu(dev);
}
+static void cxlflash_destroy_afu(void *afu)
+{
+ /* Dummy fop for cxl */
+}
+
static struct file *cxlflash_get_fd(void *ctx_cookie,
struct file_operations *fops, int *fd)
{
@@ -160,6 +165,7 @@ const struct cxlflash_backend_ops cxlflash_cxl_ops = {
.allocate_afu_irqs = cxlflash_allocate_afu_irqs,
.free_afu_irqs = cxlflash_free_afu_irqs,
.create_afu = cxlflash_create_afu,
+ .destroy_afu = cxlflash_destroy_afu,
.get_fd = cxlflash_get_fd,
.fops_get_context = cxlflash_fops_get_context,
.start_work = cxlflash_start_work,
diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index b83a55a..5d754d1 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -971,6 +971,7 @@ static void cxlflash_remove(struct pci_dev *pdev)
case INIT_STATE_AFU:
term_afu(cfg);
case INIT_STATE_PCI:
+ cfg->ops->destroy_afu(cfg->afu_cookie);
pci_disable_device(pdev);
case INIT_STATE_NONE:
free_mem(cfg);
@@ -3689,8 +3690,6 @@ static int cxlflash_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, cfg);
- cfg->afu_cookie = cfg->ops->create_afu(pdev);
-
rc = init_pci(cfg);
if (rc) {
dev_err(dev, "%s: init_pci failed rc=%d\n", __func__, rc);
@@ -3698,6 +3697,12 @@ static int cxlflash_probe(struct pci_dev *pdev,
}
cfg->init_state = INIT_STATE_PCI;
+ cfg->afu_cookie = cfg->ops->create_afu(pdev);
+ if (unlikely(!cfg->afu_cookie)) {
+ dev_err(dev, "%s: create_afu failed\n", __func__);
+ goto out_remove;
+ }
+
rc = init_afu(cfg);
if (rc && !wq_has_sleeper(&cfg->reset_waitq)) {
dev_err(dev, "%s: init_afu failed rc=%d\n", __func__, rc);
diff --git a/drivers/scsi/cxlflash/ocxl_hw.c b/drivers/scsi/cxlflash/ocxl_hw.c
index 58a3182..667cf77 100644
--- a/drivers/scsi/cxlflash/ocxl_hw.c
+++ b/drivers/scsi/cxlflash/ocxl_hw.c
@@ -15,8 +15,48 @@
#include <misc/ocxl.h>
#include "backend.h"
+#include "ocxl_hw.h"
+
+/**
+ * ocxlflash_destroy_afu() - destroy the AFU structure
+ * @afu_cookie: AFU to be freed.
+ */
+static void ocxlflash_destroy_afu(void *afu_cookie)
+{
+ struct ocxl_hw_afu *afu = afu_cookie;
+
+ if (!afu)
+ return;
+
+ kfree(afu);
+}
+
+/**
+ * ocxlflash_create_afu() - create the AFU for OpenCXL
+ * @pdev: PCI device associated with the host.
+ *
+ * Return: AFU on success, NULL on failure
+ */
+static void *ocxlflash_create_afu(struct pci_dev *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct ocxl_hw_afu *afu;
+
+ afu = kzalloc(sizeof(*afu), GFP_KERNEL);
+ if (unlikely(!afu)) {
+ dev_err(dev, "%s: HW AFU allocation failed\n", __func__);
+ goto out;
+ }
+
+ afu->pdev = pdev;
+ afu->dev = dev;
+out:
+ return afu;
+}
/* Backend ops to ocxlflash services */
const struct cxlflash_backend_ops cxlflash_ocxl_ops = {
.module = THIS_MODULE,
+ .create_afu = ocxlflash_create_afu,
+ .destroy_afu = ocxlflash_destroy_afu,
};
diff --git a/drivers/scsi/cxlflash/ocxl_hw.h b/drivers/scsi/cxlflash/ocxl_hw.h
new file mode 100644
index 0000000..57eb53b
--- /dev/null
+++ b/drivers/scsi/cxlflash/ocxl_hw.h
@@ -0,0 +1,19 @@
+/*
+ * CXL Flash Device Driver
+ *
+ * Written by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>, IBM Corporation
+ * Uma Krishnan <ukrishn@linux.vnet.ibm.com>, IBM Corporation
+ *
+ * Copyright (C) 2018 IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/* OpenCXL hardware AFU associated with the host */
+struct ocxl_hw_afu {
+ struct pci_dev *pdev; /* PCI device */
+ struct device *dev; /* Generic device */
+};
--
2.1.0
next prev parent reply other threads:[~2018-02-22 22:23 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-22 22:20 [PATCH 00/38] cxlflash: OpenCXL transport support Uma Krishnan
2018-02-22 22:21 ` [PATCH 01/38] cxlflash: Preserve number of interrupts for master contexts Uma Krishnan
2018-02-22 22:22 ` [PATCH 02/38] cxlflash: Avoid clobbering context control register value Uma Krishnan
2018-02-22 22:22 ` [PATCH 03/38] cxlflash: Add argument identifier names Uma Krishnan
2018-02-22 22:22 ` [PATCH 04/38] cxlflash: Introduce OpenCXL backend Uma Krishnan
2018-02-23 4:28 ` Andrew Donnellan
2018-02-23 19:36 ` Uma Krishnan
2018-02-22 22:23 ` Uma Krishnan [this message]
2018-02-22 22:23 ` [PATCH 06/38] cxlflash: Read host function configuration Uma Krishnan
2018-02-22 22:23 ` [PATCH 07/38] cxlflash: Setup function acTag range Uma Krishnan
2018-02-22 22:23 ` [PATCH 08/38] cxlflash: Read host AFU configuration Uma Krishnan
2018-02-22 22:23 ` [PATCH 09/38] cxlflash: Setup AFU acTag range Uma Krishnan
2018-02-22 22:24 ` [PATCH 10/38] cxlflash: Setup AFU PASID Uma Krishnan
2018-02-22 22:24 ` [PATCH 11/38] cxlflash: Adapter context support for OpenCXL Uma Krishnan
2018-02-22 22:24 ` [PATCH 12/38] cxlflash: Use IDR to manage adapter contexts Uma Krishnan
2018-02-22 22:24 ` [PATCH 13/38] cxlflash: Support adapter file descriptors for OpenCXL Uma Krishnan
2018-02-22 22:24 ` [PATCH 14/38] cxlflash: Support adapter context discovery Uma Krishnan
2018-02-22 22:24 ` [PATCH 15/38] cxlflash: Support image reload policy modification Uma Krishnan
2018-02-22 22:24 ` [PATCH 16/38] cxlflash: MMIO map the AFU Uma Krishnan
2018-02-22 22:25 ` [PATCH 17/38] cxlflash: Support starting an adapter context Uma Krishnan
2018-02-22 22:25 ` [PATCH 18/38] cxlflash: Support process specific mappings Uma Krishnan
2018-02-22 22:25 ` [PATCH 19/38] cxlflash: Support AFU state toggling Uma Krishnan
2018-02-22 22:25 ` [PATCH 20/38] cxlflash: Support reading adapter VPD data Uma Krishnan
2018-02-22 22:25 ` [PATCH 21/38] cxlflash: Setup function OpenCXL link Uma Krishnan
2018-02-22 22:26 ` [PATCH 22/38] cxlflash: Setup OpenCXL transaction layer Uma Krishnan
2018-02-22 22:26 ` [PATCH 23/38] cxlflash: Support process element lifecycle Uma Krishnan
2018-02-22 22:26 ` [PATCH 24/38] cxlflash: Support AFU interrupt management Uma Krishnan
2018-02-22 22:26 ` [PATCH 25/38] cxlflash: Support AFU interrupt mapping and registration Uma Krishnan
2018-02-22 22:26 ` [PATCH 26/38] cxlflash: Support starting user contexts Uma Krishnan
2018-02-22 22:27 ` [PATCH 27/38] cxlflash: Support adapter context polling Uma Krishnan
2018-02-22 22:27 ` [PATCH 28/38] cxlflash: Support adapter context reading Uma Krishnan
2018-02-22 22:27 ` [PATCH 29/38] cxlflash: Support adapter context mmap and release Uma Krishnan
2018-02-22 22:27 ` [PATCH 30/38] cxlflash: Support file descriptor mapping Uma Krishnan
2018-02-22 22:27 ` [PATCH 31/38] cxlflash: Introduce object handle fop Uma Krishnan
2018-02-22 22:27 ` [PATCH 32/38] cxlflash: Setup LISNs for user contexts Uma Krishnan
2018-02-22 22:27 ` [PATCH 33/38] cxlflash: Setup LISNs for master contexts Uma Krishnan
2018-02-22 22:28 ` [PATCH 34/38] cxlflash: Update synchronous interrupt status bits Uma Krishnan
2018-02-22 22:28 ` [PATCH 35/38] cxlflash: Introduce OCXL context state machine Uma Krishnan
2018-02-22 22:28 ` [PATCH 36/38] cxlflash: Register for translation errors Uma Krishnan
2018-02-22 22:28 ` [PATCH 37/38] cxlflash: Support AFU reset Uma Krishnan
2018-02-22 22:28 ` [PATCH 38/38] cxlflash: Enable OpenCXL operations Uma Krishnan
2018-02-23 4:13 ` [PATCH 00/38] cxlflash: OpenCXL transport support Andrew Donnellan
2018-02-23 18:05 ` Uma Krishnan
2018-02-23 19:38 ` Uma Krishnan
2018-02-26 14:43 ` Matthew R. Ochs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1519338184-51964-1-git-send-email-ukrishn@linux.vnet.ibm.com \
--to=ukrishn@linux.vnet.ibm.com \
--cc=andrew.donnellan@au1.ibm.com \
--cc=clombard@linux.vnet.ibm.com \
--cc=fbarrat@linux.vnet.ibm.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=manoj@linux.vnet.ibm.com \
--cc=martin.petersen@oracle.com \
--cc=mrochs@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).