[PATCH v2 14/14] mci: sdhci: replace sdhci_wait_idle

[Ahmad Fatoum]

On 14.03.24 19:47, Steffen Trumtrar wrote:
> Linux uses a different sdhci_wait_idle function than what barebox
> currently does. For HS200 support, the linux version needs to be used.
> As currently only arasan-sdhci is tested with HS200, keep the old
> sdhci_wait_idle as sdhci_wait_idle_data and convert all users of it.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
> Signed-off-by: Steffen Trumtrar <s.trumtrar at pengutronix.de>

I would have split this up into two commits, but this is ok too:

Reviewed-by: Ahmad Fatoum <a.fatoum at pengutronix.de>

> ---
>  drivers/mci/am654-sdhci.c            |  2 +-
>  drivers/mci/arasan-sdhci.c           |  2 +-
>  drivers/mci/atmel-sdhci-common.c     |  4 ++--
>  drivers/mci/dove-sdhci.c             |  2 +-
>  drivers/mci/mci-bcm2835.c            |  2 +-
>  drivers/mci/rockchip-dwcmshc-sdhci.c |  2 +-
>  drivers/mci/sdhci.c                  | 29 +++++++++++++++++++++++++++--
>  drivers/mci/sdhci.h                  |  3 ++-
>  8 files changed, 36 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/mci/am654-sdhci.c b/drivers/mci/am654-sdhci.c
> index 1d94834c1a..391b65591c 100644
> --- a/drivers/mci/am654-sdhci.c
> +++ b/drivers/mci/am654-sdhci.c
> @@ -471,7 +471,7 @@ static int am654_sdhci_send_cmd(struct mci_host *mci, struct mci_cmd *cmd,
>  	int ret;
>  	dma_addr_t dma;
>  
> -	ret = sdhci_wait_idle(&host->sdhci, cmd);
> +	ret = sdhci_wait_idle_data(&host->sdhci, cmd);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/mci/arasan-sdhci.c b/drivers/mci/arasan-sdhci.c
> index 80489e98f4..0a06308dbe 100644
> --- a/drivers/mci/arasan-sdhci.c
> +++ b/drivers/mci/arasan-sdhci.c
> @@ -250,7 +250,7 @@ static int arasan_sdhci_send_cmd(struct mci_host *mci, struct mci_cmd *cmd,
>  	u32 mask, command, xfer;
>  	int ret;
>  
> -	ret = sdhci_wait_idle(&host->sdhci, cmd);
> +	ret = sdhci_wait_idle(&host->sdhci, cmd, data);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/mci/atmel-sdhci-common.c b/drivers/mci/atmel-sdhci-common.c
> index a69d6b67b5..082ce842f7 100644
> --- a/drivers/mci/atmel-sdhci-common.c
> +++ b/drivers/mci/atmel-sdhci-common.c
> @@ -98,7 +98,7 @@ int at91_sdhci_send_command(struct at91_sdhci *host, struct mci_cmd *cmd,
>  	int status;
>  	int ret;
>  
> -	ret = sdhci_wait_idle(&host->sdhci, cmd);
> +	ret = sdhci_wait_idle_data(&host->sdhci, cmd);
>  	if (ret)
>  		return ret;
>  
> @@ -188,7 +188,7 @@ static int at91_sdhci_set_clock(struct at91_sdhci *host, unsigned clock)
>  	u32 caps, caps_clk_mult;
>  	int ret;
>  
> -	ret = sdhci_wait_idle(&host->sdhci, NULL);
> +	ret = sdhci_wait_idle_data(&host->sdhci, NULL);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/mci/dove-sdhci.c b/drivers/mci/dove-sdhci.c
> index 8a4c4a11b4..d37046ad31 100644
> --- a/drivers/mci/dove-sdhci.c
> +++ b/drivers/mci/dove-sdhci.c
> @@ -62,7 +62,7 @@ static int dove_sdhci_mci_send_cmd(struct mci_host *mci, struct mci_cmd *cmd,
>  	unsigned int num_bytes = 0;
>  	struct dove_sdhci *host = priv_from_mci_host(mci);
>  
> -	ret = sdhci_wait_idle(&host->sdhci, cmd);
> +	ret = sdhci_wait_idle_data(&host->sdhci, cmd);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c
> index 2b541e4c05..455ce994f7 100644
> --- a/drivers/mci/mci-bcm2835.c
> +++ b/drivers/mci/mci-bcm2835.c
> @@ -128,7 +128,7 @@ static int bcm2835_mci_request(struct mci_host *mci, struct mci_cmd *cmd,
>  		block_data |= data->blocksize;
>  	}
>  
> -	ret = sdhci_wait_idle(&host->sdhci, cmd);
> +	ret = sdhci_wait_idle_data(&host->sdhci, cmd);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/mci/rockchip-dwcmshc-sdhci.c b/drivers/mci/rockchip-dwcmshc-sdhci.c
> index 03f463a3f6..f503dbae65 100644
> --- a/drivers/mci/rockchip-dwcmshc-sdhci.c
> +++ b/drivers/mci/rockchip-dwcmshc-sdhci.c
> @@ -249,7 +249,7 @@ static int rk_sdhci_send_cmd(struct mci_host *mci, struct mci_cmd *cmd,
>  	int ret;
>  	dma_addr_t dma;
>  
> -	ret = sdhci_wait_idle(&host->sdhci, cmd);
> +	ret = sdhci_wait_idle_data(&host->sdhci, cmd);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
> index 7dedd5a7b2..8bba1e3bf9 100644
> --- a/drivers/mci/sdhci.c
> +++ b/drivers/mci/sdhci.c
> @@ -788,7 +788,32 @@ void sdhci_enable_clk(struct sdhci *host, u16 clk)
>  	sdhci_write16(host, SDHCI_CLOCK_CONTROL, clk);
>  }
>  
> -int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd)
> +int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd, struct mci_data *data)
> +{
> +	u32 mask;
> +	int ret;
> +
> +	mask = SDHCI_CMD_INHIBIT_CMD;
> +
> +	if (data || (cmd && (cmd->resp_type & MMC_RSP_BUSY)))
> +		mask |= SDHCI_CMD_INHIBIT_DATA;
> +
> +	if (cmd && cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION)
> +		mask &= ~SDHCI_CMD_INHIBIT_DATA;
> +
> +	ret = wait_on_timeout(10 * MSECOND,
> +			!(sdhci_read32(host, SDHCI_PRESENT_STATE) & mask));
> +
> +	if (ret) {
> +		dev_err(host->mci->hw_dev,
> +				"SDHCI timeout while waiting for idle\n");
> +		return -EBUSY;
> +	}
> +
> +	return 0;
> +}
> +
> +int sdhci_wait_idle_data(struct sdhci *host, struct mci_cmd *cmd)
>  {
>  	u32 mask;
>  	int ret;
> @@ -820,7 +845,7 @@ void sdhci_set_clock(struct sdhci *host, unsigned int clock, unsigned int input_
>  
>  	sdhci_set_uhs_signaling(host, host->mci->timing);
>  
> -	sdhci_wait_idle(host, NULL);
> +	sdhci_wait_idle_data(host, NULL);
>  
>  	sdhci_write16(host, SDHCI_CLOCK_CONTROL, 0);
>  
> diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h
> index f10a801c88..15ce2b92b6 100644
> --- a/drivers/mci/sdhci.h
> +++ b/drivers/mci/sdhci.h
> @@ -309,7 +309,8 @@ static inline void sdhci_write8(struct sdhci *host, int reg, u32 val)
>  
>  #define SDHCI_NO_DMA DMA_ERROR_CODE
>  int sdhci_execute_tuning(struct sdhci *sdhci, u32 opcode);
> -int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd);
> +int sdhci_wait_idle_data(struct sdhci *host, struct mci_cmd *cmd);
> +int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd, struct mci_data *data);
>  int sdhci_wait_for_done(struct sdhci *host, u32 mask);
>  void sdhci_read_response(struct sdhci *host, struct mci_cmd *cmd);
>  void sdhci_set_cmd_xfer_mode(struct sdhci *host, struct mci_cmd *cmd,
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |