mmc: sdhci: UHS-II support, export host operations to core
RFC PATCH v3 11/21 mmc: sdhci: UHS-II support, export host operations to core
From: AKASHI Takahiro <[email protected]>
Export sdhci-specific UHS-II operations to core.
--- drivers/mmc/host/sdhci.c | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
drivers/mmc/host/sdhci.c +70 -0
@@ -2977,6 +2977,70 @@ static void sdhci_card_event(struct mmc_host *mmc)spin_unlock_irqrestore (&host->lock, flags); } +#if IS_ENABLED (CONFIG_MMC_SDHCI_UHS2 ) +static int sdhci_uhs2_detect_init (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +int ret; + +if (sdhci_uhs2_ops.do_detect_init) + ret = sdhci_uhs2_ops.do_detect_init (host); +else +return 0 ; + +return ret; +} + +static int sdhci_uhs2_set_reg (struct mmc_host *mmc,enum uhs2_act act) +{ +struct sdhci_host *host =mmc_priv (mmc); +int ret; + +if (sdhci_uhs2_ops.do_set_reg) + ret = sdhci_uhs2_ops.do_set_reg (host, act); +else + ret =0 ; + +return ret; +} + +static void sdhci_uhs2_disable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + + clk &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); +} + +static void sdhci_uhs2_enable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +ktime_t timeout; + + clk |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); + +/* Wait max 20 ms */ + timeout =ktime_add_ms (ktime_get (),20 ); +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + + clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (clk &SDHCI_CLOCK_INT_STABLE ) +break ; +if (timedout) { +pr_err ("%s: Internal clock never stabilised.\n" , +mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return ; + } +udelay (10 ); + } +} +#endif /* CONFIG_MMC_SDHCI_UHS2 */ +static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .post_req = sdhci_post_req,
@@ -2992,6 +3056,12 @@ static const struct mmc_host_ops sdhci_ops = { .execute_tuning = sdhci_execute_tuning, .card_event = sdhci_card_event, .card_busy = sdhci_card_busy, +#if IS_ENABLED (CONFIG_MMC_SDHCI_UHS2 ) + .uhs2_detect_init = sdhci_uhs2_detect_init, + .uhs2_set_reg = sdhci_uhs2_set_reg, + .uhs2_disable_clk = sdhci_uhs2_disable_clk, + .uhs2_enable_clk = sdhci_uhs2_enable_clk, +#endif /* CONFIG_MMC_SDHCI_UHS2 */ };/*****************************************************************************\
Signature · 1 line
2.27.0
Adrian Hunter
maintainerQuoted 71 lines · Ben Chuang
From: AKASHI Takahiro <[email protected]>
Export sdhci-specific UHS-II operations to core.
Signed-off-by Ben Chuang <[email protected]>Signed-off-by AKASHI Takahiro <[email protected]>--- drivers/mmc/host/sdhci.c | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)drivers/mmc/host/sdhci.c +53
-0@@ -2977,6 +2977,70 @@ static void sdhci_card_event(struct mmc_host *mmc)spin_unlock_irqrestore (&host->lock, flags); } +#if IS_ENABLED (CONFIG_MMC_SDHCI_UHS2 ) +static int sdhci_uhs2_detect_init (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +int ret; + +if (sdhci_uhs2_ops.do_detect_init) + ret = sdhci_uhs2_ops.do_detect_init (host); +else +return 0 ; + +return ret; +} + +static int sdhci_uhs2_set_reg (struct mmc_host *mmc,enum uhs2_act act) +{ +struct sdhci_host *host =mmc_priv (mmc); +int ret; + +if (sdhci_uhs2_ops.do_set_reg) + ret = sdhci_uhs2_ops.do_set_reg (host, act); +else + ret =0 ; + +return ret; +} + +static void sdhci_uhs2_disable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + + clk &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); +} + +static void sdhci_uhs2_enable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +ktime_t timeout; + + clk |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); + +/* Wait max 20 ms */ + timeout =ktime_add_ms (ktime_get (),20 ); +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + + clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (clk &SDHCI_CLOCK_INT_STABLE ) +break ;
drivers/mmc/host/sdhci.c static void sdhci_card_event(struct mmc_host *mmc) · line 3042
Quoted 10 lines
drivers/mmc/host/sdhci.c +10
-0+if (timedout) { +pr_err ("%s: Internal clock never stabilised.\n" , +mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return ; + } + udelay(10); + } +} +#endif /* CONFIG_MMC_SDHCI_UHS2 */
Please put all uhs2 functions in sdhci-uhs2.c and call them through sdhci_ops.
Quoted 18 lines
drivers/mmc/host/sdhci.c +7
-0+static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .post_req = sdhci_post_req,@@ -2992,6 +3056,12 @@ static const struct mmc_host_ops sdhci_ops = { .execute_tuning = sdhci_execute_tuning, .card_event = sdhci_card_event, .card_busy = sdhci_card_busy, +#if IS_ENABLED (CONFIG_MMC_SDHCI_UHS2 ) + .uhs2_detect_init = sdhci_uhs2_detect_init, + .uhs2_set_reg = sdhci_uhs2_set_reg, + .uhs2_disable_clk = sdhci_uhs2_disable_clk, + .uhs2_enable_clk = sdhci_uhs2_enable_clk, +#endif /* CONFIG_MMC_SDHCI_UHS2 */ };/*****************************************************************************\
Quoted 76 lines · Adrian Hunter
Quoted 75 lines · Ben Chuang
From: AKASHI Takahiro <[email protected]>
Export sdhci-specific UHS-II operations to core.
Signed-off-by Ben Chuang <[email protected]>Signed-off-by AKASHI Takahiro <[email protected]>--- drivers/mmc/host/sdhci.c | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)drivers/mmc/host/sdhci.c +57
-0@@ -2977,6 +2977,70 @@ static void sdhci_card_event(struct mmc_host *mmc)spin_unlock_irqrestore (&host->lock, flags); } +#if IS_ENABLED (CONFIG_MMC_SDHCI_UHS2 ) +static int sdhci_uhs2_detect_init (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +int ret; + +if (sdhci_uhs2_ops.do_detect_init) + ret = sdhci_uhs2_ops.do_detect_init (host); +else +return 0 ; + +return ret; +} + +static int sdhci_uhs2_set_reg (struct mmc_host *mmc,enum uhs2_act act) +{ +struct sdhci_host *host =mmc_priv (mmc); +int ret; + +if (sdhci_uhs2_ops.do_set_reg) + ret = sdhci_uhs2_ops.do_set_reg (host, act); +else + ret =0 ; + +return ret; +} + +static void sdhci_uhs2_disable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + + clk &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); +} + +static void sdhci_uhs2_enable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +ktime_t timeout; + + clk |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); + +/* Wait max 20 ms */ + timeout =ktime_add_ms (ktime_get (),20 ); +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + + clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (clk &SDHCI_CLOCK_INT_STABLE ) +break ; +if (timedout) { +pr_err ("%s: Internal clock never stabilised.\n" , +mmc_hostname (host->mmc)); +sdhci_dumpregs (host);
Quoted 8 lines
drivers/mmc/host/sdhci.c static void sdhci_card_event(struct mmc_host *mmc) · line 3042
Quoted 6 lines
drivers/mmc/host/sdhci.c +6
-0+ return; + } +udelay (10 ); + } +} +#endif /* CONFIG_MMC_SDHCI_UHS2 */ Please put all uhs2 functions in
sdhci-uhs2.cand call them throughsdhci_ops.
Okay although the logic itself in sdhci_uhs2_[enable|disable]_clk() doesn't seem to be UHS-II specific.
-Takahiro Akashi
Quoted 20 lines
Quoted 19 lines
drivers/mmc/host/sdhci.c +7
-0+static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .post_req = sdhci_post_req,@@ -2992,6 +3056,12 @@ static const struct mmc_host_ops sdhci_ops = { .execute_tuning = sdhci_execute_tuning, .card_event = sdhci_card_event, .card_busy = sdhci_card_busy, +#if IS_ENABLED (CONFIG_MMC_SDHCI_UHS2 ) + .uhs2_detect_init = sdhci_uhs2_detect_init, + .uhs2_set_reg = sdhci_uhs2_set_reg, + .uhs2_disable_clk = sdhci_uhs2_disable_clk, + .uhs2_enable_clk = sdhci_uhs2_enable_clk, +#endif /* CONFIG_MMC_SDHCI_UHS2 */ };/*****************************************************************************\