lkml.org 
[lkml]   [2019]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.0 04/99] acpi/nfit: Always dump _DSM output payload
    Date
    From: Dan Williams <dan.j.williams@intel.com>

    [ Upstream commit 351f339faa308c1c1461314a18c832239a841ca0 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/acpi/nfit/core.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
    index 4be4dc3e8aa6..38ec79bb3edd 100644
    --- a/drivers/acpi/nfit/core.c
    +++ b/drivers/acpi/nfit/core.c
    @@ -563,6 +563,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,
    @@ -581,12 +587,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,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-05-07 07:33    [W:4.724 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site