Commit 54be94d3 authored Jan 12, 2022 by Sameer Pujar Committed by Greg Kroah-Hartman Apr 27, 2022

reset: tegra-bpmp: Restore Handle errors in BPMP response



[ Upstream commit d1da1052ffad63aa5181b69f20a6952e31f339c2 ]

This reverts following commit 69125b4b9440 ("reset: tegra-bpmp: Revert
Handle errors in BPMP response").

The Tegra194 HDA reset failure is fixed by commit d278dc9151a0 ("ALSA:
hda/tegra: Fix Tegra194 HDA reset failure"). The temporary revert of
original commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP
response") can be removed now.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/1641995806-15245-1-git-send-email-spujar@nvidia.com


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 0cb2c00d

drivers/reset/tegra/reset-bpmp.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
		struct tegra_bpmp *bpmp = to_tegra_bpmp(rstc);
		struct mrq_reset_request request;
		struct tegra_bpmp_message msg;
		int err;

		memset(&request, 0, sizeof(request));
		request.cmd = command;
		@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
		msg.tx.data = &request;
		msg.tx.size = sizeof(request);

		return tegra_bpmp_transfer(bpmp, &msg);
		err = tegra_bpmp_transfer(bpmp, &msg);
		if (err)
		return err;
		if (msg.rx.ret)
		return -EINVAL;

		return 0;
		}

		static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,