* [PATCH] mmc: tegra: Optimize write_w path for tegra114 and later
@ 2015-02-11 17:55 Rhyland Klein
2015-02-12 3:50 ` Alexandre Courbot
2015-03-05 14:59 ` Ulf Hansson
0 siblings, 2 replies; 4+ messages in thread
From: Rhyland Klein @ 2015-02-11 17:55 UTC (permalink / raw)
To: Ulf Hansson, Chris Ball
Cc: Stephen Warren, Thierry Reding, Alexandre Courbot, linux-mmc,
linux-tegra, linux-kernel, Rhyland Klein
Setup a different set of sdhci_ops for tegra114 and later so that
the write_w callback is only used on tegra114. This allows us to
remove the NVQUIRK_SHADOW_XFER_MODE_REG and simply the logic
in tegra_sdhci_writew.
This was suggested by Alexandre Courbot.
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
---
drivers/mmc/host/sdhci-tegra.c | 45 +++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index f3778d58d1cd..180062498c35 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -41,7 +41,6 @@
#define NVQUIRK_DISABLE_SDR50 BIT(3)
#define NVQUIRK_DISABLE_SDR104 BIT(4)
#define NVQUIRK_DISABLE_DDR50 BIT(5)
-#define NVQUIRK_SHADOW_XFER_MODE_REG BIT(6)
struct sdhci_tegra_soc_data {
const struct sdhci_pltfm_data *pdata;
@@ -74,20 +73,18 @@ static void tegra_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
struct sdhci_tegra *tegra_host = pltfm_host->priv;
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
- if (soc_data->nvquirks & NVQUIRK_SHADOW_XFER_MODE_REG) {
- switch (reg) {
- case SDHCI_TRANSFER_MODE:
- /*
- * Postpone this write, we must do it together with a
- * command write that is down below.
- */
- pltfm_host->xfer_mode_shadow = val;
- return;
- case SDHCI_COMMAND:
- writel((val << 16) | pltfm_host->xfer_mode_shadow,
- host->ioaddr + SDHCI_TRANSFER_MODE);
- return;
- }
+ switch (reg) {
+ case SDHCI_TRANSFER_MODE:
+ /*
+ * Postpone this write, we must do it together with a
+ * command write that is down below.
+ */
+ pltfm_host->xfer_mode_shadow = val;
+ return;
+ case SDHCI_COMMAND:
+ writel((val << 16) | pltfm_host->xfer_mode_shadow,
+ host->ioaddr + SDHCI_TRANSFER_MODE);
+ return;
}
writew(val, host->ioaddr + reg);
@@ -173,7 +170,6 @@ static void tegra_sdhci_set_bus_width(struct sdhci_host *host, int bus_width)
static const struct sdhci_ops tegra_sdhci_ops = {
.get_ro = tegra_sdhci_get_ro,
.read_w = tegra_sdhci_readw,
- .write_w = tegra_sdhci_writew,
.write_l = tegra_sdhci_writel,
.set_clock = sdhci_set_clock,
.set_bus_width = tegra_sdhci_set_bus_width,
@@ -214,6 +210,18 @@ static struct sdhci_tegra_soc_data soc_data_tegra30 = {
NVQUIRK_DISABLE_SDR104,
};
+static const struct sdhci_ops tegra114_sdhci_ops = {
+ .get_ro = tegra_sdhci_get_ro,
+ .read_w = tegra_sdhci_readw,
+ .write_w = tegra_sdhci_writew,
+ .write_l = tegra_sdhci_writel,
+ .set_clock = sdhci_set_clock,
+ .set_bus_width = tegra_sdhci_set_bus_width,
+ .reset = tegra_sdhci_reset,
+ .set_uhs_signaling = sdhci_set_uhs_signaling,
+ .get_max_clock = sdhci_pltfm_clk_get_max_clock,
+};
+
static const struct sdhci_pltfm_data sdhci_tegra114_pdata = {
.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
@@ -221,15 +229,14 @@ static const struct sdhci_pltfm_data sdhci_tegra114_pdata = {
SDHCI_QUIRK_NO_HISPD_BIT |
SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
- .ops = &tegra_sdhci_ops,
+ .ops = &tegra114_sdhci_ops,
};
static struct sdhci_tegra_soc_data soc_data_tegra114 = {
.pdata = &sdhci_tegra114_pdata,
.nvquirks = NVQUIRK_DISABLE_SDR50 |
NVQUIRK_DISABLE_DDR50 |
- NVQUIRK_DISABLE_SDR104 |
- NVQUIRK_SHADOW_XFER_MODE_REG,
+ NVQUIRK_DISABLE_SDR104,
};
static const struct of_device_id sdhci_tegra_dt_match[] = {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: tegra: Optimize write_w path for tegra114 and later
2015-02-11 17:55 [PATCH] mmc: tegra: Optimize write_w path for tegra114 and later Rhyland Klein
@ 2015-02-12 3:50 ` Alexandre Courbot
2015-02-12 16:17 ` Rhyland Klein
2015-03-05 14:59 ` Ulf Hansson
1 sibling, 1 reply; 4+ messages in thread
From: Alexandre Courbot @ 2015-02-12 3:50 UTC (permalink / raw)
To: Rhyland Klein
Cc: Ulf Hansson, Chris Ball, Stephen Warren, Thierry Reding,
linux-mmc, linux-tegra@vger.kernel.org, Linux Kernel Mailing List
On Thu, Feb 12, 2015 at 2:55 AM, Rhyland Klein <rklein@nvidia.com> wrote:
> Setup a different set of sdhci_ops for tegra114 and later so that
> the write_w callback is only used on tegra114. This allows us to
> remove the NVQUIRK_SHADOW_XFER_MODE_REG and simply the logic
> in tegra_sdhci_writew.
>
> This was suggested by Alexandre Courbot.
There's a tag for that. ;)
Suggested-by: Alexandre Courbot <acourbot@nvidia.com>
>
> Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Thanks for keeping up with this!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: tegra: Optimize write_w path for tegra114 and later
2015-02-12 3:50 ` Alexandre Courbot
@ 2015-02-12 16:17 ` Rhyland Klein
0 siblings, 0 replies; 4+ messages in thread
From: Rhyland Klein @ 2015-02-12 16:17 UTC (permalink / raw)
To: Alexandre Courbot
Cc: Ulf Hansson, Chris Ball, Stephen Warren, Thierry Reding,
linux-mmc, linux-tegra@vger.kernel.org, Linux Kernel Mailing List
On 2/11/2015 10:50 PM, Alexandre Courbot wrote:
> On Thu, Feb 12, 2015 at 2:55 AM, Rhyland Klein <rklein@nvidia.com> wrote:
>> Setup a different set of sdhci_ops for tegra114 and later so that
>> the write_w callback is only used on tegra114. This allows us to
>> remove the NVQUIRK_SHADOW_XFER_MODE_REG and simply the logic
>> in tegra_sdhci_writew.
>>
>> This was suggested by Alexandre Courbot.
>
> There's a tag for that. ;)
>
> Suggested-by: Alexandre Courbot <acourbot@nvidia.com>
>
>>
>> Signed-off-by: Rhyland Klein <rklein@nvidia.com>
>
> Acked-by: Alexandre Courbot <acourbot@nvidia.com>
>
> Thanks for keeping up with this!
>
Ahh I figured there had to be one but I wasn't sure. Ulf, I can repost
this if you want unless you want to just update the commit msg (assuming
there are no other complaints).
-rhyland
--
nvpublic
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: tegra: Optimize write_w path for tegra114 and later
2015-02-11 17:55 [PATCH] mmc: tegra: Optimize write_w path for tegra114 and later Rhyland Klein
2015-02-12 3:50 ` Alexandre Courbot
@ 2015-03-05 14:59 ` Ulf Hansson
1 sibling, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2015-03-05 14:59 UTC (permalink / raw)
To: Rhyland Klein
Cc: Chris Ball, Stephen Warren, Thierry Reding, Alexandre Courbot,
linux-mmc, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
On 11 February 2015 at 18:55, Rhyland Klein <rklein@nvidia.com> wrote:
> Setup a different set of sdhci_ops for tegra114 and later so that
> the write_w callback is only used on tegra114. This allows us to
> remove the NVQUIRK_SHADOW_XFER_MODE_REG and simply the logic
> in tegra_sdhci_writew.
>
> This was suggested by Alexandre Courbot.
>
> Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Applied, with some changes, thanks!
1. Added the suggested-by tag.
2. Remove some unused variables causing compiler warnings.
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-tegra.c | 45 +++++++++++++++++++++++-----------------
> 1 file changed, 26 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index f3778d58d1cd..180062498c35 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -41,7 +41,6 @@
> #define NVQUIRK_DISABLE_SDR50 BIT(3)
> #define NVQUIRK_DISABLE_SDR104 BIT(4)
> #define NVQUIRK_DISABLE_DDR50 BIT(5)
> -#define NVQUIRK_SHADOW_XFER_MODE_REG BIT(6)
>
> struct sdhci_tegra_soc_data {
> const struct sdhci_pltfm_data *pdata;
> @@ -74,20 +73,18 @@ static void tegra_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
> struct sdhci_tegra *tegra_host = pltfm_host->priv;
> const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
>
> - if (soc_data->nvquirks & NVQUIRK_SHADOW_XFER_MODE_REG) {
> - switch (reg) {
> - case SDHCI_TRANSFER_MODE:
> - /*
> - * Postpone this write, we must do it together with a
> - * command write that is down below.
> - */
> - pltfm_host->xfer_mode_shadow = val;
> - return;
> - case SDHCI_COMMAND:
> - writel((val << 16) | pltfm_host->xfer_mode_shadow,
> - host->ioaddr + SDHCI_TRANSFER_MODE);
> - return;
> - }
> + switch (reg) {
> + case SDHCI_TRANSFER_MODE:
> + /*
> + * Postpone this write, we must do it together with a
> + * command write that is down below.
> + */
> + pltfm_host->xfer_mode_shadow = val;
> + return;
> + case SDHCI_COMMAND:
> + writel((val << 16) | pltfm_host->xfer_mode_shadow,
> + host->ioaddr + SDHCI_TRANSFER_MODE);
> + return;
> }
>
> writew(val, host->ioaddr + reg);
> @@ -173,7 +170,6 @@ static void tegra_sdhci_set_bus_width(struct sdhci_host *host, int bus_width)
> static const struct sdhci_ops tegra_sdhci_ops = {
> .get_ro = tegra_sdhci_get_ro,
> .read_w = tegra_sdhci_readw,
> - .write_w = tegra_sdhci_writew,
> .write_l = tegra_sdhci_writel,
> .set_clock = sdhci_set_clock,
> .set_bus_width = tegra_sdhci_set_bus_width,
> @@ -214,6 +210,18 @@ static struct sdhci_tegra_soc_data soc_data_tegra30 = {
> NVQUIRK_DISABLE_SDR104,
> };
>
> +static const struct sdhci_ops tegra114_sdhci_ops = {
> + .get_ro = tegra_sdhci_get_ro,
> + .read_w = tegra_sdhci_readw,
> + .write_w = tegra_sdhci_writew,
> + .write_l = tegra_sdhci_writel,
> + .set_clock = sdhci_set_clock,
> + .set_bus_width = tegra_sdhci_set_bus_width,
> + .reset = tegra_sdhci_reset,
> + .set_uhs_signaling = sdhci_set_uhs_signaling,
> + .get_max_clock = sdhci_pltfm_clk_get_max_clock,
> +};
> +
> static const struct sdhci_pltfm_data sdhci_tegra114_pdata = {
> .quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
> SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
> @@ -221,15 +229,14 @@ static const struct sdhci_pltfm_data sdhci_tegra114_pdata = {
> SDHCI_QUIRK_NO_HISPD_BIT |
> SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
> SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
> - .ops = &tegra_sdhci_ops,
> + .ops = &tegra114_sdhci_ops,
> };
>
> static struct sdhci_tegra_soc_data soc_data_tegra114 = {
> .pdata = &sdhci_tegra114_pdata,
> .nvquirks = NVQUIRK_DISABLE_SDR50 |
> NVQUIRK_DISABLE_DDR50 |
> - NVQUIRK_DISABLE_SDR104 |
> - NVQUIRK_SHADOW_XFER_MODE_REG,
> + NVQUIRK_DISABLE_SDR104,
> };
>
> static const struct of_device_id sdhci_tegra_dt_match[] = {
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-05 14:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-11 17:55 [PATCH] mmc: tegra: Optimize write_w path for tegra114 and later Rhyland Klein
2015-02-12 3:50 ` Alexandre Courbot
2015-02-12 16:17 ` Rhyland Klein
2015-03-05 14:59 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox