| Message ID | 155242666957.581839.11006696811038518218.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 351f339faa308c1c1461314a18c832239a841ca0 |
| Headers | show |
| Series | acpi/nfit: Always dump _DSM output payload | expand |
On Tue, 2019-03-12 at 14:37 -0700, Dan Williams wrote: > The dynamic-debug statements for command payload output only get > emitted > when the command is not ND_CMD_CALL. Move the output payload dumping > ahead of the early return path for ND_CMD_CALL. > > Fixes: 31eca76ba2fc9 ("...whitelisted dimm command marshaling > mechanism") > Reported-by: Vishal Verma <vishal.l.verma@intel.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > drivers/acpi/nfit/core.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > Looks good to me, Reviewed-by: Vishal Verma <vishal.l.verma@intel.com> > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c > index a22e2f2bbb75..c9367e78521b 100644 > --- a/drivers/acpi/nfit/core.c > +++ b/drivers/acpi/nfit/core.c > @@ -546,6 +546,12 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor > *nd_desc, struct nvdimm *nvdimm, > goto out; > } > > + dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name, > + cmd_name, out_obj->buffer.length); > + print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4, > + out_obj->buffer.pointer, > + min_t(u32, 128, out_obj->buffer.length), true); > + > if (call_pkg) { > call_pkg->nd_fw_size = out_obj->buffer.length; > memcpy(call_pkg->nd_payload + call_pkg->nd_size_in, > @@ -564,12 +570,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor > *nd_desc, struct nvdimm *nvdimm, > return 0; > } > > - dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name, > - cmd_name, out_obj->buffer.length); > - print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4, > - out_obj->buffer.pointer, > - min_t(u32, 128, out_obj->buffer.length), true); > - > for (i = 0, offset = 0; i < desc->out_num; i++) { > u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, > buf, > (u32 *) out_obj->buffer.pointer, >
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index a22e2f2bbb75..c9367e78521b 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -546,6 +546,12 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, goto out; } + dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name, + cmd_name, out_obj->buffer.length); + print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4, + out_obj->buffer.pointer, + min_t(u32, 128, out_obj->buffer.length), true); + if (call_pkg) { call_pkg->nd_fw_size = out_obj->buffer.length; memcpy(call_pkg->nd_payload + call_pkg->nd_size_in, @@ -564,12 +570,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, return 0; } - dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name, - cmd_name, out_obj->buffer.length); - print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4, - out_obj->buffer.pointer, - min_t(u32, 128, out_obj->buffer.length), true); - for (i = 0, offset = 0; i < desc->out_num; i++) { u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, buf, (u32 *) out_obj->buffer.pointer,
The dynamic-debug statements for command payload output only get emitted when the command is not ND_CMD_CALL. Move the output payload dumping ahead of the early return path for ND_CMD_CALL. Fixes: 31eca76ba2fc9 ("...whitelisted dimm command marshaling mechanism") Reported-by: Vishal Verma <vishal.l.verma@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/acpi/nfit/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)