raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

mmc: use downstream DT property to modify CQE and/or SD CQ behaviour

Browse Source 
Implement a tristate-style option for "supports-cqe". If the property is
absent or zero, disable CQ completely. For 1, enable CQ unconditionally
for eMMC cards, and known-good SD cards. For 2, enable for eMMC cards,
and all SD cards that are not known-bad.

The sdhci-brcmstb driver needs to know about the tristate as its probe
sequence would otherwise override a disable in mmc_of_parse().

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
This commit is contained in:
Jonathan Bell
2025-01-08 16:02:27 +00:00
committed by Dom Cobley
parent 895e91fd61
commit 47f3b60310
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/core/host.c
View File

@@ -271,7 +271,7 @@ EXPORT_SYMBOL(mmc_of_parse_clk_phase);
int mmc_of_parse(struct mmc_host *host) int mmc_of_parse(struct mmc_host *host)
{ {
struct device *dev = host->parent; struct device *dev = host->parent;
u32 bus_width, drv_type, cd_debounce_delay_ms; u32 bus_width, drv_type, cd_debounce_delay_ms, cq_allow;
int ret; int ret;
if (!dev || !dev_fwnode(dev)) if (!dev || !dev_fwnode(dev))
@@ -408,6 +408,15 @@ int mmc_of_parse(struct mmc_host *host)
host->caps2 &= ~(MMC_CAP2_HS400_1_8V | MMC_CAP2_HS400_1_2V | host->caps2 &= ~(MMC_CAP2_HS400_1_8V | MMC_CAP2_HS400_1_2V |
MMC_CAP2_HS400_ES); MMC_CAP2_HS400_ES);
cq_allow = 0;
/*
* Downstream property - if a u32 and 2 instead of a bool,
* trust most A2 SD cards claiming CQ support.
*/
device_property_read_u32(dev, "supports-cqe", &cq_allow);
if (cq_allow == 2)
host->caps2 |= MMC_CAP2_SD_CQE_PERMISSIVE;
/* Must be after "non-removable" check */ /* Must be after "non-removable" check */
if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) { if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) {
if (host->caps & MMC_CAP_NONREMOVABLE) if (host->caps & MMC_CAP_NONREMOVABLE)

4
drivers/mmc/core/sd.c
View File

@@ -1527,8 +1527,8 @@ cont:
goto free_card; goto free_card;
} }
/* Disallow command queueing on unvetted cards */ /* Disallow command queueing on unvetted cards unless overridden */
if (!mmc_card_working_sd_cq(card)) if (!(host->caps2 & MMC_CAP2_SD_CQE_PERMISSIVE) && !mmc_card_working_sd_cq(card))
card->ext_csd.cmdq_support = false; card->ext_csd.cmdq_support = false;
/* Enable command queueing if supported */ /* Enable command queueing if supported */

6
drivers/mmc/host/sdhci-brcmstb.c
View File

@@ -571,7 +571,7 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev)
struct sdhci_pltfm_host *pltfm_host; struct sdhci_pltfm_host *pltfm_host;
const struct of_device_id *match; const struct of_device_id *match;
struct sdhci_brcmstb_priv *priv; struct sdhci_brcmstb_priv *priv;
u32 actual_clock_mhz; u32 actual_clock_mhz, cqe;
struct sdhci_host *host; struct sdhci_host *host;
struct resource *iomem; struct resource *iomem;
bool no_pinctrl = false; bool no_pinctrl = false;
@@ -600,7 +600,9 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev)
pltfm_host->clk = clk; pltfm_host->clk = clk;
priv = sdhci_pltfm_priv(pltfm_host); priv = sdhci_pltfm_priv(pltfm_host);
if (device_property_read_bool(&pdev->dev, "supports-cqe")) { cqe = 0;
device_property_read_u32(&pdev->dev, "supports-cqe", &cqe);
if (cqe > 0) {
priv->flags |= BRCMSTB_PRIV_FLAGS_HAS_CQE; priv->flags |= BRCMSTB_PRIV_FLAGS_HAS_CQE;
match_priv->ops->irq = sdhci_brcmstb_cqhci_irq; match_priv->ops->irq = sdhci_brcmstb_cqhci_irq;
} }

1
include/linux/mmc/host.h
View File

@@ -463,6 +463,7 @@ struct mmc_host {
#define MMC_CAP2_CRYPTO 0 #define MMC_CAP2_CRYPTO 0
#endif #endif
#define MMC_CAP2_ALT_GPT_TEGRA (1 << 28) /* Host with eMMC that has GPT entry at a non-standard location */ #define MMC_CAP2_ALT_GPT_TEGRA (1 << 28) /* Host with eMMC that has GPT entry at a non-standard location */
#define MMC_CAP2_SD_CQE_PERMISSIVE (1 << 31) /* Ignore allow-list for CQ capable SD card detection */
bool uhs2_sd_tran; /* UHS-II flag for SD_TRAN state */ bool uhs2_sd_tran; /* UHS-II flag for SD_TRAN state */
bool uhs2_app_cmd; /* UHS-II flag for APP command */ bool uhs2_app_cmd; /* UHS-II flag for APP command */