* [PATCH v2] ioat: fail self-test if wait_for_completion times out
@ 2015-01-08 14:16 Nicholas Mc Guire
2015-01-08 15:51 ` Jiang, Dave
2015-01-08 15:57 ` Prarit Bhargava
0 siblings, 2 replies; 3+ messages in thread
From: Nicholas Mc Guire @ 2015-01-08 14:16 UTC (permalink / raw)
To: Vinod Koul
Cc: Dan Williams, Prarit Bhargava, Josh Triplett, Rashika, Dave Jiang,
dmaengine, linux-kernel, Nicholas Mc Guire
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@hofr.at>
---
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;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] ioat: fail self-test if wait_for_completion times out
2015-01-08 14:16 [PATCH v2] ioat: fail self-test if wait_for_completion times out Nicholas Mc Guire
@ 2015-01-08 15:51 ` Jiang, Dave
2015-01-08 15:57 ` Prarit Bhargava
1 sibling, 0 replies; 3+ messages in thread
From: Jiang, Dave @ 2015-01-08 15:51 UTC (permalink / raw)
To: der.herr@hofr.at
Cc: Williams, Dan J, dmaengine@vger.kernel.org,
linux-kernel@vger.kernel.org, rashika.kheria@gmail.com,
Koul, Vinod, prarit@redhat.com, josh@joshtriplett.org
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2200 bytes --]
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@hofr.at>
Acked-by: Dave Jiang <dave.jiang@intel.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;
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] ioat: fail self-test if wait_for_completion times out
2015-01-08 14:16 [PATCH v2] ioat: fail self-test if wait_for_completion times out Nicholas Mc Guire
2015-01-08 15:51 ` Jiang, Dave
@ 2015-01-08 15:57 ` Prarit Bhargava
1 sibling, 0 replies; 3+ messages in thread
From: Prarit Bhargava @ 2015-01-08 15:57 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Vinod Koul, Dan Williams, Josh Triplett, Rashika, Dave Jiang,
dmaengine, linux-kernel
On 01/08/2015 09:16 AM, 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@hofr.at>
Reviewed-by: Prarit Bhargava <prarit@redhat.com>
P.
> ---
>
> 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;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-08 15:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-08 14:16 [PATCH v2] ioat: fail self-test if wait_for_completion times out Nicholas Mc Guire
2015-01-08 15:51 ` Jiang, Dave
2015-01-08 15:57 ` Prarit Bhargava
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox