LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [RESEND v4 0/3] mmc: mediatek: Add HS400 online tuning support
@ 2021-09-17 12:48 Wenbin Mei
  2021-09-17 12:48 ` [RESEND v4 1/3] dt-bindings: mmc: mtk-sd: add hs400 dly3 setting Wenbin Mei
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Wenbin Mei @ 2021-09-17 12:48 UTC (permalink / raw)
  To: Ulf Hansson, Rob Herring, Matthias Brugger
  Cc: Chaotian Jing, Avri Altman, Wenbin Mei, Wolfram Sang,
	Yoshihiro Shimoda, Linus Walleij, Yue Hu, Bean Huo,
	Adrian Hunter, linux-mmc, devicetree, linux-arm-kernel,
	linux-mediatek, linux-kernel

Change in v4:
- split driver patch into a core patch and a mtk-sd patch
- use mmc_get_ext_csd function
- move mmc_get_ext_csd() to include/linux/mmc/host.h
- modify some commit message.

Change in v3:
- add detail descripthion for hs400 dly3

Change in v2:
- remove the check "mmc_can_ext_csd"
- change the hs400 tuning condition for "msdc_cmd_done" function and
"msdc_cmd_next" function
- use "-EIO" instead of "-ERANGE"

Wenbin Mei (3):
  dt-bindings: mmc: mtk-sd: add hs400 dly3 setting
  mmc: core: add tuning support for HS400 mode
  mmc: mediatek: Add HS400 online tuning support

 .../devicetree/bindings/mmc/mtk-sd.yaml       | 12 +++
 drivers/mmc/core/mmc.c                        |  8 ++
 drivers/mmc/core/mmc_ops.h                    |  1 -
 drivers/mmc/host/mtk-sd.c                     | 79 ++++++++++++++++++-
 include/linux/mmc/host.h                      |  4 +
 5 files changed, 101 insertions(+), 3 deletions(-)

--
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [RESEND v4 1/3] dt-bindings: mmc: mtk-sd: add hs400 dly3 setting
  2021-09-17 12:48 [RESEND v4 0/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
@ 2021-09-17 12:48 ` Wenbin Mei
  2021-09-17 12:48 ` [RESEND v4 2/3] mmc: core: add tuning support for HS400 mode Wenbin Mei
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Wenbin Mei @ 2021-09-17 12:48 UTC (permalink / raw)
  To: Ulf Hansson, Rob Herring, Matthias Brugger
  Cc: Chaotian Jing, Avri Altman, Wenbin Mei, Wolfram Sang,
	Yoshihiro Shimoda, Linus Walleij, Yue Hu, Bean Huo,
	Adrian Hunter, linux-mmc, devicetree, linux-arm-kernel,
	linux-mediatek, linux-kernel, Rob Herring

Add hs400 dly3 setting for mtk-sd yaml

Signed-off-by: Wenbin Mei <wenbin.mei@mediatek.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---
 Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
index e866e985549e..82768a807294 100644
--- a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
+++ b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
@@ -119,6 +119,18 @@ properties:
       If present, HS400 command responses are sampled on rising edges.
       If not present, HS400 command responses are sampled on falling edges.
 
+  mediatek,hs400-ds-dly3:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Gear of the third delay line for DS for input data latch in data
+      pad macro, there are 32 stages from 0 to 31.
+      For different corner IC, the time is different about one step, it is
+      about 100ps.
+      The value is confirmed by doing scan and calibration to find a best
+      value with corner IC and it is valid only for HS400 mode.
+    minimum: 0
+    maximum: 31
+
   mediatek,latch-ck:
     $ref: /schemas/types.yaml#/definitions/uint32
     description:
-- 
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [RESEND v4 2/3] mmc: core: add tuning support for HS400 mode
  2021-09-17 12:48 [RESEND v4 0/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
  2021-09-17 12:48 ` [RESEND v4 1/3] dt-bindings: mmc: mtk-sd: add hs400 dly3 setting Wenbin Mei
