On Fri, Apr 10, 2020 at 08:27:31AM -0700, Guenter Roeck wrote: > From: Dan Williams <dan.j.williams@xxxxxxxxx> > > [ Upstream commit ebe9f6f19d80d8978d16078dff3d5bd93ad8d102 ] > > Commit 11189c1089da "acpi/nfit: Fix command-supported detection" broke > ND_CMD_CALL for bus-level commands. The "func = cmd" assumption is only > valid for: > > ND_CMD_ARS_CAP > ND_CMD_ARS_START > ND_CMD_ARS_STATUS > ND_CMD_CLEAR_ERROR > > The function number otherwise needs to be pulled from the command > payload for: > > NFIT_CMD_TRANSLATE_SPA > NFIT_CMD_ARS_INJECT_SET > NFIT_CMD_ARS_INJECT_CLEAR > NFIT_CMD_ARS_INJECT_GET > > Update cmd_to_func() for the bus case and call it in the common path. > > Fixes: 11189c1089da ("acpi/nfit: Fix command-supported detection") > Cc: <stable@xxxxxxxxxxxxxxx> > Reviewed-by: Vishal Verma <vishal.l.verma@xxxxxxxxx> > Reported-by: Grzegorz Burzynski <grzegorz.burzynski@xxxxxxxxx> > Tested-by: Jeff Moyer <jmoyer@xxxxxxxxxx> > Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx> > [groeck: backport to v4.14.y: adjust for missing commit 4b27db7e26cdb] > Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> > --- > Commit 11189c1089da ("acpi/nfit: Fix command-supported detection") > has been applied to v4.14.y as commit 1c285c34a509, but not its fix. > > This patch has already been applied to v4.19.y. v5.4.y and later are > not affected. > > drivers/acpi/nfit/core.c | 24 +++++++++++++----------- > 1 file changed, 13 insertions(+), 11 deletions(-) Now queued up, thanks. greg k-h