From patchwork Fri Mar 20 18:00:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 6059011 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 AF7EF9F2A9 for ; Fri, 20 Mar 2015 18:00:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFB9A2050B for ; Fri, 20 Mar 2015 18:00:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD23D204D1 for ; Fri, 20 Mar 2015 18:00:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751127AbbCTSAj (ORCPT ); Fri, 20 Mar 2015 14:00:39 -0400 Received: from mail-ig0-f171.google.com ([209.85.213.171]:33987 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750977AbbCTSAi (ORCPT ); Fri, 20 Mar 2015 14:00:38 -0400 Received: by igcau2 with SMTP id au2so423966igc.1 for ; Fri, 20 Mar 2015 11:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=VxUVGuyqF5x/oEBzxHbxaDHCAnqRbEGmlsrQxSGYbB8=; b=aVZ/9IhfGr6FtLgHglPu7A03WObBOLrjj4HP2HrMkhScmTYXql3x7wc4zw1QMjiox/ ALSGs6+Df4wpaCP8kk+SB4GxcxY9WaVrrPepdtj76vd47v5c/KrmadVOKWm4MZCgECDn sse1beemWOyI5DiAYT5E6R4NGO+I3rZOdOD30= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VxUVGuyqF5x/oEBzxHbxaDHCAnqRbEGmlsrQxSGYbB8=; b=PVa6l10VXlqzBbOlcOhjlE4E+Lak3oo1US1ov13AgR0CWDKXp8fPEbISIvHcEi+yYY 5F1mFV6iQWRQ2lZZU9QJrUP+wtVIX8y84pmmsj7/SBenWDmaMgSDSvnxBfo7jCf7+M9w d4pjVhiM8aITpmtnoODkM5S9j3VFg/JASna0CgJuxyJVkNtjQjnfZr+nOcnK3SaGZIEt lnDmAlEM8Iszz5izuJamk9rZgjm6mpZ3R8QmY06ogLBZsb7NX9BWY4oI36WJ+ZVcJf+C sz/xkWBSzVN2Q4sONrJ/4jDv2PozwYnj+HAHHvhiNusr8z0a19gi4bnL/PtzwHv5aub3 mPrA== X-Gm-Message-State: ALoCoQk07VQ33ZuK6xYDH7qdEjf3yzvzeshpnR2cIviewqyMUbsX1j9yAWdwwLQCjhoQM682TkvF X-Received: by 10.43.77.6 with SMTP id zg6mr5918374icb.68.1426874438048; Fri, 20 Mar 2015 11:00:38 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id x9sm1551670igl.2.2015.03.20.11.00.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 11:00:36 -0700 (PDT) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Cc: Alim Akhtar , Sonny Rao , Andrew Bresticker , Heiko Stuebner , Addy Ke , Alexandru Stan , javier.martinez@collabora.co.uk, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Doug Anderson , chris@printf.net, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mmc: dw_mmc: Don't send clock off command if power is off Date: Fri, 20 Mar 2015 11:00:20 -0700 Message-Id: <1426874420-25103-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 We've already seen that it causes failures if we try to send the "SDMMC_CMD_UPD_CLK" command when power is off to the system. Here's another case where we were doing it: we were sending an SDMMC_CMD_UPD_CLK to set the clock to 0 when the card was already powered off and the clock was already at 0. Let's avoid that command and avoid problems. Signed-off-by: Doug Anderson --- drivers/mmc/host/dw_mmc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 47dfd0e..aeec698 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1172,8 +1172,9 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) break; case MMC_POWER_OFF: - /* Turn clock off before power goes down */ - dw_mci_setup_bus(slot, false); + /* Turn clock off before power goes down; only if powered */ + if (slot->host->vqmmc_enabled) + dw_mci_setup_bus(slot, false); if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);