From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 647502690D5; Tue, 8 Apr 2025 11:50:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113017; cv=none; b=XgxvsXoPx+x9Fp/a9Vh+wUt0U8AbexZlvLeaLESwyWMRV+t56DhUD7nPTBy1XYEAFp0j4bIgfo4mBfv0CtfLUVShgbrizZgeoUUi9+bo8fWkuasE43LLz26dS8+yz5yHTpv23tHs+3lZrzS0DPEb6wxhjcUwYoMm5SYz0wPZbCo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113017; c=relaxed/simple; bh=O58U0y0tb/aBWKbHCnMwQMfoA/X5vekrc6SOwSqQ4xA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pXdrfkOS3UgqY0qxJQeJBvuRtD4Bd2xuIySxwEkIWqGPzjzfR1xp1Px2eb8/vJ2ywWbEDuaHgt7WAR145DUOL2iSlFeEd5KqkQhq5HKbTODftV3iDcSpTMeJpOBjmHpggwNDZp6esTukZYu8V2sm4RNDz+Wu7csLYljStZdMuFQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KudN9+uw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KudN9+uw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE4F3C4CEE5; Tue, 8 Apr 2025 11:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113017; bh=O58U0y0tb/aBWKbHCnMwQMfoA/X5vekrc6SOwSqQ4xA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KudN9+uwg3MnRQuP/O0HjoGszTK84DwySBT6l3KS7i/Zc1j8IFdXN9bYj8dGbpHo2 oUzj14BsBCvyVya28V9CnKXYGq8ZVOnc0AH44nLFe14j9VEnTqBpevBEGpNUaNDIjH 3rc2Th+OdmsFtviU435iYZltfoqN0u0sagNWneVU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kamal Dasu , Florian Fainelli , Ulf Hansson , Sasha Levin Subject: [PATCH 5.15 254/279] mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops Date: Tue, 8 Apr 2025 12:50:37 +0200 Message-ID: <20250408104833.237568687@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104826.319283234@linuxfoundation.org> References: <20250408104826.319283234@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kamal Dasu [ Upstream commit 723ef0e20dbb2aa1b5406d2bb75374fc48187daa ] cqhci timeouts observed on brcmstb platforms during suspend: ... [ 164.832853] mmc0: cqhci: timeout for tag 18 ... Adding cqhci_suspend()/resume() calls to disable cqe in sdhci_brcmstb_suspend()/resume() respectively to fix CQE timeouts seen on PM suspend. Fixes: d46ba2d17f90 ("mmc: sdhci-brcmstb: Add support for Command Queuing (CQE)") Cc: stable@vger.kernel.org Signed-off-by: Kamal Dasu Reviewed-by: Florian Fainelli Link: https://lore.kernel.org/r/20250311165946.28190-1-kamal.dasu@broadcom.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-brcmstb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c index 8fb23b1228875..21574f0607f8b 100644 --- a/drivers/mmc/host/sdhci-brcmstb.c +++ b/drivers/mmc/host/sdhci-brcmstb.c @@ -392,8 +392,15 @@ static int sdhci_brcmstb_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host); + int ret; clk_disable_unprepare(priv->base_clk); + if (host->mmc->caps2 & MMC_CAP2_CQE) { + ret = cqhci_suspend(host->mmc); + if (ret) + return ret; + } + return sdhci_pltfm_suspend(dev); } @@ -411,6 +418,9 @@ static int sdhci_brcmstb_resume(struct device *dev) ret = clk_set_rate(priv->base_clk, priv->base_freq_hz); } + if (host->mmc->caps2 & MMC_CAP2_CQE) + ret = cqhci_resume(host->mmc); + return ret; } #endif -- 2.39.5