Re: [PATCH v9 14/15] mmc: sdhci-cadence: Support mmc hardware reset

[Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>]

Hi Brad,

On Wed, Jan 18, 2023 at 07:51:35PM -0800, Brad Larson wrote:
> Add support for mmc hardware reset using a reset-controller
> that would need to be enabled in the device tree with
> a supporting driver.  The default is disabled for all
> existing designs.
> 
> Signed-off-by: Brad Larson <blarson@xxxxxxx>
> ---
> 
> Changes since v6:
> - Previously patch 17/17
> - Changed delay after reset_control_assert() from 9 to 3 usec
> - Renamed sdhci_mmc_hw_reset() to sdhci_cdns_mmc_hw_reset()
> 
> ---
>  drivers/mmc/host/sdhci-cadence.c | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
> index e92aa79a8be2..62321cef41db 100644
> --- a/drivers/mmc/host/sdhci-cadence.c
> +++ b/drivers/mmc/host/sdhci-cadence.c
> @@ -12,6 +12,7 @@
[...]
>  static int sdhci_cdns_probe(struct platform_device *pdev)
>  {
>  	struct sdhci_host *host;
> @@ -521,6 +541,17 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto free;
>  
> +	if (host->mmc->caps & MMC_CAP_HW_RESET) {
> +		priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, "hw");
> +		if (IS_ERR(priv->rst_hw)) {
> +			ret = PTR_ERR(priv->rst_hw);
> +			if (ret == -ENOENT)
> +				priv->rst_hw = NULL;

The optional reset_control_get variants return NULL instead of -ENOENT
if no reset is specified.

This should return on any error instead.

> +		} else {
> +			host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;

This probably shouldn't be set if reset_control_get_optional returned NULL.

> +		}
> +	}
> +
>  	ret = sdhci_add_host(host);

regards
Philipp