reset: tegra-bpmp: Restore Handle errors in BPMP response
Subsystems (2)
PATCH 1/1 reset: tegra-bpmp: Restore Handle errors in BPMP response
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.
--- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/reset/tegra/reset-bpmp.c +8 -1
@@ -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,
Signature · 1 line
2.7.4
Quoted 30 lines · Sameer Pujar
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 commitc045ceb5a145("reset: tegra-bpmp: Handle errors in BPMP response") can be removed now.Signed-off-by Sameer Pujar <[email protected]>--- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/reset/tegra/reset-bpmp.c +1
-1@@ -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);
drivers/reset/tegra/reset-bpmp.c static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, · line 43
Quoted 10 lines
drivers/reset/tegra/reset-bpmp.c +7
-0+ 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,
Thanks!
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Sameer Pujar
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 commitc045ceb5a145("reset: tegra-bpmp: Handle errors in BPMP response") can be removed now.
Quoted 4 lines
Signed-off-by Sameer Pujar <[email protected]>--- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Hi Philipp,
the commit that fixed the HDA reset failure was merged into v5.17-rc1, so this can safely be applied as a fix for v5.17. At the same time the existing bug is fairly harmless, so deferring this to v5.18 would also be fine.
Quoted 39 lines · Sameer Pujar
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 commitc045ceb5a145("reset: tegra-bpmp: Handle errors in BPMP
response") can be removed now.Signed-off-by Sameer Pujar <[email protected]>---
drivers/reset/tegra/reset-bpmp.c | 9 ++++++++-1 file changed, 8 insertions(+), 1 deletion(-)drivers/reset/tegra/reset-bpmp.c +1
-0@@ -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;drivers/reset/tegra/reset-bpmp.c +0
-0@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(structreset_controller_dev *rstc, msg.tx.data = &request; msg.tx.size = sizeof(request);
- returntegra_bpmp_transfer(bpmp, &msg);
+ err =tegra_bpmp_transfer(bpmp, &msg);
+ if (err)
+ return err;
Quoted 8 lines
+ if (msg.rx.ret)
+ return-EINVAL;
+
+ return 0;
}
static int tegra_bpmp_reset_module(structreset_controller_dev*rstc,
Thank you, applied to reset/fixes.
regards
Philipp