From patchwork Mon Jun 4 06:30:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10445725 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8E5AB60284 for ; Mon, 4 Jun 2018 06:30:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7948F28B8B for ; Mon, 4 Jun 2018 06:30:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6DF6828B9A; Mon, 4 Jun 2018 06:30:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F04F828B94 for ; Mon, 4 Jun 2018 06:30:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750731AbeFDGaf (ORCPT ); Mon, 4 Jun 2018 02:30:35 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:40185 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750723AbeFDGae (ORCPT ); Mon, 4 Jun 2018 02:30:34 -0400 Received: by mail-lf0-f66.google.com with SMTP id q11-v6so23340986lfc.7 for ; Sun, 03 Jun 2018 23:30:33 -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; bh=uC2ZkqqPQ6i2R/3XSeZZvncMOjNr5ymw+nTiocMZg0k=; b=IXvY2PgSkoQ6j/UG6VorQXuzRvltelACCdvPy5h6JTvxRtPGNAsHMSzhyXy+8em+nI OghLFndwWaNC71mdlag3QsTwtW6+vBk6fTSsoshxQ+aQyHUtBHLASj71HKd/JnLrg+P+ Hemx7MAH/07xYtAyzGdq5HhOf6ynEHNNcObEo= 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; bh=uC2ZkqqPQ6i2R/3XSeZZvncMOjNr5ymw+nTiocMZg0k=; b=obw73e1brl8W3B+YkKt2ugorQd41LoZCa8iKxJGsjgGpp2DHkWJsA2wFcp+SyYSuw8 IDIGM/8Si7svDP8w70ukvc+cCQ2CUiJIaLGbZinUarAvolbyZ+V4Zc69gwfSg6BHlTKG dCeJzws+v+KRenraUbasPleWm7FPqpFPxJB21caUinazKf3tVWXiat876QgYo6XYvdB3 lxS/X1mNd5/btn0rVKdUml65mo9ZowqGMQM1cxKIecmoVvc4gNrlihleL1DcDhvSLBgv 8JrYewhypMgR4iyJ74tYAP4V6HtfTA23J3u4ByxStQx87kT5r4fwlI/xGkkLcyhzCChz HQlg== X-Gm-Message-State: ALKqPwciIMG9DjDgTapGJBeanISbjTh7uw5unM5nlXFxb8yGXXJT8kWo eVu458utsQoVhyjlekdAgTA+thZLdp4= X-Google-Smtp-Source: ADUXVKI8seFiDP+x9PVXHHuDukT3X8mamLMNG6jr/5FfQDtpxpBu4iSAuxdzmY2fLflGIFXVyQvwBw== X-Received: by 2002:a19:f611:: with SMTP id x17-v6mr12264268lfe.116.1528093832524; Sun, 03 Jun 2018 23:30:32 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id s18-v6sm3813171lfc.22.2018.06.03.23.30.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Jun 2018 23:30:31 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Kai-Heng Feng Cc: michal.pecio@gmail.com, Ritesh Raj Sarraf , Bauer Chen , Alan Stern Subject: [PATCH v2 4/4] mmc: rtsx_usb_sdmmc: Re-work card detection/removal support Date: Mon, 4 Jun 2018 08:30:24 +0200 Message-Id: <20180604063024.15629-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The rtsx USB parent device, has logic to detect when a card is inserted into the card slot. Although, the logic can't detect when a card is removed. This makes things a bit tricky, which is why the current method is simply to turn on MMC_CAP_NEEDS_POLL during probe. Using MMC_CAP_NEEDS_POLL means lots of energy being wasted, as the mmc host becomes runtime resumed frequently by the mmc core, while it polls for new cards being inserted. To address this problem, let's start relying on that the rtsx USB driver runtime resumes its child device, which is the rtsx_usb_sdmmc device, when it detects that a new card being inserted. This means dropping MMC_CAP_NEEDS_POLL from being set during probe. Instead let's implement a ->runtime_resume() callback to schedule a detect work and to set MMC_CAP_NEEDS_POLL. In this way, polling is enabled as long as there is card inserted, thus we can rely on the mmc core to detect also when the card becomes removed. Furthermore, to avoid polling forever after a card has been removed, let's implement a ->runtime_suspend() callback and make it clear MMC_CAP_NEEDS_POLL. Signed-off-by: Ulf Hansson --- Changes in v2: - Schedule a detect work only when there seems to be a card inserted. --- drivers/mmc/host/rtsx_usb_sdmmc.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index ca0ab8eb30c3..669c6ab021c8 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -1324,7 +1325,7 @@ static void rtsx_usb_init_host(struct rtsx_usb_sdmmc *host) mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR50 | - MMC_CAP_NEEDS_POLL | MMC_CAP_ERASE | MMC_CAP_SYNC_RUNTIME_PM; + MMC_CAP_ERASE | MMC_CAP_SYNC_RUNTIME_PM; mmc->caps2 = MMC_CAP2_NO_PRESCAN_POWERUP | MMC_CAP2_FULL_PWR_CYCLE | MMC_CAP2_NO_SDIO; @@ -1429,6 +1430,31 @@ static int rtsx_usb_sdmmc_drv_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int rtsx_usb_sdmmc_runtime_suspend(struct device *dev) +{ + struct rtsx_usb_sdmmc *host = dev_get_drvdata(dev); + + host->mmc->caps &= ~MMC_CAP_NEEDS_POLL; + return 0; +} + +static int rtsx_usb_sdmmc_runtime_resume(struct device *dev) +{ + struct rtsx_usb_sdmmc *host = dev_get_drvdata(dev); + + host->mmc->caps |= MMC_CAP_NEEDS_POLL; + if (sdmmc_get_cd(host->mmc) == 1) + mmc_detect_change(host->mmc, 0); + return 0; +} +#endif + +static const struct dev_pm_ops rtsx_usb_sdmmc_dev_pm_ops = { + SET_RUNTIME_PM_OPS(rtsx_usb_sdmmc_runtime_suspend, + rtsx_usb_sdmmc_runtime_resume, NULL) +}; + static const struct platform_device_id rtsx_usb_sdmmc_ids[] = { { .name = "rtsx_usb_sdmmc", @@ -1444,6 +1470,7 @@ static struct platform_driver rtsx_usb_sdmmc_driver = { .id_table = rtsx_usb_sdmmc_ids, .driver = { .name = "rtsx_usb_sdmmc", + .pm = &rtsx_usb_sdmmc_dev_pm_ops, }, }; module_platform_driver(rtsx_usb_sdmmc_driver);