Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3141860ybj; Mon, 23 Sep 2019 15:38:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxffYAZ3AjujZA1FsShN02Tu16KUZg21Jd07C8NIVaU9GV2/KPoHWaE1MbRTXq94+7Hao8 X-Received: by 2002:aa7:d692:: with SMTP id d18mr2508431edr.95.1569278316725; Mon, 23 Sep 2019 15:38:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569278316; cv=none; d=google.com; s=arc-20160816; b=CFncz8bj3GxcCd4VRY1oNSn9O23Wl/2JSE0OSWeEiMoyuwC9HUi45iVvrnVvfNmH17 jQjw1zMMNTTcd6GNX5dAAV/3614Mv+z0uhHmAw9E/dgNted6plIED35ta1Cxai32WhrQ I8i5tpoBAkAZ/tqA1zssrPQBYLVCqwhf0M2wUlNixcROz0QwxOhiAG7fh1/MQILEbVeU OAGalNderu8pm7gPieo864ArJOiwVSltpEOrwAhQ5v9VNNx3zFeIKDKoNQt1+yapIUsS I2FFfEe9IWFDAvF/Y2Rqe+c/2IzXODiLYgon+88E7TR/UidHf9DjE1bdWnXjscZi9b3o eDTw== 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=7xusYlWhFKzzWiCXxRIOQvSBsEVKu1kjtnfarMQ9cYQ=; b=LyHXTyox9KmZdjFfWF2VKCGMjJ1eW+BknfvuBoa8GuEgKdzXJwPUdFysX9b1Nw3Tuw E7NyGPv0Z5kxHf2UR9syzoahttFR/mf+evAT3UwUe7jwofHpmEh61VEaw3LsnLup7nL0 ui7qzuNt22icVXDIQ8XsW7IsMD29Lx2SojFT9TiWsIa4WUSvqUQCOSH2Y3lH/TFnt3FW RIMyXyRoq4fMlQHVepXDynaK9Dk6nENdAxfab8LfnKes1QZu9f/g6nlbP42vnMIVuVUD uZQI+rWDY9XziFUHFfc0sjsB5RGG9QXNZCbWgnOTvA5uf3biGHNx8/kuycU02OW/xp+t 0QUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MEm2Am+P; 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 d22si7616861ede.131.2019.09.23.15.38.13; Mon, 23 Sep 2019 15:38:36 -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=MEm2Am+P; 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 S2392192AbfIVStR (ORCPT + 99 others); Sun, 22 Sep 2019 14:49:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:45898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391881AbfIVSs5 (ORCPT ); Sun, 22 Sep 2019 14:48:57 -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 8BDF7208C2; Sun, 22 Sep 2019 18:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178136; bh=dWZQeEXELj4oPCyvPKatzqbyZkyD3e/BEQa+Mm6YXN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MEm2Am+PyUhnIQrkbGpCHMx9En0eHFrm7u7c/VaSMlAcWAmVBQ9sD91ANnW3N04Cd Oxyv27gQlzhJ1akcpmQAeJDlUnBYD2xq4WjVG0Ky77dkohBueZldEWWyNnpXXpPr1f cB3Hs97Gnmfsm4FyGvfIkXVJLB16ylb4I0Y3Xx4k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 187/203] mmc: mtk-sd: Re-store SDIO IRQs mask at system resume Date: Sun, 22 Sep 2019 14:43:33 -0400 Message-Id: <20190922184350.30563-187-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 1c81d69d4c98aab56c5a7d5a810f84aefdb37e9b ] In cases when SDIO IRQs have been enabled, runtime suspend is prevented by the driver. However, this still means msdc_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 mtk-sd 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 mtk-sd 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 mtk-sd driver, so let's do that. Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mtk-sd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 33f4b6387ef71..978c8ccce7e31 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -2421,6 +2421,9 @@ static void msdc_restore_reg(struct msdc_host *host) } else { writel(host->save_para.pad_tune, host->base + tune_reg); } + + if (sdio_irq_claimed(host->mmc)) + __msdc_enable_sdio_irq(host, 1); } static int msdc_runtime_suspend(struct device *dev) -- 2.20.1