[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1420732305.207559.0.camel@djiang5-desk2.amr.corp.intel.com>
Date: Thu, 8 Jan 2015 15:51:45 +0000
From: "Jiang, Dave" <dave.jiang@...el.com>
To: "der.herr@...r.at" <der.herr@...r.at>
CC: "Williams, Dan J" <dan.j.williams@...el.com>,
"dmaengine@...r.kernel.org" <dmaengine@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"rashika.kheria@...il.com" <rashika.kheria@...il.com>,
"Koul, Vinod" <vinod.koul@...el.com>,
"prarit@...hat.com" <prarit@...hat.com>,
"josh@...htriplett.org" <josh@...htriplett.org>
Subject: Re: [PATCH v2] ioat: fail self-test if wait_for_completion times out
On Thu, 2015-01-08 at 14:16 +0000, Nicholas Mc Guire wrote:
> wait_for_completion_timeout reaching timeout was being ignored,
> fail the self-test if timeout condition occurs.
>
> v2: fixup of coding style issues.
>
> Signed-off-by: Nicholas Mc Guire <der.herr@...r.at>
Acked-by: Dave Jiang <dave.jiang@...el.com>
> ---
>
> this was only compile tested with
> x86_64_defconfig + CONFIG_DMA_ENGINE=y + CONFIG_INTEL_IOATDMA=m
>
> patch is against linux-next 3.19.0-rc3 -next-20150108
>
> drivers/dma/ioat/dma_v3.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
> index be307182..a26882e 100644
> --- a/drivers/dma/ioat/dma_v3.c
> +++ b/drivers/dma/ioat/dma_v3.c
> @@ -1311,7 +1311,8 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
>
> tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
>
> - if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
> + if (tmo == 0 ||
> + dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
> dev_err(dev, "Self-test xor timed out\n");
> err = -ENODEV;
> goto dma_unmap;
> @@ -1377,7 +1378,8 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
>
> tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
>
> - if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
> + if (tmo == 0 ||
> + dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
> dev_err(dev, "Self-test validate timed out\n");
> err = -ENODEV;
> goto dma_unmap;
> @@ -1429,7 +1431,8 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
>
> tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
>
> - if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
> + if (tmo == 0 ||
> + dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
> dev_err(dev, "Self-test 2nd validate timed out\n");
> err = -ENODEV;
> goto dma_unmap;
Powered by blists - more mailing lists