2020-05-04 06:43:48

by Ben Chuang

[permalink] [raw]
Subject: [PATCH] mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10

From: Ben Chuang <[email protected]>

Need to clear some bits in a vendor-defined register after reboot from
Windows 10.

Fixes: e51df6ce668a ("mmc: host: sdhci-pci: Add Genesys Logic GL975x support")
Reported-by: Grzegorz Kowal <[email protected]>
Signed-off-by: Ben Chuang <[email protected]>
---
drivers/mmc/host/sdhci-pci-gli.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
index ce15a05f23d4..8170b659f2af 100644
--- a/drivers/mmc/host/sdhci-pci-gli.c
+++ b/drivers/mmc/host/sdhci-pci-gli.c
@@ -26,6 +26,9 @@
#define SDHCI_GLI_9750_DRIVING_2 GENMASK(27, 26)
#define GLI_9750_DRIVING_1_VALUE 0xFFF
#define GLI_9750_DRIVING_2_VALUE 0x3
+#define SDHCI_GLI_9750_SEL_1 BIT(29)
+#define SDHCI_GLI_9750_SEL_2 BIT(31)
+#define SDHCI_GLI_9750_ALL_RST (BIT(24)|BIT(25)|BIT(28)|BIT(30))

#define SDHCI_GLI_9750_PLL 0x864
#define SDHCI_GLI_9750_PLL_TX2_INV BIT(23)
@@ -122,6 +125,8 @@ static void gli_set_9750(struct sdhci_host *host)
GLI_9750_DRIVING_1_VALUE);
driving_value |= FIELD_PREP(SDHCI_GLI_9750_DRIVING_2,
GLI_9750_DRIVING_2_VALUE);
+ driving_value &= ~(SDHCI_GLI_9750_SEL_1|SDHCI_GLI_9750_SEL_2|SDHCI_GLI_9750_ALL_RST);
+ driving_value |= SDHCI_GLI_9750_SEL_2;
sdhci_writel(host, driving_value, SDHCI_GLI_9750_DRIVING);

sw_ctrl_value &= ~SDHCI_GLI_9750_SW_CTRL_4;
--
2.26.2


2020-05-04 07:29:06

by Adrian Hunter

[permalink] [raw]
Subject: Re: [PATCH] mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10

On 4/05/20 9:39 am, Ben Chuang wrote:
> From: Ben Chuang <[email protected]>
>
> Need to clear some bits in a vendor-defined register after reboot from
> Windows 10.
>
> Fixes: e51df6ce668a ("mmc: host: sdhci-pci: Add Genesys Logic GL975x support")
> Reported-by: Grzegorz Kowal <[email protected]>
> Signed-off-by: Ben Chuang <[email protected]>

Acked-by: Adrian Hunter <[email protected]>

> ---
> drivers/mmc/host/sdhci-pci-gli.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> index ce15a05f23d4..8170b659f2af 100644
> --- a/drivers/mmc/host/sdhci-pci-gli.c
> +++ b/drivers/mmc/host/sdhci-pci-gli.c
> @@ -26,6 +26,9 @@
> #define SDHCI_GLI_9750_DRIVING_2 GENMASK(27, 26)
> #define GLI_9750_DRIVING_1_VALUE 0xFFF
> #define GLI_9750_DRIVING_2_VALUE 0x3
> +#define SDHCI_GLI_9750_SEL_1 BIT(29)
> +#define SDHCI_GLI_9750_SEL_2 BIT(31)
> +#define SDHCI_GLI_9750_ALL_RST (BIT(24)|BIT(25)|BIT(28)|BIT(30))
>
> #define SDHCI_GLI_9750_PLL 0x864
> #define SDHCI_GLI_9750_PLL_TX2_INV BIT(23)
> @@ -122,6 +125,8 @@ static void gli_set_9750(struct sdhci_host *host)
> GLI_9750_DRIVING_1_VALUE);
> driving_value |= FIELD_PREP(SDHCI_GLI_9750_DRIVING_2,
> GLI_9750_DRIVING_2_VALUE);
> + driving_value &= ~(SDHCI_GLI_9750_SEL_1|SDHCI_GLI_9750_SEL_2|SDHCI_GLI_9750_ALL_RST);
> + driving_value |= SDHCI_GLI_9750_SEL_2;
> sdhci_writel(host, driving_value, SDHCI_GLI_9750_DRIVING);
>
> sw_ctrl_value &= ~SDHCI_GLI_9750_SW_CTRL_4;
>

2020-05-05 09:17:08

by Grzegorz Kowal

[permalink] [raw]
Subject: Re: [PATCH] mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10

Tested-by: Grzegorz Kowal <[email protected]>

Thanks,
Grzegorz

