From patchwork Fri Jan 11 08:30:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1023443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wdz1PYnI"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bbfQ5pyWz9sN9; Fri, 11 Jan 2019 19:30:38 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ghsD3-000582-Jt; Fri, 11 Jan 2019 08:30:33 +0000 Received: from mail-pl1-f195.google.com ([209.85.214.195]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ghsD1-00056P-SG for kernel-team@lists.ubuntu.com; Fri, 11 Jan 2019 08:30:32 +0000 Received: by mail-pl1-f195.google.com with SMTP id p8so6475769plo.2 for ; Fri, 11 Jan 2019 00:30:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=wgIrannsWfX8wZ9pel78yyLwkJiUwK1pjdoJUjciefE=; b=Wdz1PYnIwaP8X+ghkPu6vnYhpKbrfTLTBRm5PtZbnB+S3OYe040rINLrcnxY0harA2 srDFQG3an8LU/MlvEzklVLmrRkQGyFaQQ4QwXgzQ/2wds8avnU25P+4J0+7wNssPxlHm RghNH7ucTUlul1n52B+mUm7GJE56719YIBA0GDaiRv1q+Pk80zog+BUatAOOFRu5fngL 0foGNMQxlXbakk1t0auluP/Xs5SZChIoFdLbjPNx5Xk4a8tH5e+c4zctX5W+oWZ06AjI PVvBFD5pLnh5yyftzrVSc6d0gRt5ecTxPVnHu6QQd8B8zA4woWsHP7Fkrajxvu1vQ49H /T+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=wgIrannsWfX8wZ9pel78yyLwkJiUwK1pjdoJUjciefE=; b=brPIZrkffDoJ8NYdd+up+dcGmM3LvRB9ueMStMC2skHSpPWA4XrX+7EM3EqLh4prXB NIk3zctqT0Yyyegm4H5842ySWCVRiDJxAFLNrguOkaik69/oQg9QrIKXfXvkrhFpADBn OfQnU4BshGJPmaGcF8M2rj+KD14T+fOBnV/95ykv39ZY7d96XYVSFuIhr/CJ+mlTA+dH aH2y+qJOZymTFprDtdRGfYKUC2/u1x7dWaDrx0Gb9D9jkalxx23s0y45LAvmxtdPQki3 5mdT3lLFiZTpCgfqVCVvf1ebTzoHQZv7XRv2uiPGPhDogrndp6gAZPgnfuEgjPUtgpJn gjHg== X-Gm-Message-State: AJcUukePuPJt7FH8N2LmA+wGGwqy22YRh7xiqRe1FrjQXLip5s4b8RUX z2YVfAuClwRhbS2r15xG0ToQ8EJYe3I= X-Google-Smtp-Source: ALg8bN7be+GWg7bBK8Il4SuNVoRPhV8LJdhI75Rx/hwkUSW4ICDW5A7fWfU6tczGOtQCK4YI35zpwA== X-Received: by 2002:a17:902:a60f:: with SMTP id u15mr13082217plq.275.1547195430116; Fri, 11 Jan 2019 00:30:30 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id c13sm115527146pfo.121.2019.01.11.00.30.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 00:30:29 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 03/12][SRU][B][C][D][OEM-B] mmc: rtsx_usb_sdmmc: Don't runtime resume the device while changing led Date: Fri, 11 Jan 2019 16:30:10 +0800 Message-Id: <20190111083019.32135-4-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190111083019.32135-1-acelan.kao@canonical.com> References: <20190111083019.32135-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ulf Hansson BugLink: https://bugs.launchpad.net/bugs/1811337 In case the card has been powered off, it seems silly to continue to allow the led to be updated. Instead let's forbid that, as it enables us to prevent runtime resuming the device and thus avoids wasting energy. Signed-off-by: Ulf Hansson Tested-by: Kai-Heng Feng Tested-by: Oleksandr Natalenko (cherry picked from commit 4bfdd76dcb672dd55121b04ed7f1c1ff4343f1ef) Signed-off-by: AceLan Kao --- drivers/mmc/host/rtsx_usb_sdmmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index 78422079ecfa..bb0ec00ef357 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -1309,14 +1309,18 @@ static void rtsx_usb_update_led(struct work_struct *work) container_of(work, struct rtsx_usb_sdmmc, led_work); struct rtsx_ucr *ucr = host->ucr; - pm_runtime_get_sync(sdmmc_dev(host)); + pm_runtime_get_noresume(sdmmc_dev(host)); mutex_lock(&ucr->dev_mutex); + if (host->power_mode == MMC_POWER_OFF) + goto out; + if (host->led.brightness == LED_OFF) rtsx_usb_turn_off_led(ucr); else rtsx_usb_turn_on_led(ucr); +out: mutex_unlock(&ucr->dev_mutex); pm_runtime_put(sdmmc_dev(host)); }