[PATCH 12/12] mci: arasan: use sdhci_wait_idle2

[Ahmad Fatoum]

Hello Steffen,

On 08.03.24 12:17, Steffen Trumtrar wrote:
> To support HS200 mode, the arasan needs a differernt sdhci_wait_idle
> function. Remove the default CMD_INHIBIT_DATA, otherwise the sdhci hs200
> tuning will timeout.

AFAICS, this new sdhci_wait_idle2 is what Linux does by default. Given
that we will want to replace existing sdhci_wait_idle with the new
version, I think you should rename the old one to sdhci_wait_idle_data()
or similar and add sdhci_wait_idle2 without the 2.

> +	mask = SDHCI_CMD_INHIBIT_CMD;
> +
> +	if (data || (cmd->resp_type & MMC_RSP_BUSY))
> +		mask |= SDHCI_CMD_INHIBIT_DATA;

Here cmd is de-referenced unconditionally.

> +
> +	if (cmd && cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION)
> +		mask &= ~SDHCI_CMD_INHIBIT_DATA;

Here, it's checked after the fact. Can you add a cmd && check in the hunk
before too?

Cheers,
Ahmad

> +
> +	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(struct sdhci *host, struct mci_cmd *cmd)
>  {
>  	u32 mask;
> diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h
> index 80916e670f..80c3f98c9c 100644
> --- a/drivers/mci/sdhci.h
> +++ b/drivers/mci/sdhci.h
> @@ -307,6 +307,7 @@ 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_idle2(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 |