| From 89e2ce006887f4e96ffe940897b299e22e80840b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 12 Jan 2022 19:26:46 +0530 |
| Subject: reset: tegra-bpmp: Restore Handle errors in BPMP response |
| |
| From: Sameer Pujar <spujar@nvidia.com> |
| |
| [ 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> |
| --- |
| drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- |
| 1 file changed, 8 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c |
| index 24d3395964cc..4c5bba52b105 100644 |
| --- a/drivers/reset/tegra/reset-bpmp.c |
| +++ b/drivers/reset/tegra/reset-bpmp.c |
| @@ -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, |
| -- |
| 2.35.1 |
| |