* [PATCH 0/2] mmc: sdhci-cadence: warning fix and read block gap tuning @ 2025-06-26 14:43 Benoît Monin 2025-06-26 14:43 ` [PATCH 1/2] mmc: sdhci-cadence: use of_property_present Benoît Monin 2025-06-26 14:43 ` [PATCH 2/2] mmc: sdhci-cadence: tune multi-block read gap Benoît Monin 0 siblings, 2 replies; 5+ messages in thread From: Benoît Monin @ 2025-06-26 14:43 UTC (permalink / raw) To: Adrian Hunter, Ulf Hansson Cc: Benoît Monin, linux-mmc, linux-kernel, Vladimir Kondratiev, Tawfik Bayouk, Gregory CLEMENT, Théo Lebrun, Thomas Petazzoni Two patches for the SDHCI cadence driver: The first one fixes a misuse of of_property_read_bool to detect the presence of properties in the device tree. The second one implements the read block gap coefficient tuning for HS200 mode. It should work on all cadence sd4hc controllers but has only be tested, and proven to be useful, on mobileye boards. If needs be, it could be limited to mobileye,eyeq-sd4hc compatible devices. Benoît Monin (1): mmc: sdhci-cadence: use of_property_present Vladimir Kondratiev (1): mmc: sdhci-cadence: tune multi-block read gap drivers/mmc/host/sdhci-cadence.c | 144 ++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 2 deletions(-) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] mmc: sdhci-cadence: use of_property_present 2025-06-26 14:43 [PATCH 0/2] mmc: sdhci-cadence: warning fix and read block gap tuning Benoît Monin @ 2025-06-26 14:43 ` Benoît Monin 2025-07-03 12:19 ` Ulf Hansson 2025-06-26 14:43 ` [PATCH 2/2] mmc: sdhci-cadence: tune multi-block read gap Benoît Monin 1 sibling, 1 reply; 5+ messages in thread From: Benoît Monin @ 2025-06-26 14:43 UTC (permalink / raw) To: Adrian Hunter, Ulf Hansson Cc: Benoît Monin, linux-mmc, linux-kernel, Vladimir Kondratiev, Tawfik Bayouk, Gregory CLEMENT, Théo Lebrun, Thomas Petazzoni Instead of using of_property_read_bool to check the presence of the cdns,phy-* properties in the device tree, use of_property_present in function sdhci_cdns_phy_param_count. This silences the following warning messages since the cdns,phy-* properties are all u32, not boolean. OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-input-delay-legacy' with a value. OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-input-delay-mmc-highspeed' with a value. OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-input-delay-mmc-ddr' with a value. OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-dll-delay-sdclk' with a value. OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-dll-delay-sdclk-hsmmc' with a value. Signed-off-by: Benoît Monin <benoit.monin@bootlin.com> --- drivers/mmc/host/sdhci-cadence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index a94b297fcf2a..27bd2eb29948 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -144,7 +144,7 @@ static unsigned int sdhci_cdns_phy_param_count(struct device_node *np) int i; for (i = 0; i < ARRAY_SIZE(sdhci_cdns_phy_cfgs); i++) - if (of_property_read_bool(np, sdhci_cdns_phy_cfgs[i].property)) + if (of_property_present(np, sdhci_cdns_phy_cfgs[i].property)) count++; return count; ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] mmc: sdhci-cadence: use of_property_present 2025-06-26 14:43 ` [PATCH 1/2] mmc: sdhci-cadence: use of_property_present Benoît Monin @ 2025-07-03 12:19 ` Ulf Hansson 0 siblings, 0 replies; 5+ messages in thread From: Ulf Hansson @ 2025-07-03 12:19 UTC (permalink / raw) To: Benoît Monin Cc: Adrian Hunter, linux-mmc, linux-kernel, Vladimir Kondratiev, Tawfik Bayouk, Gregory CLEMENT, Théo Lebrun, Thomas Petazzoni On Thu, 26 Jun 2025 at 16:44, Benoît Monin <benoit.monin@bootlin.com> wrote: > > Instead of using of_property_read_bool to check the presence of the > cdns,phy-* properties in the device tree, use of_property_present in > function sdhci_cdns_phy_param_count. > > This silences the following warning messages since the cdns,phy-* > properties are all u32, not boolean. > > OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-input-delay-legacy' with a value. > OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-input-delay-mmc-highspeed' with a value. > OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-input-delay-mmc-ddr' with a value. > OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-dll-delay-sdclk' with a value. > OF: /soc/sdhci@d8010000: Read of boolean property 'cdns,phy-dll-delay-sdclk-hsmmc' with a value. > > Signed-off-by: Benoît Monin <benoit.monin@bootlin.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-cadence.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c > index a94b297fcf2a..27bd2eb29948 100644 > --- a/drivers/mmc/host/sdhci-cadence.c > +++ b/drivers/mmc/host/sdhci-cadence.c > @@ -144,7 +144,7 @@ static unsigned int sdhci_cdns_phy_param_count(struct device_node *np) > int i; > > for (i = 0; i < ARRAY_SIZE(sdhci_cdns_phy_cfgs); i++) > - if (of_property_read_bool(np, sdhci_cdns_phy_cfgs[i].property)) > + if (of_property_present(np, sdhci_cdns_phy_cfgs[i].property)) > count++; > > return count; ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] mmc: sdhci-cadence: tune multi-block read gap 2025-06-26 14:43 [PATCH 0/2] mmc: sdhci-cadence: warning fix and read block gap tuning Benoît Monin 2025-06-26 14:43 ` [PATCH 1/2] mmc: sdhci-cadence: use of_property_present Benoît Monin @ 2025-06-26 14:43 ` Benoît Monin 2025-07-03 11:29 ` Ulf Hansson 1 sibling, 1 reply; 5+ messages in thread From: Benoît Monin @ 2025-06-26 14:43 UTC (permalink / raw) To: Adrian Hunter, Ulf Hansson Cc: Benoît Monin, linux-mmc, linux-kernel, Vladimir Kondratiev, Tawfik Bayouk, Gregory CLEMENT, Théo Lebrun, Thomas Petazzoni, Vladimir Kondratiev From: Vladimir Kondratiev <vladimir.kondratiev@intel.com> Additional tuning required for multi-block read command. Implement it accordingly to Cadence recommendation. 2 registers used: HRS37 and HRS38. To HRS37, SD interface mode programmed, this selects HRS38 slot - there is separate slot for every SD interface mode. HRS38 contains gap parameter, it is selected by starting with gap=0 and sending multi-block read command. gap incremented until multi-block read succeeds. As of now, this tuning executed for HS200 only Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@intel.com> Signed-off-by: Benoît Monin <benoit.monin@bootlin.com> --- drivers/mmc/host/sdhci-cadence.c | 142 ++++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index 27bd2eb29948..6dcf7ae0c99d 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -36,6 +36,23 @@ #define SDHCI_CDNS_HRS06_MODE_MMC_HS400 0x5 #define SDHCI_CDNS_HRS06_MODE_MMC_HS400ES 0x6 +/* Read block gap */ +#define SDHCI_CDNS_HRS37 0x94 /* interface mode select */ +#define SDHCI_CDNS_HRS37_MODE_DS 0x0 +#define SDHCI_CDNS_HRS37_MODE_HS 0x1 +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR12 0x8 +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR25 0x9 +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR50 0xa +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR104 0xb +#define SDHCI_CDNS_HRS37_MODE_UDS_DDR50 0xc +#define SDHCI_CDNS_HRS37_MODE_MMC_LEGACY 0x20 +#define SDHCI_CDNS_HRS37_MODE_MMC_SDR 0x21 +#define SDHCI_CDNS_HRS37_MODE_MMC_DDR 0x22 +#define SDHCI_CDNS_HRS37_MODE_MMC_HS200 0x23 +#define SDHCI_CDNS_HRS37_MODE_MMC_HS400 0x24 +#define SDHCI_CDNS_HRS37_MODE_MMC_HS400ES 0x25 +#define SDHCI_CDNS_HRS38 0x98 /* Read block gap coefficient */ +#define SDHCI_CDNS_HRS38_BLKGAP_MAX 0xf /* SRS - Slot Register Set (SDHCI-compatible) */ #define SDHCI_CDNS_SRS_BASE 0x200 @@ -251,6 +268,123 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) return 0; } +/** + * mmc_send_mb_read() - send multi-block read command + * @host: MMC host + * + * Sends multi-block read command, CMD23/CMD18/CMD12, ignore read data + * + * Return: error code + */ +static int mmc_send_mb_read(struct mmc_host *host) +{ + const int blksz = 512; + const int blocks = 32; + struct scatterlist sg; + struct mmc_command sbc = { + .opcode = MMC_SET_BLOCK_COUNT, + .arg = blocks, + .flags = MMC_RSP_R1 | MMC_CMD_AC, + }; + struct mmc_command cmd = { + .opcode = MMC_READ_MULTIPLE_BLOCK, + .arg = 0, + .flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC, + }; + struct mmc_command stop = { + .opcode = MMC_STOP_TRANSMISSION, + .arg = 0, + .flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC, + }; + struct mmc_data data = { + .flags = MMC_DATA_READ, + .blksz = blksz, + .blocks = blocks, + .blk_addr = 0, + .timeout_ns = 800000000, /* 800ms */ + .timeout_clks = 1000, + .sg = &sg, + .sg_len = 1, + }; + struct mmc_request mrq = { + .sbc = &sbc, + .cmd = &cmd, + .data = &data, + .stop = &stop, + }; + int size = blksz * blocks, err = 0; + u8 *data_buf; + + data_buf = kzalloc(size, GFP_KERNEL); + if (!data_buf) + return -ENOMEM; + + sg_init_one(&sg, data_buf, size); + + mmc_wait_for_req(host, &mrq); + + if (sbc.error) { + err = sbc.error; + goto out; + } + + if (cmd.error) { + err = cmd.error; + goto out; + } + + if (data.error) { + err = data.error; + goto out; + } + +out: + kfree(data_buf); + return err; +} + +/** + * sdhci_cdns_tune_blkgap() - tune multi-block read gap + * @mmc: MMC host + * + * Tune delay used in multi block read. To do so, + * try sending multi-block read command with incremented gap, unless + * it succeeds. + * + * Return: error code + */ +static int sdhci_cdns_tune_blkgap(struct mmc_host *mmc) +{ + struct sdhci_host *host = mmc_priv(mmc); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_cdns_priv *priv = sdhci_pltfm_priv(pltfm_host); + void __iomem *hrs37_reg = priv->hrs_addr + SDHCI_CDNS_HRS37; + void __iomem *hrs38_reg = priv->hrs_addr + SDHCI_CDNS_HRS38; + bool tuned = false; + u8 gap; + u8 hrs37_mode; + + switch (host->timing) { + case MMC_TIMING_MMC_HS200: + hrs37_mode = SDHCI_CDNS_HRS37_MODE_MMC_HS200; + break; + default: + return 0; /* no tuning in this mode */ + } + + writel(hrs37_mode, hrs37_reg); + + for (gap = 0; gap <= SDHCI_CDNS_HRS38_BLKGAP_MAX; gap++) { + writel(gap, hrs38_reg); + tuned = !mmc_send_mb_read(mmc); + if (tuned) + break; + } + dev_dbg(mmc_dev(mmc), "read block gap tune %s, gap %d\n", + tuned ? "OK" : "failed", gap); + return tuned ? 0 : -EIO; +} + /* * In SD mode, software must not use the hardware tuning and instead perform * an almost identical procedure to eMMC. @@ -261,6 +395,7 @@ static int sdhci_cdns_execute_tuning(struct sdhci_host *host, u32 opcode) int max_streak = 0; int end_of_streak = 0; int i; + int ret; /* * Do not execute tuning for UHS_SDR50 or UHS_DDR50. @@ -288,7 +423,12 @@ static int sdhci_cdns_execute_tuning(struct sdhci_host *host, u32 opcode) return -EIO; } - return sdhci_cdns_set_tune_val(host, end_of_streak - max_streak / 2); + ret = sdhci_cdns_set_tune_val(host, end_of_streak - max_streak / 2); + + if (!ret) + ret = sdhci_cdns_tune_blkgap(host->mmc); + + return ret; } static void sdhci_cdns_set_uhs_signaling(struct sdhci_host *host, ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] mmc: sdhci-cadence: tune multi-block read gap 2025-06-26 14:43 ` [PATCH 2/2] mmc: sdhci-cadence: tune multi-block read gap Benoît Monin @ 2025-07-03 11:29 ` Ulf Hansson 0 siblings, 0 replies; 5+ messages in thread From: Ulf Hansson @ 2025-07-03 11:29 UTC (permalink / raw) To: Benoît Monin Cc: Adrian Hunter, linux-mmc, linux-kernel, Vladimir Kondratiev, Tawfik Bayouk, Gregory CLEMENT, Théo Lebrun, Thomas Petazzoni, Vladimir Kondratiev On Thu, 26 Jun 2025 at 16:44, Benoît Monin <benoit.monin@bootlin.com> wrote: > > From: Vladimir Kondratiev <vladimir.kondratiev@intel.com> > > Additional tuning required for multi-block read command. > Implement it accordingly to Cadence recommendation. > > 2 registers used: HRS37 and HRS38. To HRS37, SD interface mode programmed, > this selects HRS38 slot - there is separate slot for every SD interface > mode. HRS38 contains gap parameter, > it is selected by starting with gap=0 and sending multi-block read command. > gap incremented until multi-block read succeeds. > > As of now, this tuning executed for HS200 only > > Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@intel.com> > Signed-off-by: Benoît Monin <benoit.monin@bootlin.com> > --- > drivers/mmc/host/sdhci-cadence.c | 142 ++++++++++++++++++++++++++++++- > 1 file changed, 141 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c > index 27bd2eb29948..6dcf7ae0c99d 100644 > --- a/drivers/mmc/host/sdhci-cadence.c > +++ b/drivers/mmc/host/sdhci-cadence.c > @@ -36,6 +36,23 @@ > #define SDHCI_CDNS_HRS06_MODE_MMC_HS400 0x5 > #define SDHCI_CDNS_HRS06_MODE_MMC_HS400ES 0x6 > > +/* Read block gap */ > +#define SDHCI_CDNS_HRS37 0x94 /* interface mode select */ > +#define SDHCI_CDNS_HRS37_MODE_DS 0x0 > +#define SDHCI_CDNS_HRS37_MODE_HS 0x1 > +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR12 0x8 > +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR25 0x9 > +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR50 0xa > +#define SDHCI_CDNS_HRS37_MODE_UDS_SDR104 0xb > +#define SDHCI_CDNS_HRS37_MODE_UDS_DDR50 0xc > +#define SDHCI_CDNS_HRS37_MODE_MMC_LEGACY 0x20 > +#define SDHCI_CDNS_HRS37_MODE_MMC_SDR 0x21 > +#define SDHCI_CDNS_HRS37_MODE_MMC_DDR 0x22 > +#define SDHCI_CDNS_HRS37_MODE_MMC_HS200 0x23 > +#define SDHCI_CDNS_HRS37_MODE_MMC_HS400 0x24 > +#define SDHCI_CDNS_HRS37_MODE_MMC_HS400ES 0x25 > +#define SDHCI_CDNS_HRS38 0x98 /* Read block gap coefficient */ > +#define SDHCI_CDNS_HRS38_BLKGAP_MAX 0xf > /* SRS - Slot Register Set (SDHCI-compatible) */ > #define SDHCI_CDNS_SRS_BASE 0x200 > > @@ -251,6 +268,123 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) > return 0; > } > > +/** > + * mmc_send_mb_read() - send multi-block read command > + * @host: MMC host > + * > + * Sends multi-block read command, CMD23/CMD18/CMD12, ignore read data > + * > + * Return: error code > + */ > +static int mmc_send_mb_read(struct mmc_host *host) > +{ > + const int blksz = 512; > + const int blocks = 32; > + struct scatterlist sg; > + struct mmc_command sbc = { > + .opcode = MMC_SET_BLOCK_COUNT, > + .arg = blocks, > + .flags = MMC_RSP_R1 | MMC_CMD_AC, > + }; > + struct mmc_command cmd = { > + .opcode = MMC_READ_MULTIPLE_BLOCK, > + .arg = 0, > + .flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC, > + }; > + struct mmc_command stop = { > + .opcode = MMC_STOP_TRANSMISSION, > + .arg = 0, > + .flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC, > + }; > + struct mmc_data data = { > + .flags = MMC_DATA_READ, > + .blksz = blksz, > + .blocks = blocks, > + .blk_addr = 0, > + .timeout_ns = 800000000, /* 800ms */ > + .timeout_clks = 1000, > + .sg = &sg, > + .sg_len = 1, > + }; > + struct mmc_request mrq = { > + .sbc = &sbc, > + .cmd = &cmd, > + .data = &data, > + .stop = &stop, > + }; > + int size = blksz * blocks, err = 0; > + u8 *data_buf; > + > + data_buf = kzalloc(size, GFP_KERNEL); > + if (!data_buf) > + return -ENOMEM; > + > + sg_init_one(&sg, data_buf, size); > + > + mmc_wait_for_req(host, &mrq); > + > + if (sbc.error) { > + err = sbc.error; > + goto out; > + } > + > + if (cmd.error) { > + err = cmd.error; > + goto out; > + } > + > + if (data.error) { > + err = data.error; > + goto out; > + } > + > +out: > + kfree(data_buf); > + return err; > +} The above function does not belong in a host driver. It's the core's responsibility to create and manage requests/commands. That said, I wonder if we really need a multiple-block-read - or if we can just read the ext-CSD from the eMMC, as it also allows us to exercise the DATA lines? If reading ext CSD is okay, we already have mmc_get_ext_csd() being exported and available for host drivers to use. In fact mtk-sd is already using it for the similar reason. [...] Kind regards Uffe ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-03 12:20 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-06-26 14:43 [PATCH 0/2] mmc: sdhci-cadence: warning fix and read block gap tuning Benoît Monin 2025-06-26 14:43 ` [PATCH 1/2] mmc: sdhci-cadence: use of_property_present Benoît Monin 2025-07-03 12:19 ` Ulf Hansson 2025-06-26 14:43 ` [PATCH 2/2] mmc: sdhci-cadence: tune multi-block read gap Benoît Monin 2025-07-03 11:29 ` Ulf Hansson
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).