mmc: sdhci-cadence: warning fix and read block gap tuning

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 <[email protected]>

---
 drivers/mmc/host/sdhci-cadence.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/mmc/host/sdhci-cadence.c +1 -1

index a94b297fcf2a..27bd2eb29948 100644
@@ -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;

From: Vladimir Kondratiev <[email protected]>

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 <[email protected]>

Signed-off-by Benoît Monin <[email protected]>

---
 drivers/mmc/host/sdhci-cadence.c | 142 ++++++++++++++++++++++++++++++-
 1 file changed, 141 insertions(+), 1 deletion(-)

drivers/mmc/host/sdhci-cadence.c +81 -0

index 27bd2eb29948..6dcf7ae0c99d 100644
@@ -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;
+       }