[PATCH v3] mmc: tegra: fix SDR50 tuning override

[PATCH v3] mmc: tegra: fix SDR50 tuning override

[Michał Mirosław]

Commit 7ad2ed1dfcbe inadvertently mixed up a quirk flag's name and
broke SDR50 tuning override. Use correct NVQUIRK_ name.

Fixes: 7ad2ed1dfcbe ("mmc: tegra: enable UHS-I modes")
Cc: <stable@vger.kernel.org> # 4f6aa3264af4: mmc: tegra: Only advertise UHS modes if IO regulator is present
Cc: <stable@vger.kernel.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>

---
 v3: added Thierry's signs that were missing in v2
 v2: converted 'Depends-On' tag to proper 'Cc: stable' lines

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 7bc950520fd9..403ac44a7378 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -386,7 +386,7 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
 			misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_DDR50;
 		if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR104)
 			misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDR104;
-		if (soc_data->nvquirks & SDHCI_MISC_CTRL_ENABLE_SDR50)
+		if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR50)
 			clk_ctrl |= SDHCI_CLOCK_CTRL_SDR50_TUNING_OVERRIDE;
 	}
 
-- 
2.20.1

Re: [PATCH v3] mmc: tegra: fix SDR50 tuning override

[Ulf Hansson]

On Tue, 7 Jan 2020 at 10:47, Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
>
> Commit 7ad2ed1dfcbe inadvertently mixed up a quirk flag's name and
> broke SDR50 tuning override. Use correct NVQUIRK_ name.
>
> Fixes: 7ad2ed1dfcbe ("mmc: tegra: enable UHS-I modes")
> Cc: <stable@vger.kernel.org> # 4f6aa3264af4: mmc: tegra: Only advertise UHS modes if IO regulator is present

I am dropping this tag, simply because I don't understand what it should tell.

Instead, please monitor responses from stable maintainers, to see if
there is failure to apply this for stable and then send a manual
backport.

> Cc: <stable@vger.kernel.org>
> Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> Reviewed-by: Thierry Reding <treding@nvidia.com>
> Tested-by: Thierry Reding <treding@nvidia.com>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>

Applied for fixes, thanks!

Kind regards
Uffe


>
> ---
>  v3: added Thierry's signs that were missing in v2
>  v2: converted 'Depends-On' tag to proper 'Cc: stable' lines
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---
>  drivers/mmc/host/sdhci-tegra.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 7bc950520fd9..403ac44a7378 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -386,7 +386,7 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
>                         misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_DDR50;
>                 if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR104)
>                         misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDR104;
> -               if (soc_data->nvquirks & SDHCI_MISC_CTRL_ENABLE_SDR50)
> +               if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR50)
>                         clk_ctrl |= SDHCI_CLOCK_CTRL_SDR50_TUNING_OVERRIDE;
>         }
>
> --
> 2.20.1
>

Re: [PATCH v3] mmc: tegra: fix SDR50 tuning override

[Michał Mirosław]

On Thu, Jan 16, 2020 at 03:39:54PM +0100, Ulf Hansson wrote:
> On Tue, 7 Jan 2020 at 10:47, Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
> >
> > Commit 7ad2ed1dfcbe inadvertently mixed up a quirk flag's name and
> > broke SDR50 tuning override. Use correct NVQUIRK_ name.
> >
> > Fixes: 7ad2ed1dfcbe ("mmc: tegra: enable UHS-I modes")
> > Cc: <stable@vger.kernel.org> # 4f6aa3264af4: mmc: tegra: Only advertise UHS modes if IO regulator is present
> 
> I am dropping this tag, simply because I don't understand what it should tell.

It tells the maintainer that he needs to cherry-pick this commit if
its not in particular stable version already. I guess this is only
for v4.4, as v4.9+ already have it, and v3.16 does not include the
Fixed commit.

Best Regards,
Michał Mirosław

Re: [PATCH v3] mmc: tegra: fix SDR50 tuning override

[Dmitry Osipenko]

17.01.2020 17:11, Michał Mirosław пишет:
> On Thu, Jan 16, 2020 at 03:39:54PM +0100, Ulf Hansson wrote:
>> On Tue, 7 Jan 2020 at 10:47, Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
>>>
>>> Commit 7ad2ed1dfcbe inadvertently mixed up a quirk flag's name and
>>> broke SDR50 tuning override. Use correct NVQUIRK_ name.
>>>
>>> Fixes: 7ad2ed1dfcbe ("mmc: tegra: enable UHS-I modes")
>>> Cc: <stable@vger.kernel.org> # 4f6aa3264af4: mmc: tegra: Only advertise UHS modes if IO regulator is present
>>
>> I am dropping this tag, simply because I don't understand what it should tell.
> 
> It tells the maintainer that he needs to cherry-pick this commit if
> its not in particular stable version already. I guess this is only
> for v4.4, as v4.9+ already have it, and v3.16 does not include the
> Fixed commit.

I guess it could be: Cc: <stable@vger.kernel.org> # v4.4+

And then you could email Greg KH or Sasha Levin, asking to pick up the
additional commit to the stable kernel, or they will ask you by
themselves about why the patch isn't applying and how to handle it.

Re: [PATCH v3] mmc: tegra: fix SDR50 tuning override

[Ulf Hansson]

On Fri, 17 Jan 2020 at 15:11, Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
>
> On Thu, Jan 16, 2020 at 03:39:54PM +0100, Ulf Hansson wrote:
> > On Tue, 7 Jan 2020 at 10:47, Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
> > >
> > > Commit 7ad2ed1dfcbe inadvertently mixed up a quirk flag's name and
> > > broke SDR50 tuning override. Use correct NVQUIRK_ name.
> > >
> > > Fixes: 7ad2ed1dfcbe ("mmc: tegra: enable UHS-I modes")
> > > Cc: <stable@vger.kernel.org> # 4f6aa3264af4: mmc: tegra: Only advertise UHS modes if IO regulator is present
> >
> > I am dropping this tag, simply because I don't understand what it should tell.
>
> It tells the maintainer that he needs to cherry-pick this commit if
> its not in particular stable version already. I guess this is only
> for v4.4, as v4.9+ already have it, and v3.16 does not include the
> Fixed commit.

Alright, I updated myself on stable rules and found this, thanks!

So I have amended the patch to add back the tag, let's give this a try.

Kind regards
Uffe