2022-04-14 12:26:17

by Ben Chuang

Subject: [RESEND, PATCH] mmc: sdhci-pci-gli: A workaround to allow GL9755 to enter ASPM L1.2

From: Ben Chuang <[email protected]>

When GL9755 enters ASPM L1 sub-states, it will stay at L1.1 and will not
enter L1.2. The workaround is to toggle PM state to allow GL9755 to enter
ASPM L1.2.

Signed-off-by: Ben Chuang <[email protected]>
---
drivers/mmc/host/sdhci-pci-gli.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
index 97035d77c18c..52230857388f 100644
--- a/drivers/mmc/host/sdhci-pci-gli.c
+++ b/drivers/mmc/host/sdhci-pci-gli.c
@@ -137,6 +137,9 @@
#define PCI_GLI_9755_SerDes 0x70
#define PCI_GLI_9755_SCP_DIS BIT(19)

+#define PCI_GLI_9755_PM_CTRL 0xFC
+#define PCI_GLI_9755_PM_STATE GENMASK(1, 0)
+
#define GLI_MAX_TUNING_LOOP 40

/* Genesys Logic chipset */
@@ -597,6 +600,13 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)
GLI_9755_CFG2_L1DLY_VALUE);
pci_write_config_dword(pdev, PCI_GLI_9755_CFG2, value);

+ /* toggle PM state to allow GL9755 to enter ASPM L1.2 */
+ pci_read_config_dword(pdev, PCI_GLI_9755_PM_CTRL, &value);
+ value |= PCI_GLI_9755_PM_STATE;
+ pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
+ value &= ~PCI_GLI_9755_PM_STATE;
+ pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
+
gl9755_wt_off(pdev);
}

--
2.35.1

2022-04-19 18:06:04

by Adrian Hunter

Subject: Re: [RESEND, PATCH] mmc: sdhci-pci-gli: A workaround to allow GL9755 to enter ASPM L1.2

On 14/04/22 12:49, Ben Chuang wrote:
> From: Ben Chuang <[email protected]>
>
> When GL9755 enters ASPM L1 sub-states, it will stay at L1.1 and will not
> enter L1.2. The workaround is to toggle PM state to allow GL9755 to enter
> ASPM L1.2.
>
> Signed-off-by: Ben Chuang <[email protected]>

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

> ---
> drivers/mmc/host/sdhci-pci-gli.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> index 97035d77c18c..52230857388f 100644
> --- a/drivers/mmc/host/sdhci-pci-gli.c
> +++ b/drivers/mmc/host/sdhci-pci-gli.c
> @@ -137,6 +137,9 @@
> #define PCI_GLI_9755_SerDes 0x70
> #define PCI_GLI_9755_SCP_DIS BIT(19)
>
> +#define PCI_GLI_9755_PM_CTRL 0xFC
> +#define PCI_GLI_9755_PM_STATE GENMASK(1, 0)
> +
> #define GLI_MAX_TUNING_LOOP 40
>
> /* Genesys Logic chipset */
> @@ -597,6 +600,13 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)
> GLI_9755_CFG2_L1DLY_VALUE);
> pci_write_config_dword(pdev, PCI_GLI_9755_CFG2, value);
>
> + /* toggle PM state to allow GL9755 to enter ASPM L1.2 */
> + pci_read_config_dword(pdev, PCI_GLI_9755_PM_CTRL, &value);
> + value |= PCI_GLI_9755_PM_STATE;
> + pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
> + value &= ~PCI_GLI_9755_PM_STATE;
> + pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
> +
> gl9755_wt_off(pdev);
> }
>

2022-04-22 10:01:39

by Ulf Hansson

Subject: Re: [RESEND, PATCH] mmc: sdhci-pci-gli: A workaround to allow GL9755 to enter ASPM L1.2

On Thu, 14 Apr 2022 at 11:49, Ben Chuang <[email protected]> wrote:
>
> From: Ben Chuang <[email protected]>
>
> When GL9755 enters ASPM L1 sub-states, it will stay at L1.1 and will not
> enter L1.2. The workaround is to toggle PM state to allow GL9755 to enter
> ASPM L1.2.
>
> Signed-off-by: Ben Chuang <[email protected]>

