linux-kernel - Re: [PATCH 1/2] spi/spi_s3c64xx: Fix timeout handling in wait_for

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <AANLkTi=6voS7WXcXgVTdK614W0Epy_Ehf5QzufErV2tD@mail.gmail.com>
Date:	Wed, 8 Sep 2010 10:11:59 +0900
From:	Jassi Brar <jassisinghbrar@...il.com>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	Grant Likely <grant.likely@...retlab.ca>,
	David Brownell <dbrownell@...rs.sourceforge.net>,
	Jassi Brar <jassi.brar@...sung.com>,
	spi-devel-general@...ts.sourceforge.net,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] spi/spi_s3c64xx: Fix timeout handling in wait_for_xfer()

On Wed, Sep 8, 2010 at 12:37 AM, Mark Brown
<broonie@...nsource.wolfsonmicro.com> wrote:
> In wait_for_xfer() for PIO transfer we are using val as both a
> counter variable to track the number of spins we've waited for
> completion and the value we read from the controller, causing
> us to fail to ever actually notice the timeout. Fix this by using
> a separate value to hold the register readback.
>
> Also warn when we hit the timeout.
>
> Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
> ---
>  drivers/spi/spi_s3c64xx.c |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/spi/spi_s3c64xx.c b/drivers/spi/spi_s3c64xx.c
> index 6e48ea9..03b28e4 100644
> --- a/drivers/spi/spi_s3c64xx.c
> +++ b/drivers/spi/spi_s3c64xx.c
> @@ -321,7 +321,7 @@ static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd,
>  {
>        struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
>        void __iomem *regs = sdd->regs;
> -       unsigned long val;
> +       unsigned long val, reg;
>        int ms;
>
>        /* millisecs to xfer 'len' bytes @ 'cur_speed' */
> @@ -333,13 +333,16 @@ static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd,
>                val = wait_for_completion_timeout(&sdd->xfer_completion, val);
>        } else {
>                val = msecs_to_loops(ms);
> +
>                do {
> -                       val = readl(regs + S3C64XX_SPI_STATUS);
> -               } while (RX_FIFO_LVL(val, sci) < xfer->len && --val);
> +                       reg = readl(regs + S3C64XX_SPI_STATUS);
> +               } while (RX_FIFO_LVL(reg, sci) < xfer->len && --val);
>        }
>
> -       if (!val)
> +       if (!val) {
> +               dev_warn(&sdd->pdev->dev, "Transfer timeout\n");
>                return -EIO;
> +       }

I have already submitted a patch a few days ago
https://patchwork.kernel.org/patch/151941/
(It's strange that Grant's id isn't there in the CC list, despite my writing it)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/