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, Li Ming <ming.li@zohomail.com>
Subject: [PATCH v7 10/14] cxl: Add support to handle user feature commands for get feature
Date: Thu, 20 Feb 2025 12:42:48 -0700 [thread overview]
Message-ID: <20250220194438.2281088-11-dave.jiang@intel.com> (raw)
In-Reply-To: <20250220194438.2281088-1-dave.jiang@intel.com>
Add helper function to parse the user data from fwctl RPC ioctl and
send the parsed input parameters to cxl_get_feature() call.
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Li Ming <ming.li@zohomail.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
v7:
- Move the flex array define here. (Jonathan)
---
drivers/cxl/core/features.c | 44 +++++++++++++++++++++++++++++++++++++
include/uapi/fwctl/cxl.h | 11 ++++++++--
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/drivers/cxl/core/features.c b/drivers/cxl/core/features.c
index 6cec89977fa0..2a35581d2677 100644
--- a/drivers/cxl/core/features.c
+++ b/drivers/cxl/core/features.c
@@ -427,6 +427,47 @@ static void *cxlctl_get_supported_features(struct cxl_features_state *cxlfs,
return no_free_ptr(rpc_out);
}
+static void *cxlctl_get_feature(struct cxl_features_state *cxlfs,
+ const struct fwctl_rpc_cxl *rpc_in,
+ size_t *out_len)
+{
+ struct cxl_mailbox *cxl_mbox = &cxlfs->cxlds->cxl_mbox;
+ const struct cxl_mbox_get_feat_in *feat_in;
+ u16 offset, count, return_code;
+ size_t out_size = *out_len;
+
+ if (rpc_in->op_size != sizeof(*feat_in))
+ return ERR_PTR(-EINVAL);
+
+ feat_in = &rpc_in->get_feat_in;
+ offset = le16_to_cpu(feat_in->offset);
+ count = le16_to_cpu(feat_in->count);
+
+ if (!count)
+ return ERR_PTR(-EINVAL);
+
+ struct fwctl_rpc_cxl_out *rpc_out __free(kvfree) =
+ kvzalloc(out_size, GFP_KERNEL);
+ if (!rpc_out)
+ return ERR_PTR(-ENOMEM);
+
+ out_size = cxl_get_feature(cxl_mbox, &feat_in->uuid,
+ feat_in->selection, rpc_out->payload,
+ count, offset, &return_code);
+ *out_len = sizeof(struct fwctl_rpc_cxl_out);
+ if (!out_size) {
+ rpc_out->size = 0;
+ rpc_out->retval = return_code;
+ return no_free_ptr(rpc_out);
+ }
+
+ rpc_out->size = out_size;
+ rpc_out->retval = CXL_MBOX_CMD_RC_SUCCESS;
+ *out_len += out_size;
+
+ return no_free_ptr(rpc_out);
+}
+
static bool cxlctl_validate_hw_command(struct cxl_features_state *cxlfs,
const struct fwctl_rpc_cxl *rpc_in,
enum fwctl_rpc_scope scope,
@@ -436,6 +477,7 @@ static bool cxlctl_validate_hw_command(struct cxl_features_state *cxlfs,
switch (opcode) {
case CXL_MBOX_OP_GET_SUPPORTED_FEATURES:
+ case CXL_MBOX_OP_GET_FEATURE:
if (cxl_mbox->feat_cap < CXL_FEATURES_RO)
return false;
if (scope >= FWCTL_RPC_CONFIGURATION)
@@ -453,6 +495,8 @@ static void *cxlctl_handle_commands(struct cxl_features_state *cxlfs,
switch (opcode) {
case CXL_MBOX_OP_GET_SUPPORTED_FEATURES:
return cxlctl_get_supported_features(cxlfs, rpc_in, out_len);
+ case CXL_MBOX_OP_GET_FEATURE:
+ return cxlctl_get_feature(cxlfs, rpc_in, out_len);
default:
return ERR_PTR(-EOPNOTSUPP);
}
diff --git a/include/uapi/fwctl/cxl.h b/include/uapi/fwctl/cxl.h
index 4bbfd7727526..3dc7ffeb3eae 100644
--- a/include/uapi/fwctl/cxl.h
+++ b/include/uapi/fwctl/cxl.h
@@ -18,6 +18,7 @@
* @op_size: Size of input payload.
* @reserved1: Reserved. Must be 0s.
* @get_sup_feats_in: Get Supported Features input
+ * @get_feat_in: Get Feature input
*/
struct fwctl_rpc_cxl {
__struct_group(fwctl_rpc_cxl_hdr, hdr, /* no attrs */,
@@ -26,7 +27,10 @@ struct fwctl_rpc_cxl {
__u32 op_size;
__u32 reserved1;
);
- struct cxl_mbox_get_sup_feats_in get_sup_feats_in;
+ union {
+ struct cxl_mbox_get_sup_feats_in get_sup_feats_in;
+ struct cxl_mbox_get_feat_in get_feat_in;
+ };
};
/**
@@ -40,7 +44,10 @@ struct fwctl_rpc_cxl_out {
__u32 size;
__u32 retval;
);
- struct cxl_mbox_get_sup_feats_out get_sup_feats_out;
+ union {
+ struct cxl_mbox_get_sup_feats_out get_sup_feats_out;
+ __DECLARE_FLEX_ARRAY(__u8, payload);
+ };
};
#endif
--
2.48.1
next prev parent reply other threads:[~2025-02-20 19:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-20 19:42 [PATCH v7 00/14] cxl: Add CXL feature commands support via fwctl Dave Jiang
2025-02-20 19:42 ` [PATCH v7 01/14] cxl: Enumerate feature commands Dave Jiang
2025-02-25 21:09 ` Davidlohr Bueso
2025-02-20 19:42 ` [PATCH v7 02/14] cxl: Add Get Supported Features command for kernel usage Dave Jiang
2025-02-25 21:01 ` Davidlohr Bueso
2025-02-26 15:31 ` Dave Jiang
2025-02-20 19:42 ` [PATCH v7 03/14] cxl/test: Add Get Supported Features mailbox command support Dave Jiang
2025-02-20 19:42 ` [PATCH v7 04/14] cxl/mbox: Add GET_FEATURE mailbox command Dave Jiang
2025-02-20 19:42 ` [PATCH v7 05/14] cxl/mbox: Add SET_FEATURE " Dave Jiang
2025-02-20 19:42 ` [PATCH v7 06/14] cxl: Setup exclusive CXL features that are reserved for the kernel Dave Jiang
2025-02-20 19:42 ` [PATCH v7 07/14] cxl: Add FWCTL support to CXL Dave Jiang
2025-02-20 19:42 ` [PATCH v7 08/14] cxl: Move cxl feature command structs to user header Dave Jiang
2025-02-20 19:42 ` [PATCH v7 09/14] cxl: Add support for fwctl RPC command to enable CXL feature commands Dave Jiang
2025-02-20 19:42 ` Dave Jiang [this message]
2025-02-20 19:42 ` [PATCH v7 11/14] cxl: Add support to handle user feature commands for set feature Dave Jiang
2025-02-20 19:42 ` [PATCH v7 12/14] cxl/test: Add Get Feature support to cxl_test Dave Jiang
2025-02-20 19:42 ` [PATCH v7 13/14] cxl/test: Add Set " Dave Jiang
2025-02-20 19:42 ` [PATCH v7 14/14] fwctl/cxl: Add documentation to FWCTL CXL Dave Jiang
2025-02-25 17:54 ` [PATCH v7 00/14] cxl: Add CXL feature commands support via fwctl Dave Jiang
2025-02-26 16:02 ` 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=20250220194438.2281088-11-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=ming.li@zohomail.com \
--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