From patchwork Thu Apr 7 18:14:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 8775671 Return-Path: X-Original-To: patchwork-linux-mmc@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 E3C859F3D1 for ; Thu, 7 Apr 2016 18:14:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10ECB20256 for ; Thu, 7 Apr 2016 18:14:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 242CD20222 for ; Thu, 7 Apr 2016 18:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756860AbcDGSOa (ORCPT ); Thu, 7 Apr 2016 14:14:30 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34013 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756449AbcDGSO3 (ORCPT ); Thu, 7 Apr 2016 14:14:29 -0400 Received: by mail-pf0-f182.google.com with SMTP id c20so60233335pfc.1 for ; Thu, 07 Apr 2016 11:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5ttRAz3Kdd8P4nnmQehMT461jbW+zdt3k7gMeadhDwA=; b=Cx5B158OFaLmlnPEEW8ql3yzV3GZNstOmhWHIxBP2Za9tQW2nONTorb6jrojbaWfCg XNcnGiheLKZYPcNqdDz3AJ8B8HLj6iNjOottY4FTpuqqwV2mbKOxCjStClhkDOiPvo5q EpyFguRaho/XDNLDmWkh44j8PNcklF0vO3Hbi5F0Ur6pZHnS4TWtABkSsfL9LX4pmjHv kPo2b8vVPTsCm4PAu9R7FBSerKYjx/bVXHz9HWfnFSV88pEyDeCGn+FxE4ygUwBCnt+Y pmiqnPdPwYMEMI7Mm+9RaZ8rfHKMDTqzbFOHo203dCL+yQGznTaj6g5W2YZ9TzibIT+A Vd/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5ttRAz3Kdd8P4nnmQehMT461jbW+zdt3k7gMeadhDwA=; b=dvZxZnZr0AyLoVXFnbziAko/M/DwMNt19kz7ykCoHHkl2ZNBZmVBdqhhJoUZI/lZXg 6BIypg2Kk+e83NN9QmDz0q4B/p1QkOd1ahYAEFRtY1NB0DAas2mjAfIKnHeilP0VXYiN etRql7W0Fwcb50n7XkJ68hXNMIBvXqLf76CkL55ZmG9lg1pbKDK9Spgm5Owk8ztsIXZV 1NUbQM3lsydyL5F/yGmL3rQOzDCVmxIm5KVRszWydeomVl13EVs7IxWt9Wsegd9GWv+h D7jN6gpB4cbzv/2RHS3uBSTPEzwC3OyaicwtxHSVoywkw1fHh8sDqHNgbA5JjDqfp4Nq nWFw== X-Gm-Message-State: AD7BkJKyrIsuO/jCvjRSLPnmXPO8y1B4DPxHDhZ7g9u2F+58Fxnl4iwFh22YgxNUElkvvkbg X-Received: by 10.98.34.216 with SMTP id p85mr6461517pfj.45.1460052868504; Thu, 07 Apr 2016 11:14:28 -0700 (PDT) Received: from gwendal.mtv.corp.google.com ([172.22.64.242]) by smtp.gmail.com with ESMTPSA id x64sm13676605pfa.72.2016.04.07.11.14.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Apr 2016 11:14:27 -0700 (PDT) From: Gwendal Grignou To: ulf.hansson@linaro.org Cc: linux-mmc@vger.kernel.org Subject: [PATCH v4] mmc: core: in mmc_hw_reset(), allow power cycle. Date: Thu, 7 Apr 2016 11:14:17 -0700 Message-Id: <1460052857-31738-1-git-send-email-gwendal@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: References: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 When the eMMC device does not support/allow sending RST_n signal, try to do a brute force power cycle instead of returning EOPNOTSUPP. If power cycle is not supported by the hardware, mmc_init_card still send a CMD0, performing a Software Reset. Signed-off-by: Gwendal Grignou --- Changes in v4: - Integrate Ulf's comment: update mmc_blk_reset() drivers/mmc/card/block.c | 4 ++-- drivers/mmc/core/core.c | 5 +++-- drivers/mmc/core/mmc.c | 24 +++++++++++------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index a4bf0f7..44e220a 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1141,7 +1141,7 @@ static int mmc_blk_reset(struct mmc_blk_data *md, struct mmc_host *host, md->reset_done |= type; err = mmc_hw_reset(host); /* Ensure we switch back to the correct partition */ - if (err != -EOPNOTSUPP) { + if (!err) { struct mmc_blk_data *main_md = dev_get_drvdata(&host->card->dev); int part_err; @@ -1153,7 +1153,7 @@ static int mmc_blk_reset(struct mmc_blk_data *md, struct mmc_host *host, * We have failed to get back into the correct * partition, so we need to abort the whole request. */ - return -ENODEV; + err = -ENODEV; } } return err; diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index d8bbc78..d5bc2d8 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2468,8 +2468,9 @@ int mmc_hw_reset(struct mmc_host *host) ret = host->bus_ops->reset(host); mmc_bus_put(host); - if (ret != -EOPNOTSUPP) - pr_warn("%s: tried to reset card\n", mmc_hostname(host)); + if (ret) + pr_warn("%s: tried to reset card, got error %d\n", + mmc_hostname(host), ret); return ret; } diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 96cc7e2..92b7bea 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1988,19 +1988,17 @@ static int mmc_reset(struct mmc_host *host) { struct mmc_card *card = host->card; - if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset) - return -EOPNOTSUPP; - - if (!mmc_can_reset(card)) - return -EOPNOTSUPP; - - mmc_set_clock(host, host->f_init); - - host->ops->hw_reset(host); - - /* Set initial state and call mmc_set_ios */ - mmc_set_initial_state(host); - + if ((host->caps & MMC_CAP_HW_RESET) && host->ops->hw_reset && + mmc_can_reset(card)) { + /* If the card accept RST_n signal, send it. */ + mmc_set_clock(host, host->f_init); + host->ops->hw_reset(host); + /* Set initial state and call mmc_set_ios */ + mmc_set_initial_state(host); + } else { + /* Do a brute force power cycle */ + mmc_power_cycle(host, card->ocr); + } return mmc_init_card(host, card->ocr, card); }