Skip to contentSkip to conversation

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

PATCH Applied Jon Hunter 3 participants 6 messages Nov 12, 2021 – Dec 6, 2021

Subsystems (2)
lore
Share & tools
lore

Jon Hunter

author maintainer
#0 lore raw

PATCH 1/1 reset: tegra-bpmp: Revert Handle errors in BPMP response

Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") fixed an issue in the Tegra BPMP error handling but has exposed an issue in the Tegra194 HDA driver and now resetting the Tegra194 HDA controller is failing. For now revert the commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") while a fix for the Tegra HDA driver is created.

Fixes c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")
---
 drivers/reset/tegra/reset-bpmp.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/reset/tegra/reset-bpmp.c +1 -8
index 4c5bba52b105..24d3395964cc 100644
@@ -20,7 +20,6 @@ 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;
@@ -31,13 +30,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
 	msg.tx.data = &request;
 	msg.tx.size = sizeof(request);
 
-	err = tegra_bpmp_transfer(bpmp, &msg);
-	if (err)
-		return err;
-	if (msg.rx.ret)
-		return -EINVAL;
-
-	return 0;
+	return tegra_bpmp_transfer(bpmp, &msg);
 }
 
 static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
Signature · 1 line
2.25.1
#1 lore raw
Quoted 31 lines · Jon Hunter

Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") fixed an issue in the Tegra BPMP error handling but has exposed an issue in the Tegra194 HDA driver and now resetting the Tegra194 HDA controller is failing. For now revert the commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") while a fix for the Tegra HDA driver is created.

Fixes c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")
---
  drivers/reset/tegra/reset-bpmp.c | 9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)
drivers/reset/tegra/reset-bpmp.c +0 -2
index 4c5bba52b105..24d3395964cc 100644
@@ -20,7 +20,6 @@ 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;
@@ -31,13 +30,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
  	msg.tx.data = &request;
  	msg.tx.size = sizeof(request);
 
-	err = tegra_bpmp_transfer(bpmp, &msg);

drivers/reset/tegra/reset-bpmp.c static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, · line 36

Quoted 10 lines
drivers/reset/tegra/reset-bpmp.c +1 -6
-	if (err)
-		return err;
-	if (msg.rx.ret)
-		return -EINVAL;
-
-	return 0;
+	return tegra_bpmp_transfer(bpmp, &msg);
  }
 
  static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,

Is there some reason the subject and commit message does not follow normal revert convention (as done by 'git revert')?

Mikko

author maintainer
#2 lore raw
Quoted 35 lines · Mikko Perttunen
Quoted 34 lines · Jon Hunter

Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") fixed an issue in the Tegra BPMP error handling but has exposed an issue in the Tegra194 HDA driver and now resetting the Tegra194 HDA controller is failing. For now revert the commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") while a fix for the Tegra HDA driver is created.

Fixes c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")

---
  drivers/reset/tegra/reset-bpmp.c | 9 +--------

  1 file changed, 1 insertion(+), 8 deletions(-)
drivers/reset/tegra/reset-bpmp.c +0 -6
index 4c5bba52b105..24d3395964cc 100644
@@ -20,7 +20,6 @@ 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;
@@ -31,13 +30,7 @@ static int tegra_bpmp_reset_common(struct 
 reset_controller_dev *rstc,
       msg.tx.data = &request;
       msg.tx.size = sizeof(request);
-    err = tegra_bpmp_transfer(bpmp, &msg);
-    if (err)
-        return err;
-    if (msg.rx.ret)
-        return -EINVAL;
Quoted 8 lines

drivers/reset/tegra/reset-bpmp.c static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,

Quoted 6 lines
drivers/reset/tegra/reset-bpmp.c +1 -2
-
-    return 0;
+    return tegra_bpmp_transfer(bpmp, &msg);
   }
   static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
 

Is there some reason the subject and commit message does not follow normal revert convention (as done by 'git revert')?

Some maintainers prefer that the patch is not titled "Revert ..." and want the patch subject to follow the normal sub-system prefix. If you search through the patches for 'revert' in the subject you will see a mixture. I prefer this approach.

Jon

Signature · 1 line
nvpublic
maintainer Applied
#3 lore raw
In reply to Jon Hunter
Quoted 9 lines · Jon Hunter

Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") fixed an issue in the Tegra BPMP error handling but has exposed an issue in the Tegra194 HDA driver and now resetting the Tegra194 HDA controller is failing. For now revert the commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") while a fix for the Tegra HDA driver is created.

Fixes c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")

Thank you, applied to reset/fixes.

regards
Philipp

author maintainer
#4 lore raw

Hi Philipp,

Quoted 8 lines · Philipp Zabel
Quoted 7 lines · Jon Hunter

Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") fixed an issue in the Tegra BPMP error handling but has exposed an issue in the Tegra194 HDA driver and now resetting the Tegra194 HDA controller is failing. For now revert the commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") while a fix for the Tegra HDA driver is created.

Quoted 4 lines
Quoted 2 lines
Fixes c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")

Thank you, applied to reset/fixes.

I see this has not been picked up yet for v5.16 and so I just wanted to check that you are planning to submit for v5.16.

Thanks!
Jon

Signature · 1 line
nvpublic
maintainer
#5 lore raw

Hi Jon,

Quoted 11 lines · Jon Hunter

Hi Philipp,

Quoted 8 lines · Philipp Zabel
Quoted 7 lines · Jon Hunter

Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") fixed an issue in the Tegra BPMP error handling but has exposed an issue in the Tegra194 HDA driver and now resetting the Tegra194 HDA controller is failing. For now revert the commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") while a fix for the Tegra HDA driver is created.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Fixes c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response")

Thank you, applied to reset/fixes.

I see this has not been picked up yet for v5.16 and so I just wanted to check that you are planning to submit for v5.16.

Thank you for the reminder, I forgot to Cc: you on the pull request:

https://lore.kernel.org/linux-arm-kernel/[email protected]/

regards
Philipp