From patchwork Fri Sep 13 09:41:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 173745 Delivered-To: patches@linaro.org Received: by 2002:ac9:19ad:0:0:0:0:0 with SMTP id d45csp464845oce; Fri, 13 Sep 2019 02:41:23 -0700 (PDT) X-Received: by 2002:a2e:8594:: with SMTP id b20mr28275150lji.232.1568367683025; Fri, 13 Sep 2019 02:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568367683; cv=none; d=google.com; s=arc-20160816; b=uY1NCV6FhOkE+EjE8yXMsB/ur5vH7jTZoiuqqM7RO2C7Y7LnnoQdPT4tCkz3ClqESh twRh3EwFXEkqqnaUUnIHXlfQ3Noj3ErAKh/Wbc8vXsd4RW3TxQpCfkIc/e3gDS0LHCqf qs48xE/bre1S14Ls/aP4fsezpEEJ9J8HAHNiYE/vnQwh6i8BHe9Z3K92KG6Mt00eDGFP ngQTFl/h5SBQVixN0MBzwsiqS5atvIhMQgCz9WNsq8mZR2Nk97CoZqBO7d/vnYsWGV9o v64er3cwAt7/m2Y5yosAFnzXSwEmU9MNA1uNXhyc1TW664VPrdx4f47GxPo89UGOQTyI 2n+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=QS5aLvWZAGl2qy1uqqrDaZesBLdCRvn2tS/IES0IrhM=; b=ECbnySvosfsH6BFOX30P5285mWXRc8KFakvU6PRm2FBkMBUan+mg6hBFBkuwgB+mC6 xhYNwyUmRWHBlLZvB/DZQr5zUr6sszhxoXiLf28h1mSUuFjT7OKiBXE1X0PySTMpkVNp j5LffA/Fg0KslrPQWhvEv7ek3aA5gFet/o3wY+HNxVfEkyrp/txZnGOLsw1IKoKgrfvd 1qVXBSobXcnr7sdiOypBKWSTg51n2r740GDtV/3O6piQpx7ddq2K4SvFlgl7ByPclTez Nn29vYcVssWkComNYPENQx13+Oryc7ze4EyQDSuAl3Simst5OZpHamV4N21ng/PG8VBj Ohbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yZ5hsC3w; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id d27sor8615540lfn.30.2019.09.13.02.41.22 for (Google Transport Security); Fri, 13 Sep 2019 02:41:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yZ5hsC3w; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=QS5aLvWZAGl2qy1uqqrDaZesBLdCRvn2tS/IES0IrhM=; b=yZ5hsC3wpKS6si95BrlMuHu1YR8h/0bTMI9DXnxjZWspdHqN1NRmsaGxp+nAxstv92 1fzPPu9jEAL6CNzjvzEjLp3g5hmREbhMnxAnZKOVckJvwdCAu+bJxIyKdlR0Qi6YVo4b 5OLcr7zH3kOTDBXAfUWTiPfaKSQrrO/oIeQuBf8qX8wUaMyVk37vlWX27hoxlGuF/+UY ZAyTx1v2oq1OSd8OlcaHIAtDfN5ElolhZyhFTyFLrygAk9maOIMXSQWY49hELJZBT2Tn Jp6rEBMG+D8e4yy7qTe/q2oOWmRdxz+x5Puswfi2iho4OcCIWM+ZDvDq2hc0/0gOrJiz qung== 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=QS5aLvWZAGl2qy1uqqrDaZesBLdCRvn2tS/IES0IrhM=; b=RUZAb6VKXktffvFDbUN/ERPy7v2zwo9HuzOZ9VmPVR/lGm+pU+3fmFdAzSfXHidCf5 uKilH9uf3zSEK+9nZ+mwX8t5TNoZv0B0yyA6tRQQcaR2bO/nY3oqeunpYNoVAikg3gx5 81jXZWlTU7YRzQGH2qSxk1ut147XXXQZUJZrbTHFDsYHY3vv01HONAyQFjc20yjgyUBs zYYGDNkxEwit8+d4mat5Ih1xROa64A0TryzOLYR8pdeJeN2moskqpEYZirvm4Nkdtetr ZrXN539tfZWUNJ2OkMLnR9dWONzVtlhpKE1QpEjSv0l9AgqEAo3MdwIJXZdjySwIKVDq S+mw== X-Gm-Message-State: APjAAAViKx8WgyeNV3QmOw0LPJIoe6CsbglfVajarL5j524BNhwnW4mA UxqmVQsbDYWhx3jhH8Z/7pnb4RVc X-Google-Smtp-Source: APXvYqyUxASV7kYcJEmZaWXICNtRekMjOPkhAQ78JgYbxBn5y94tN6W9C5mpRNzDqz1V5ckldlf5eg== X-Received: by 2002:ac2:51cd:: with SMTP id u13mr8658216lfm.135.1568367682684; Fri, 13 Sep 2019 02:41:22 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id h21sm6198268ljg.34.2019.09.13.02.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2019 02:41:22 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Masahiro Yamada , Wolfram Sang Cc: Ulrich Hecht , Simon Horman , Niklas Soderlund , Geert Uytterhoeven , stable@vger.kernel.org Subject: [PATCH 3/3] mmc: tmio: Fixup runtime PM management during remove Date: Fri, 13 Sep 2019 11:41:18 +0200 Message-Id: <20190913094118.21243-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 Accessing the device when it may be runtime suspended is a bug, which is the case in tmio_mmc_host_remove(). Let's fix the behaviour. Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson --- drivers/mmc/host/tmio_mmc_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 32f9679ec42e..9b6e1001e77c 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1274,12 +1274,11 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) struct platform_device *pdev = host->pdev; struct mmc_host *mmc = host->mmc; + pm_runtime_get_sync(&pdev->dev); + if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0000); - if (!host->native_hotplug) - pm_runtime_get_sync(&pdev->dev); - dev_pm_qos_hide_latency_limit(&pdev->dev); mmc_remove_host(mmc); @@ -1288,6 +1287,8 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) tmio_mmc_release_dma(host); pm_runtime_dont_use_autosuspend(&pdev->dev); + if (host->native_hotplug) + pm_runtime_put_noidle(&pdev->dev); pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); }