mmc: sdhci-pci-gli: Fix can not access GL9750 after reboot from Windows 10
PATCH 1/1 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(+)
drivers/mmc/host/sdhci-pci-gli.c +5 -0
@@ -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 ;
Signature · 1 line
2.26.2
Quoted 8 lines · Ben Chuang
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]>
Quoted 28 lines
--- drivers/mmc/host/sdhci-pci-gli.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mmc/host/sdhci-pci-gli.c +5
-0@@ -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 ;
Grzegorz Kowal
Tested-byTested-by Grzegorz Kowal <[email protected]>
Thanks,
Grzegorz
Quoted 42 lines · Adrian Hunter
Quoted 8 lines · Ben Chuang
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]>Quoted 28 lines
--- drivers/mmc/host/sdhci-pci-gli.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mmc/host/sdhci-pci-gli.c +5
-0@@ -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 ;
Quoted 9 lines · Ben Chuang
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
Quoted 30 lines
--- drivers/mmc/host/sdhci-pci-gli.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mmc/host/sdhci-pci-gli.c +5
-1@@ -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