From patchwork Tue Apr 18 12:32:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 97539 Delivered-To: patches@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1781731qgf; Tue, 18 Apr 2017 05:32:11 -0700 (PDT) X-Received: by 10.28.8.83 with SMTP id 80mr12595641wmi.23.1492518730924; Tue, 18 Apr 2017 05:32:10 -0700 (PDT) Return-Path: Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com. [2a00:1450:400c:c09::236]) by mx.google.com with ESMTPS id b84si15865364wmh.110.2017.04.18.05.32.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2017 05:32:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c09::236 as permitted sender) client-ip=2a00:1450:400c:c09::236; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c09::236 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x236.google.com with SMTP id o81so54897905wmb.1 for ; Tue, 18 Apr 2017 05:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K+XutemgPvfoyqd1a0qMnT4I6wJMVayFsIyBWTgcb28=; b=chsPKxOwdQc4NngcLlIe3v+tvLirrhtrD5v8riP8J8p3lHrdC8uFuPTqdvaOnRV4v9 2ADy2icoRnj9VXB64px9feHEBayAo5ff+SfQOkqlHgyM3WuRK+zpUCvjMC9lWQ30nd77 mB/K7HepEHmsxcCCFLS/j1CZOLKMrbVTn7JNM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K+XutemgPvfoyqd1a0qMnT4I6wJMVayFsIyBWTgcb28=; b=SLzjp5PURgoJSzD8FhbO2wUyknjTPN2Q1oClxRdRte+zpxgmTXT5308fKnE/h8wgio CxOG3adfiwftnRuWESFWfWYPsVnHyJBRXdasNXfSwtvQrMzKYLHuHPmUimGmtzYTQ65b 3DHa2YBXnDd55kyTCJEV3vmxbtxylHdeEC5zkupXXCYAMs+4Q2/HqjsEhZU/5jM2j5HL Ivdf4wGpkjin5PyS11KHtCG8qWYTilofcgoP8xHBQpEN7eTlFwECZIRPjG4TLNm9X+nh hpY59O8HcjiOe/OooyEg1gp10C+VPZd41dAybmVdO5Z27HqdJhJZY+hvsU1AbB9WRPLn gmTw== X-Gm-Message-State: AN3rC/6b1S6TU+iFNqTXXFb9VlZxZsByZuc+ALKSF4QZgNXRE4xzcrZp PUsQ9oVzVdZ5hOwBkYg= X-Received: by 10.28.74.18 with SMTP id x18mr13156538wma.64.1492518730552; Tue, 18 Apr 2017 05:32:10 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id 135sm2528372wmi.1.2017.04.18.05.32.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Apr 2017 05:32:09 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Brian Norris , Shawn Lin , Doug Anderson Subject: [PATCH 3/3] mmc: dw_mmc: Prevent runtime PM suspend when SDIO IRQs are enabled Date: Tue, 18 Apr 2017 14:32:04 +0200 Message-Id: <1492518724-30511-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492518724-30511-1-git-send-email-ulf.hansson@linaro.org> References: <1492518724-30511-1-git-send-email-ulf.hansson@linaro.org> To be able to handle SDIO IRQs the dw_mmc device needs to be powered and providing clock to the SDIO card. Therefore, we must not allow the device to be runtime PM suspended while SDIO IRQs are enabled. To fix this, let's increase the runtime PM usage count while the mmc core enables SDIO IRQs. Later when the mmc core tells dw_mmc to disable SDIO IRQs, we drop the usage count to again allow runtime PM suspend. This now becomes the default behaviour for dw_mmc. In cases where SDIO IRQs can be re-routed as GPIO wake-ups during runtime PM suspend, one could potentially allow runtime PM suspend. However, that will have to be addressed as a separate change on top of this one. Signed-off-by: Ulf Hansson --- drivers/mmc/host/dw_mmc.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.7.4 diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index f086791..4256957 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "dw_mmc.h" @@ -1657,8 +1658,15 @@ static void __dw_mci_enable_sdio_irq(struct dw_mci_slot *slot, int enb) static void dw_mci_enable_sdio_irq(struct mmc_host *mmc, int enb) { struct dw_mci_slot *slot = mmc_priv(mmc); + struct dw_mci *host = slot->host; __dw_mci_enable_sdio_irq(slot, enb); + + /* Avoid runtime suspending the device when SDIO IRQ is enabled */ + if (enb) + pm_runtime_get_noresume(host->dev); + else + pm_runtime_put_noidle(host->dev); } static void dw_mci_ack_sdio_irq(struct mmc_host *mmc)