RE: [PATCH v2 2/2] mmc: host: sdhci-esdhc-imx: update esdhc sysctl dtocv bitmask

[Bough Chen]

> -----Original Message-----
> From: Josua Mayer <josua@xxxxxxxxxxxxx>
> Sent: 2024年10月30日 21:44
> To: Adrian Hunter <adrian.hunter@xxxxxxxxx>; Bough Chen
> <haibo.chen@xxxxxxx>; Ulf Hansson <ulf.hansson@xxxxxxxxxx>; Shawn Guo
> <shawnguo@xxxxxxxxxx>; Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>;
> Pengutronix Kernel Team <kernel@xxxxxxxxxxxxxx>; Fabio Estevam
> <festevam@xxxxxxxxx>
> Cc: Mikhail Anikin <mikhail.anikin@xxxxxxxxxxxxx>; Jon Nettleton
> <jon@xxxxxxxxxxxxx>; yazan.shhady <yazan.shhady@xxxxxxxxxxxxx>; Rabeeh
> Khoury <rabeeh@xxxxxxxxxxxxx>; imx@xxxxxxxxxxxxxxx;
> linux-mmc@xxxxxxxxxxxxxxx; dl-S32 <S32@xxxxxxx>;
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Subject: Re: [PATCH v2 2/2] mmc: host: sdhci-esdhc-imx: update esdhc sysctl
> dtocv bitmask
> 
> Am 30.10.24 um 14:37 schrieb Josua Mayer:
> > NXP ESDHC supports setting data timeout using uSDHCx_SYS_CTRL register
> > DTOCV bits (bits 16-19).
> > Currently the driver accesses those bits by 32-bit write using
> > SDHCI_TIMEOUT_CONTROL (0x2E) defined in drivers/mmc/host/sdhci.h.
> > This is offset by two bytes relative to uSDHCx_SYS_CTRL (0x2C).
> > The driver also defines ESDHC_SYS_CTRL_DTOCV_MASK as first 4 bits,
> > which is correct relative to SDHCI_TIMEOUT_CONTROL but not relative to
> > uSDHCx_SYS_CTRL. The definition carrying control register in its name
> > is therefore inconsistent.
> >
> > Update the bitmask definition for bits 16-19 to be correct relative to
> > control register base.
> > Update the esdhc_set_timeout function to set timeout value at control
> > register base, not timeout offset.
> >
> > This solves a purely cosmetic problem.
> >
> > Signed-off-by: Josua Mayer <josua@xxxxxxxxxxxxx>
> > ---
> >  drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c
> > b/drivers/mmc/host/sdhci-esdhc-imx.c
> > index
> >
> a830d9a9490408d3148b927bf1acc719a13e8975..101feabb24fb41bd10a2e796f
> 4f3
> > f8d4357dc245 100644
> > --- a/drivers/mmc/host/sdhci-esdhc-imx.c
> > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
> > @@ -30,10 +30,10 @@
> >  #include "sdhci-esdhc.h"
> >  #include "cqhci.h"
> >
> > -#define ESDHC_SYS_CTRL_DTOCV_MASK	0x0f
> >  #define	ESDHC_CTRL_D3CD			0x08
> >  #define ESDHC_BURST_LEN_EN_INCR		(1 << 27)
> >  #define ESDHC_SYS_CTRL			0x2c
> > +#define ESDHC_SYS_CTRL_DTOCV_MASK	GENMASK(19, 16)
> >  #define ESDHC_SYS_CTRL_IPP_RST_N	BIT(23)
> >  /* VENDOR SPEC register */
> >  #define ESDHC_VENDOR_SPEC		0xc0
> > @@ -1387,7 +1387,7 @@ static void esdhc_set_timeout(struct sdhci_host
> > *host, struct mmc_command *cmd)
> >
> >  	/* use maximum timeout counter */
> >  	esdhc_clrset_le(host, ESDHC_SYS_CTRL_DTOCV_MASK,
> > -			esdhc_is_usdhc(imx_data) ? 0xF : 0xE,
> > +			esdhc_is_usdhc(imx_data) ? 0x0F0000 : 0x0E0000,
> >  			SDHCI_TIMEOUT_CONTROL);
> ^^ There is a mistake here, intended: ESDHC_SYS_CTRL (I changed that last
> second while writing commit description :( )

Yes, please fix this.

Regards
Haibo Chen
> >  }
> >
> >