Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756581AbcKKQEn (ORCPT ); Fri, 11 Nov 2016 11:04:43 -0500 Received: from ssl.serverraum.org ([213.133.101.245]:60402 "EHLO ssl.serverraum.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750979AbcKKQEm (ORCPT ); Fri, 11 Nov 2016 11:04:42 -0500 Authentication-Results: ssl.serverraum.org; dmarc=none header.from=walle.cc From: Michael Walle To: linux-kernel@vger.kernel.org Cc: linux-mmc@vger.kernel.org, Ulf Hansson , Adrian Hunter , yangbo lu , Michael Walle Subject: [PATCH v2] mmc: sdhci-of-esdhc: fixup PRESENT_STATE read Date: Fri, 11 Nov 2016 17:04:19 +0100 Message-Id: <1478880259-24943-1-git-send-email-michael@walle.cc> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1554 Lines: 47 Since commit 87a18a6a5652 ("mmc: mmc: Use ->card_busy() to detect busy cards in __mmc_switch()") the ESDHC driver is broken: mmc0: Card stuck in programming state! __mmc_switch mmc0: error -110 whilst initialising MMC card Since this commit __mmc_switch() uses ->card_busy(), which is sdhci_card_busy() for the esdhc driver. sdhci_card_busy() uses the PRESENT_STATE register, specifically the DAT0 signal level bit. But the ESDHC uses a non-conformant PRESENT_STATE register, thus a read fixup is required to make the driver work again. Signed-off-by: Michael Walle Fixes: 87a18a6a5652 ("mmc: mmc: Use ->card_busy() to detect busy cards in __mmc_switch()") --- v2: - use lower bits of the original value (that was actually a typo) - add fixes tag - fix typo drivers/mmc/host/sdhci-of-esdhc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index fb71c86..f9c84bb 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -66,6 +66,18 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host, return ret; } } + /* + * The DAT[3:0] line signal levels and the CMD line signal level is + * not compatible with standard SDHC register. Move the corresponding + * bits around. + */ + if (spec_reg == SDHCI_PRESENT_STATE) { + ret = value & ~0xf8000000; + ret |= (value >> 4) & SDHCI_DATA_LVL_MASK; + ret |= (value << 1) & 0x01000000; + return ret; + } + ret = value; return ret; } -- 2.1.4