From: Adrian Hunter <adrian.hunter@intel.com> To: Kishon Vijay Abraham I <kishon@ti.com>, Ulf Hansson <ulf.hansson@linaro.org>, Tony Lindgren <tony@atomide.com> Cc: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Russell King <linux@armlinux.org.uk>, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 06/11] mmc: sdhci: Add quirk to disable HW timeout Date: Thu, 15 Mar 2018 13:26:10 +0200 [thread overview] Message-ID: <e98930eb-aaca-c193-1e5a-185195e71de5@intel.com> (raw) In-Reply-To: <20180307132020.30951-7-kishon@ti.com> 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 <kishon@ti.com> > --- > 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.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); } } > 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 */ >
WARNING: multiple messages have this Message-ID (diff)
From: adrian.hunter@intel.com (Adrian Hunter) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 06/11] mmc: sdhci: Add quirk to disable HW timeout Date: Thu, 15 Mar 2018 13:26:10 +0200 [thread overview] Message-ID: <e98930eb-aaca-c193-1e5a-185195e71de5@intel.com> (raw) In-Reply-To: <20180307132020.30951-7-kishon@ti.com> 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 <kishon@ti.com> > --- > 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.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); } } > 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 */ >
next prev parent reply other threads:[~2018-03-15 11:27 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-07 13:20 [PATCH v3 00/11] mmc: sdhci-omap: Add UHS/HS200 mode support Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` [PATCH v3 01/11] mmc: sdhci-omap: Fix when capabilities are obtained from SDHCI_CAPABILITIES reg Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 14:17 ` Adrian Hunter 2018-03-15 14:17 ` Adrian Hunter 2018-03-07 13:20 ` [PATCH v3 02/11] mmc: sdhci-omap: Remove setting ADMA capability in driver Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 14:18 ` Adrian Hunter 2018-03-15 14:18 ` Adrian Hunter 2018-03-07 13:20 ` [PATCH v3 03/11] mmc: sdhci-omap: Workaround for Errata i843 Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 14:24 ` Adrian Hunter 2018-03-15 14:24 ` Adrian Hunter 2018-03-07 13:20 ` [PATCH v3 04/11] mmc: sdhci-omap: Invoke sdhci_get_of_property to read sdhci dt properties Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 14:27 ` Adrian Hunter 2018-03-15 14:27 ` Adrian Hunter 2018-03-07 13:20 ` [PATCH v3 05/11] mmc: sdhci: Disable HS200 mode if controller can't support 1.8v Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 10:58 ` Adrian Hunter 2018-03-15 10:58 ` Adrian Hunter 2018-03-07 13:20 ` [PATCH v3 06/11] mmc: sdhci: Add quirk to disable HW timeout Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 11:26 ` Adrian Hunter [this message] 2018-03-15 11:26 ` Adrian Hunter 2018-03-07 13:20 ` [PATCH v3 07/11] mmc: sdhci: Program a relatively accurate SW timeout value Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 13:13 ` Adrian Hunter 2018-03-15 13:13 ` Adrian Hunter 2018-03-16 6:29 ` Kishon Vijay Abraham I 2018-03-16 6:29 ` Kishon Vijay Abraham I 2018-03-16 6:29 ` Kishon Vijay Abraham I 2018-03-16 14:21 ` Adrian Hunter 2018-03-16 14:21 ` Adrian Hunter 2018-03-19 9:20 ` Kishon Vijay Abraham I 2018-03-19 9:20 ` Kishon Vijay Abraham I 2018-03-19 9:20 ` Kishon Vijay Abraham I 2018-03-19 10:00 ` Adrian Hunter 2018-03-19 10:00 ` Adrian Hunter 2018-03-19 10:19 ` Kishon Vijay Abraham I 2018-03-19 10:19 ` Kishon Vijay Abraham I 2018-03-19 10:19 ` Kishon Vijay Abraham I 2018-03-20 9:48 ` Kishon Vijay Abraham I 2018-03-20 9:48 ` Kishon Vijay Abraham I 2018-03-20 9:48 ` Kishon Vijay Abraham I 2018-04-04 12:48 ` Adrian Hunter 2018-04-04 12:48 ` Adrian Hunter 2018-03-07 13:20 ` [PATCH v3 08/11] mmc: sdhci-omap: Workaround for Errata i834 Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` [PATCH v3 09/11] dt-bindings: sdhci-omap: Add K2G specific binding Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` [PATCH v3 10/11] mmc: sdhci-omap: Add support for MMC/SD controller in k2g SoC Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` [PATCH v3 11/11] mmc: sdhci-omap: Add sdhci_omap specific ops for enable_sdio_irq Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-07 13:20 ` Kishon Vijay Abraham I 2018-03-15 14:34 ` Adrian Hunter 2018-03-15 14:34 ` Adrian Hunter 2018-03-07 15:12 ` [PATCH v3 00/11] mmc: sdhci-omap: Add UHS/HS200 mode support Tony Lindgren 2018-03-07 15:12 ` Tony Lindgren 2018-03-15 8:47 ` Ulf Hansson 2018-03-15 8:47 ` Ulf Hansson 2018-03-15 8:52 ` Adrian Hunter 2018-03-15 8:52 ` Adrian Hunter 2018-03-15 10:02 ` Kishon Vijay Abraham I 2018-03-15 10:02 ` Kishon Vijay Abraham I 2018-03-15 10:02 ` Kishon Vijay Abraham I
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=e98930eb-aaca-c193-1e5a-185195e71de5@intel.com \ --to=adrian.hunter@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=kishon@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=tony@atomide.com \ --cc=ulf.hansson@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.