Chris,
Ping?
The discussion on save/restoring SDHCI_INT_ENABLE reached consensus
that this patch is needed. Can you still apply?
On Tue, Mar 8, 2011 at 1:39 PM, Grant Grundler <grundler@xxxxxxxxxx> wrote:
>
> Save and restore SDHCI interrupt mask during suspend/resume.
> Enables ARM Tegra2 board to suspend/resume.
>
> Signed-off-by: Venkat Rao <vrao@xxxxxxxxxxxx>
> Reviewed-by: Olof Johansson <olofj@xxxxxxxxxxxx>
> Reviewed-by: Grant Grundler <grundler@xxxxxxxxxxxx>
Please add "From: Venkat Rao <vrao@xxxxxxxxxxxx>" since he should get
"author credit" for this patch.
thanks,
grant
> ---
> Âdrivers/mmc/host/sdhci.c Â| Â Â5 +++++
> Âinclude/linux/mmc/sdhci.h | Â Â2 ++
> Â2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 3c6358f..68d2e36 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1654,6 +1654,8 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)
> Â Â Â Âif (mmc->card && (mmc->card->type != MMC_TYPE_SDIO))
> Â Â Â Â Â Â Â Âret = mmc_suspend_host(host->mmc);
>
> + Â Â Â /* Save the original intmask to restore later */
> + Â Â Â host->save_intmask = sdhci_readl(host, SDHCI_INT_ENABLE);
> Â Â Â Âsdhci_mask_irqs(host, SDHCI_INT_ALL_MASK);
>
> Â Â Â Âif (host->vmmc)
> @@ -1695,6 +1697,9 @@ int sdhci_resume_host(struct sdhci_host *host)
>
> Â Â Â Âsdhci_enable_card_detection(host);
>
> + Â Â Â /* Restore the original intmask */
> + Â Â Â sdhci_unmask_irqs(host, host->save_intmask);
> +
> Â Â Â Âreturn ret;
> Â}
>
> diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
> index dfb2106..5b9f6db 100644
> --- a/include/linux/mmc/sdhci.h
> +++ b/include/linux/mmc/sdhci.h
> @@ -141,6 +141,8 @@ struct sdhci_host {
>
> Â Â Â Âunsigned int caps; Â Â Â/* Alternative capabilities */
>
> + Â Â Â unsigned int save_intmask; Â Â/* Store original intmask */
> +
> Â Â Â Âunsigned long private[0] ____cacheline_aligned;
> Â};
> Â#endif /* __SDHCI_H */
> --
> 1.7.2.3
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
