From: Faiz Abbas <faiz_abbas@ti.com>
To: Adrian Hunter <adrian.hunter@intel.com>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-mmc@vger.kernel.org>
Cc: <kishon@ti.com>, <mark.rutland@arm.com>, <robh+dt@kernel.org>,
<ulf.hansson@linaro.org>, <zhang.chunyan@linaro.org>,
<tony@atomide.com>
Subject: Re: [PATCH v3 4/7] mmc: sdhci: Add quirk for disabling DTO during erase command
Date: Mon, 16 Dec 2019 14:12:19 +0530 [thread overview]
Message-ID: <09bb8f31-534d-c278-45c3-e0314286819c@ti.com> (raw)
In-Reply-To: <003f7e7a-a762-5355-9404-4a6655754fb0@intel.com>
Hi Adrian,
On 13/12/19 3:10 pm, Adrian Hunter wrote:
> On 10/12/19 11:51 am, Faiz Abbas wrote:
>> Some controllers might prematurely issue a data timeout during an erase
>> command. Add a quirk to disable the interrupt when an erase command is
>> issued.
>>
>> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
>> ---
>> drivers/mmc/host/sdhci.c | 5 +++++
>> drivers/mmc/host/sdhci.h | 2 ++
>> 2 files changed, 7 insertions(+)
>>
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index 6f3d4991bee1..b8934c50b9c4 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -1532,6 +1532,11 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
>> /* Initially, a command has no error */
>> cmd->error = 0;
>>
>> + if (cmd->opcode == MMC_ERASE &&
>> + (host->quirks2 & SDHCI_QUIRK2_DISABLE_DTO_FOR_ERASE)) {
>> + sdhci_set_data_timeout_irq(host, false);
>> + }
>
> If you factor out __sdhci_set_timeout() like below then
> you could implement ->set_timeout() to do this.
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index ad6d2f93aa0b..389e3239eadc 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1002,27 +1002,28 @@ static void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable)
> sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
> }
>
> -static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
> +void __sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
> {
> - u8 count;
> -
> - if (host->ops->set_timeout) {
> - host->ops->set_timeout(host, cmd);
> - } else {
> - bool too_big = false;
> -
> - count = sdhci_calc_timeout(host, cmd, &too_big);
> + bool too_big = false;
> + u8 count = sdhci_calc_timeout(host, cmd, &too_big);
> +
> + if (too_big && host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) {
> + sdhci_calc_sw_timeout(host, cmd);
> + sdhci_set_data_timeout_irq(host, false);
> + } else if (!(host->ier & SDHCI_INT_DATA_TIMEOUT)) {
> + sdhci_set_data_timeout_irq(host, true);
> + }
>
> - if (too_big &&
> - host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) {
> - sdhci_calc_sw_timeout(host, cmd);
> - 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);
> +}
> +EXPORT_SYMBOL_GPL(__sdhci_set_timeout);
>
> - sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
> - }
> +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
> + __sdhci_set_timeout(host, cmd);
> }
Ok. I'll add the refactoring as a separate patch.
Thanks,
Faiz
next prev parent reply other threads:[~2019-12-16 8:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 9:51 [PATCH v3 0/7] Port am335 and am437 devices to sdhci-omap Faiz Abbas
2019-12-10 9:51 ` [PATCH v3 1/7] dt-bindings: sdhci-omap: Add properties for using external dma Faiz Abbas
2019-12-18 21:39 ` Rob Herring
2019-12-10 9:51 ` [PATCH v3 2/7] mmc: sdhci: add support for using external DMA devices Faiz Abbas
2019-12-12 12:55 ` Adrian Hunter
2019-12-16 8:27 ` Faiz Abbas
2019-12-16 13:45 ` Adrian Hunter
2019-12-23 14:25 ` Faiz Abbas
2019-12-10 9:51 ` [PATCH v3 3/7] mmc: sdhci-omap: Add using external dma Faiz Abbas
2019-12-10 9:51 ` [PATCH v3 4/7] mmc: sdhci: Add quirk for disabling DTO during erase command Faiz Abbas
2019-12-13 9:40 ` Adrian Hunter
2019-12-16 8:42 ` Faiz Abbas [this message]
2019-12-10 9:51 ` [PATCH v3 5/7] mmc: sdhci-omap: Add DISABLE_DTO_FOR_ERASE Quirk Faiz Abbas
2019-12-10 9:51 ` [PATCH v3 6/7] dt-bindings: sdhci-omap: Add am335x and am437x specific bindings Faiz Abbas
2019-12-10 9:51 ` [PATCH v3 7/7] mmc: sdhci-omap: Add am335x and am437x specific compatibles Faiz Abbas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=09bb8f31-534d-c278-45c3-e0314286819c@ti.com \
--to=faiz_abbas@ti.com \
--cc=adrian.hunter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
--cc=zhang.chunyan@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).