* [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr()
@ 2019-12-12 7:52 Yangbo Lu
2019-12-12 7:52 ` [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 Yangbo Lu
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Yangbo Lu @ 2019-12-12 7:52 UTC (permalink / raw)
To: linux-mmc, Ulf Hansson, Adrian Hunter; +Cc: Yangbo Lu
Convert to use a new function esdhc_tuning_window_ptr() to
get tuning window start point and end point.
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
drivers/mmc/host/sdhci-of-esdhc.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 7f87a90..cd0f21e 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -882,20 +882,11 @@ static void esdhc_tuning_block_enable(struct sdhci_host *host, bool enable)
esdhc_clock_enable(host, true);
}
-static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start,
+static void esdhc_tuning_window_ptr(struct sdhci_host *host, u8 *window_start,
u8 *window_end)
{
- struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
- u8 tbstat_15_8, tbstat_7_0;
u32 val;
- if (esdhc->quirk_tuning_erratum_type1) {
- *window_start = 5 * esdhc->div_ratio;
- *window_end = 3 * esdhc->div_ratio;
- return;
- }
-
/* Write TBCTL[11:8]=4'h8 */
val = sdhci_readl(host, ESDHC_TBCTL);
val &= ~(0xf << 8);
@@ -914,6 +905,25 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start,
val = sdhci_readl(host, ESDHC_TBSTAT);
val = sdhci_readl(host, ESDHC_TBSTAT);
+ *window_end = val & 0xff;
+ *window_start = (val >> 8) & 0xff;
+}
+
+static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start,
+ u8 *window_end)
+{
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
+ u8 start_ptr, end_ptr;
+
+ if (esdhc->quirk_tuning_erratum_type1) {
+ *window_start = 5 * esdhc->div_ratio;
+ *window_end = 3 * esdhc->div_ratio;
+ return;
+ }
+
+ esdhc_tuning_window_ptr(host, &start_ptr, &end_ptr);
+
/* Reset data lines by setting ESDHCCTL[RSTD] */
sdhci_reset(host, SDHCI_RESET_DATA);
/* Write 32'hFFFF_FFFF to IRQSTAT register */
@@ -924,10 +934,8 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start,
* then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio
* and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio.
*/
- tbstat_7_0 = val & 0xff;
- tbstat_15_8 = (val >> 8) & 0xff;
- if (abs(tbstat_15_8 - tbstat_7_0) > (4 * esdhc->div_ratio)) {
+ if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio)) {
*window_start = 8 * esdhc->div_ratio;
*window_end = 4 * esdhc->div_ratio;
} else {
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 2019-12-12 7:52 [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Yangbo Lu @ 2019-12-12 7:52 ` Yangbo Lu 2019-12-20 7:46 ` Adrian Hunter 2020-01-16 14:39 ` Ulf Hansson 2019-12-13 12:20 ` [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Adrian Hunter ` (2 subsequent siblings) 3 siblings, 2 replies; 8+ messages in thread From: Yangbo Lu @ 2019-12-12 7:52 UTC (permalink / raw) To: linux-mmc, Ulf Hansson, Adrian Hunter; +Cc: Yangbo Lu There is an official update for eSDHC tuning erratum A-008171. This patch is to implement the changes, - Affect all revisions of SoC. - Changes for tuning window checking. - Hardware hits a new condition that tuning succeeds although the eSDHC might not have tuned properly for type2 SoCs (soc_tuning_erratum_type2[] array in driver). So check tuning window after tuning succeeds. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- drivers/mmc/host/sdhci-of-esdhc.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index cd0f21e..a99c000d 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -848,20 +848,20 @@ static int esdhc_signal_voltage_switch(struct mmc_host *mmc, } static struct soc_device_attribute soc_tuning_erratum_type1[] = { - { .family = "QorIQ T1023", .revision = "1.0", }, - { .family = "QorIQ T1040", .revision = "1.0", }, - { .family = "QorIQ T2080", .revision = "1.0", }, - { .family = "QorIQ LS1021A", .revision = "1.0", }, + { .family = "QorIQ T1023", }, + { .family = "QorIQ T1040", }, + { .family = "QorIQ T2080", }, + { .family = "QorIQ LS1021A", }, { }, }; static struct soc_device_attribute soc_tuning_erratum_type2[] = { - { .family = "QorIQ LS1012A", .revision = "1.0", }, - { .family = "QorIQ LS1043A", .revision = "1.*", }, - { .family = "QorIQ LS1046A", .revision = "1.0", }, - { .family = "QorIQ LS1080A", .revision = "1.0", }, - { .family = "QorIQ LS2080A", .revision = "1.0", }, - { .family = "QorIQ LA1575A", .revision = "1.0", }, + { .family = "QorIQ LS1012A", }, + { .family = "QorIQ LS1043A", }, + { .family = "QorIQ LS1046A", }, + { .family = "QorIQ LS1080A", }, + { .family = "QorIQ LS2080A", }, + { .family = "QorIQ LA1575A", }, { }, }; @@ -929,13 +929,13 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, /* Write 32'hFFFF_FFFF to IRQSTAT register */ sdhci_writel(host, 0xFFFFFFFF, SDHCI_INT_STATUS); - /* If TBSTAT[15:8]-TBSTAT[7:0] > 4 * div_ratio - * or TBSTAT[7:0]-TBSTAT[15:8] > 4 * div_ratio, + /* If TBSTAT[15:8]-TBSTAT[7:0] > (4 * div_ratio) + 2 + * or TBSTAT[7:0]-TBSTAT[15:8] > (4 * div_ratio) + 2, * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio. */ - if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio)) { + if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio + 2)) { *window_start = 8 * esdhc->div_ratio; *window_end = 4 * esdhc->div_ratio; } else { @@ -1008,6 +1008,19 @@ static int esdhc_execute_tuning(struct mmc_host *mmc, u32 opcode) if (ret) break; + /* For type2 affected platforms of the tuning erratum, + * tuning may succeed although eSDHC might not have + * tuned properly. Need to check tuning window. + */ + if (esdhc->quirk_tuning_erratum_type2 && + !host->tuning_err) { + esdhc_tuning_window_ptr(host, &window_start, + &window_end); + if (abs(window_start - window_end) > + (4 * esdhc->div_ratio + 2)) + host->tuning_err = -EAGAIN; + } + /* If HW tuning fails and triggers erratum, * try workaround. */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 2019-12-12 7:52 ` [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 Yangbo Lu @ 2019-12-20 7:46 ` Adrian Hunter 2020-01-16 14:39 ` Ulf Hansson 1 sibling, 0 replies; 8+ messages in thread From: Adrian Hunter @ 2019-12-20 7:46 UTC (permalink / raw) To: Yangbo Lu, linux-mmc, Ulf Hansson On 12/12/19 9:52 am, Yangbo Lu wrote: > There is an official update for eSDHC tuning erratum A-008171. > This patch is to implement the changes, > - Affect all revisions of SoC. > - Changes for tuning window checking. > - Hardware hits a new condition that tuning succeeds although > the eSDHC might not have tuned properly for type2 SoCs > (soc_tuning_erratum_type2[] array in driver). So check > tuning window after tuning succeeds. > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci-of-esdhc.c | 39 ++++++++++++++++++++++++++------------- > 1 file changed, 26 insertions(+), 13 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c > index cd0f21e..a99c000d 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -848,20 +848,20 @@ static int esdhc_signal_voltage_switch(struct mmc_host *mmc, > } > > static struct soc_device_attribute soc_tuning_erratum_type1[] = { > - { .family = "QorIQ T1023", .revision = "1.0", }, > - { .family = "QorIQ T1040", .revision = "1.0", }, > - { .family = "QorIQ T2080", .revision = "1.0", }, > - { .family = "QorIQ LS1021A", .revision = "1.0", }, > + { .family = "QorIQ T1023", }, > + { .family = "QorIQ T1040", }, > + { .family = "QorIQ T2080", }, > + { .family = "QorIQ LS1021A", }, > { }, > }; > > static struct soc_device_attribute soc_tuning_erratum_type2[] = { > - { .family = "QorIQ LS1012A", .revision = "1.0", }, > - { .family = "QorIQ LS1043A", .revision = "1.*", }, > - { .family = "QorIQ LS1046A", .revision = "1.0", }, > - { .family = "QorIQ LS1080A", .revision = "1.0", }, > - { .family = "QorIQ LS2080A", .revision = "1.0", }, > - { .family = "QorIQ LA1575A", .revision = "1.0", }, > + { .family = "QorIQ LS1012A", }, > + { .family = "QorIQ LS1043A", }, > + { .family = "QorIQ LS1046A", }, > + { .family = "QorIQ LS1080A", }, > + { .family = "QorIQ LS2080A", }, > + { .family = "QorIQ LA1575A", }, > { }, > }; > > @@ -929,13 +929,13 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > /* Write 32'hFFFF_FFFF to IRQSTAT register */ > sdhci_writel(host, 0xFFFFFFFF, SDHCI_INT_STATUS); > > - /* If TBSTAT[15:8]-TBSTAT[7:0] > 4 * div_ratio > - * or TBSTAT[7:0]-TBSTAT[15:8] > 4 * div_ratio, > + /* If TBSTAT[15:8]-TBSTAT[7:0] > (4 * div_ratio) + 2 > + * or TBSTAT[7:0]-TBSTAT[15:8] > (4 * div_ratio) + 2, > * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio > * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio. > */ > > - if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio)) { > + if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio + 2)) { > *window_start = 8 * esdhc->div_ratio; > *window_end = 4 * esdhc->div_ratio; > } else { > @@ -1008,6 +1008,19 @@ static int esdhc_execute_tuning(struct mmc_host *mmc, u32 opcode) > if (ret) > break; > > + /* For type2 affected platforms of the tuning erratum, > + * tuning may succeed although eSDHC might not have > + * tuned properly. Need to check tuning window. > + */ > + if (esdhc->quirk_tuning_erratum_type2 && > + !host->tuning_err) { > + esdhc_tuning_window_ptr(host, &window_start, > + &window_end); > + if (abs(window_start - window_end) > > + (4 * esdhc->div_ratio + 2)) > + host->tuning_err = -EAGAIN; > + } > + > /* If HW tuning fails and triggers erratum, > * try workaround. > */ > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 2019-12-12 7:52 ` [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 Yangbo Lu 2019-12-20 7:46 ` Adrian Hunter @ 2020-01-16 14:39 ` Ulf Hansson 1 sibling, 0 replies; 8+ messages in thread From: Ulf Hansson @ 2020-01-16 14:39 UTC (permalink / raw) To: Yangbo Lu; +Cc: linux-mmc, Adrian Hunter On Thu, 12 Dec 2019 at 08:53, Yangbo Lu <yangbo.lu@nxp.com> wrote: > > There is an official update for eSDHC tuning erratum A-008171. > This patch is to implement the changes, > - Affect all revisions of SoC. > - Changes for tuning window checking. > - Hardware hits a new condition that tuning succeeds although > the eSDHC might not have tuned properly for type2 SoCs > (soc_tuning_erratum_type2[] array in driver). So check > tuning window after tuning succeeds. > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-of-esdhc.c | 39 ++++++++++++++++++++++++++------------- > 1 file changed, 26 insertions(+), 13 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c > index cd0f21e..a99c000d 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -848,20 +848,20 @@ static int esdhc_signal_voltage_switch(struct mmc_host *mmc, > } > > static struct soc_device_attribute soc_tuning_erratum_type1[] = { > - { .family = "QorIQ T1023", .revision = "1.0", }, > - { .family = "QorIQ T1040", .revision = "1.0", }, > - { .family = "QorIQ T2080", .revision = "1.0", }, > - { .family = "QorIQ LS1021A", .revision = "1.0", }, > + { .family = "QorIQ T1023", }, > + { .family = "QorIQ T1040", }, > + { .family = "QorIQ T2080", }, > + { .family = "QorIQ LS1021A", }, > { }, > }; > > static struct soc_device_attribute soc_tuning_erratum_type2[] = { > - { .family = "QorIQ LS1012A", .revision = "1.0", }, > - { .family = "QorIQ LS1043A", .revision = "1.*", }, > - { .family = "QorIQ LS1046A", .revision = "1.0", }, > - { .family = "QorIQ LS1080A", .revision = "1.0", }, > - { .family = "QorIQ LS2080A", .revision = "1.0", }, > - { .family = "QorIQ LA1575A", .revision = "1.0", }, > + { .family = "QorIQ LS1012A", }, > + { .family = "QorIQ LS1043A", }, > + { .family = "QorIQ LS1046A", }, > + { .family = "QorIQ LS1080A", }, > + { .family = "QorIQ LS2080A", }, > + { .family = "QorIQ LA1575A", }, > { }, > }; > > @@ -929,13 +929,13 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > /* Write 32'hFFFF_FFFF to IRQSTAT register */ > sdhci_writel(host, 0xFFFFFFFF, SDHCI_INT_STATUS); > > - /* If TBSTAT[15:8]-TBSTAT[7:0] > 4 * div_ratio > - * or TBSTAT[7:0]-TBSTAT[15:8] > 4 * div_ratio, > + /* If TBSTAT[15:8]-TBSTAT[7:0] > (4 * div_ratio) + 2 > + * or TBSTAT[7:0]-TBSTAT[15:8] > (4 * div_ratio) + 2, > * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio > * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio. > */ > > - if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio)) { > + if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio + 2)) { > *window_start = 8 * esdhc->div_ratio; > *window_end = 4 * esdhc->div_ratio; > } else { > @@ -1008,6 +1008,19 @@ static int esdhc_execute_tuning(struct mmc_host *mmc, u32 opcode) > if (ret) > break; > > + /* For type2 affected platforms of the tuning erratum, > + * tuning may succeed although eSDHC might not have > + * tuned properly. Need to check tuning window. > + */ > + if (esdhc->quirk_tuning_erratum_type2 && > + !host->tuning_err) { > + esdhc_tuning_window_ptr(host, &window_start, > + &window_end); > + if (abs(window_start - window_end) > > + (4 * esdhc->div_ratio + 2)) > + host->tuning_err = -EAGAIN; > + } > + > /* If HW tuning fails and triggers erratum, > * try workaround. > */ > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() 2019-12-12 7:52 [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Yangbo Lu 2019-12-12 7:52 ` [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 Yangbo Lu @ 2019-12-13 12:20 ` Adrian Hunter 2019-12-16 3:23 ` Y.b. Lu 2019-12-20 7:45 ` Adrian Hunter 2020-01-16 14:39 ` Ulf Hansson 3 siblings, 1 reply; 8+ messages in thread From: Adrian Hunter @ 2019-12-13 12:20 UTC (permalink / raw) To: Yangbo Lu, Yinbo Zhu; +Cc: linux-mmc, Ulf Hansson, Rasmus Villemoes Is there a fix for below coming? https://lore.kernel.org/lkml/8afd0f53-eba8-e000-d8cc-b464e65850c3@rasmusvillemoes.dk/ ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() 2019-12-13 12:20 ` [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Adrian Hunter @ 2019-12-16 3:23 ` Y.b. Lu 0 siblings, 0 replies; 8+ messages in thread From: Y.b. Lu @ 2019-12-16 3:23 UTC (permalink / raw) To: Adrian Hunter, Yinbo Zhu; +Cc: linux-mmc, Ulf Hansson, Rasmus Villemoes Sorry Adrian. I missed that email. I sent out a fix up patch for reviewing. https://patchwork.kernel.org/patch/11293337/ Thanks! Best regards, Yangbo Lu > -----Original Message----- > From: linux-mmc-owner@vger.kernel.org <linux-mmc-owner@vger.kernel.org> > On Behalf Of Adrian Hunter > Sent: Friday, December 13, 2019 8:20 PM > To: Y.b. Lu <yangbo.lu@nxp.com>; Yinbo Zhu <yinbo.zhu@nxp.com> > Cc: linux-mmc@vger.kernel.org; Ulf Hansson <ulf.hansson@linaro.org>; > Rasmus Villemoes <linux@rasmusvillemoes.dk> > Subject: Re: [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use > esdhc_tuning_window_ptr() > > Is there a fix for below coming? > > https://lore.kernel.org/lkml/8afd0f53-eba8-e000-d8cc-b464e65850c3@rasmusvillemoes.dk/ ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() 2019-12-12 7:52 [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Yangbo Lu 2019-12-12 7:52 ` [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 Yangbo Lu 2019-12-13 12:20 ` [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Adrian Hunter @ 2019-12-20 7:45 ` Adrian Hunter 2020-01-16 14:39 ` Ulf Hansson 3 siblings, 0 replies; 8+ messages in thread From: Adrian Hunter @ 2019-12-20 7:45 UTC (permalink / raw) To: Yangbo Lu, linux-mmc, Ulf Hansson On 12/12/19 9:52 am, Yangbo Lu wrote: > Convert to use a new function esdhc_tuning_window_ptr() to > get tuning window start point and end point. > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci-of-esdhc.c | 34 +++++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c > index 7f87a90..cd0f21e 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -882,20 +882,11 @@ static void esdhc_tuning_block_enable(struct sdhci_host *host, bool enable) > esdhc_clock_enable(host, true); > } > > -static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > +static void esdhc_tuning_window_ptr(struct sdhci_host *host, u8 *window_start, > u8 *window_end) > { > - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > - struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host); > - u8 tbstat_15_8, tbstat_7_0; > u32 val; > > - if (esdhc->quirk_tuning_erratum_type1) { > - *window_start = 5 * esdhc->div_ratio; > - *window_end = 3 * esdhc->div_ratio; > - return; > - } > - > /* Write TBCTL[11:8]=4'h8 */ > val = sdhci_readl(host, ESDHC_TBCTL); > val &= ~(0xf << 8); > @@ -914,6 +905,25 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > val = sdhci_readl(host, ESDHC_TBSTAT); > val = sdhci_readl(host, ESDHC_TBSTAT); > > + *window_end = val & 0xff; > + *window_start = (val >> 8) & 0xff; > +} > + > +static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > + u8 *window_end) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host); > + u8 start_ptr, end_ptr; > + > + if (esdhc->quirk_tuning_erratum_type1) { > + *window_start = 5 * esdhc->div_ratio; > + *window_end = 3 * esdhc->div_ratio; > + return; > + } > + > + esdhc_tuning_window_ptr(host, &start_ptr, &end_ptr); > + > /* Reset data lines by setting ESDHCCTL[RSTD] */ > sdhci_reset(host, SDHCI_RESET_DATA); > /* Write 32'hFFFF_FFFF to IRQSTAT register */ > @@ -924,10 +934,8 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio > * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio. > */ > - tbstat_7_0 = val & 0xff; > - tbstat_15_8 = (val >> 8) & 0xff; > > - if (abs(tbstat_15_8 - tbstat_7_0) > (4 * esdhc->div_ratio)) { > + if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio)) { > *window_start = 8 * esdhc->div_ratio; > *window_end = 4 * esdhc->div_ratio; > } else { > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() 2019-12-12 7:52 [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Yangbo Lu ` (2 preceding siblings ...) 2019-12-20 7:45 ` Adrian Hunter @ 2020-01-16 14:39 ` Ulf Hansson 3 siblings, 0 replies; 8+ messages in thread From: Ulf Hansson @ 2020-01-16 14:39 UTC (permalink / raw) To: Yangbo Lu; +Cc: linux-mmc, Adrian Hunter On Thu, 12 Dec 2019 at 08:53, Yangbo Lu <yangbo.lu@nxp.com> wrote: > > Convert to use a new function esdhc_tuning_window_ptr() to > get tuning window start point and end point. > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-of-esdhc.c | 34 +++++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c > index 7f87a90..cd0f21e 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -882,20 +882,11 @@ static void esdhc_tuning_block_enable(struct sdhci_host *host, bool enable) > esdhc_clock_enable(host, true); > } > > -static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > +static void esdhc_tuning_window_ptr(struct sdhci_host *host, u8 *window_start, > u8 *window_end) > { > - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > - struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host); > - u8 tbstat_15_8, tbstat_7_0; > u32 val; > > - if (esdhc->quirk_tuning_erratum_type1) { > - *window_start = 5 * esdhc->div_ratio; > - *window_end = 3 * esdhc->div_ratio; > - return; > - } > - > /* Write TBCTL[11:8]=4'h8 */ > val = sdhci_readl(host, ESDHC_TBCTL); > val &= ~(0xf << 8); > @@ -914,6 +905,25 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > val = sdhci_readl(host, ESDHC_TBSTAT); > val = sdhci_readl(host, ESDHC_TBSTAT); > > + *window_end = val & 0xff; > + *window_start = (val >> 8) & 0xff; > +} > + > +static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > + u8 *window_end) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host); > + u8 start_ptr, end_ptr; > + > + if (esdhc->quirk_tuning_erratum_type1) { > + *window_start = 5 * esdhc->div_ratio; > + *window_end = 3 * esdhc->div_ratio; > + return; > + } > + > + esdhc_tuning_window_ptr(host, &start_ptr, &end_ptr); > + > /* Reset data lines by setting ESDHCCTL[RSTD] */ > sdhci_reset(host, SDHCI_RESET_DATA); > /* Write 32'hFFFF_FFFF to IRQSTAT register */ > @@ -924,10 +934,8 @@ static void esdhc_prepare_sw_tuning(struct sdhci_host *host, u8 *window_start, > * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio > * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio. > */ > - tbstat_7_0 = val & 0xff; > - tbstat_15_8 = (val >> 8) & 0xff; > > - if (abs(tbstat_15_8 - tbstat_7_0) > (4 * esdhc->div_ratio)) { > + if (abs(start_ptr - end_ptr) > (4 * esdhc->div_ratio)) { > *window_start = 8 * esdhc->div_ratio; > *window_end = 4 * esdhc->div_ratio; > } else { > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-01-16 14:40 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-12 7:52 [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Yangbo Lu 2019-12-12 7:52 ` [PATCH 2/2] mmc: sdhci-of-esdhc: update tuning erratum A-008171 Yangbo Lu 2019-12-20 7:46 ` Adrian Hunter 2020-01-16 14:39 ` Ulf Hansson 2019-12-13 12:20 ` [PATCH 1/2] mmc: sdhci-of-esdhc: convert to use esdhc_tuning_window_ptr() Adrian Hunter 2019-12-16 3:23 ` Y.b. Lu 2019-12-20 7:45 ` Adrian Hunter 2020-01-16 14:39 ` 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).