Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20220112083156.1124782-1-jiasheng@iscas.ac.cn>
In-Reply-To: <20220112083156.1124782-1-jiasheng@iscas.ac.cn>
From:   Ulf Hansson <ulf.hansson@linaro.org>
Date:   Fri, 21 Jan 2022 15:31:58 +0100
Message-ID: <CAPDyKFpJ3i4QrraziGNn+dMn_0GipHPsKeMxqJ4cNVpm0GYmXg@mail.gmail.com>
Subject: Re: [PATCH v2] mmc: sdhci-of-esdhc: Check for error num after setting mask
To:     Jiasheng Jiang <jiasheng@iscas.ac.cn>
Cc:     adrian.hunter@intel.com, linux-mmc@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, 12 Jan 2022 at 09:32, Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote:
>
> Because of the possible failure of the dma_supported(), the
> dma_set_mask_and_coherent() may return error num.
> Therefore, it should be better to check it and return the error if
> fails.
> And since the sdhci_setup_host() has already checked the return value of
> the enable_dma, we need not check it in sdhci_resume_host() again.
>
> Fixes: 5552d7ad596c ("mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe


> ---
> Changelog
>
> v1 -> v2
>
> * Change 1. Remove the change of esdhc_of_resume and refine the commit
> * message.
> ---
>  drivers/mmc/host/sdhci-of-esdhc.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
> index a593b1fbd69e..0f3658b36513 100644
> --- a/drivers/mmc/host/sdhci-of-esdhc.c
> +++ b/drivers/mmc/host/sdhci-of-esdhc.c
> @@ -524,12 +524,16 @@ static void esdhc_of_adma_workaround(struct sdhci_host *host, u32 intmask)
>
>  static int esdhc_of_enable_dma(struct sdhci_host *host)
>  {
> +       int ret;
>         u32 value;
>         struct device *dev = mmc_dev(host->mmc);
>
>         if (of_device_is_compatible(dev->of_node, "fsl,ls1043a-esdhc") ||
> -           of_device_is_compatible(dev->of_node, "fsl,ls1046a-esdhc"))
> -               dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));
> +           of_device_is_compatible(dev->of_node, "fsl,ls1046a-esdhc")) {
> +               ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));
> +               if (ret)
> +                       return ret;
> +       }
>
>         value = sdhci_readl(host, ESDHC_DMA_SYSCTL);
>
> --
> 2.25.1
>