| Message ID | 20220324011126.1144504-3-alison.schofield@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Do not allow set-partition immediate mode | expand |
On Wed, 23 Mar 2022 18:11:19 -0700 alison.schofield@intel.com wrote: > From: Alison Schofield <alison.schofield@intel.com> > > This move serves two purposes: 1) Emit the warning in the raw > command validation path, and 2) Remove the dependency on the > struct cxl_mem_command in handle_mailbox_cmd_from_user() in > preparation for a refactor of that function. > > Signed-off-by: Alison Schofield <alison.schofield@intel.com> FWIW as this is obviously fine. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/core/mbox.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c > index 6612d73c37a8..28131c6f7fcf 100644 > --- a/drivers/cxl/core/mbox.c > +++ b/drivers/cxl/core/mbox.c > @@ -224,6 +224,8 @@ static int cxl_to_mem_cmd_raw(struct cxl_dev_state *cxlds, > if (!cxl_mem_raw_command_allowed(send_cmd->raw.opcode)) > return -EPERM; > > + dev_WARN_ONCE(cxlds->dev, true, "raw command path used\n"); > + > *mem_cmd = (struct cxl_mem_command) { > .info = { > .id = CXL_MEM_COMMAND_ID_RAW, > @@ -424,9 +426,6 @@ static int handle_mailbox_cmd_from_user(struct cxl_dev_state *cxlds, > cxl_command_names[cmd->info.id].name, mbox_cmd.opcode, > cmd->info.size_in); > > - dev_WARN_ONCE(dev, cmd->info.id == CXL_MEM_COMMAND_ID_RAW, > - "raw command path used\n"); > - > rc = cxlds->mbox_send(cxlds, &mbox_cmd); > if (rc) > goto out;
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index 6612d73c37a8..28131c6f7fcf 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -224,6 +224,8 @@ static int cxl_to_mem_cmd_raw(struct cxl_dev_state *cxlds, if (!cxl_mem_raw_command_allowed(send_cmd->raw.opcode)) return -EPERM; + dev_WARN_ONCE(cxlds->dev, true, "raw command path used\n"); + *mem_cmd = (struct cxl_mem_command) { .info = { .id = CXL_MEM_COMMAND_ID_RAW, @@ -424,9 +426,6 @@ static int handle_mailbox_cmd_from_user(struct cxl_dev_state *cxlds, cxl_command_names[cmd->info.id].name, mbox_cmd.opcode, cmd->info.size_in); - dev_WARN_ONCE(dev, cmd->info.id == CXL_MEM_COMMAND_ID_RAW, - "raw command path used\n"); - rc = cxlds->mbox_send(cxlds, &mbox_cmd); if (rc) goto out;