On Mon, May 4, 2020 at 4:26 AM Adrian Hunter <[email protected]> wrote:
>
> On 4/05/20 9:39 am, Ben Chuang wrote:
> > From: Ben Chuang <[email protected]>
> >
> > Need to clear some bits in a vendor-defined register after reboot from
> > Windows 10.
> >
> > Fixes: e51df6ce668a ("mmc: host: sdhci-pci: Add Genesys Logic GL975x support")
> > Reported-by: Grzegorz Kowal <[email protected]>
> > Signed-off-by: Ben Chuang <[email protected]>
>
> Acked-by: Adrian Hunter <[email protected]>
>
> > ---
> > drivers/mmc/host/sdhci-pci-gli.c | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> > index ce15a05f23d4..8170b659f2af 100644
> > --- a/drivers/mmc/host/sdhci-pci-gli.c
> > +++ b/drivers/mmc/host/sdhci-pci-gli.c
> > @@ -26,6 +26,9 @@
> > #define SDHCI_GLI_9750_DRIVING_2 GENMASK(27, 26)
> > #define GLI_9750_DRIVING_1_VALUE 0xFFF
> > #define GLI_9750_DRIVING_2_VALUE 0x3
> > +#define SDHCI_GLI_9750_SEL_1 BIT(29)
> > +#define SDHCI_GLI_9750_SEL_2 BIT(31)
> > +#define SDHCI_GLI_9750_ALL_RST (BIT(24)|BIT(25)|BIT(28)|BIT(30))
> >
> > #define SDHCI_GLI_9750_PLL 0x864
> > #define SDHCI_GLI_9750_PLL_TX2_INV BIT(23)
> > @@ -122,6 +125,8 @@ static void gli_set_9750(struct sdhci_host *host)
> > GLI_9750_DRIVING_1_VALUE);
> > driving_value |= FIELD_PREP(SDHCI_GLI_9750_DRIVING_2,
> > GLI_9750_DRIVING_2_VALUE);
> > + driving_value &= ~(SDHCI_GLI_9750_SEL_1|SDHCI_GLI_9750_SEL_2|SDHCI_GLI_9750_ALL_RST);
> > + driving_value |= SDHCI_GLI_9750_SEL_2;
> > sdhci_writel(host, driving_value, SDHCI_GLI_9750_DRIVING);
> >
> > sw_ctrl_value &= ~SDHCI_GLI_9750_SW_CTRL_4;
> >
>

2020-05-05 11:36:26

by Ulf Hansson

[permalink] [raw]
Subject: Re: [PATCH] mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10

On Mon, 4 May 2020 at 08:41, Ben Chuang <[email protected]> wrote:
>
> From: Ben Chuang <[email protected]>
>
> Need to clear some bits in a vendor-defined register after reboot from
> Windows 10.
>
> Fixes: e51df6ce668a ("mmc: host: sdhci-pci: Add Genesys Logic GL975x support")
> Reported-by: Grzegorz Kowal <[email protected]>
> Signed-off-by: Ben Chuang <[email protected]>

Applied for fixes, thanks!

Kind regards
Uffe


> ---
> drivers/mmc/host/sdhci-pci-gli.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> index ce15a05f23d4..8170b659f2af 100644
> --- a/drivers/mmc/host/sdhci-pci-gli.c
> +++ b/drivers/mmc/host/sdhci-pci-gli.c
> @@ -26,6 +26,9 @@
> #define SDHCI_GLI_9750_DRIVING_2 GENMASK(27, 26)
> #define GLI_9750_DRIVING_1_VALUE 0xFFF
> #define GLI_9750_DRIVING_2_VALUE 0x3
> +#define SDHCI_GLI_9750_SEL_1 BIT(29)
> +#define SDHCI_GLI_9750_SEL_2 BIT(31)
> +#define SDHCI_GLI_9750_ALL_RST (BIT(24)|BIT(25)|BIT(28)|BIT(30))
>
> #define SDHCI_GLI_9750_PLL 0x864
> #define SDHCI_GLI_9750_PLL_TX2_INV BIT(23)
> @@ -122,6 +125,8 @@ static void gli_set_9750(struct sdhci_host *host)
> GLI_9750_DRIVING_1_VALUE);
> driving_value |= FIELD_PREP(SDHCI_GLI_9750_DRIVING_2,
> GLI_9750_DRIVING_2_VALUE);
> + driving_value &= ~(SDHCI_GLI_9750_SEL_1|SDHCI_GLI_9750_SEL_2|SDHCI_GLI_9750_ALL_RST);
> + driving_value |= SDHCI_GLI_9750_SEL_2;
> sdhci_writel(host, driving_value, SDHCI_GLI_9750_DRIVING);
>
> sw_ctrl_value &= ~SDHCI_GLI_9750_SW_CTRL_4;
> --
> 2.26.2
>