From patchwork Mon Jan 26 11:19:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: addy ke X-Patchwork-Id: 5708731 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 200BB9F4DC for ; Mon, 26 Jan 2015 11:23:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FB2920125 for ; Mon, 26 Jan 2015 11:23:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 632762012E for ; Mon, 26 Jan 2015 11:23:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YFhlh-0005H4-9r; Mon, 26 Jan 2015 11:23:45 +0000 Received: from regular1.263xmail.com ([211.150.99.137]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YFhkM-0004M5-2p; Mon, 26 Jan 2015 11:22:25 +0000 Received: from addy.ke?rock-chips.com (unknown [192.168.167.229]) by regular1.263xmail.com (Postfix) with SMTP id D7BC26C46; Mon, 26 Jan 2015 19:21:52 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 74D97437; Mon, 26 Jan 2015 19:21:47 +0800 (CST) X-RL-SENDER: addy.ke@rock-chips.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: addy.ke@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: kfx@rock-chips.com X-DNS-TYPE: 0 Received: from unknown (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith SMTP id 4143TSREG8; Mon, 26 Jan 2015 19:21:51 +0800 (CST) From: Addy Ke To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rdunlap@infradead.org, tgih.jun@samsung.com, jh80.chung@samsung.com, chris@printf.net, ulf.hansson@linaro.org, dinguyen@altera.com, heiko@sntech.de, olof@lixom.net, dianders@chromium.org, sonnyrao@chromium.org, amstan@chromium.org Subject: [PATCH 2/2] mmc: dw_mmc: wait until card ready if tuning fails Date: Mon, 26 Jan 2015 19:19:35 +0800 Message-Id: <1422271175-19445-3-git-send-email-addy.ke@rock-chips.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1422271175-19445-1-git-send-email-addy.ke@rock-chips.com> References: <1422271175-19445-1-git-send-email-addy.ke@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150126_032222_971172_0D263F31 X-CRM114-Status: GOOD ( 12.15 ) X-Spam-Score: -0.0 (/) Cc: huangtao@rock-chips.com, devicetree@vger.kernel.org, Addy Ke , hl@rock-chips.com, linux-doc@vger.kernel.org, yzq@rock-chips.com, zyw@rock-chips.com, zhangqing@rock-chips.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, kever.yang@rock-chips.com, lintao@rock-chips.com, linux-rockchip@lists.infradead.org, xjq@rock-chips.com, zhenfu.fang@rock-chips.com, chenfen@rock-chips.com, cf@rock-chips.com, hj@rock-chips.com, linux-arm-kernel@lists.infradead.org, zyf@rock-chips.com X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch based on Alex's patch: https://patchwork.kernel.org/patch/5516411/ Signed-off-by: Addy Ke --- drivers/mmc/core/mmc_ops.h | 1 - drivers/mmc/host/dw_mmc.c | 48 ++++++++++++++++++++++++++++++++++++++++------ include/linux/mmc/card.h | 2 ++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h index 6f4b00e..c5be9ce 100644 --- a/drivers/mmc/core/mmc_ops.h +++ b/drivers/mmc/core/mmc_ops.h @@ -20,7 +20,6 @@ int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr); int mmc_all_send_cid(struct mmc_host *host, u32 *cid); int mmc_set_relative_addr(struct mmc_card *card); int mmc_send_csd(struct mmc_card *card, u32 *csd); -int mmc_send_status(struct mmc_card *card, u32 *status); int mmc_send_cid(struct mmc_host *host, u32 *cid); int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp); int mmc_spi_set_crc(struct mmc_host *host, int use_crc); diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index e54e656..4a31a5e 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1317,10 +1317,38 @@ static void dw_mci_enable_sdio_irq(struct mmc_host *mmc, int enb) spin_unlock_irqrestore(&host->irq_lock, irqflags); } -static int dw_mci_tuning_test(struct dw_mci_slot *slot, u32 opcode, - struct dw_mci_tuning_data *tuning_data, - u8 *blk_test) +static int dw_mci_card_busy(u32 status) { + return !(status & R1_READY_FOR_DATA) || + (R1_CURRENT_STATE(status) == R1_STATE_PRG); +} + +static int dw_mci_wait_for_card_ready(struct mmc_card *card) +{ + struct mmc_host *mmc = card->host; + struct dw_mci_slot *slot = mmc_priv(mmc); + struct dw_mci *host = slot->host; + int err = 0; + u32 status; + + do { + err = mmc_send_status(card, &status); + if (err) { + dev_err(host->dev, + "Get card status fail in tuning state\n"); + break; + } + } while (dw_mci_card_busy(status)); + + return err; +} + +static int dw_mci_tuning_test(struct mmc_card *card, u32 opcode, + struct dw_mci_tuning_data *tuning_data, + u8 *blk_test) +{ + struct mmc_host *mmc = card->host; + struct dw_mci_slot *slot = mmc_priv(mmc); struct dw_mci *host = slot->host; struct mmc_host *mmc = slot->mmc; const u8 *blk_pattern = tuning_data->blk_pattern; @@ -1330,6 +1358,7 @@ static int dw_mci_tuning_test(struct dw_mci_slot *slot, u32 opcode, struct mmc_command stop = {0}; struct mmc_data data = {0}; struct scatterlist sg; + int err; memset(blk_test, 0, blksz); @@ -1365,6 +1394,11 @@ static int dw_mci_tuning_test(struct dw_mci_slot *slot, u32 opcode, dev_dbg(host->dev, "Tuning error: cmd.error:%d, data.error:%d\n", cmd.error, data.error); + + err = dw_mci_wait_for_card_ready(card); + if (err) + return err; + if (cmd.error) return cmd.error; else @@ -1372,9 +1406,11 @@ static int dw_mci_tuning_test(struct dw_mci_slot *slot, u32 opcode, } } -static int dw_mci_execute_generic_tuning(struct dw_mci_slot *slot, u32 opcode, +static int dw_mci_execute_generic_tuning(struct mmc_card *card, u32 opcode, struct dw_mci_tuning_data *tuning_data) { + struct mmc_host *mmc = card->host; + struct dw_mci_slot *slot = mmc_priv(mmc); struct dw_mci *host = slot->host; unsigned int blksz = tuning_data->blksz; u8 *blk_test; @@ -1412,7 +1448,7 @@ static int dw_mci_execute_generic_tuning(struct dw_mci_slot *slot, u32 opcode, for (i = 0; i < NUM_PHASES; i++) { clk_set_phase(host->sample_clk, i * PHASE_INCREMENT); - v = !dw_mci_tuning_test(slot, opcode, tuning_data, blk_test); + v = !dw_mci_tuning_test(card, opcode, tuning_data, blk_test); if ((!prev_v) && v) { range_count++; @@ -1496,7 +1532,7 @@ static int dw_mci_execute_tuning(struct mmc_card *card, u32 opcode) if (drv_data && drv_data->execute_tuning) err = drv_data->execute_tuning(slot, opcode, &tuning_data); else - err = dw_mci_execute_generic_tuning(slot, opcode, &tuning_data); + err = dw_mci_execute_generic_tuning(card, opcode, &tuning_data); return err; } diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 4d69c00..40d90ae 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -518,4 +518,6 @@ extern void mmc_unregister_driver(struct device_driver *); extern void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table); +int mmc_send_status(struct mmc_card *card, u32 *status); + #endif /* LINUX_MMC_CARD_H */