From: Dave Jiang <dave.jiang@intel.com>
To: Dan Williams <dan.j.williams@intel.com>, <linux-cxl@vger.kernel.org>
Cc: <ira.weiny@intel.com>, <navneet.singh@intel.com>
Subject: Re: [PATCH 02/19] tools/testing/cxl: Remove unused @cxlds argument
Date: Tue, 13 Jun 2023 15:08:32 -0700 [thread overview]
Message-ID: <1add648c-9b80-03e9-3579-8ae0aaa2056b@intel.com> (raw)
In-Reply-To: <168592150866.1948938.14035429174747236697.stgit@dwillia2-xfh.jf.intel.com>
On 6/4/23 16:31, Dan Williams wrote:
> In preparation for plumbing a 'struct cxl_memdev_state' as a superset of
> a 'struct cxl_dev_state' cleanup the usage of @cxlds in the unit test
> infrastructure.
>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
> tools/testing/cxl/test/mem.c | 86 +++++++++++++++++++-----------------------
> 1 file changed, 39 insertions(+), 47 deletions(-)
>
> diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
> index 34b48027b3de..bdaf086d994e 100644
> --- a/tools/testing/cxl/test/mem.c
> +++ b/tools/testing/cxl/test/mem.c
> @@ -180,8 +180,7 @@ static void mes_add_event(struct mock_event_store *mes,
> log->nr_events++;
> }
>
> -static int mock_get_event(struct cxl_dev_state *cxlds,
> - struct cxl_mbox_cmd *cmd)
> +static int mock_get_event(struct device *dev, struct cxl_mbox_cmd *cmd)
> {
> struct cxl_get_event_payload *pl;
> struct mock_event_log *log;
> @@ -201,7 +200,7 @@ static int mock_get_event(struct cxl_dev_state *cxlds,
>
> memset(cmd->payload_out, 0, cmd->size_out);
>
> - log = event_find_log(cxlds->dev, log_type);
> + log = event_find_log(dev, log_type);
> if (!log || event_log_empty(log))
> return 0;
>
> @@ -234,8 +233,7 @@ static int mock_get_event(struct cxl_dev_state *cxlds,
> return 0;
> }
>
> -static int mock_clear_event(struct cxl_dev_state *cxlds,
> - struct cxl_mbox_cmd *cmd)
> +static int mock_clear_event(struct device *dev, struct cxl_mbox_cmd *cmd)
> {
> struct cxl_mbox_clear_event_payload *pl = cmd->payload_in;
> struct mock_event_log *log;
> @@ -246,7 +244,7 @@ static int mock_clear_event(struct cxl_dev_state *cxlds,
> if (log_type >= CXL_EVENT_TYPE_MAX)
> return -EINVAL;
>
> - log = event_find_log(cxlds->dev, log_type);
> + log = event_find_log(dev, log_type);
> if (!log)
> return 0; /* No mock data in this log */
>
> @@ -256,7 +254,7 @@ static int mock_clear_event(struct cxl_dev_state *cxlds,
> * However, this is not good behavior for the host so test it.
> */
> if (log->clear_idx + pl->nr_recs > log->cur_idx) {
> - dev_err(cxlds->dev,
> + dev_err(dev,
> "Attempting to clear more events than returned!\n");
> return -EINVAL;
> }
> @@ -266,7 +264,7 @@ static int mock_clear_event(struct cxl_dev_state *cxlds,
> nr < pl->nr_recs;
> nr++, handle++) {
> if (handle != le16_to_cpu(pl->handles[nr])) {
> - dev_err(cxlds->dev, "Clearing events out of order\n");
> + dev_err(dev, "Clearing events out of order\n");
> return -EINVAL;
> }
> }
> @@ -477,7 +475,7 @@ static int mock_get_log(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> return 0;
> }
>
> -static int mock_rcd_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_rcd_id(struct cxl_mbox_cmd *cmd)
> {
> struct cxl_mbox_identify id = {
> .fw_revision = { "mock fw v1 " },
> @@ -495,7 +493,7 @@ static int mock_rcd_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> return 0;
> }
>
> -static int mock_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_id(struct cxl_mbox_cmd *cmd)
> {
> struct cxl_mbox_identify id = {
> .fw_revision = { "mock fw v1 " },
> @@ -517,8 +515,7 @@ static int mock_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> return 0;
> }
>
> -static int mock_partition_info(struct cxl_dev_state *cxlds,
> - struct cxl_mbox_cmd *cmd)
> +static int mock_partition_info(struct cxl_mbox_cmd *cmd)
> {
> struct cxl_mbox_get_partition_info pi = {
> .active_volatile_cap =
> @@ -535,11 +532,9 @@ static int mock_partition_info(struct cxl_dev_state *cxlds,
> return 0;
> }
>
> -static int mock_get_security_state(struct cxl_dev_state *cxlds,
> +static int mock_get_security_state(struct cxl_mockmem_data *mdata,
> struct cxl_mbox_cmd *cmd)
> {
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> -
> if (cmd->size_in)
> return -EINVAL;
>
> @@ -569,9 +564,9 @@ static void user_plimit_check(struct cxl_mockmem_data *mdata)
> mdata->security_state |= CXL_PMEM_SEC_STATE_USER_PLIMIT;
> }
>
> -static int mock_set_passphrase(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_set_passphrase(struct cxl_mockmem_data *mdata,
> + struct cxl_mbox_cmd *cmd)
> {
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> struct cxl_set_pass *set_pass;
>
> if (cmd->size_in != sizeof(*set_pass))
> @@ -629,9 +624,9 @@ static int mock_set_passphrase(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd
> return -EINVAL;
> }
>
> -static int mock_disable_passphrase(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_disable_passphrase(struct cxl_mockmem_data *mdata,
> + struct cxl_mbox_cmd *cmd)
> {
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> struct cxl_disable_pass *dis_pass;
>
> if (cmd->size_in != sizeof(*dis_pass))
> @@ -700,10 +695,9 @@ static int mock_disable_passphrase(struct cxl_dev_state *cxlds, struct cxl_mbox_
> return 0;
> }
>
> -static int mock_freeze_security(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_freeze_security(struct cxl_mockmem_data *mdata,
> + struct cxl_mbox_cmd *cmd)
> {
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> -
> if (cmd->size_in != 0)
> return -EINVAL;
>
> @@ -717,10 +711,9 @@ static int mock_freeze_security(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd
> return 0;
> }
>
> -static int mock_unlock_security(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_unlock_security(struct cxl_mockmem_data *mdata,
> + struct cxl_mbox_cmd *cmd)
> {
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> -
> if (cmd->size_in != NVDIMM_PASSPHRASE_LEN)
> return -EINVAL;
>
> @@ -759,10 +752,9 @@ static int mock_unlock_security(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd
> return 0;
> }
>
> -static int mock_passphrase_secure_erase(struct cxl_dev_state *cxlds,
> +static int mock_passphrase_secure_erase(struct cxl_mockmem_data *mdata,
> struct cxl_mbox_cmd *cmd)
> {
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> struct cxl_pass_erase *erase;
>
> if (cmd->size_in != sizeof(*erase))
> @@ -858,10 +850,10 @@ static int mock_passphrase_secure_erase(struct cxl_dev_state *cxlds,
> return 0;
> }
>
> -static int mock_get_lsa(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_get_lsa(struct cxl_mockmem_data *mdata,
> + struct cxl_mbox_cmd *cmd)
> {
> struct cxl_mbox_get_lsa *get_lsa = cmd->payload_in;
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> void *lsa = mdata->lsa;
> u32 offset, length;
>
> @@ -878,10 +870,10 @@ static int mock_get_lsa(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> return 0;
> }
>
> -static int mock_set_lsa(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> +static int mock_set_lsa(struct cxl_mockmem_data *mdata,
> + struct cxl_mbox_cmd *cmd)
> {
> struct cxl_mbox_set_lsa *set_lsa = cmd->payload_in;
> - struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> void *lsa = mdata->lsa;
> u32 offset, length;
>
> @@ -896,8 +888,7 @@ static int mock_set_lsa(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> return 0;
> }
>
> -static int mock_health_info(struct cxl_dev_state *cxlds,
> - struct cxl_mbox_cmd *cmd)
> +static int mock_health_info(struct cxl_mbox_cmd *cmd)
> {
> struct cxl_mbox_health_info health_info = {
> /* set flags for maint needed, perf degraded, hw replacement */
> @@ -1117,6 +1108,7 @@ ATTRIBUTE_GROUPS(cxl_mock_mem_core);
> static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> {
> struct device *dev = cxlds->dev;
> + struct cxl_mockmem_data *mdata = dev_get_drvdata(dev);
> int rc = -EIO;
>
> switch (cmd->opcode) {
> @@ -1131,45 +1123,45 @@ static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *
> break;
> case CXL_MBOX_OP_IDENTIFY:
> if (cxlds->rcd)
> - rc = mock_rcd_id(cxlds, cmd);
> + rc = mock_rcd_id(cmd);
> else
> - rc = mock_id(cxlds, cmd);
> + rc = mock_id(cmd);
> break;
> case CXL_MBOX_OP_GET_LSA:
> - rc = mock_get_lsa(cxlds, cmd);
> + rc = mock_get_lsa(mdata, cmd);
> break;
> case CXL_MBOX_OP_GET_PARTITION_INFO:
> - rc = mock_partition_info(cxlds, cmd);
> + rc = mock_partition_info(cmd);
> break;
> case CXL_MBOX_OP_GET_EVENT_RECORD:
> - rc = mock_get_event(cxlds, cmd);
> + rc = mock_get_event(dev, cmd);
> break;
> case CXL_MBOX_OP_CLEAR_EVENT_RECORD:
> - rc = mock_clear_event(cxlds, cmd);
> + rc = mock_clear_event(dev, cmd);
> break;
> case CXL_MBOX_OP_SET_LSA:
> - rc = mock_set_lsa(cxlds, cmd);
> + rc = mock_set_lsa(mdata, cmd);
> break;
> case CXL_MBOX_OP_GET_HEALTH_INFO:
> - rc = mock_health_info(cxlds, cmd);
> + rc = mock_health_info(cmd);
> break;
> case CXL_MBOX_OP_GET_SECURITY_STATE:
> - rc = mock_get_security_state(cxlds, cmd);
> + rc = mock_get_security_state(mdata, cmd);
> break;
> case CXL_MBOX_OP_SET_PASSPHRASE:
> - rc = mock_set_passphrase(cxlds, cmd);
> + rc = mock_set_passphrase(mdata, cmd);
> break;
> case CXL_MBOX_OP_DISABLE_PASSPHRASE:
> - rc = mock_disable_passphrase(cxlds, cmd);
> + rc = mock_disable_passphrase(mdata, cmd);
> break;
> case CXL_MBOX_OP_FREEZE_SECURITY:
> - rc = mock_freeze_security(cxlds, cmd);
> + rc = mock_freeze_security(mdata, cmd);
> break;
> case CXL_MBOX_OP_UNLOCK:
> - rc = mock_unlock_security(cxlds, cmd);
> + rc = mock_unlock_security(mdata, cmd);
> break;
> case CXL_MBOX_OP_PASSPHRASE_SECURE_ERASE:
> - rc = mock_passphrase_secure_erase(cxlds, cmd);
> + rc = mock_passphrase_secure_erase(mdata, cmd);
> break;
> case CXL_MBOX_OP_GET_POISON:
> rc = mock_get_poison(cxlds, cmd);
>
next prev parent reply other threads:[~2023-06-13 22:09 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-04 23:31 [PATCH 00/19] cxl: Device memory setup Dan Williams
2023-06-04 23:31 ` [PATCH 01/19] cxl/regs: Clarify when a 'struct cxl_register_map' is input vs output Dan Williams
2023-06-05 8:46 ` Jonathan Cameron
2023-06-13 22:03 ` Dave Jiang
2023-06-04 23:31 ` [PATCH 02/19] tools/testing/cxl: Remove unused @cxlds argument Dan Williams
2023-06-06 10:53 ` Jonathan Cameron
2023-06-13 22:08 ` Dave Jiang [this message]
2023-06-04 23:31 ` [PATCH 03/19] cxl/mbox: Move mailbox related driver state to its own data structure Dan Williams
2023-06-06 11:10 ` Jonathan Cameron
2023-06-14 0:45 ` Dan Williams
2023-06-13 22:15 ` Dave Jiang
2023-06-04 23:31 ` [PATCH 04/19] cxl/memdev: Make mailbox functionality optional Dan Williams
2023-06-06 11:15 ` Jonathan Cameron
2023-06-13 20:53 ` Dan Williams
2023-06-04 23:32 ` [PATCH 05/19] cxl/port: Rename CXL_DECODER_{EXPANDER, ACCELERATOR} => {HOSTMEM, DEVMEM} Dan Williams
2023-06-06 11:21 ` Jonathan Cameron
2023-06-13 21:03 ` Dan Williams
2023-06-04 23:32 ` [PATCH 06/19] cxl/hdm: Default CXL_DEVTYPE_DEVMEM decoders to CXL_DECODER_DEVMEM Dan Williams
2023-06-06 11:27 ` Jonathan Cameron
2023-06-13 21:23 ` Dan Williams
2023-06-13 22:32 ` Dan Williams
2023-06-14 9:15 ` Jonathan Cameron
2023-06-04 23:32 ` [PATCH 07/19] cxl/region: Manage decoder target_type at decoder-attach time Dan Williams
2023-06-06 12:36 ` Jonathan Cameron
2023-06-13 22:42 ` Dave Jiang
2023-06-04 23:32 ` [PATCH 08/19] cxl/port: Enumerate flit mode capability Dan Williams
2023-06-06 13:04 ` Jonathan Cameron
2023-06-14 1:06 ` Dan Williams
2023-06-04 23:32 ` [PATCH 09/19] cxl/memdev: Formalize endpoint port linkage Dan Williams
2023-06-06 13:26 ` Jonathan Cameron
2023-06-07 16:47 ` Fan Ni
2023-06-13 22:59 ` Dave Jiang
2023-06-04 23:32 ` [PATCH 10/19] cxl/memdev: Indicate probe deferral Dan Williams
2023-06-06 13:54 ` Jonathan Cameron
2023-06-04 23:32 ` [PATCH 11/19] cxl/region: Factor out construct_region_{begin, end} and drop_region() for reuse Dan Williams
2023-06-06 14:29 ` Jonathan Cameron
2023-06-13 23:29 ` Dave Jiang
2023-06-04 23:32 ` [PATCH 12/19] cxl/region: Factor out interleave ways setup Dan Williams
2023-06-06 14:31 ` Jonathan Cameron
2023-06-13 23:30 ` Dave Jiang
2023-06-04 23:32 ` [PATCH 13/19] cxl/region: Factor out interleave granularity setup Dan Williams
2023-06-06 14:33 ` Jonathan Cameron
2023-06-13 23:42 ` Dave Jiang
2023-06-04 23:32 ` [PATCH 14/19] cxl/region: Clarify locking requirements of cxl_region_attach() Dan Williams
2023-06-06 14:35 ` Jonathan Cameron
2023-06-13 23:45 ` Dave Jiang
2023-06-04 23:33 ` [PATCH 15/19] cxl/region: Specify host-only vs device memory at region creation time Dan Williams
2023-06-06 14:42 ` Jonathan Cameron
2023-06-04 23:33 ` [PATCH 16/19] cxl/hdm: Define a driver interface for DPA allocation Dan Williams
2023-06-06 14:58 ` Jonathan Cameron
2023-06-13 23:53 ` Dave Jiang
2023-06-04 23:33 ` [PATCH 17/19] cxl/region: Define a driver interface for HPA free space enumeration Dan Williams
2023-06-06 15:23 ` Jonathan Cameron
2023-06-14 0:15 ` Dave Jiang
2023-06-04 23:33 ` [PATCH 18/19] cxl/region: Define a driver interface for region creation Dan Williams
2023-06-06 15:31 ` Jonathan Cameron
2023-06-04 23:33 ` [PATCH 19/19] tools/testing/cxl: Emulate a CXL accelerator with local memory Dan Williams
2023-06-06 15:34 ` Jonathan Cameron
2023-06-07 21:09 ` Vikram Sethi
2023-06-08 10:47 ` Jonathan Cameron
2023-06-08 14:34 ` Vikram Sethi
2023-06-08 15:22 ` Jonathan Cameron
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=1add648c-9b80-03e9-3579-8ae0aaa2056b@intel.com \
--to=dave.jiang@intel.com \
--cc=dan.j.williams@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=navneet.singh@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