LKML Archive mirror
 help / color / mirror / Atom feed
* [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response
@ 2022-01-12 13:56 Sameer Pujar
  2022-01-13 23:44 ` Jon Hunter
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Sameer Pujar @ 2022-01-12 13:56 UTC (permalink / raw
  To: p.zabel, thierry.reding, jonathanh, mperttunen
  Cc: linux-tegra, linux-kernel, 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 commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP
response") can be removed now.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
 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 24d3395..4c5bba5 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.7.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response
  2022-01-12 13:56 [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response Sameer Pujar
@ 2022-01-13 23:44 ` Jon Hunter
  2022-01-27 17:32 ` Thierry Reding
  2022-04-04 10:17 ` Philipp Zabel
  2 siblings, 0 replies; 4+ messages in thread
From: Jon Hunter @ 2022-01-13 23:44 UTC (permalink / raw
  To: Sameer Pujar, p.zabel, thierry.reding, mperttunen
  Cc: linux-tegra, linux-kernel


On 12/01/2022 13:56, Sameer Pujar wrote:
> 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>
> ---
>   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 24d3395..4c5bba5 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,


Thanks!

Tested-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>

Jon


-- 
nvpublic

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response
  2022-01-12 13:56 [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response Sameer Pujar
  2022-01-13 23:44 ` Jon Hunter
@ 2022-01-27 17:32 ` Thierry Reding
  2022-04-04 10:17 ` Philipp Zabel
  2 siblings, 0 replies; 4+ messages in thread
From: Thierry Reding @ 2022-01-27 17:32 UTC (permalink / raw
  To: Philipp Zabel
  Cc: Sameer Pujar, jonathanh, mperttunen, linux-tegra, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

On Wed, Jan 12, 2022 at 07:26:46PM +0530, Sameer Pujar wrote:
> 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>
> ---
>  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.

Acked-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response
  2022-01-12 13:56 [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response Sameer Pujar
  2022-01-13 23:44 ` Jon Hunter
  2022-01-27 17:32 ` Thierry Reding
@ 2022-04-04 10:17 ` Philipp Zabel
  2 siblings, 0 replies; 4+ messages in thread
From: Philipp Zabel @ 2022-04-04 10:17 UTC (permalink / raw
  To: Sameer Pujar, thierry.reding, jonathanh, mperttunen
  Cc: linux-tegra, linux-kernel

On Mi, 2022-01-12 at 19:26 +0530, Sameer Pujar wrote:
> 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>
> ---
>  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 24d3395..4c5bba5 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,

Thank you, applied to reset/fixes.

regards
Philipp

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-04-04 10:17 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-12 13:56 [PATCH] reset: tegra-bpmp: Restore Handle errors in BPMP response Sameer Pujar
2022-01-13 23:44 ` Jon Hunter
2022-01-27 17:32 ` Thierry Reding
2022-04-04 10:17 ` Philipp Zabel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).