From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933176Ab2JWNrO (ORCPT ); Tue, 23 Oct 2012 09:47:14 -0400 Received: from mga01.intel.com ([192.55.52.88]:19320 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933130Ab2JWNns (ORCPT ); Tue, 23 Oct 2012 09:43:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,635,1344236400"; d="scan'208";a="237191307" From: Irina Tirdea To: Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck , Chris Ball Cc: linux-kernel@vger.kernel.org, Adrian Hunter , Octavian Purdila , Irina Tirdea Subject: [PATCH 21/26] mmc: sdhci: panic write: poll interrupts Date: Tue, 23 Oct 2012 16:48:19 +0300 Message-Id: <1351000104-13015-22-git-send-email-irina.tirdea@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351000104-13015-1-git-send-email-irina.tirdea@intel.com> References: <1351000104-13015-1-git-send-email-irina.tirdea@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Adrian Hunter Signed-off-by: Adrian Hunter Signed-off-by: Irina Tirdea --- drivers/mmc/host/sdhci.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index e096526..d85e9d5 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -131,6 +131,8 @@ static void sdhci_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set) ier &= ~clear; ier |= set; sdhci_writel(host, ier, SDHCI_INT_ENABLE); + if (mmc_panic_task_active(host->mmc)) + ier = 0; sdhci_writel(host, ier, SDHCI_SIGNAL_ENABLE); } @@ -1267,6 +1269,8 @@ static int sdhci_set_power(struct sdhci_host *host, unsigned short power) * * \*****************************************************************************/ +static irqreturn_t sdhci_irq(int irq, void *dev_id); + static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) { struct sdhci_host *host; @@ -1347,6 +1351,11 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) mmiowb(); sdhci_unlock_irqrestore(host, flags); + + if (mmc_am_panic_task(host->mmc)) { + while (host->mrq) + sdhci_irq(0, host); + } } static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) @@ -2066,6 +2075,27 @@ void sdhci_unlock_irqrestore(struct sdhci_host *host, unsigned long flags) spin_unlock_irqrestore(&host->lock, flags); } +static void sdhci_panic_begin(struct mmc_host *mmc) +{ + struct sdhci_host *host = mmc_priv(mmc); + + sdhci_writel(host, 0, SDHCI_SIGNAL_ENABLE); +} + +static void sdhci_panic_end(struct mmc_host *mmc) +{ + struct sdhci_host *host = mmc_priv(mmc); + u32 ier; + + ier = sdhci_readl(host, SDHCI_INT_ENABLE); + sdhci_writel(host, ier, SDHCI_SIGNAL_ENABLE); +} + +static const struct mmc_panic_ops sdhci_pops = { + .begin = sdhci_panic_begin, + .end = sdhci_panic_end, +}; + #endif /*****************************************************************************\ @@ -2854,6 +2884,9 @@ int sdhci_add_host(struct sdhci_host *host) * Set host parameters. */ mmc->ops = &sdhci_ops; +#ifdef CONFIG_MMC_BLOCK_PANIC_WRITE + mmc->pops = &sdhci_pops; +#endif mmc->f_max = host->max_clk; if (host->ops->get_min_clock) mmc->f_min = host->ops->get_min_clock(host); -- 1.7.9.5