All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Tony Lindgren <tony@atomide.com>,
	Rob Herring <robh+dt@kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>
Cc: <kishon@ti.com>, <nsekhar@ti.com>, <linux-omap@vger.kernel.org>,
	<linux-mmc@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: [RFC PATCH 2/7] mmc: sdhci: Add quirk to indicate controller supports ADMA2
Date: Mon, 7 Aug 2017 21:31:37 +0530	[thread overview]
Message-ID: <20170807160142.12134-3-kishon@ti.com> (raw)
In-Reply-To: <20170807160142.12134-1-kishon@ti.com>

TI's implementation of sdhci controller used in DRA7 SoC's doesn't
have SDHCI_CAN_DO_ADMA2 set in CAPA register though it supports
ADMA2. Add quirk to support using ADMA2 even if the controller reports
incorrect capability in CAPA.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/mmc/host/sdhci.c | 3 ++-
 drivers/mmc/host/sdhci.h | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ece3751d2a25..fff0baadbc3e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3264,7 +3264,8 @@ int sdhci_setup_host(struct sdhci_host *host)
 	}
 
 	if ((host->version >= SDHCI_SPEC_200) &&
-		(host->caps & SDHCI_CAN_DO_ADMA2))
+		((host->caps & SDHCI_CAN_DO_ADMA2) ||
+		(host->quirks2 & SDHCI_QUIRK2_FORCE_ADMA)))
 		host->flags |= SDHCI_USE_ADMA;
 
 	if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA) &&
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 6905131f603d..d778034e324d 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -437,6 +437,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN		(1<<15)
 /* Controller does not have CRC stripped in Command Response */
 #define SDHCI_QUIRK2_NO_CRC_STRIPPING			(1<<16)
+/* Controller has bad caps bits, but really supports DMA */
+#define SDHCI_QUIRK2_FORCE_ADMA				(1<<17)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: Kishon Vijay Abraham I <kishon@ti.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Tony Lindgren <tony@atomide.com>,
	Rob Herring <robh+dt@kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>
Cc: kishon@ti.com, nsekhar@ti.com, linux-omap@vger.kernel.org,
	linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [RFC PATCH 2/7] mmc: sdhci: Add quirk to indicate controller supports ADMA2
Date: Mon, 7 Aug 2017 21:31:37 +0530	[thread overview]
Message-ID: <20170807160142.12134-3-kishon@ti.com> (raw)
In-Reply-To: <20170807160142.12134-1-kishon@ti.com>

TI's implementation of sdhci controller used in DRA7 SoC's doesn't
have SDHCI_CAN_DO_ADMA2 set in CAPA register though it supports
ADMA2. Add quirk to support using ADMA2 even if the controller reports
incorrect capability in CAPA.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/mmc/host/sdhci.c | 3 ++-
 drivers/mmc/host/sdhci.h | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ece3751d2a25..fff0baadbc3e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3264,7 +3264,8 @@ int sdhci_setup_host(struct sdhci_host *host)
 	}
 
 	if ((host->version >= SDHCI_SPEC_200) &&
-		(host->caps & SDHCI_CAN_DO_ADMA2))
+		((host->caps & SDHCI_CAN_DO_ADMA2) ||
+		(host->quirks2 & SDHCI_QUIRK2_FORCE_ADMA)))
 		host->flags |= SDHCI_USE_ADMA;
 
 	if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA) &&
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 6905131f603d..d778034e324d 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -437,6 +437,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN		(1<<15)
 /* Controller does not have CRC stripped in Command Response */
 #define SDHCI_QUIRK2_NO_CRC_STRIPPING			(1<<16)
