mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
A message that is not in the archive (sent off-list or not yet received): [email protected]
Adrian Hunter
maintainerHi
For some reason this email doesn't seem to get onto the mailing lists. I am trying to figure out why.
Quoted 65 lines · Adrian Hunter
A host controller for a SD card may need a GPIO for card detect in order to wake up from runtime suspend when a card is inserted. If that GPIO is not configured, then the host controller will not wake up. Fix that for the affected devices by not enabling runtime PM unless the GPIO is successfully set up.
This affects BYT sd card host controller which had runtime PM enabled from v3.11. For completeness, the MFD sd card host controller is flagged also.
Tested on v3.11.10 and v3.12.4 although the patch applies with some offsets and fuzz.
Signed-off-by Adrian Hunter <[email protected]>Cc stable <[email protected]> # 3.11+--- drivers/mmc/host/sdhci-pci.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/mmc/host/sdhci-pci.c +11
-0@@ -65,6 +65,7 @@ struct sdhci_pci_fixes {unsigned int quirks;unsigned int quirks2;bool allow_runtime_pm; +bool own_cd_for_runtime_pm;int (*probe) (struct sdhci_pci_chip *);@@ -296,6 +297,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1_hc2 = {static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = {@@ -360,6 +362,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { .quirks2 =SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };/* Define Host controllers for Intel Merrifield platform */ @@ -1457,6 +1460,14 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(sdhci_pci_add_own_cd (slot); +/* +* Check if the chip needs a separate GPIO for card detect to wake up +* from runtime suspend. If it is not there, don't allow runtime PM. +* Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure. +*/ +if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid (slot->cd_gpio)) + chip->allow_runtime_pm = false; +return slot; remove:
Adrian Hunter
maintainer[PATCH V2 mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
In reply to a message not in the archiveA host controller for a SD card may need a GPIO for card detect in order to wake up from runtime suspend when a card is inserted. If that GPIO is not configured, then the host controller will not wake up. Fix that for the affected devices by not enabling runtime PM unless the GPIO is successfully set up.
This affects BYT sd card host controller which had runtime PM enabled from v3.11. For completeness, the MFD sd card host controller is flagged also.
Tested on v3.11.10 and v3.12.4 although the patch applies with some offsets and fuzz.
---
V2: Rebased
drivers/mmc/host/sdhci-pci.c | 10 ++++++++++ drivers/mmc/host/sdhci-pci.h | 1 + 2 files changed, 11 insertions(+)
drivers/mmc/host/sdhci-pci.c +10 -0
@@ -225,6 +225,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1_hc2 = {static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = {
@@ -289,6 +290,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { .quirks2 =SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };/* Define Host controllers for Intel Merrifield platform */
@@ -1370,6 +1372,14 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(sdhci_pci_add_own_cd (slot); +/* +* Check if the chip needs a separate GPIO for card detect to wake up +* from runtime suspend. If it is not there, don't allow runtime PM. +* Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure. +*/ +if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid (slot->cd_gpio)) + chip->allow_runtime_pm = false; +return slot; remove:
drivers/mmc/host/sdhci-pci.h +1 -0
@@ -39,6 +39,7 @@ struct sdhci_pci_fixes {unsigned int quirks;unsigned int quirks2;bool allow_runtime_pm; +bool own_cd_for_runtime_pm;int (*probe) (struct sdhci_pci_chip *);
Signature · 1 line
1.7.11.7
Adrian Hunter
maintainerPATCH v3 1/1 mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
A host controller for a SD card may need a GPIO for card detect in order to wake up from runtime suspend when a card is inserted. If that GPIO is not configured, then the host controller will not wake up. Fix that for the affected devices by not enabling runtime PM unless the GPIO is successfully set up.
This affects BYT sd card host controller which had runtime PM enabled from v3.11. For completeness, the MFD sd card host controller is flagged also.
The original patch before rebasing (see link below) was tested on v3.11.10 and v3.12.4 although the patch applied with some offsets and fuzz. The original patch is here:
http://marc.info/?l=linux-mmc&m=138676702327057) was tested on v3.11.10 and v3.12.4
---
V3: Update comments to reflect that the original patch applies to stable trees whereas the rebased patch does not.
V2: Rebased
drivers/mmc/host/sdhci-pci.c | 10 ++++++++++ drivers/mmc/host/sdhci-pci.h | 1 + 2 files changed, 11 insertions(+)
drivers/mmc/host/sdhci-pci.c +10 -0
@@ -225,6 +225,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1_hc2 = {static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = {
@@ -289,6 +290,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { .quirks2 =SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };/* Define Host controllers for Intel Merrifield platform */
@@ -1370,6 +1372,14 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(sdhci_pci_add_own_cd (slot); +/* +* Check if the chip needs a separate GPIO for card detect to wake up +* from runtime suspend. If it is not there, don't allow runtime PM. +* Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure. +*/ +if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid (slot->cd_gpio)) + chip->allow_runtime_pm = false; +return slot; remove:
drivers/mmc/host/sdhci-pci.h +1 -0
@@ -39,6 +39,7 @@ struct sdhci_pci_fixes {unsigned int quirks;unsigned int quirks2;bool allow_runtime_pm; +bool own_cd_for_runtime_pm;int (*probe) (struct sdhci_pci_chip *);
Signature · 1 line
1.7.11.7
Adrian Hunter
maintainerPing?
Quoted 80 lines · Adrian Hunter
A host controller for a SD card may need a GPIO for card detect in order to wake up from runtime suspend when a card is inserted. If that GPIO is not configured, then the host controller will not wake up. Fix that for the affected devices by not enabling runtime PM unless the GPIO is successfully set up.
This affects BYT sd card host controller which had runtime PM enabled from v3.11. For completeness, the MFD sd card host controller is flagged also.
The original patch before rebasing (see link below) was tested on v3.11.10 and v3.12.4 although the patch applied with some offsets and fuzz. The original patch is here:
http://marc.info/?l=linux-mmc&m=138676702327057) was tested on v3.11.10 and v3.12.4Signed-off-by Adrian Hunter <[email protected]>---
V3: Update comments to reflect that the original patch applies to stable trees whereas the rebased patch does not.
V2: Rebased
drivers/mmc/host/sdhci-pci.c | 10 ++++++++++ drivers/mmc/host/sdhci-pci.h | 1 + 2 files changed, 11 insertions(+)drivers/mmc/host/sdhci-pci.c +10
-0@@ -225,6 +225,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1_hc2 = {static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = {@@ -289,6 +290,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { .quirks2 =SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };/* Define Host controllers for Intel Merrifield platform */ @@ -1370,6 +1372,14 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(sdhci_pci_add_own_cd (slot); +/* +* Check if the chip needs a separate GPIO for card detect to wake up +* from runtime suspend. If it is not there, don't allow runtime PM. +* Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure. +*/ +if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid (slot->cd_gpio)) + chip->allow_runtime_pm = false; +return slot; remove:drivers/mmc/host/sdhci-pci.h +1
-0@@ -39,6 +39,7 @@ struct sdhci_pci_fixes {unsigned int quirks;unsigned int quirks2;bool allow_runtime_pm; +bool own_cd_for_runtime_pm;int (*probe) (struct sdhci_pci_chip *);
Adrian Hunter
maintainerQuoted 86 lines · Adrian Hunter
Ping?
Quoted 80 lines · Adrian Hunter
A host controller for a SD card may need a GPIO for card detect in order to wake up from runtime suspend when a card is inserted. If that GPIO is not configured, then the host controller will not wake up. Fix that for the affected devices by not enabling runtime PM unless the GPIO is successfully set up.
This affects BYT sd card host controller which had runtime PM enabled from v3.11. For completeness, the MFD sd card host controller is flagged also.
The original patch before rebasing (see link below) was tested on v3.11.10 and v3.12.4 although the patch applied with some offsets and fuzz. The original patch is here:
http://marc.info/?l=linux-mmc&m=138676702327057) was tested on v3.11.10 and v3.12.4Signed-off-by Adrian Hunter <[email protected]>---
V3: Update comments to reflect that the original patch applies to stable trees whereas the rebased patch does not.
V2: Rebased
drivers/mmc/host/sdhci-pci.c | 10 ++++++++++ drivers/mmc/host/sdhci-pci.h | 1 + 2 files changed, 11 insertions(+)drivers/mmc/host/sdhci-pci.c +10
-0@@ -225,6 +225,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1_hc2 = {static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = {@@ -289,6 +290,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { .quirks2 =SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON , .allow_runtime_pm = true, + .own_cd_for_runtime_pm = true, };/* Define Host controllers for Intel Merrifield platform */ @@ -1370,6 +1372,14 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(sdhci_pci_add_own_cd (slot); +/* +* Check if the chip needs a separate GPIO for card detect to wake up +* from runtime suspend. If it is not there, don't allow runtime PM. +* Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure. +*/ +if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid (slot->cd_gpio)) + chip->allow_runtime_pm = false; +return slot; remove:drivers/mmc/host/sdhci-pci.h +1
-0@@ -39,6 +39,7 @@ struct sdhci_pci_fixes {unsigned int quirks;unsigned int quirks2;bool allow_runtime_pm; +bool own_cd_for_runtime_pm;int (*probe) (struct sdhci_pci_chip *);
Hi Adrian,
Quoted 19 lines · Adrian Hunter
A host controller for a SD card may need a GPIO for card detect in order to wake up from runtime suspend when a card is inserted. If that GPIO is not configured, then the host controller will not wake up. Fix that for the affected devices by not enabling runtime PM unless the GPIO is successfully set up.
This affects BYT sd card host controller which had runtime PM enabled from v3.11. For completeness, the MFD sd card host controller is flagged also.
The original patch before rebasing (see link below) was tested on v3.11.10 and v3.12.4 although the patch applied with some offsets and fuzz. The original patch is here:
http://marc.info/?l=linux-mmc&m=138676702327057) was tested on v3.11.10 and v3.12.4
Quoted 8 lines
Signed-off-by Adrian Hunter <[email protected]>---
V3: Update comments to reflect that the original patch applies to stable trees whereas the rebased patch does not.
V2: Rebased
Thanks, pushed v3 to mmc-next for 3.14. Looks like you lost the stable@ tag in v3 (and have a mispaste after the URL), so I added it back and cleared up the text.
- Chris.
Signature · 1 line
Chris Ball <[email protected]> <http://printf.net/>