@ 2021-09-17 12:48 ` Wenbin Mei
  2021-09-17 12:48 ` [RESEND v4 3/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
  2021-09-23 18:49 ` [RESEND v4 0/3] " Ulf Hansson
  3 siblings, 0 replies; 5+ messages in thread
From: Wenbin Mei @ 2021-09-17 12:48 UTC (permalink / raw)
  To: Ulf Hansson, Rob Herring, Matthias Brugger
  Cc: Chaotian Jing, Avri Altman, Wenbin Mei, Wolfram Sang,
	Yoshihiro Shimoda, Linus Walleij, Yue Hu, Bean Huo,
	Adrian Hunter, linux-mmc, devicetree, linux-arm-kernel,
	linux-mediatek, linux-kernel

This adds the execute_hs400_tuning callback function for HS400 tuning
operations and move the declaration of mmc_get_ext_csd() to
include/linux/mmc/host.h.

If execute_hs400_tuning is not implemented then they are not called.
That means there should be no affect for existing drivers as none implemt
these ops.

Signed-off-by: Wenbin Mei <wenbin.mei@mediatek.com>
---
 drivers/mmc/core/mmc.c     | 8 ++++++++
 drivers/mmc/core/mmc_ops.h | 1 -
 include/linux/mmc/host.h   | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 838726b68ff3..0aa72acd8612 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1222,6 +1222,14 @@ static int mmc_select_hs400(struct mmc_card *card)
 	mmc_set_timing(host, MMC_TIMING_MMC_HS400);
 	mmc_set_bus_speed(card);
 
+	if (host->ops->execute_hs400_tuning) {
+		mmc_retune_disable(host);
+		err = host->ops->execute_hs400_tuning(host, card);
+		mmc_retune_enable(host);
+		if (err)
+			goto out_err;
+	}
+
 	if (host->ops->hs400_complete)
 		host->ops->hs400_complete(host);
 
diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h
index ae25ffc2e870..e5e94567a9a9 100644
--- a/drivers/mmc/core/mmc_ops.h
+++ b/drivers/mmc/core/mmc_ops.h
@@ -38,7 +38,6 @@ int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp);
 int mmc_spi_set_crc(struct mmc_host *host, int use_crc);
 int mmc_bus_test(struct mmc_card *card, u8 bus_width);
 int mmc_can_ext_csd(struct mmc_card *card);
-int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);
 int mmc_switch_status(struct mmc_card *card, bool crc_err_fatal);
 bool mmc_prepare_busy_cmd(struct mmc_host *host, struct mmc_command *cmd,
 			  unsigned int timeout_ms);
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index ff1a251bb0bc..072650aeb2a7 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -162,6 +162,9 @@ struct mmc_host_ops {
 	/* Prepare HS400 target operating frequency depending host driver */
 	int	(*prepare_hs400_tuning)(struct mmc_host *host, struct mmc_ios *ios);
 
+	/* Execute HS400 tuning depending host driver */
+	int	(*execute_hs400_tuning)(struct mmc_host *host, struct mmc_card *card);
+
 	/* Prepare switch to DDR during the HS400 init sequence */
 	int	(*hs400_prepare_ddr)(struct mmc_host *host);
 
@@ -633,5 +636,6 @@ static inline enum dma_data_direction mmc_get_dma_dir(struct mmc_data *data)
 
 int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error);
 int mmc_send_abort_tuning(struct mmc_host *host, u32 opcode);
+int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);
 
 #endif /* LINUX_MMC_HOST_H */
-- 
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [RESEND v4 3/3] mmc: mediatek: Add HS400 online tuning support
  2021-09-17 12:48 [RESEND v4 0/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
  2021-09-17 12:48 ` [RESEND v4 1/3] dt-bindings: mmc: mtk-sd: add hs400 dly3 setting Wenbin Mei
  2021-09-17 12:48 ` [RESEND v4 2/3] mmc: core: add tuning support for HS400 mode Wenbin Mei
@ 2021-09-17 12:48 ` Wenbin Mei
  2021-09-23 18:49 ` [RESEND v4 0/3] " Ulf Hansson
  3 siblings, 0 replies; 5+ messages in thread
From: Wenbin Mei @ 2021-09-17 12:48 UTC (permalink / raw)
  To: Ulf Hansson, Rob Herring, Matthias Brugger
  Cc: Chaotian Jing, Avri Altman, Wenbin Mei, Wolfram Sang,
	Yoshihiro Shimoda, Linus Walleij, Yue Hu, Bean Huo,
	Adrian Hunter, linux-mmc, devicetree, linux-arm-kernel,
	linux-mediatek, linux-kernel

According to JEDEC Spec, there is no need to do tuning under HS400 mode
since the Rx signal is aligned with the DS signal. However, MediaTek's
IC need set its "DS delay" internally to ensure it can latch Rx signal
correctly.
In previous version, We provide an "hs400-ds-delay" in device tree to
cover different chipset/PCB design, and it works fine in most cases.
But, with the development of process technology and the big VCore
voltage scale range(may have 0.7V/0.6V/0.55V), it is difficult to find
a suitable "hs400-ds-delay" to cover all of IC corner
cases(SSSS/TTTT/FFFF).
So that We must have the ability to do hs400 online tuning.

Signed-off-by: Wenbin Mei <wenbin.mei@mediatek.com>
Reviewed-by: Chaotian Jing <chaotian.jing@mediatek.com>
---
 drivers/mmc/host/mtk-sd.c | 79 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 4dfc246c5f95..5f98f869545d 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -258,6 +258,7 @@
 #define MSDC_PAD_TUNE_RD_SEL	  (0x1 << 13)   /* RW */
 #define MSDC_PAD_TUNE_CMD_SEL	  (0x1 << 21)   /* RW */
 
+#define PAD_DS_TUNE_DLY_SEL       (0x1 << 0)	/* RW */
 #define PAD_DS_TUNE_DLY1	  (0x1f << 2)   /* RW */
 #define PAD_DS_TUNE_DLY2	  (0x1f << 7)   /* RW */
 #define PAD_DS_TUNE_DLY3	  (0x1f << 12)  /* RW */
@@ -301,6 +302,11 @@
 #define PAD_CMD_RD_RXDLY_SEL    (0x1 << 11)     /* RW */
 #define PAD_CMD_TX_DLY          (0x1f << 12)    /* RW */
 
+/* EMMC50_PAD_DS_TUNE mask */
+#define PAD_DS_DLY_SEL		(0x1 << 16)	/* RW */
+#define PAD_DS_DLY1		(0x1f << 10)	/* RW */
+#define PAD_DS_DLY3		(0x1f << 0)	/* RW */
+
 #define REQ_CMD_EIO  (0x1 << 0)
 #define REQ_CMD_TMO  (0x1 << 1)
 #define REQ_DAT_ERR  (0x1 << 2)
@@ -448,11 +454,13 @@ struct msdc_host {
 	bool vqmmc_enabled;
 	u32 latch_ck;
 	u32 hs400_ds_delay;
+	u32 hs400_ds_dly3;
 	u32 hs200_cmd_int_delay; /* cmd internal delay for HS200/SDR104 */
 	u32 hs400_cmd_int_delay; /* cmd internal delay for HS400 */
 	bool hs400_cmd_resp_sel_rising;
 				 /* cmd response sample selection for HS400 */
 	bool hs400_mode;	/* current eMMC will run at hs400 mode */
+	bool hs400_tuning;	/* hs400 mode online tuning */
 	bool internal_cd;	/* Use internal card-detect logic */
 	bool cqhci;		/* support eMMC hw cmdq */
 	struct msdc_save_para save_para; /* used when gate HCLK */
@@ -1190,7 +1198,8 @@ static bool msdc_cmd_done(struct msdc_host *host, int events,
 	if (!sbc_error && !(events & MSDC_INT_CMDRDY)) {
 		if (events & MSDC_INT_CMDTMO ||
 		    (cmd->opcode != MMC_SEND_TUNING_BLOCK &&
-		     cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200))
+		     cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200 &&
+		     !host->hs400_tuning))
 			/*
 			 * should not clear fifo/interrupt as the tune data
 			 * may have alreay come when cmd19/cmd21 gets response
@@ -1287,7 +1296,8 @@ static void msdc_cmd_next(struct msdc_host *host,
 	if ((cmd->error &&
 	    !(cmd->error == -EILSEQ &&
 	      (cmd->opcode == MMC_SEND_TUNING_BLOCK ||
-	       cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200))) ||
+	       cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200 ||
+	       host->hs400_tuning))) ||
 	    (mrq->sbc && mrq->sbc->error))
 		msdc_request_done(host, mrq);
 	else if (cmd == mrq->sbc)
@@ -2251,6 +2261,67 @@ static int msdc_prepare_hs400_tuning(struct mmc_host *mmc, struct mmc_ios *ios)
 	return 0;
 }
 
+static int msdc_execute_hs400_tuning(struct mmc_host *mmc, struct mmc_card *card)
+{
+	struct msdc_host *host = mmc_priv(mmc);
+	struct msdc_delay_phase dly1_delay;
+	u32 val, result_dly1 = 0;
+	u8 *ext_csd;
+	int i, ret;
+
+	if (host->top_base) {
+		sdr_set_bits(host->top_base + EMMC50_PAD_DS_TUNE,
+			     PAD_DS_DLY_SEL);
+		if (host->hs400_ds_dly3)
+			sdr_set_field(host->top_base + EMMC50_PAD_DS_TUNE,
+				      PAD_DS_DLY3, host->hs400_ds_dly3);
+	} else {
+		sdr_set_bits(host->base + PAD_DS_TUNE, PAD_DS_TUNE_DLY_SEL);
+		if (host->hs400_ds_dly3)
+			sdr_set_field(host->base + PAD_DS_TUNE,
+				      PAD_DS_TUNE_DLY3, host->hs400_ds_dly3);
+	}
+
+	host->hs400_tuning = true;
+	for (i = 0; i < PAD_DELAY_MAX; i++) {
+		if (host->top_base)
+			sdr_set_field(host->top_base + EMMC50_PAD_DS_TUNE,
+				      PAD_DS_DLY1, i);
+		else
+			sdr_set_field(host->base + PAD_DS_TUNE,
+				      PAD_DS_TUNE_DLY1, i);
+		ret = mmc_get_ext_csd(card, &ext_csd);
+		if (!ret)
+			result_dly1 |= (1 << i);
+	}
+	host->hs400_tuning = false;
+
+	dly1_delay = get_best_delay(host, result_dly1);
+	if (dly1_delay.maxlen == 0) {
+		dev_err(host->dev, "Failed to get DLY1 delay!\n");
+		goto fail;
+	}
+	if (host->top_base)
+		sdr_set_field(host->top_base + EMMC50_PAD_DS_TUNE,
+			      PAD_DS_DLY1, dly1_delay.final_phase);
+	else
+		sdr_set_field(host->base + PAD_DS_TUNE,
+			      PAD_DS_TUNE_DLY1, dly1_delay.final_phase);
+
+	if (host->top_base)
+		val = readl(host->top_base + EMMC50_PAD_DS_TUNE);
+	else
+		val = readl(host->base + PAD_DS_TUNE);
+
+	dev_info(host->dev, "Fianl PAD_DS_TUNE: 0x%x\n", val);
+
+	return 0;
+
+fail:
+	dev_err(host->dev, "Failed to tuning DS pin delay!\n");
+	return -EIO;
+}
+
 static void msdc_hw_reset(struct mmc_host *mmc)
 {
 	struct msdc_host *host = mmc_priv(mmc);
@@ -2377,6 +2448,7 @@ static const struct mmc_host_ops mt_msdc_ops = {
 	.card_busy = msdc_card_busy,
 	.execute_tuning = msdc_execute_tuning,
 	.prepare_hs400_tuning = msdc_prepare_hs400_tuning,
+	.execute_hs400_tuning = msdc_execute_hs400_tuning,
 	.hw_reset = msdc_hw_reset,
 };
 
@@ -2396,6 +2468,9 @@ static void msdc_of_property_parse(struct platform_device *pdev,
 	of_property_read_u32(pdev->dev.of_node, "hs400-ds-delay",
 			     &host->hs400_ds_delay);
 
+	of_property_read_u32(pdev->dev.of_node, "mediatek,hs400-ds-dly3",
+			     &host->hs400_ds_dly3);
+
 	of_property_read_u32(pdev->dev.of_node, "mediatek,hs200-cmd-int-delay",
 			     &host->hs200_cmd_int_delay);
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [RESEND v4 0/3] mmc: mediatek: Add HS400 online tuning support
  2021-09-17 12:48 [RESEND v4 0/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
                   ` (2 preceding siblings ...)
  2021-09-17 12:48 ` [RESEND v4 3/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
@ 2021-09-23 18:49 ` Ulf Hansson
  3 siblings, 0 replies; 5+ messages in thread
From: Ulf Hansson @ 2021-09-23 18:49 UTC (permalink / raw)
  To: Wenbin Mei
  Cc: Rob Herring, Matthias Brugger, Chaotian Jing, Avri Altman,
	Wolfram Sang, Yoshihiro Shimoda, Linus Walleij, Yue Hu, Bean Huo,
	Adrian Hunter, linux-mmc, DTML, Linux ARM,
	moderated list:ARM/Mediatek SoC support,
	Linux Kernel Mailing List

On Fri, 17 Sept 2021 at 14:48, Wenbin Mei <wenbin.mei@mediatek.com> wrote:
>
> Change in v4:
> - split driver patch into a core patch and a mtk-sd patch
> - use mmc_get_ext_csd function
> - move mmc_get_ext_csd() to include/linux/mmc/host.h
> - modify some commit message.
>
> Change in v3:
> - add detail descripthion for hs400 dly3
>
> Change in v2:
> - remove the check "mmc_can_ext_csd"
> - change the hs400 tuning condition for "msdc_cmd_done" function and
> "msdc_cmd_next" function
> - use "-EIO" instead of "-ERANGE"
>
> Wenbin Mei (3):
>   dt-bindings: mmc: mtk-sd: add hs400 dly3 setting
>   mmc: core: add tuning support for HS400 mode
>   mmc: mediatek: Add HS400 online tuning support
>
>  .../devicetree/bindings/mmc/mtk-sd.yaml       | 12 +++
>  drivers/mmc/core/mmc.c                        |  8 ++
>  drivers/mmc/core/mmc_ops.h                    |  1 -
>  drivers/mmc/host/mtk-sd.c                     | 79 ++++++++++++++++++-
>  include/linux/mmc/host.h                      |  4 +
>  5 files changed, 101 insertions(+), 3 deletions(-)
>
> --
> 2.25.1
>

Applied for next, thanks!

Kind regards
Uffe

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-09-23 18:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-17 12:48 [RESEND v4 0/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
2021-09-17 12:48 ` [RESEND v4 1/3] dt-bindings: mmc: mtk-sd: add hs400 dly3 setting Wenbin Mei
2021-09-17 12:48 ` [RESEND v4 2/3] mmc: core: add tuning support for HS400 mode Wenbin Mei
2021-09-17 12:48 ` [RESEND v4 3/3] mmc: mediatek: Add HS400 online tuning support Wenbin Mei
2021-09-23 18:49 ` [RESEND v4 0/3] " 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).