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
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 <[email protected]>
---
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
On Fri, 17 Sept 2021 at 14:48, Wenbin Mei <[email protected]> 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