From patchwork Thu Mar 15 11:26:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 10284255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89ACC602C2 for ; Thu, 15 Mar 2018 11:27:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E0C628922 for ; Thu, 15 Mar 2018 11:27:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 728EF28982; Thu, 15 Mar 2018 11:27:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0F23C28922 for ; Thu, 15 Mar 2018 11:27:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=etBUyKK12LvbWS4KFFKuS4pJIfA0yHUIgqRh8X1h6iE=; b=Hk08Fd3XFDyKMr 1LtVUYbZvcKL6lp9iNIQ/O1M9Kw/O1Zy/g5TxhFsNbqsOm2a7+J4+Nq9uiyb3iyNQqD3qnqYsmnZk 5jkCpVUZUpK0oIIpGJiTJAXJE8TUPBDINaGj6puZYTdFCdi9/PQ2ujdci6IL/whKvqYANg5ZtEp41 UHUohUNjipTJI1uJugO57nCdvFiv3Mrwh5vGMGuSIedIC14QnU71thoU+kdeJ84pSJiD6ONOIPdBV FR0FvQBIdxDvss0Z0FYPhz65clmld8wa7iEtvMDbXWYsq6yFbCwW001IoOMIZOwCF1x+JoOO8tuk1 fSbZvdN1nBvZ5JsYOhEw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewR2S-0001bF-Ds; Thu, 15 Mar 2018 11:27:16 +0000 Received: from mga03.intel.com ([134.134.136.65]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewR2P-0001XW-6C for linux-arm-kernel@lists.infradead.org; Thu, 15 Mar 2018 11:27:14 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Mar 2018 04:27:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,310,1517904000"; d="scan'208";a="211555721" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.168]) ([10.237.72.168]) by fmsmga006.fm.intel.com with ESMTP; 15 Mar 2018 04:26:58 -0700 Subject: Re: [PATCH v3 06/11] mmc: sdhci: Add quirk to disable HW timeout To: Kishon Vijay Abraham I , Ulf Hansson , Tony Lindgren References: <20180307132020.30951-1-kishon@ti.com> <20180307132020.30951-7-kishon@ti.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: Date: Thu, 15 Mar 2018 13:26:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180307132020.30951-7-kishon@ti.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180315_042713_369760_98FA88E3 X-CRM114-Status: GOOD ( 27.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, linux-mmc@vger.kernel.org, Russell King , linux-kernel@vger.kernel.org, Rob Herring , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On 07/03/18 15:20, Kishon Vijay Abraham I wrote: > Add quirk to disable HW timeout if the requested timeout is more than > the maximum obtainable timeout. > > Signed-off-by: Kishon Vijay Abraham I > --- > drivers/mmc/host/sdhci.c | 27 +++++++++++++++++++++------ > drivers/mmc/host/sdhci.h | 5 +++++ > 2 files changed, 26 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index aa8b5ca0d1b0..1dd117cbeb6e 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -767,12 +767,6 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) > break; > } > > - if (count >= 0xF) { > - DBG("Too large timeout 0x%x requested for CMD%d!\n", > - count, cmd->opcode); > - count = 0xE; > - } > - > return count; > } > > @@ -790,6 +784,16 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host) > sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); > } > > +static void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable) > +{ > + if (enable) > + host->ier |= SDHCI_INT_DATA_TIMEOUT; > + else > + host->ier &= ~SDHCI_INT_DATA_TIMEOUT; > + sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); > + sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); > +} > + > static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) > { > u8 count; > @@ -798,6 +802,17 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) > host->ops->set_timeout(host, cmd); > } else { > count = sdhci_calc_timeout(host, cmd); > + if (count >= 0xF && > + host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) > + sdhci_set_data_timeout_irq(host, false); > + else if (!(host->ier & SDHCI_INT_DATA_TIMEOUT)) > + sdhci_set_data_timeout_irq(host, true); > + > + if (count >= 0xF) { > + DBG("Too large timeout 0x%x requested for CMD%d!\n", > + count, cmd->opcode); > + count = 0xE; > + } > sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL); > } > } I guess I misunderstood you, but we need to cater for open-ended busy timeouts (i.e. busy_timeout==0) and broken timeout (i.e. SDHCI_QUIRK_BROKEN_TIMEOUT_VAL and SDHCI_QUIRK2_DISABLE_HW_TIMEOUT together mean never use the HW timeout) So maybe like this: > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index c95b0a4a7594..ff283ee08854 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -437,6 +437,11 @@ struct sdhci_host { > #define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN (1<<15) > /* Controller has CRC in 136 bit Command Response */ > #define SDHCI_QUIRK2_RSP_136_HAS_CRC (1<<16) > +/* > + * Disable HW timeout if the requested timeout is more than the maximum > + * obtainable timeout > + */ > +#define SDHCI_QUIRK2_DISABLE_HW_TIMEOUT (1<<17) > > int irq; /* Device IRQ */ > void __iomem *ioaddr; /* Mapped address */ > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index aa8b5ca0d1b0..a358eb5c5f98 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -709,12 +709,15 @@ static u32 sdhci_sdma_address(struct sdhci_host *host) return sg_dma_address(host->data->sg); } -static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) +static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd, + bool *too_big) { u8 count; struct mmc_data *data = cmd->data; unsigned target_timeout, current_timeout; + *too_big = true; + /* * If the host controller provides us with an incorrect timeout * value, just skip the check and use 0xE. The hardware may take @@ -768,9 +771,12 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) } if (count >= 0xF) { - DBG("Too large timeout 0x%x requested for CMD%d!\n", - count, cmd->opcode); + if (!(host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT)) + DBG("Too large timeout 0x%x requested for CMD%d!\n", + count, cmd->opcode); count = 0xE; + } else { + *too_big = false; } return count; @@ -790,6 +796,16 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host) sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); } +static void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable) +{ + if (enable) + host->ier |= SDHCI_INT_DATA_TIMEOUT; + else + host->ier &= ~SDHCI_INT_DATA_TIMEOUT; + sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); + sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); +} + static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) { u8 count; @@ -797,7 +813,17 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) if (host->ops->set_timeout) { host->ops->set_timeout(host, cmd); } else { - count = sdhci_calc_timeout(host, cmd); + bool too_big = false; + + count = sdhci_calc_timeout(host, cmd, &too_big); + + if (too_big && + host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) { + sdhci_set_data_timeout_irq(host, false); + } else if (!(host->ier & SDHCI_INT_DATA_TIMEOUT)) { + sdhci_set_data_timeout_irq(host, true); + } + sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL); } }