From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f98.google.com (mail-pj1-f98.google.com [209.85.216.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B616443E2F for ; Tue, 4 Aug 2026 20:38:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.98 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785875917; cv=none; b=JbljGozq7qNvh6W+2PFRVLycBV3Jjtpbv1hS1CaQP82i3KEqz3ncu1Bo9YwzD5RwQry2rHuq+O8Cf57COfytWAFdC4RUTtUEaVTPHMmNCsFKmM/0d8fOQZBO/7JA3M9WtuElwzCkPPuWwiHpmYy9w4s4xbM/wUgXxjnRHmRaWXk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785875917; c=relaxed/simple; bh=vGhPuXq1iNs0S9LWh5B+ANM3UKDA3I+HCz4oggIpVgE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e9mye/umqmN3mPQxDOO/98vyXy9BfilPJtLVxuYbYB8ko8XwnQoBg+cAxT/jBvg7wSPC/Hw7qd/LlCoDHtaZTRqnB+ovQGWYFz3y2tKp4uOAPHglMLZTIAAT3Ly5KEpmBPN2IQbYbKtJOaVkbc+zkLgdODWB7UbbsoLKZntqxbM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=IMIcAum5; arc=none smtp.client-ip=209.85.216.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="IMIcAum5" Received: by mail-pj1-f98.google.com with SMTP id 98e67ed59e1d1-383b4a3755fso215549a91.3 for ; Tue, 04 Aug 2026 13:38:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785875915; x=1786480715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=w1SOtiVsmUE6ZgXMlvd++4bCVWf5EA4Vx02vkVKxhPM=; b=JWlrqeVXJdfJnGNd2anhwlBuW5U5KPB7MAu3gli/bhcllnIalffK3wtAY2d8Qe9SxE NGujlMkOxXzzUv2OISHFmEXfI8vtfX0FVPsjWuws/YZc6AK+i4CQVkvzwR2Qvr72iFkn FK6LfyX1x869EgmBC1WsHj6un4FfkAjmS6qYOfc1Xh6TQwWULOuDfRspA/0f6mES+qPb XasxRudNPuKQiXZudzbxl1gUlBqz0EXmKJIB0Dz8NEURoL3yTF8B7/DUvW+O0kWEueFZ 8jhPF1c54Z8zKaTGU7MUFIscBDgNdHWdBgIqYJQop2UPr+HmuRXQD/wYd7GqcROGcIam 8lgA== X-Forwarded-Encrypted: i=1; AHgh+RqN2orMePVPIyrNdZ6v6xsWuCxjoki9V+UsisSwlJLGwrIBLmxtxHQv30pUP98iyVFsEfg1LwLO2CGX@vger.kernel.org X-Gm-Message-State: AOJu0Yzp5js7nseHuUtwP1Qdmm80O31a6aJhGq8op6E/lKj8X4X5lyTj KXgbnPpaxl1JeXalLeZ5D7qWEbOh8nEW7PPrYDG7XxEBkyZO6n+qggE9hIdOYGy+wXt+Usn6v0W kAO5VuO9z/cFuetM+4dr1BlJx/fP1VwmOZjZwRZx24V3KR6EBuhju2u28M/8K4AAHgXE5osWKpB r55Cf71NXG1BhPco4zmGvvR5vasgF3DVR0v2kaUIs30PMFB+8rrufrNyV+pGYOB3Oii8LmC/tlE 661E1Actfbizw== X-Gm-Gg: AR+sD10/VBINxed2No6oEXvKFP4O0TOsy2ElBqZYOvNqdV+YldbwHRTJ3iLfJwBrqQZ k+S2wkgEVtH0pS4uWzvJuTB1O/3T01f2IMsfCctwTl7Sigz2ZK68bAJ7hZjTqEDmDP5h4uADZnH 7bReVfcnixCdPNDpF0OL40pAx1+gEv4nLLP6vGgHzs/D35rSkBAmJ37mUF2LO2rcPz1m+P2u79P twySb+0HEbZ9Sr9EaAf44LzI+i85t+1cGtejlU5QERczv5xnuMTS0e7O9EEvE79gY6EpWaiI5TC D8e32+OtcwxcBliJDde/GDF6rVSyAQ8ciK9w6HJebsCoCuq9i67I4ACohrPGDx2wuHQcOavGQKM dKa3grvlWSciEJRPK02w8yaj6A/Fip6WGwPXPPbnHtoRl0oh3PWa0nLKTu2kSvwprX70L+QGjJR 32X1J9R64rKfTxX9rKRsOLvxmNCJ9cfCWI X-Received: by 2002:a17:90b:4d91:b0:36d:b424:4f17 with SMTP id 98e67ed59e1d1-3903c53799cmr1293189a91.1.1785875914302; Tue, 04 Aug 2026 13:38:34 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-26.dlp.protect.broadcom.com. [144.49.247.26]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-38fec134e0fsm359629a91.8.2026.08.04.13.38.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Aug 2026 13:38:34 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-934979ee9f1so29988185a.2 for ; Tue, 04 Aug 2026 13:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1785875913; x=1786480713; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=w1SOtiVsmUE6ZgXMlvd++4bCVWf5EA4Vx02vkVKxhPM=; b=IMIcAum5+dXw+SKbozC04+S2X3mAFqObSAMX14tdJ2ZGrGNrbMWhmmvwWTaeIf5ZCO eXIuyBLlegt9bQ+zT7S6p3yix0vfmqwg3lrq3/W041trg+9VkDpzGEpDFNdzR71jjJZ3 Oow7C3VmbuoCpNvnQZ2Z5kdUN8l/LawxIrQa0= X-Forwarded-Encrypted: i=1; AHgh+RohqQKacf2gPXzyi44wiv3bPM5Vac9DOvfA8yxMkubDBCZgwYNE/SP8Bi2nXVosnocdbIQ/t1VHFLLL@vger.kernel.org X-Received: by 2002:a05:620a:a00c:b0:92e:6c8a:2a39 with SMTP id af79cd13be357-9364915b1d3mr120054385a.13.1785875912858; Tue, 04 Aug 2026 13:38:32 -0700 (PDT) X-Received: by 2002:a05:620a:a00c:b0:92e:6c8a:2a39 with SMTP id af79cd13be357-9364915b1d3mr120047085a.13.1785875912290; Tue, 04 Aug 2026 13:38:32 -0700 (PDT) Received: from mail.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9364a52dbeesm11089085a.30.2026.08.04.13.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 13:38:31 -0700 (PDT) From: Kamal Dasu To: Ulf Hansson Cc: Kamal Dasu , Florian Fainelli , Wolfram Sang , Oleksij Rempel , Avri Altman , Pedro Demarchi Gomes , Erick Shepherd , Adrian Hunter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/3] mmc: core: Honor keep-power-in-suspend and reset-card-at-resume for (e)MMC Date: Tue, 4 Aug 2026 16:38:18 -0400 Message-Id: <20260804203818.881765-4-kamal.dasu@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260804203818.881765-1-kamal.dasu@broadcom.com> References: <20260804203818.881765-1-kamal.dasu@broadcom.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e On some platforms, firmware accesses the (e)MMC card directly during resume from Suspend-to-DRAM, before the kernel's own resume path has run, in order to load boot code. This requires the card to remain powered and responsive throughout suspend: putting it to sleep, sending it a power-off notification, or removing its supply is not safe, since firmware needs to talk to a live card. Since the card is never power-cycled, nothing else resets it back to a known state before the kernel reuses it after resume. keep-power-in-suspend / MMC_PM_KEEP_POWER already exist for the first part, but are only consumed in the SDIO suspend/resume path (mmc_sdio_suspend()/mmc_sdio_resume()), gated on a per-function runtime request via sdio_set_host_pm_flags(). (e)MMC has no equivalent function-driver layer to make that request, and the requirement here is a fixed platform characteristic rather than a per-cycle one, so _mmc_suspend() checks host->pm_caps directly instead of pm_flags. When pm_caps has MMC_PM_KEEP_POWER set and pm_type is MMC_POWEROFF_SUSPEND, skip the poweroff-notify/sleep/power-off sequence entirely: deselect the card and mark it suspended. The pm_type check matters because _mmc_suspend() is also called for shutdown, driver unbind, and undervoltage, none of which are guaranteed a subsequent _mmc_resume() call, so those still need the normal power-off path. reset-card-at-resume covers the second part: when set, _mmc_resume() resets the host to its initial bus state the same way _mmc_hw_reset() does for a non-power-cycle reset, before mmc_power_up() and mmc_init_card() re-identify the card. This is independent of MMC_PM_KEEP_POWER in the code, though on brcmstb both capabilities are set together, since keeping the card powered is what creates the unknown-state problem reset-card-at-resume addresses. host->pm_flags is set alongside marking the card suspended, and cleared in _mmc_resume(), so host controller resume handlers can tell power was preserved if they need to. Reported-by: Florian Fainelli Closes: https://lore.kernel.org/r/20260413180551.3683969-1-florian.fainelli@broadcom.com/ Signed-off-by: Kamal Dasu --- Changes in v6: - Reworked around Ulf's two-property split: dropped the unconditional mmc_set_clock()/mmc_set_initial_state() reset from the suspend-side fast path, and instead perform it in _mmc_resume(), gated on the new MMC_CAP2_RESET_AT_RESUME (from reset-card-at-resume), matching the property's name and description ("before the card can be used, it must be reset"). - No longer touches MMC_CAP2_NO_POWEROFF_SUSPEND/no-mmc-poweroff- suspend at all -- that capability and property are gone, per the v4 rework; this patch only adds MMC_CAP2_RESET_AT_RESUME. Changes in v5: - Only set host->pm_flags |= MMC_PM_KEEP_POWER after mmc_deselect_cards() succeeds, instead of unconditionally before it. Otherwise, if the deselect fails, the card is never marked suspended, _mmc_resume() takes its early exit, and the flag never gets cleared -- leaking it for the rest of uptime. Changes in v4: - Gated the fast path on pm_type == MMC_POWEROFF_SUSPEND; it was previously unconditional, so it wrongly skipped the required power-off/notify handling during shutdown, unbind and undervoltage as well. - Set/clear host->pm_flags |= MMC_PM_KEEP_POWER around the suspend/ resume, mirroring the SDIO convention, so host controller resume handlers can tell power was preserved and perform a soft resume sequence instead of assuming power was lost. - Dropped MMC_CAP2_NO_POWEROFF_SUSPEND and the no-mmc-poweroff- suspend DT property entirely. Reuse keep-power-in-suspend / MMC_PM_KEEP_POWER instead, per Krzysztof's point that the new property described the same contract as the existing one. _mmc_suspend() now checks host->pm_caps directly rather than pm_flags, since (e)MMC has no per-function driver to make the dynamic sdio_set_host_pm_flags()-style request SDIO uses. Changes in v3: - Reworked _mmc_suspend() to skip poweroff-notify/sleep/power-off entirely, not just SLEEP, per Ulf. - Renamed to MMC_CAP2_NO_POWEROFF_SUSPEND/no-mmc-poweroff-suspend. Changes in v2: - Replaced the card-level MMC_QUIRK_BROKEN_SLEEP quirk with a host capability, per Ulf. - Added Reported-by/Closes crediting Florian. drivers/mmc/core/host.c | 2 ++ drivers/mmc/core/mmc.c | 33 +++++++++++++++++++++++++++++++++ include/linux/mmc/host.h | 1 + 3 files changed, 36 insertions(+) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index b7ce3137d452..1622f7846441 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -400,6 +400,8 @@ int mmc_of_parse(struct mmc_host *host) if (device_property_read_bool(dev, "no-mmc-hs400")) host->caps2 &= ~(MMC_CAP2_HS400_1_8V | MMC_CAP2_HS400_1_2V | MMC_CAP2_HS400_ES); + if (device_property_read_bool(dev, "reset-card-at-resume")) + host->caps2 |= MMC_CAP2_RESET_AT_RESUME; /* Must be after "non-removable" check */ if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) { diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 05444ecf3909..f85e034c79ed 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2157,6 +2157,26 @@ static int _mmc_suspend(struct mmc_host *host, enum mmc_poweroff_type pm_type) goto out; } + /* + * Keep the card powered across an actual suspend; shutdown, unbind + * and undervoltage still need the normal power-off path below, + * since they aren't guaranteed a subsequent _mmc_resume(). + * + * Check pm_caps, not pm_flags: unlike SDIO, (e)MMC has no + * per-function driver to request this via + * sdio_set_host_pm_flags(), so it's a fixed platform trait here. + */ + if (pm_type == MMC_POWEROFF_SUSPEND && + (host->pm_caps & MMC_PM_KEEP_POWER)) { + if (!mmc_host_is_spi(host)) + err = mmc_deselect_cards(host); + if (!err) { + host->pm_flags |= MMC_PM_KEEP_POWER; + mmc_card_set_suspended(host->card); + } + goto out; + } + if (mmc_card_can_poweroff_notify(host->card) && mmc_host_can_poweroff_notify(host, pm_type)) err = mmc_poweroff_notify(host->card, notify_type); @@ -2217,9 +2237,22 @@ static int _mmc_resume(struct mmc_host *host) if (!mmc_card_suspended(host->card)) goto out; + /* + * Firmware or other hardware may have accessed the card while it + * stayed powered through suspend, leaving it in a state the kernel + * can no longer assume it knows. Reset the host to its initial bus + * state like _mmc_hw_reset() does for a non-power-cycle reset, + * before mmc_init_card() re-identifies the card. + */ + if (host->caps2 & MMC_CAP2_RESET_AT_RESUME) { + mmc_set_clock(host, host->f_init); + mmc_set_initial_state(host); + } + mmc_power_up(host, host->card->ocr); err = mmc_init_card(host, host->card->ocr, host->card); mmc_card_clr_suspended(host->card); + host->pm_flags &= ~MMC_PM_KEEP_POWER; out: mmc_release_host(host); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index ba84f02c2a10..14a407a9f9b7 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -463,6 +463,7 @@ struct mmc_host { #define MMC_CAP2_CRYPTO 0 #endif #define MMC_CAP2_ALT_GPT_TEGRA (1 << 28) /* Host with eMMC that has GPT entry at a non-standard location */ +#define MMC_CAP2_RESET_AT_RESUME (1 << 29) /* Card must be reset before use at resume */ bool uhs2_sd_tran; /* UHS-II flag for SD_TRAN state */ bool uhs2_app_cmd; /* UHS-II flag for APP command */ -- 2.34.1