On 03/09/2015 06:23 AM, Jaehoon Chung wrote:
> Hi, Karol.
>
> This patch can't apply. You need to rebase on latest mmc-next.
> Then i will check this patch.
Ok, no problem. Sorry for that.
>
> Best Regards,
> Jaehoon Chung
>
> On 03/06/2015 10:29 PM, Karol Wrona wrote:
>> This patch adds runtime pm handling to dw_mmc.
>> It mainly uses mci_request/mci_request_end for mmc host state information.
>> The goal of the runtime pm in dw_mmc host is mainly for giving an information
>> for containing it power domain about its activity.
>>
>> Signed-off-by: Karol Wrona <k.wr...@samsung.com>
>> Acked-by: Kyungmin Park <kyungmin.p...@samsung.com>
>> ---
>> drivers/mmc/host/dw_mmc.c | 99
>> ++++++++++++++++++++++++++++++++++++++++++---
>> drivers/mmc/host/dw_mmc.h | 2 +
>> 2 files changed, 95 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
>> index 4d2e3c2..ad8b71e 100644
>> --- a/drivers/mmc/host/dw_mmc.c
>> +++ b/drivers/mmc/host/dw_mmc.c
>> @@ -38,6 +38,7 @@
>> #include <linux/of.h>
>> #include <linux/of_gpio.h>
>> #include <linux/mmc/slot-gpio.h>
>> +#include <linux/pm_runtime.h>
>>
>> #include "dw_mmc.h"
>>
>> @@ -112,6 +113,8 @@ static int dw_mci_req_show(struct seq_file *s, void *v)
>> struct mmc_command *stop;
>> struct mmc_data *data;
>>
>> + pm_runtime_get_sync(slot->host->dev);
>> +
>> /* Make sure we get a consistent snapshot */
>> spin_lock_bh(&slot->host->lock);
>> mrq = slot->mrq;
>> @@ -141,6 +144,9 @@ static int dw_mci_req_show(struct seq_file *s, void *v)
>>
>> spin_unlock_bh(&slot->host->lock);
>>
>> + pm_runtime_mark_last_busy(slot->host->dev);
>> + pm_runtime_put_autosuspend(slot->host->dev);
>> +
>> return 0;
>> }
>>
>> @@ -1043,6 +1049,8 @@ static void dw_mci_request(struct mmc_host *mmc,
>> struct mmc_request *mrq)
>>
>> WARN_ON(slot->mrq);
>>
>> + pm_runtime_get_sync(host->dev);
>> +
>> /*
>> * The check for card presence and queueing of the request must be
>> * atomic, otherwise the card could be removed in between and the
>> @@ -1054,6 +1062,9 @@ static void dw_mci_request(struct mmc_host *mmc,
>> struct mmc_request *mrq)
>> spin_unlock_bh(&host->lock);
>> mrq->cmd->error = -ENOMEDIUM;
>> mmc_request_done(mmc, mrq);
>> +
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> return;
>> }
>>
>> @@ -1081,6 +1092,8 @@ static void dw_mci_set_ios(struct mmc_host *mmc,
>> struct mmc_ios *ios)
>> slot->ctype = SDMMC_CTYPE_1BIT;
>> }
>>
>> + pm_runtime_get_sync(slot->host->dev);
>> +
>> regs = mci_readl(slot->host, UHS_REG);
>>
>> /* DDR mode set */
>> @@ -1116,7 +1129,7 @@ static void dw_mci_set_ios(struct mmc_host *mmc,
>> struct mmc_ios *ios)
>> dev_err(slot->host->dev,
>> "failed to enable vmmc regulator\n");
>> /*return, if failed turn on vmmc*/
>> - return;
>> + goto _end;
>> }
>> }
>> set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags);
>> @@ -1150,6 +1163,10 @@ static void dw_mci_set_ios(struct mmc_host *mmc,
>> struct mmc_ios *ios)
>> default:
>> break;
>> }
>> +
>> +_end:
>> + pm_runtime_mark_last_busy(slot->host->dev);
>> + pm_runtime_put_autosuspend(slot->host->dev);
>> }
>>
>> static int dw_mci_card_busy(struct mmc_host *mmc)
>> @@ -1157,12 +1174,17 @@ static int dw_mci_card_busy(struct mmc_host *mmc)
>> struct dw_mci_slot *slot = mmc_priv(mmc);
>> u32 status;
>>
>> + pm_runtime_get_sync(slot->host->dev);
>> +
>> /*
>> * Check the busy bit which is low when DAT[3:0]
>> * (the data lines) are 0000
>> */
>> status = mci_readl(slot->host, STATUS);
>>
>> + pm_runtime_mark_last_busy(slot->host->dev);
>> + pm_runtime_put_autosuspend(slot->host->dev);
>> +
>> return !!(status & SDMMC_STATUS_BUSY);
>> }
>>
>> @@ -1175,6 +1197,8 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc,
>> struct mmc_ios *ios)
>> int min_uv, max_uv;
>> int ret;
>>
>> + pm_runtime_get_sync(host->dev);
>> +
>> /*
>> * Program the voltage. Note that some instances of dw_mmc may use
>> * the UHS_REG for this. For other instances (like exynos) the UHS_REG
>> @@ -1197,11 +1221,17 @@ static int dw_mci_switch_voltage(struct mmc_host
>> *mmc, struct mmc_ios *ios)
>> dev_dbg(&mmc->class_dev,
>> "Regulator set error %d: %d - %d\n",
>> ret, min_uv, max_uv);
>> +
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> return ret;
>> }
>> }
>> mci_writel(host, UHS_REG, uhs);
>>
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> +
>> return 0;
>> }
>>
>> @@ -1211,6 +1241,8 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
>> struct dw_mci_slot *slot = mmc_priv(mmc);
>> int gpio_ro = mmc_gpio_get_ro(mmc);
>>
>> + pm_runtime_get_sync(slot->host->dev);
>> +
>> /* Use platform get_ro function, else try on board write protect */
>> if ((slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) ||
>> (slot->host->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT))
>> @@ -1221,6 +1253,9 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
>> read_only =
>> mci_readl(slot->host, WRTPRT) & (1 << slot->id) ? 1 : 0;
>>
>> + pm_runtime_mark_last_busy(slot->host->dev);
>> + pm_runtime_put_autosuspend(slot->host->dev);
>> +
>> dev_dbg(&mmc->class_dev, "card is %s\n",
>> read_only ? "read-only" : "read-write");
>>
>> @@ -1235,6 +1270,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
>> struct dw_mci *host = slot->host;
>> int gpio_cd = mmc_gpio_get_cd(mmc);
>>
>> + pm_runtime_get_sync(host->dev);
>> +
>> /* Use platform get_cd function, else try onboard card detect */
>> if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
>> present = 1;
>> @@ -1254,6 +1291,9 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
>> }
>> spin_unlock_bh(&host->lock);
>>
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> +
>> return present;
>> }
>>
>> @@ -1262,6 +1302,8 @@ static void dw_mci_init_card(struct mmc_host *mmc,
>> struct mmc_card *card)
>> struct dw_mci_slot *slot = mmc_priv(mmc);
>> struct dw_mci *host = slot->host;
>>
>> + pm_runtime_get_sync(host->dev);
>> +
>> /*
>> * Low power mode will stop the card clock when idle. According to the
>> * description of the CLKENA register we should disable low power mode
>> @@ -1289,6 +1331,9 @@ static void dw_mci_init_card(struct mmc_host *mmc,
>> struct mmc_card *card)
>> SDMMC_CMD_PRV_DAT_WAIT, 0);
>> }
>> }
>> +
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> }
>>
>> static void dw_mci_enable_sdio_irq(struct mmc_host *mmc, int enb)
>> @@ -1298,6 +1343,9 @@ static void dw_mci_enable_sdio_irq(struct mmc_host
>> *mmc, int enb)
>> unsigned long irqflags;
>> u32 int_mask;
>>
>> + if (enb)
>> + pm_runtime_get_sync(slot->host->dev);
>> +
>> spin_lock_irqsave(&host->irq_lock, irqflags);
>>
>> /* Enable/disable Slot Specific SDIO interrupt */
>> @@ -1309,6 +1357,12 @@ static void dw_mci_enable_sdio_irq(struct mmc_host
>> *mmc, int enb)
>> mci_writel(host, INTMASK, int_mask);
>>
>> spin_unlock_irqrestore(&host->irq_lock, irqflags);
>> +
>> + /* If interrupt is enabled leave device active. */
>> + if (!enb) {
>> + pm_runtime_mark_last_busy(slot->host->dev);
>> + pm_runtime_put_autosuspend(slot->host->dev);
>> + }
>> }
>>
>> static int dw_mci_execute_tuning(struct mmc_host *mmc, u32 opcode)
>> @@ -1318,8 +1372,14 @@ static int dw_mci_execute_tuning(struct mmc_host
>> *mmc, u32 opcode)
>> const struct dw_mci_drv_data *drv_data = host->drv_data;
>> int err = -ENOSYS;
>>
>> + pm_runtime_get_sync(host->dev);
>> +
>> if (drv_data && drv_data->execute_tuning)
>> err = drv_data->execute_tuning(slot);
>> +
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> +
>> return err;
>> }
>>
>> @@ -1359,10 +1419,14 @@ static void dw_mci_request_end(struct dw_mci *host,
>> struct mmc_request *mrq)
>> } else {
>> dev_vdbg(host->dev, "list empty\n");
>>
>> - if (host->state == STATE_SENDING_CMD11)
>> + if (host->state == STATE_SENDING_CMD11) {
>> host->state = STATE_WAITING_CMD11_DONE;
>> - else
>> + } else {
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> +
>> host->state = STATE_IDLE;
>> + }
>> }
>>
>> spin_unlock(&host->lock);
>> @@ -2595,6 +2659,11 @@ int dw_mci_probe(struct dw_mci *host)
>> return -ENODEV;
>> }
>>
>> + pm_runtime_enable(host->dev);
>> + pm_runtime_get_sync(host->dev);
>> + pm_runtime_set_autosuspend_delay(host->dev, DWMMC_AUTOSUSPEND_DELAY);
>> + pm_runtime_use_autosuspend(host->dev);
>> +
>> host->biu_clk = devm_clk_get(host->dev, "biu");
>> if (IS_ERR(host->biu_clk)) {
>> dev_dbg(host->dev, "biu clock not available\n");
>> @@ -2781,6 +2850,9 @@ int dw_mci_probe(struct dw_mci *host)
>> if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO)
>> dev_info(host->dev, "Internal DMAC interrupt fix enabled.\n");
>>
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> +
>> return 0;
>>
>> err_dmaunmap:
>> @@ -2795,6 +2867,9 @@ err_clk_biu:
>> if (!IS_ERR(host->biu_clk))
>> clk_disable_unprepare(host->biu_clk);
>>
>> + pm_runtime_put_sync(host->dev);
>> + pm_runtime_disable(host->dev);
>> +
>> return ret;
>> }
>> EXPORT_SYMBOL(dw_mci_probe);
>> @@ -2803,6 +2878,8 @@ void dw_mci_remove(struct dw_mci *host)
>> {
>> int i;
>>
>> + pm_runtime_get_sync(host->dev);
>> +
>> mci_writel(host, RINTSTS, 0xFFFFFFFF);
>> mci_writel(host, INTMASK, 0); /* disable all mmc interrupt first */
>>
>> @@ -2819,6 +2896,9 @@ void dw_mci_remove(struct dw_mci *host)
>> if (host->use_dma && host->dma_ops->exit)
>> host->dma_ops->exit(host);
>>
>> + pm_runtime_put_sync(host->dev);
>> + pm_runtime_disable(host->dev);
>> +
>> if (!IS_ERR(host->ciu_clk))
>> clk_disable_unprepare(host->ciu_clk);
>>
>> @@ -2841,11 +2921,14 @@ EXPORT_SYMBOL(dw_mci_suspend);
>>
>> int dw_mci_resume(struct dw_mci *host)
>> {
>> - int i, ret;
>> + int i;
>> +
>> + pm_runtime_get_sync(host->dev);
>>
>> if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) {
>> - ret = -ENODEV;
>> - return ret;
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> + return -ENODEV;
>> }
>>
>> if (host->use_dma && host->dma_ops->init)
>> @@ -2876,6 +2959,10 @@ int dw_mci_resume(struct dw_mci *host)
>> dw_mci_setup_bus(slot, true);
>> }
>> }
>> +
>> + pm_runtime_mark_last_busy(host->dev);
>> + pm_runtime_put_autosuspend(host->dev);
>> +
>> return 0;
>> }
>> EXPORT_SYMBOL(dw_mci_resume);
>> diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
>> index 18c4afe..6a364f4f 100644
>> --- a/drivers/mmc/host/dw_mmc.h
>> +++ b/drivers/mmc/host/dw_mmc.h
>> @@ -209,6 +209,8 @@ extern int dw_mci_suspend(struct dw_mci *host);
>> extern int dw_mci_resume(struct dw_mci *host);
>> #endif
>>
>> +#define DWMMC_AUTOSUSPEND_DELAY 50
>> +
>> /**
>> * struct dw_mci_slot - MMC slot state
>> * @mmc: The mmc_host representing this slot.
>>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
