From patchwork Tue Dec 18 14:38:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Rudholm X-Patchwork-Id: 13639 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7BEE923E2D for ; Tue, 18 Dec 2012 14:39:44 +0000 (UTC) Received: from mail-ie0-f178.google.com (mail-ie0-f178.google.com [209.85.223.178]) by fiordland.canonical.com (Postfix) with ESMTP id EE0AAA18FCC for ; Tue, 18 Dec 2012 14:39:43 +0000 (UTC) Received: by mail-ie0-f178.google.com with SMTP id c12so949230ieb.37 for ; Tue, 18 Dec 2012 06:39:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type:x-gm-message-state; bh=J3lzh6h5a5lHp/gFILSGRWH41rItKKtYcck//3TZdHQ=; b=Qgo/vj4OP9kcVASnuvoleiUR8lXdp9KFQrNPhu//3MzXmM9UIS6uI6GnRTW3mfxo4C 9nZozqmfMJNv97yaUUcEVUNzURuEPqXV3vsUjNaT1mtFocDm7+s/GNQ9hViLg4ckWofc NiSromg/+r/PGITchzEK30wPa+z+aP2f8EW2hNeK+Ix0jIWDO07aZJIEnhBwmjoZZgBY iNfkYQnVvJCgrM78Pl0YKk2xzVUxm/otqz67TyXmhL8uGtYNZ/Me5VHcQ8FMWR20hKj+ dH1FrU0+1IfFaqfBp8UTnOUOkUV2r5RU2r7TMopjABY3+VoxGO35Uq0TUprmqP+IlS2h Z8og== X-Received: by 10.50.36.164 with SMTP id r4mr2552825igj.57.1355841583255; Tue, 18 Dec 2012 06:39:43 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp145514igt; Tue, 18 Dec 2012 06:39:41 -0800 (PST) X-Received: by 10.14.0.3 with SMTP id 3mr6178746eea.16.1355841580401; Tue, 18 Dec 2012 06:39:40 -0800 (PST) Received: from eu1sys200aog113.obsmtp.com (eu1sys200aog113.obsmtp.com [207.126.144.135]) by mx.google.com with SMTP id l8si4843359eem.29.2012.12.18.06.39.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 06:39:40 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of johan.rudholm@stericsson.com) client-ip=207.126.144.135; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of johan.rudholm@stericsson.com) smtp.mail=johan.rudholm@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob113.postini.com ([207.126.147.11]) with SMTP ID DSNKUNCAFE6HLMhEUwLgyi54GS2CUMU1eJDH@postini.com; Tue, 18 Dec 2012 14:39:39 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id B0EFBC6; Tue, 18 Dec 2012 14:31:01 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 0D306839; Tue, 18 Dec 2012 14:39:11 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 92E17A8088; Tue, 18 Dec 2012 15:39:04 +0100 (CET) Received: from steludxu1610.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 18 Dec 2012 15:39:09 +0100 From: Johan Rudholm To: , Chris Ball Cc: Per Forlin , Ulf Hansson , Fredrik Soderstedt , Kevin Liu , Philip Rakity , Daniel Drake , Aaron , Subhash Jadavani , Johan Rudholm , Kevin Liu Subject: [PATCH v2 3/3] mmc: core: Fixup signal voltage switch Date: Tue, 18 Dec 2012 15:38:58 +0100 Message-ID: <1355841538-6674-4-git-send-email-johan.rudholm@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1355841538-6674-1-git-send-email-johan.rudholm@stericsson.com> References: <1355841538-6674-1-git-send-email-johan.rudholm@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQk/WrriedN+slATX3t/Hi5IGVHpGS9ECLaejmVBdtIfTuxooHXLm/sAPvx1ix+1TyF+Rol7 When switching SD and SDIO cards from 3.3V to 1.8V signal levels, the clock should be gated for 5 ms during the step. After enabling the clock, the host should wait for at least 1 ms before checking for failure. Failure by the card to switch is indicated by dat[0:3] being pulled low. The host should check for this condition and power-cycle the card if failure is indicated. Add a retry mechanism for the SDIO case. If the voltage switch fails repeatedly, give up and continue the initialization using the original voltage. This patch places a couple of requirements on the host driver: 1) mmc_set_ios with ios.clock = 0 must gate the clock 2) mmc_power_off must actually cut the power to the card 3) The card_busy host_ops member must be implemented if these requirements are not fulfilled, the 1.8V signal voltage switch will still be attempted but may not be successful. Signed-off-by: Johan Rudholm Signed-off-by: Kevin Liu Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 75 +++++++++++++++++++++++++++++++++++++++++++---- drivers/mmc/core/sd.c | 21 +++++++++---- drivers/mmc/core/sdio.c | 20 +++++++++++-- 3 files changed, 104 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 285f064..03a42db 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1223,6 +1223,7 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, bool cmd11 { struct mmc_command cmd = {0}; int err = 0; + u32 clock; BUG_ON(!host); @@ -1231,6 +1232,16 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, bool cmd11 * 1.8V signalling. */ if ((signal_voltage != MMC_SIGNAL_VOLTAGE_330) && cmd11) { + /* + * If we cannot switch voltages, return failure so the caller + * can continue without UHS mode + */ + if (!host->ops->start_signal_voltage_switch) + return -EPERM; + if (!host->ops->card_busy) + pr_warning("%s: cannot verify signal voltage switch\n", + mmc_hostname(host)); + cmd.opcode = SD_SWITCH_VOLTAGE; cmd.arg = 0; cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; @@ -1241,16 +1252,70 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, bool cmd11 if (!mmc_host_is_spi(host) && (cmd.resp[0] & R1_ERROR)) return -EIO; - } - - host->ios.signal_voltage = signal_voltage; - if (host->ops->start_signal_voltage_switch) { mmc_host_clk_hold(host); + /* + * The card should drive cmd and dat[0:3] low immediately + * after the response of cmd11, but wait 1 ms to be sure + */ + mmc_delay(1); + if (host->ops->card_busy && !host->ops->card_busy(host)) { + err = -EAGAIN; + goto power_cycle; + } + /* + * During a signal voltage level switch, the clock must be gated + * for 5 ms according to the SD spec + */ + clock = host->ios.clock; + host->ios.clock = 0; + mmc_set_ios(host); + + host->ios.signal_voltage = signal_voltage; err = host->ops->start_signal_voltage_switch(host, &host->ios); - mmc_host_clk_release(host); + if (err) { + host->ios.clock = clock; + mmc_set_ios(host); + /* + * Voltages may not been switched, but we've already + * sent CMD11, so a power cycle is required anyway + */ + err = -EAGAIN; + goto power_cycle; + } else + + /* Keep clock gated for at least 5 ms */ + mmc_delay(5); + host->ios.clock = clock; + mmc_set_ios(host); + + /* Wait for at least 1 ms according to spec */ + mmc_delay(1); + + /* + * Failure to switch is indicated by the card holding + * dat[0:3] low + */ + if (host->ops->card_busy && host->ops->card_busy(host)) + err = -EAGAIN; + } else if (host->ops->start_signal_voltage_switch) { + host->ios.signal_voltage = signal_voltage; + err = host->ops->start_signal_voltage_switch(host, &host->ios); + } else { + return 0; } + +power_cycle: + if (err && cmd11) { + pr_debug("%s: Signal voltage switch failed, " + "power cycling card\n", mmc_hostname(host)); + /* Note that mmc_power_off calls mmc_set_signal_voltage */ + mmc_power_cycle(host); + } + + mmc_host_clk_release(host); + return err; } diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 74972c2..874d8f6 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -713,6 +713,14 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) { int err; u32 max_current; + int retries = 10; + +try_again: + if (!retries) { + ocr &= ~SD_OCR_S18R; + pr_warning("%s: Skipping voltage switch\n", + mmc_hostname(host)); + } /* * Since we're changing the OCR value, we seem to @@ -734,9 +742,10 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) /* * If the host supports one of UHS-I modes, request the card - * to switch to 1.8V signaling level. + * to switch to 1.8V signaling level. If the card has failed + * repeatedly to switch however, skip this. */ - if (host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | + if (retries && host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50)) ocr |= SD_OCR_S18R; @@ -748,7 +757,6 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) if (max_current > 150) ocr |= SD_OCR_XPC; -try_again: err = mmc_send_app_op_cond(host, ocr, rocr); if (err) return err; @@ -760,8 +768,11 @@ try_again: if (!mmc_host_is_spi(host) && rocr && ((*rocr & 0x41000000) == 0x41000000)) { err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, true); - if (err) { - ocr &= ~SD_OCR_S18R; + if (err == -EAGAIN) { + retries--; + goto try_again; + } else if (err) { + retries = 0; goto try_again; } } diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 2273ce6..39722d8 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -583,10 +583,19 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, { struct mmc_card *card; int err; + int retries = 10; BUG_ON(!host); WARN_ON(!host->claimed); +try_again: + if (!retries) { + pr_warning("%s: Skipping voltage switch\n", + mmc_hostname(host)); + ocr &= ~R4_18V_PRESENT; + host->ocr &= ~R4_18V_PRESENT; + } + /* * Inform the card of the voltage */ @@ -645,14 +654,21 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, * systems that claim 1.8v signalling in fact do not support * it. */ - if ((ocr & R4_18V_PRESENT) && + if (!powered_resume && (ocr & R4_18V_PRESENT) && (host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))) { err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, true); - if (err) { + if (err == -EAGAIN) { + sdio_reset(host); + mmc_go_idle(host); + mmc_send_if_cond(host, host->ocr_avail); + mmc_remove_card(card); + retries--; + goto try_again; + } else if (err) { ocr &= ~R4_18V_PRESENT; host->ocr &= ~R4_18V_PRESENT; }