+/* Controller has bad caps bits, but really supports DMA */
+#define SDHCI_QUIRK2_FORCE_ADMA				(1<<17)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
-- 
2.11.0

  parent reply	other threads:[~2017-08-07 16:02 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-07 16:01 [RFC PATCH 0/7] mmc: Add OMAP SDHCI driver Kishon Vijay Abraham I
2017-08-07 16:01 ` Kishon Vijay Abraham I
2017-08-07 16:01 ` [RFC PATCH 1/7] mmc: sdhci: Add quirk to indicate no CRC stripping in MMC_RSP_136 Kishon Vijay Abraham I
2017-08-07 16:01   ` Kishon Vijay Abraham I
2017-08-15  7:27   ` Adrian Hunter
2017-08-17  5:20     ` Kishon Vijay Abraham I
2017-08-17  5:20       ` Kishon Vijay Abraham I
2017-08-17  6:31       ` Adrian Hunter
2017-08-17  7:40         ` Kishon Vijay Abraham I
2017-08-17  7:40           ` Kishon Vijay Abraham I
2017-08-07 16:01 ` Kishon Vijay Abraham I [this message]
2017-08-07 16:01   ` [RFC PATCH 2/7] mmc: sdhci: Add quirk to indicate controller supports ADMA2 Kishon Vijay Abraham I
2017-08-15  7:33   ` Adrian Hunter
2017-08-17  5:30     ` Kishon Vijay Abraham I
2017-08-17  5:30       ` Kishon Vijay Abraham I
2017-08-07 16:01 ` [RFC PATCH 3/7] mmc: sdhci: Add callback to set bus mode Kishon Vijay Abraham I
2017-08-07 16:01   ` Kishon Vijay Abraham I
2017-08-15  7:38   ` Adrian Hunter
2017-08-17  5:31     ` Kishon Vijay Abraham I
2017-08-17  5:31       ` Kishon Vijay Abraham I
2017-08-07 16:01 ` [RFC PATCH 4/7] mmc: sdhci: Add quirk to indicate broken POWER_CONTROL Kishon Vijay Abraham I
2017-08-07 16:01   ` Kishon Vijay Abraham I
2017-08-15  7:41   ` Adrian Hunter
2017-08-15  7:41     ` Adrian Hunter
2017-08-17  5:32     ` Kishon Vijay Abraham I
2017-08-17  5:32       ` Kishon Vijay Abraham I
2017-08-07 16:01 ` [RFC PATCH 5/7] dt-bindings: ti-omap-hsmmc: Document new compatible for sdhci omap Kishon Vijay Abraham I
2017-08-07 16:01   ` Kishon Vijay Abraham I
2017-08-09 22:12   ` Tony Lindgren
2017-08-09 22:12     ` Tony Lindgren
2017-08-17  5:43     ` Kishon Vijay Abraham I
2017-08-17  5:43       ` Kishon Vijay Abraham I
2017-08-17 16:05       ` Tony Lindgren
2017-08-07 16:01 ` [RFC PATCH 6/7] mmc: sdhci-omap: Add OMAP SDHCI driver Kishon Vijay Abraham I
2017-08-07 16:01   ` Kishon Vijay Abraham I
2017-08-15  8:22   ` Adrian Hunter
2017-08-15  8:22     ` Adrian Hunter
2017-08-17  5:57     ` Kishon Vijay Abraham I
2017-08-17  5:57       ` Kishon Vijay Abraham I
2017-08-17  6:43       ` Adrian Hunter
2017-08-17  7:59         ` Kishon Vijay Abraham I
2017-08-17  7:59           ` Kishon Vijay Abraham I
2017-08-17  8:23           ` Adrian Hunter
2017-08-20 11:03             ` Kishon Vijay Abraham I
2017-08-20 11:03               ` Kishon Vijay Abraham I
2017-08-07 16:01 ` [RFC PATCH 7/7] MAINTAINERS: Add TI OMAP SDHCI Maintainer Kishon Vijay Abraham I
2017-08-07 16:01   ` 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=20170807160142.12134-3-kishon@ti.com \
    --to=kishon@ti.com \
    --cc=adrian.hunter@intel.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=nsekhar@ti.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: link
Be 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.