From patchwork Wed Sep 18 06:18:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 173951 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2066449ill; Tue, 17 Sep 2019 23:29:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXiMRa/EQTDKcJvw80fOmgf4Lw6e7yuoTlItiswMTMehT9AXuYYJ7KTCs/f/DUwwN/TJ4d X-Received: by 2002:a17:906:ecea:: with SMTP id qt10mr8250922ejb.23.1568788197786; Tue, 17 Sep 2019 23:29:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568788197; cv=none; d=google.com; s=arc-20160816; b=m08ZInI5waf/xrO77g5qN7Yxi/y+1KbS72hZAQRzTGuwLmNLPEtMYBirDuehYqnmOF o7QjEwQbqTchPgoddvaWIRG6h8J6FzS6/I3pPrUiEdRdx6eGqzDVrEnIhmHadwnAMjXY 1rvVqdXlx3sZXS9GEPtKFk9O3KGOgbDAxQk3mgE0p4cxPr+Y/I/sWWZvIHePwgTjJHcp YWM12YgkCPQZuNjC5D0Jj5W0Gd6tzuLeItj8H/vQEsrgvnyrObJYFKLPti++saBTOnjw GdRk8LY7jbf3Wz/lDYET7Gobj+xkZkTiH0nCR5caXfbdXdzruiW6mrPVRD6ZYUZKLr00 SBNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qp0rzK091pZLIVzmkFX8vFmx5GwTwnpG5ES3Qn3Ec/E=; b=STrB8sWzdMtErNcx2j7PL+QuRXdmgdce20OX568u2LlCwxCgQ2ZVattEjw0yJ7uv2b vuLyCdNv9D35HKMlsT/uaE2DhsMIHA++HlYqwOpvSpKf3buwz/5Yk+tnrpSZTSuXMKoa Pz73/BXe5qFc/LcJhnseoyWJnd0uTCNSxNkKe0liWl/MIlUXllScx3zEmR9uK9A/FyGj 4ed7pQeH6J25PfCzwry4YoY5o8zf20ev9x9u4c4lJUuGzQMtirGu+zw6QWzXUz+EMqQZ R2D/haWFukRWdbjW3G6UugQXcl4+jfW65yxQ95II/w7spUcUQaQ/QmvXyJ2hPWrQ9Wl8 nEPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0NFQBDEm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jz5si2219314ejb.119.2019.09.17.23.29.57; Tue, 17 Sep 2019 23:29:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0NFQBDEm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730050AbfIRGZY (ORCPT + 27 others); Wed, 18 Sep 2019 02:25:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:46264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729345AbfIRGZV (ORCPT ); Wed, 18 Sep 2019 02:25:21 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 58AF821924; Wed, 18 Sep 2019 06:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568787919; bh=7HJG+tyke0aMUoyf9Jd+F8sWEbOTMi+IfHKsAHxKB3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0NFQBDEmuYAFm3EByUGNC6mET7y5UKh3vxl+Z/qLAXVoWJMiPriOI6/qpPIjoi5TI jIgoIFwgiB0oyAfo6bgrsr6bzAO413mINL/SDyXFyx6IbW/aJtVTJJKF46AHS0v7/G NPe1UcSb0wmVywkCNZgc2zgbz/PflltHAK1DKZvk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ulf Hansson , Geert Uytterhoeven Subject: [PATCH 5.2 31/85] mmc: tmio: Fixup runtime PM management during remove Date: Wed, 18 Sep 2019 08:18:49 +0200 Message-Id: <20190918061235.139292345@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061234.107708857@linuxfoundation.org> References: <20190918061234.107708857@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ulf Hansson commit 87b5d602a1cc76169b8d81ec2c74c8d95d9350dc upstream. 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 Tested-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/tmio_mmc_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1284,12 +1284,11 @@ void tmio_mmc_host_remove(struct tmio_mm 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); @@ -1298,6 +1297,8 @@ void tmio_mmc_host_remove(struct tmio_mm 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); }