From: Yann Gautier <yann.gautier@foss.st.com>
To: Rob Herring <robh+dt@kernel.org>, Ulf Hansson <ulf.hansson@linaro.org>
Cc: <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Christophe Kerello <christophe.kerello@foss.st.com>,
Linus Walleij <linus.walleij@linaro.org>,
Ludovic Barre <ludovic.barre@foss.st.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Russell King <linux@armlinux.org.uk>, Marek Vasut <marex@denx.de>,
<kernel@dh-electronics.com>,
Manivannan Sadhasivam <mani@kernel.org>,
Grzegorz Szymaszek <gszymaszek@short.pl>,
Yann Gautier <yann.gautier@foss.st.com>
Subject: [PATCH 3/3] mmc: mmci: manage MMC_PM_KEEP_POWER per variant config
Date: Fri, 4 Mar 2022 14:51:34 +0100 [thread overview]
Message-ID: <20220304135134.47827-4-yann.gautier@foss.st.com> (raw)
In-Reply-To: <20220304135134.47827-1-yann.gautier@foss.st.com>
Add a disable_keep_power field in variant_data struct. The
MMC_PM_KEEP_POWER flag will be enabled if disable_keep_power is not set.
It is only set to true for stm32_sdmmc variants.
The issue was seen on STM32MP157C-DK2 board, which embeds a wifi chip.
It doesn't correctly support low power, and we need to unbind the wifi
driver before a suspend sequence. But the wifi chip firmware is then
lost, and the communication with SDIO fails if MMC_PM_KEEP_POWER is
enabled.
The flag can still be enabled through DT property: keep-power-in-suspend.
Signed-off-by: Yann Gautier <yann.gautier@foss.st.com>
---
drivers/mmc/host/mmci.c | 5 ++++-
drivers/mmc/host/mmci.h | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 45b8608c935c..0e2f2f5d6a52 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -274,6 +274,7 @@ static struct variant_data variant_stm32_sdmmc = {
.busy_detect = true,
.busy_detect_flag = MCI_STM32_BUSYD0,
.busy_detect_mask = MCI_STM32_BUSYD0ENDMASK,
+ .disable_keep_power = true,
.init = sdmmc_variant_init,
};
@@ -301,6 +302,7 @@ static struct variant_data variant_stm32_sdmmcv2 = {
.busy_detect = true,
.busy_detect_flag = MCI_STM32_BUSYD0,
.busy_detect_mask = MCI_STM32_BUSYD0ENDMASK,
+ .disable_keep_power = true,
.init = sdmmc_variant_init,
};
@@ -2172,7 +2174,8 @@ static int mmci_probe(struct amba_device *dev,
host->stop_abort.flags = MMC_RSP_R1B | MMC_CMD_AC;
/* We support these PM capabilities. */
- mmc->pm_caps |= MMC_PM_KEEP_POWER;
+ if (!variant->disable_keep_power)
+ mmc->pm_caps |= MMC_PM_KEEP_POWER;
/*
* We can do SGIO
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index e1a9b96a3396..2cad1ef9766a 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -361,6 +361,7 @@ struct variant_data {
u32 opendrain;
u8 dma_lli:1;
u32 stm32_idmabsize_mask;
+ u8 disable_keep_power:1;
void (*init)(struct mmci_host *host);
};
--
2.25.1
prev parent reply other threads:[~2022-03-04 13:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 13:51 [PATCH 0/3] mmc: mmci: stm32: updates for SDIO Yann Gautier
2022-03-04 13:51 ` [PATCH 1/3] dt-bindings: mmc: mmci: add a property to disable DMA LLI Yann Gautier
2022-03-08 10:57 ` Ulf Hansson
2022-03-10 15:59 ` Yann Gautier
2022-03-11 15:45 ` Ulf Hansson
2022-03-14 22:43 ` Linus Walleij
2022-03-15 8:26 ` Yann Gautier
2022-03-17 10:00 ` Ulf Hansson
2022-03-17 10:17 ` Yann Gautier
2022-03-17 10:28 ` Ulf Hansson
2022-03-25 20:12 ` Linus Walleij
2022-03-28 14:58 ` Yann Gautier
2022-03-29 15:31 ` Manivannan Sadhasivam
2022-03-29 16:00 ` Yann Gautier
2022-03-29 17:33 ` Manivannan Sadhasivam
2022-03-29 21:16 ` Linus Walleij
2022-03-30 10:25 ` Srinivas Kandagatla
2022-03-04 13:51 ` [PATCH 2/3] mmc: mmci: stm32: manage st,disable-dma-lli property Yann Gautier
2022-03-04 13:51 ` Yann Gautier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220304135134.47827-4-yann.gautier@foss.st.com \
--to=yann.gautier@foss.st.com \
--cc=alexandre.torgue@foss.st.com \
--cc=christophe.kerello@foss.st.com \
--cc=devicetree@vger.kernel.org \
--cc=gszymaszek@short.pl \
--cc=kernel@dh-electronics.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=ludovic.barre@foss.st.com \
--cc=mani@kernel.org \
--cc=marex@denx.de \
--cc=mcoquelin.stm32@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).