mmc: sdhci-pci: Fix S0i3 for Intel BYT-based controllers
Adrian Hunter
maintainercover mmc: sdhci-pci: Fix S0i3 for Intel BYT-based controllers
Hi
Here is a small fix (cc stable) and a subsequent tidy-up.
Adrian Hunter (2):
mmc: sdhci-pci: Fix S0i3 for Intel BYT-based controllers
mmc: sdhci-pci: Get rid of glk_cqe_enable()
drivers/mmc/host/sdhci-pci-core.c | 55 +++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 23 deletions(-)
Regards
Adrian
Adrian Hunter
maintainerPATCH 1/2 mmc: sdhci-pci: Fix S0i3 for Intel BYT-based controllers
Tuning can leave the IP in an active state (Buffer Read Enable bit set) which prevents the entry to low power states (i.e. S0i3). Data reset will clear it.
Generally tuning is followed by a data transfer which will anyway sort out the state, so it is rare that S0i3 is actually prevented.
--- drivers/mmc/host/sdhci-pci-core.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-pci-core.c +31 -4
@@ -661,9 +661,36 @@ static void byt_read_dsm(struct sdhci_pci_slot *slot) slot->chip->rpm_retune = intel_host->d3_retune; } -static int byt_emmc_probe_slot (struct sdhci_pci_slot *slot) +static int intel_execute_tuning (struct mmc_host *mmc,u32 opcode) +{ +int err =sdhci_execute_tuning (mmc, opcode); +struct sdhci_host *host =mmc_priv (mmc); + +if (err) +return err; + +/* +* Tuning can leave the IP in an active state (Buffer Read Enable bit +* set) which prevents the entry to low power states (i.e. S0i3). Data +* reset will clear it. +*/ +sdhci_reset (host,SDHCI_RESET_DATA ); + +return 0 ; +} + +static void byt_probe_slot (struct sdhci_pci_slot *slot) { +struct mmc_host_ops *ops = &slot->host->mmc_host_ops; +byt_read_dsm (slot); + + ops->execute_tuning = intel_execute_tuning; +} + +static int byt_emmc_probe_slot (struct sdhci_pci_slot *slot) +{ +byt_probe_slot (slot); slot->host->mmc->caps |=MMC_CAP_8_BIT_DATA |MMC_CAP_NONREMOVABLE |MMC_CAP_HW_RESET |MMC_CAP_1_8V_DDR | MMC_CAP_CMD_DURING_TFR |
@@ -786,7 +813,7 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot) {int err; -byt_read_dsm (slot); +byt_probe_slot (slot); err =ni_set_max_freq (slot);if (err)
@@ -799,7 +826,7 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot)static int byt_sdio_probe_slot (struct sdhci_pci_slot *slot) { -byt_read_dsm (slot); +byt_probe_slot (slot); slot->host->mmc->caps |=MMC_CAP_POWER_OFF_CARD |MMC_CAP_NONREMOVABLE |MMC_CAP_WAIT_WHILE_BUSY ;return 0 ;
@@ -807,7 +834,7 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)static int byt_sd_probe_slot (struct sdhci_pci_slot *slot) { -byt_read_dsm (slot); +byt_probe_slot (slot); slot->host->mmc->caps |=MMC_CAP_WAIT_WHILE_BUSY |MMC_CAP_AGGRESSIVE_PM |MMC_CAP_CD_WAKE ; slot->cd_idx =0 ;
Signature · 1 line
1.9.1
Adrian Hunter
maintainerPATCH 2/2 mmc: sdhci-pci: Get rid of glk_cqe_enable()
In reply to Adrian HunterNow that tuning no longer leaves the Buffer Read Enable bit set (refer intel_execute_tuning()), glk_cqe_enable() is no longer needed. Get rid of it.
--- drivers/mmc/host/sdhci-pci-core.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/mmc/host/sdhci-pci-core.c +1 -19
@@ -719,26 +719,8 @@ static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot)return ret; } -static void glk_cqe_enable (struct mmc_host *mmc) -{ -struct sdhci_host *host =mmc_priv (mmc); -u32 reg; - -/* -* CQE gets stuck if it sees Buffer Read Enable bit set, which can be -* the case after tuning, so ensure the buffer is drained. -*/ - reg =sdhci_readl (host,SDHCI_PRESENT_STATE ); -while (reg &SDHCI_DATA_AVAILABLE ) { -sdhci_readl (host,SDHCI_BUFFER ); - reg =sdhci_readl (host,SDHCI_PRESENT_STATE ); - } - -sdhci_cqe_enable (mmc); -} -static const struct cqhci_host_ops glk_cqhci_ops = { - .enable = glk_cqe_enable, + .enable = sdhci_cqe_enable, .disable = sdhci_cqe_disable, .dumpregs = sdhci_pci_dumpregs, };
Signature · 1 line
1.9.1