Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f72e3a0 authored by Dan Williams's avatar Dan Williams Committed by Greg Kroah-Hartman
Browse files

acpi/nfit: Always dump _DSM output payload 



[ 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: 31eca76b ("...whitelisted dimm command marshaling mechanism")
Reported-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f07db1f1

drivers/acpi/nfit/core.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -542,6 +542,12 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
		goto out;

		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) {

	if (call_pkg) {

		call_pkg->nd_fw_size = out_obj->buffer.length;

		call_pkg->nd_fw_size = out_obj->buffer.length;

		memcpy(call_pkg->nd_payload + call_pkg->nd_size_in,

		memcpy(call_pkg->nd_payload + call_pkg->nd_size_in,
@@ -560,12 +566,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
		return 0;

		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++) {

	for (i = 0, offset = 0; i < desc->out_num; i++) {

		u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, buf,

		u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, buf,

				(u32 *) out_obj->buffer.pointer,

				(u32 *) out_obj->buffer.pointer,