From: Dave Jiang <dave.jiang@intel.com>
To: linux-cxl@vger.kernel.org
Cc: dan.j.williams@intel.com, ira.weiny@intel.com,
vishal.l.verma@intel.com, alison.schofield@intel.com,
Jonathan.Cameron@huawei.com, dave@stgolabs.net, jgg@nvidia.com,
shiju.jose@huawei.com
Subject: [RFC PATCH v2 13/20] fwctl/cxl: Add hw_info callback
Date: Fri, 15 Nov 2024 14:25:46 -0700 [thread overview]
Message-ID: <20241115212745.869552-14-dave.jiang@intel.com> (raw)
In-Reply-To: <20241115212745.869552-1-dave.jiang@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/cxl/core/mbox.c | 42 +++++++++++++++++++++++++++++++++++++++++
drivers/fwctl/cxl/cxl.c | 25 ++++++++++++++++++++++++
include/cxl/mailbox.h | 2 ++
3 files changed, 69 insertions(+)
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index fba6bdd30a82..65fceabb9fe7 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -9,6 +9,8 @@
#include <cxlmem.h>
#include <cxl.h>
+#include <uapi/fwctl/fwctl.h>
+
#include "core.h"
#include "trace.h"
@@ -573,6 +575,46 @@ int cxl_mailbox_user_commands_supported(struct cxl_mailbox *cxl_mbox)
}
EXPORT_SYMBOL_NS_GPL(cxl_mailbox_user_commands_supported, CXL);
+/**
+ * cxl_mailbox_user_commands_info_get() - Retrieve array of command info
+ * @cxl_mbox: cxl mailbox context
+ * @nr_cmds: number of commands to retrieve
+ * @outbuf: Output buffer to store array 'struct fwctl_command_info'
+ * @out_len: size of final output buffer
+ *
+ * Return: 0 for success, or -errno for failure.
+ */
+int cxl_mailbox_user_commands_info_get(struct cxl_mailbox *cxl_mbox, int nr_cmds,
+ void *outbuf, size_t *out_len)
+{
+ struct fwctl_command_info *entry;
+ struct cxl_command_info *info;
+ struct cxl_mem_command *cmd;
+
+ if (nr_cmds > FWCTL_CXL_MAX_COMMANDS)
+ return -EINVAL;
+
+ entry = outbuf;
+ for (int i = 0; i < nr_cmds; i++) {
+ cmd = fwctl_cxl_find_command(cxl_mbox, fwctl_command_sets[i]);
+ if (!cmd)
+ continue;
+ info = &cmd->info;
+ memset(entry, 0, sizeof(*entry));
+ entry->id = info->id;
+ entry->opcode = fwctl_command_sets[i];
+ entry->effects = info->effects;
+ entry->size_in = info->size_in;
+ entry->size_out = info->size_out;
+ entry++;
+ }
+
+ *out_len = sizeof(*entry) * nr_cmds;
+
+ return 0;
+}
+EXPORT_SYMBOL_NS_GPL(cxl_mailbox_user_commands_info_get, CXL);
+
int cxl_query_cmd(struct cxl_mailbox *cxl_mbox,
struct cxl_mem_query_commands __user *q)
{
diff --git a/drivers/fwctl/cxl/cxl.c b/drivers/fwctl/cxl/cxl.c
index 5eb5eabf2bff..ce8960a9beaa 100644
--- a/drivers/fwctl/cxl/cxl.c
+++ b/drivers/fwctl/cxl/cxl.c
@@ -53,6 +53,30 @@ static void *cxlctl_info(struct fwctl_uctx *uctx, size_t *length)
return info;
}
+static void *cxlctl_hw_info(struct fwctl_uctx *uctx, int commands, size_t *out_len)
+{
+ struct cxlctl_uctx *cxlctl_uctx =
+ container_of(uctx, struct cxlctl_uctx, uctx);
+ struct fwctl_device *fwctl = uctx->fwctl;
+ struct cxlctl_dev *cxlctl =
+ container_of(fwctl, struct cxlctl_dev, fwctl);
+ int rc;
+
+ if (commands > cxlctl_uctx->nr_commands)
+ return ERR_PTR(-EINVAL);
+
+ void *out __free(kvfree) = kvzalloc(*out_len, GFP_KERNEL);
+ if (!out)
+ return ERR_PTR(-ENOMEM);
+
+ rc = cxl_mailbox_user_commands_info_get(cxlctl->mbox,
+ commands, out, out_len);
+ if (rc)
+ return ERR_PTR(rc);
+
+ return_ptr(out);
+}
+
static void *cxlctl_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope,
void *rpc_in, size_t in_len, size_t *out_len)
{
@@ -66,6 +90,7 @@ static const struct fwctl_ops cxlctl_ops = {
.open_uctx = cxlctl_open_uctx,
.close_uctx = cxlctl_close_uctx,
.info = cxlctl_info,
+ .hw_info = cxlctl_hw_info,
.fw_rpc = cxlctl_fw_rpc,
};
diff --git a/include/cxl/mailbox.h b/include/cxl/mailbox.h
index af01fb78ae10..f48eebb855f7 100644
--- a/include/cxl/mailbox.h
+++ b/include/cxl/mailbox.h
@@ -85,5 +85,7 @@ struct cxl_mailbox {
int cxl_mailbox_init(struct cxl_mailbox *cxl_mbox, struct device *host);
int cxl_mailbox_user_commands_supported(struct cxl_mailbox *cxl_mbox);
+int cxl_mailbox_user_commands_info_get(struct cxl_mailbox *cxl_mbox, int nr_cmds,
+ void *outbuf, size_t *out_len);
#endif
--
2.47.0
next prev parent reply other threads:[~2024-11-15 21:28 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 21:25 [RFC PATCH v2 0/20] fwctl/cxl: Add CXL feature commands support via fwctl Dave Jiang
2024-11-15 21:25 ` [RFC PATCH v2 01/20] cxl: Refactor user ioctl command path from mds to mailbox Dave Jiang
2024-11-21 17:33 ` Jonathan Cameron
2024-12-06 0:00 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 02/20] cxl: Add Get Supported Features command for kernel usage Dave Jiang
2024-11-21 17:42 ` Jonathan Cameron
2024-12-06 0:33 ` Dan Williams
2024-12-09 12:20 ` Shiju Jose
2024-11-15 21:25 ` [RFC PATCH v2 03/20] cxl/test: Add Get Supported Features mailbox command support Dave Jiang
2024-11-21 17:45 ` Jonathan Cameron
2024-12-06 0:36 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 04/20] cxl/mbox: Add GET_FEATURE mailbox command Dave Jiang
2024-12-06 0:44 ` Dan Williams
2024-12-09 12:20 ` Shiju Jose
2024-11-15 21:25 ` [RFC PATCH v2 05/20] cxl: Add Get Feature command support for user submission Dave Jiang
2024-11-21 17:47 ` Jonathan Cameron
2024-11-22 20:14 ` Dave Jiang
2024-11-25 20:14 ` Shiju Jose
2024-12-06 0:45 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 06/20] cxl/mbox: Add SET_FEATURE mailbox command Dave Jiang
2024-12-06 0:48 ` Dan Williams
2024-12-09 12:20 ` Shiju Jose
2024-11-15 21:25 ` [RFC PATCH v2 07/20] cxl: Add Set Feature command support for user submission Dave Jiang
2024-11-21 17:49 ` Jonathan Cameron
2024-11-21 18:08 ` Dave Jiang
2024-11-22 14:17 ` Jonathan Cameron
2024-12-06 0:53 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 08/20] cxl: Move cxl_driver related bits to be usable by external drivers Dave Jiang
2024-11-21 17:55 ` Jonathan Cameron
2024-11-15 21:25 ` [RFC PATCH v2 09/20] fwctl/cxl: Add driver for CXL mailbox for handling CXL features commands Dave Jiang
2024-11-20 18:01 ` Jason Gunthorpe
2024-11-20 18:35 ` Dave Jiang
2024-11-21 18:02 ` Jonathan Cameron
2024-12-06 1:21 ` Dan Williams
2024-12-09 13:30 ` Jason Gunthorpe
2024-12-09 20:35 ` Dan Williams
2024-12-10 13:40 ` Jason Gunthorpe
2024-11-15 21:25 ` [RFC PATCH v2 10/20] fwctl/cxl: Add support for get driver information Dave Jiang
2024-11-20 18:05 ` Jason Gunthorpe
2024-11-21 18:11 ` Jonathan Cameron
2024-11-22 23:22 ` Dave Jiang
2024-11-25 18:06 ` Jonathan Cameron
2024-12-06 5:15 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 11/20] fwctl: FWCTL_HW_INFO to return hardware information Dave Jiang
2024-11-20 18:53 ` Jason Gunthorpe
2024-11-21 18:20 ` Jonathan Cameron
2024-11-22 22:42 ` Dave Jiang
2024-12-06 5:32 ` Dan Williams
2024-12-06 18:39 ` Dave Jiang
2024-12-09 13:32 ` Jason Gunthorpe
2024-11-15 21:25 ` [RFC PATCH v2 12/20] cxl: Save Command Effects Log (CEL) effects for enabled commands Dave Jiang
2024-11-21 18:22 ` Jonathan Cameron
2024-11-15 21:25 ` Dave Jiang [this message]
2024-11-21 18:26 ` [RFC PATCH v2 13/20] fwctl/cxl: Add hw_info callback Jonathan Cameron
2024-12-06 5:40 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 14/20] cxl: Move defines and error codes from cxlmem.h to cxl/mailbox.h Dave Jiang
2024-11-21 18:31 ` Jonathan Cameron
2024-12-06 5:50 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 15/20] fwctl/cxl: Add support for fwctl RPC command to enable CXL feature commands Dave Jiang
2024-11-20 18:42 ` Jason Gunthorpe
2024-11-22 14:49 ` Jonathan Cameron
2024-12-06 6:13 ` Dan Williams
2024-11-15 21:25 ` [RFC PATCH v2 16/20] fwctl/cxl: Add support to filter exclusive features Dave Jiang
2024-11-22 15:05 ` Jonathan Cameron
2024-12-03 18:06 ` Dave Jiang
2024-11-15 21:25 ` [RFC PATCH v2 17/20] cxl/test: Add Get Feature support to cxl_test Dave Jiang
2024-11-22 15:19 ` Jonathan Cameron
2024-11-15 21:25 ` [RFC PATCH v2 18/20] cxl/test: Add Set " Dave Jiang
2024-11-22 15:20 ` Jonathan Cameron
2024-11-15 21:25 ` [RFC PATCH v2 19/20] fwctl: Move fwctl documentation to its own directory Dave Jiang
2024-11-20 17:52 ` Jason Gunthorpe
2024-11-15 21:25 ` [RFC PATCH v2 20/20] fwctl/cxl: Add documentation to FWCTL CXL Dave Jiang
2024-11-22 15:26 ` Jonathan Cameron
2024-12-03 21:07 ` Dave Jiang
2024-12-06 21:10 ` Dan Williams
2024-11-20 18:57 ` [RFC PATCH v2 0/20] fwctl/cxl: Add CXL feature commands support via fwctl Jason Gunthorpe
2024-11-21 18:38 ` Jonathan Cameron
2025-01-21 20:30 ` Jason Gunthorpe
2025-01-21 20:34 ` Dave Jiang
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=20241115212745.869552-14-dave.jiang@intel.com \
--to=dave.jiang@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave@stgolabs.net \
--cc=ira.weiny@intel.com \
--cc=jgg@nvidia.com \
--cc=linux-cxl@vger.kernel.org \
--cc=shiju.jose@huawei.com \
--cc=vishal.l.verma@intel.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