Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3246533ybj; Mon, 23 Sep 2019 17:49:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzj5OfeaenKlLNQSeCx/byjeec7xMrSom48+AEQUf/X7eqn16E6E0wajW2tN68GFLPn6Zl X-Received: by 2002:a17:906:1c05:: with SMTP id k5mr237757ejg.286.1569286184652; Mon, 23 Sep 2019 17:49:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569286184; cv=none; d=google.com; s=arc-20160816; b=G3ceQoyRXo5xONNsNJjtWONvtuTT8MXF4IlJUbXcHjb5kJHF1AyD5M+lTFHdNyvWtD 8PqiIXA8oGCex9NNM6kav0frHHWTmL3LyMSXLQI2F213W+3pbsK17ss1fMLocsebxy+X BdXjSwHFROR+eYt2VWSNtsSEHB3wk/JaoehyWJp1jaM7grd+1vEiyZXeiLpc1xi2dyu3 eIids7kqoWh1RC+A2fua3tCMZSp+yRvnW6MNo/B4v1DCTUBa4cq59jHqZPl17FM6tJnN +UzsasF2DfCuUGataPYOr3dL94egIAbB+k6PKgEGjGht6YAsOL9fW0FxYbF3kIJcAaPl z+og== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dZ41bbHxLff5p0zCXST/a9g6Cmr6W9+L9hwnnBzBqxk=; b=JVN8zevbpL5E/vFN+Ec51Fmd+9jYuvVaKsinTkAUh8CgY7nEJNalrCv7tJslgzSyAN WvS30hOIkl5S8itDj/+ffKR97YA5efKf67y7kqZaZXm58pSvsnRupou0ebSYkaoSK3Mh wAcx6j39AuNxtqoGMtROZ3OMMKgncTcIIc1Yu/zOAhAZclxpKT1KJ4AEL16uHdGaLg3z zMwXthCnK20Ak4jvav8shqE2HS4ROMtTyVHqGpjG+PPGo1wxbqOjHDDyjqyX1Wdy76FR K5EbPeWCVY6CYGZG+xIYaC9yYtW3zRLL0vXYeqzfN4rcf6E35YWFl7FNKMJloXdv3Yx+ TT6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="R/e9FwQ1"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i13si109794edv.182.2019.09.23.17.49.21; Mon, 23 Sep 2019 17:49:44 -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="R/e9FwQ1"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392120AbfIVStO (ORCPT + 99 others); Sun, 22 Sep 2019 14:49:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:45856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391849AbfIVSsy (ORCPT ); Sun, 22 Sep 2019 14:48:54 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E179421A4C; Sun, 22 Sep 2019 18:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178133; bh=seL4JwafJp8UZCv4oDKz5AUomDKOVrqUXEXpQSwlfAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R/e9FwQ1MW20+xas3O2McVpbTs5r+RJarKz9bVNGYm2fWzvZvJ40F+8/rlHI2Sex1 Rie02hHJFXPOqRcGfbRLYCwgrs10JfHWprV1aVQ0Ghfbv6EMT+Ca5zyjODhg+Ey0GD RxGThTUv2J2q85sHA6IRJZGo3+t+1Y3XOVqJFShM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ulf Hansson , Matthias Kaehlcke , Douglas Anderson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 185/203] mmc: dw_mmc: Re-store SDIO IRQs mask at system resume Date: Sun, 22 Sep 2019 14:43:31 -0400 Message-Id: <20190922184350.30563-185-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ulf Hansson [ Upstream commit 7c526608d5afb62cbc967225e2ccaacfdd142e9d ] In cases when SDIO IRQs have been enabled, runtime suspend is prevented by the driver. However, this still means dw_mci_runtime_suspend|resume() gets called during system suspend/resume, via pm_runtime_force_suspend|resume(). This means during system suspend/resume, the register context of the dw_mmc device most likely loses its register context, even in cases when SDIO IRQs have been enabled. To re-enable the SDIO IRQs during system resume, the dw_mmc driver currently relies on the mmc core to re-enable the SDIO IRQs when it resumes the SDIO card, but this isn't the recommended solution. Instead, it's better to deal with this locally in the dw_mmc driver, so let's do that. Tested-by: Matthias Kaehlcke Signed-off-by: Ulf Hansson Reviewed-by: Douglas Anderson Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/dw_mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index eea52e2c5a0ce..79c55c7b4afd9 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3460,6 +3460,10 @@ int dw_mci_runtime_resume(struct device *dev) /* Force setup bus to guarantee available clock output */ dw_mci_setup_bus(host->slot, true); + /* Re-enable SDIO interrupts. */ + if (sdio_irq_claimed(host->slot->mmc)) + __dw_mci_enable_sdio_irq(host->slot, 1); + /* Now that slots are all setup, we can enable card detect */ dw_mci_enable_cd(host); -- 2.20.1