This didn't apply cleanly, I fixed it up this time. So, applied for
next, thanks!

Kind regards
Uffe


> ---
> drivers/mmc/host/sdhci-pci-gli.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> index 97035d77c18c..52230857388f 100644
> --- a/drivers/mmc/host/sdhci-pci-gli.c
> +++ b/drivers/mmc/host/sdhci-pci-gli.c
> @@ -137,6 +137,9 @@
> #define PCI_GLI_9755_SerDes 0x70
> #define PCI_GLI_9755_SCP_DIS BIT(19)
>
> +#define PCI_GLI_9755_PM_CTRL 0xFC
> +#define PCI_GLI_9755_PM_STATE GENMASK(1, 0)
> +
> #define GLI_MAX_TUNING_LOOP 40
>
> /* Genesys Logic chipset */
> @@ -597,6 +600,13 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)
> GLI_9755_CFG2_L1DLY_VALUE);
> pci_write_config_dword(pdev, PCI_GLI_9755_CFG2, value);
>
> + /* toggle PM state to allow GL9755 to enter ASPM L1.2 */
> + pci_read_config_dword(pdev, PCI_GLI_9755_PM_CTRL, &value);
> + value |= PCI_GLI_9755_PM_STATE;
> + pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
> + value &= ~PCI_GLI_9755_PM_STATE;
> + pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
> +
> gl9755_wt_off(pdev);
> }
>
> --
> 2.35.1
>

2022-04-25 09:46:35

by Ben Chuang

Subject: Re: [RESEND, PATCH] mmc: sdhci-pci-gli: A workaround to allow GL9755 to enter ASPM L1.2

On Thu, Apr 21, 2022 at 9:55 PM Ulf Hansson <[email protected]> wrote:
>
> On Thu, 14 Apr 2022 at 11:49, Ben Chuang <[email protected]> wrote:
> >
> > From: Ben Chuang <[email protected]>
> >
> > When GL9755 enters ASPM L1 sub-states, it will stay at L1.1 and will not
> > enter L1.2. The workaround is to toggle PM state to allow GL9755 to enter
> > ASPM L1.2.
> >
> > Signed-off-by: Ben Chuang <[email protected]>
>
> This didn't apply cleanly, I fixed it up this time. So, applied for
> next, thanks!
>
> Kind regards
> Uffe

I forgot to rebase to v5.18rc. I will pay more attention next time. Thank you.

Best regards,
Ben

>
>
> > ---
> > drivers/mmc/host/sdhci-pci-gli.c | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> > index 97035d77c18c..52230857388f 100644
> > --- a/drivers/mmc/host/sdhci-pci-gli.c
> > +++ b/drivers/mmc/host/sdhci-pci-gli.c
> > @@ -137,6 +137,9 @@
> > #define PCI_GLI_9755_SerDes 0x70
> > #define PCI_GLI_9755_SCP_DIS BIT(19)
> >
> > +#define PCI_GLI_9755_PM_CTRL 0xFC
> > +#define PCI_GLI_9755_PM_STATE GENMASK(1, 0)
> > +
> > #define GLI_MAX_TUNING_LOOP 40
> >
> > /* Genesys Logic chipset */
> > @@ -597,6 +600,13 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)
> > GLI_9755_CFG2_L1DLY_VALUE);
> > pci_write_config_dword(pdev, PCI_GLI_9755_CFG2, value);
> >
> > + /* toggle PM state to allow GL9755 to enter ASPM L1.2 */
> > + pci_read_config_dword(pdev, PCI_GLI_9755_PM_CTRL, &value);
> > + value |= PCI_GLI_9755_PM_STATE;
> > + pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
> > + value &= ~PCI_GLI_9755_PM_STATE;
> > + pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
> > +
> > gl9755_wt_off(pdev);
> > }
> >
> > --
> > 2.35.1
> >