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: <20200814185011.3252020-1-t.schramm@manjaro.org>
In-Reply-To: <20200814185011.3252020-1-t.schramm@manjaro.org>
From:   Ulf Hansson <ulf.hansson@linaro.org>
Date:   Mon, 24 Aug 2020 11:50:51 +0200
Message-ID: <CAPDyKFoLV1bKSmEfthoLsJR76Mdb2dbdGC2y6vNYAKE2u6YAaQ@mail.gmail.com>
Subject: Re: [PATCH] mmc: mmc_spi: fix timeout calculation
To:     Tobias Schramm <t.schramm@manjaro.org>
Cc:     "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, 14 Aug 2020 at 20:50, Tobias Schramm <t.schramm@manjaro.org> wrote:
>
> Previously the cycle timeout was converted to a microsecond value but
> then incorrectly treated as a nanosecond timeout. This patch changes
> the code to convert both the nanosecond timeout and the cycle timeout
> to a microsecond value and use that directly.
>
> Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/mmc_spi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
> index 39bb1e30c2d7..f85e0ad896a9 100644
> --- a/drivers/mmc/host/mmc_spi.c
> +++ b/drivers/mmc/host/mmc_spi.c
> @@ -882,9 +882,9 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,
>         else
>                 clock_rate = spi->max_speed_hz;
>
> -       timeout = data->timeout_ns +
> +       timeout = data->timeout_ns / 1000 +
>                   data->timeout_clks * 1000000 / clock_rate;
> -       timeout = usecs_to_jiffies((unsigned int)(timeout / 1000)) + 1;
> +       timeout = usecs_to_jiffies((unsigned int)timeout) + 1;
>
>         /* Handle scatterlist segments one at a time, with synch for
>          * each 512-byte block
> --
> 2.28.0
>