| Message ID | 20211112112712.21587-1-jonathanh@nvidia.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | reset: tegra-bpmp: Revert Handle errors in BPMP response | expand |
On 11/12/21 1:27 PM, Jon Hunter wrote: > 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") > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- > drivers/reset/tegra/reset-bpmp.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c > index 4c5bba52b105..24d3395964cc 100644 > --- a/drivers/reset/tegra/reset-bpmp.c > +++ b/drivers/reset/tegra/reset-bpmp.c > @@ -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, > Is there some reason the subject and commit message does not follow normal revert convention (as done by 'git revert')? Mikko
On 15/11/2021 17:21, Mikko Perttunen wrote: > On 11/12/21 1:27 PM, Jon Hunter wrote: >> 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") >> Signed-off-by: Jon Hunter <jonathanh@nvidia.com> >> --- >> drivers/reset/tegra/reset-bpmp.c | 9 +-------- >> 1 file changed, 1 insertion(+), 8 deletions(-) >> >> diff --git a/drivers/reset/tegra/reset-bpmp.c >> b/drivers/reset/tegra/reset-bpmp.c >> index 4c5bba52b105..24d3395964cc 100644 >> --- a/drivers/reset/tegra/reset-bpmp.c >> +++ b/drivers/reset/tegra/reset-bpmp.c >> @@ -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, >> > > 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
On Fri, 2021-11-12 at 11:27 +0000, Jon Hunter wrote: > 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") > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Thank you, applied to reset/fixes. regards Philipp
Hi Philipp, On 17/11/2021 16:23, Philipp Zabel wrote: > On Fri, 2021-11-12 at 11:27 +0000, Jon Hunter wrote: >> 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") >> Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > > 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
Hi Jon, On Mon, 2021-12-06 at 11:37 +0000, Jon Hunter wrote: > Hi Philipp, > > On 17/11/2021 16:23, Philipp Zabel wrote: > > On Fri, 2021-11-12 at 11:27 +0000, Jon Hunter wrote: > > > 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") > > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > > > > 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/5383deda141721643419e98c485fb510be56fb61.camel@pengutronix.de/ regards Philipp
diff --git a/drivers/reset/tegra/reset-bpmp.c b/drivers/reset/tegra/reset-bpmp.c index 4c5bba52b105..24d3395964cc 100644 --- a/drivers/reset/tegra/reset-bpmp.c +++ b/drivers/reset/tegra/reset-bpmp.c @@ -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,
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") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- drivers/reset/tegra/reset-bpmp.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)