mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH V2] DMA Block size configuration prior to CQE
@ 2018-12-19 20:33 Sowjanya Komatineni
  2018-12-19 20:33 ` [PATCH V2] mmc: cqhci: DMA Configuration " Sowjanya Komatineni
  0 siblings, 1 reply; 2+ messages in thread
From: Sowjanya Komatineni @ 2018-12-19 20:33 UTC (permalink / raw)
  To: adrian.hunter, ulf.hansson
  Cc: thierry.reding, jonathanh, linux-tegra, linux-kernel, linux-mmc,
	Sowjanya Komatineni

As per eMMC5.1 Spec Section 6.6.39.1, DMA Block size should be to 512 B
before enabling command queue.

Tegra SDHCI Host design strictly follows this sequence preventing write
access to SDHCI_BLOCK_SIZE when CQE is set in CQHCI_CFG. Writing to
SDHCI_BLOCK_SIZE register when CQE is enabled results in crash.

This patch is needed for enabling HW Command queue for Tegra SDHCI.

Note: couple more patches are needed for enabling HW CMDQ on Tegra SDHCI.
Based on patch review feedback from Ulf on the other HW Command queue
patch, I will resend new patch series with all these dependency patches
together along with covering letter.

[0] DMA Config prior to CQE
    https://lkml.org/lkml/2018/12/14/1062
[1] SDMMC address range
    https://lkml.org/lkml/2018/12/14/1323
[2] Fix sdhci_do_enable_v4_mode
    https://lkml.org/lkml/2018/12/14/72
[3] Add HW Command Queue for Tegra SDHCI
    https://patchwork.kernel.org/patch/10731915/

Sowjanya Komatineni (1):
  mmc: cqhci: DMA Configuration prior to CQE

 drivers/mmc/host/cqhci.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

-- 
2.7.4


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH V2] mmc: cqhci: DMA Configuration prior to CQE
  2018-12-19 20:33 [PATCH V2] DMA Block size configuration prior to CQE Sowjanya Komatineni
@ 2018-12-19 20:33 ` Sowjanya Komatineni
  0 siblings, 0 replies; 2+ messages in thread
From: Sowjanya Komatineni @ 2018-12-19 20:33 UTC (permalink / raw)
  To: adrian.hunter, ulf.hansson
  Cc: thierry.reding, jonathanh, linux-tegra, linux-kernel, linux-mmc,
	Sowjanya Komatineni

eMMC-5.1 JESD84-B51 Spec (Section 6.6.39.1), mentions "Prior to
enabling command queuing, the block size shall be set to 512 B.
Device may respond with an error to CMD46/CMD47 if block size
is not 512 B".

This patch fixes the sequence to follow exact as per the spec.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
---
Changes for v2:
   - Updated commit message with JDEC Spec typo and exact spec reference
     on the requirement.

 drivers/mmc/host/cqhci.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c
index 159270e947cf..f701342e7212 100644
--- a/drivers/mmc/host/cqhci.c
+++ b/drivers/mmc/host/cqhci.c
@@ -248,6 +248,9 @@ static void __cqhci_enable(struct cqhci_host *cq_host)
 		cqhci_writel(cq_host, cqcfg, CQHCI_CFG);
 	}
 
+	if (cq_host->ops->enable)
+		cq_host->ops->enable(mmc);
+
 	cqcfg &= ~(CQHCI_DCMD | CQHCI_TASK_DESC_SZ);
 
 	if (mmc->caps2 & MMC_CAP2_CQE_DCMD)
@@ -273,9 +276,6 @@ static void __cqhci_enable(struct cqhci_host *cq_host)
 
 	mmc->cqe_on = true;
 
-	if (cq_host->ops->enable)
-		cq_host->ops->enable(mmc);
-
 	/* Ensure all writes are done before interrupts are enabled */
 	wmb();
 
@@ -561,6 +561,7 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 	int tag = cqhci_tag(mrq);
 	struct cqhci_host *cq_host = mmc->cqe_private;
 	unsigned long flags;
+	u32 cqcfg = 0;
 
 	if (!cq_host->enabled) {
 		pr_err("%s: cqhci: not enabled\n", mmc_hostname(mmc));
@@ -579,8 +580,19 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 			pr_err("%s: cqhci: CQE failed to exit halt state\n",
 			       mmc_hostname(mmc));
 		}
+		/* Configuration must not be changed while enabled */
+		cqcfg = cqhci_readl(cq_host, CQHCI_CFG);
+		if (cqcfg & CQHCI_ENABLE) {
+			cqcfg &= ~CQHCI_ENABLE;
+			cqhci_writel(cq_host, cqcfg, CQHCI_CFG);
+		}
+
 		if (cq_host->ops->enable)
 			cq_host->ops->enable(mmc);
+
+		cqcfg |= CQHCI_ENABLE;
+		cqhci_writel(cq_host, cqcfg, CQHCI_CFG);
+
 	}
 
 	if (mrq->data) {
-- 
2.7.4


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-12-19 20:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-19 20:33 [PATCH V2] DMA Block size configuration prior to CQE Sowjanya Komatineni
2018-12-19 20:33 ` [PATCH V2] mmc: cqhci: DMA Configuration " Sowjanya Komatineni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®