* [PATCH] dmaengine: qcom_hidma: prevent disable in error
@ 2016-10-06 19:33 ` Sinan Kaya
0 siblings, 0 replies; 4+ messages in thread
From: Sinan Kaya @ 2016-10-06 19:33 UTC (permalink / raw)
To: dmaengine, timur, cov
Cc: linux-arm-msm, linux-arm-kernel, Sinan Kaya, linux-kernel
When an error is observed, we try to disable the channel and prevent
further accesses from the client.
Depending on the type of error, transitioning into disabled state might
not be possible. Adding a check to make sure that HW is in enabled/running
state before the disable transition happens.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/dma/qcom/hidma_ll.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c
index 3224f24..c3a66c9 100644
--- a/drivers/dma/qcom/hidma_ll.c
+++ b/drivers/dma/qcom/hidma_ll.c
@@ -564,19 +564,8 @@ int hidma_ll_disable(struct hidma_lldev *lldev)
u32 val;
int ret;
- val = readl(lldev->evca + HIDMA_EVCA_CTRLSTS_REG);
- lldev->evch_state = HIDMA_CH_STATE(val);
- val = readl(lldev->trca + HIDMA_TRCA_CTRLSTS_REG);
- lldev->trch_state = HIDMA_CH_STATE(val);
-
- /* already suspended by this OS */
- if ((lldev->trch_state == HIDMA_CH_SUSPENDED) ||
- (lldev->evch_state == HIDMA_CH_SUSPENDED))
- return 0;
-
- /* already stopped by the manager */
- if ((lldev->trch_state == HIDMA_CH_STOPPED) ||
- (lldev->evch_state == HIDMA_CH_STOPPED))
+ /* The channel needs to be in working state */
+ if (!hidma_ll_isenabled(lldev))
return 0;
val = readl(lldev->trca + HIDMA_TRCA_CTRLSTS_REG);
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] dmaengine: qcom_hidma: prevent disable in error
@ 2016-10-06 19:33 ` Sinan Kaya
0 siblings, 0 replies; 4+ messages in thread
From: Sinan Kaya @ 2016-10-06 19:33 UTC (permalink / raw)
To: linux-arm-kernel
When an error is observed, we try to disable the channel and prevent
further accesses from the client.
Depending on the type of error, transitioning into disabled state might
not be possible. Adding a check to make sure that HW is in enabled/running
state before the disable transition happens.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/dma/qcom/hidma_ll.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c
index 3224f24..c3a66c9 100644
--- a/drivers/dma/qcom/hidma_ll.c
+++ b/drivers/dma/qcom/hidma_ll.c
@@ -564,19 +564,8 @@ int hidma_ll_disable(struct hidma_lldev *lldev)
u32 val;
int ret;
- val = readl(lldev->evca + HIDMA_EVCA_CTRLSTS_REG);
- lldev->evch_state = HIDMA_CH_STATE(val);
- val = readl(lldev->trca + HIDMA_TRCA_CTRLSTS_REG);
- lldev->trch_state = HIDMA_CH_STATE(val);
-
- /* already suspended by this OS */
- if ((lldev->trch_state == HIDMA_CH_SUSPENDED) ||
- (lldev->evch_state == HIDMA_CH_SUSPENDED))
- return 0;
-
- /* already stopped by the manager */
- if ((lldev->trch_state == HIDMA_CH_STOPPED) ||
- (lldev->evch_state == HIDMA_CH_STOPPED))
+ /* The channel needs to be in working state */
+ if (!hidma_ll_isenabled(lldev))
return 0;
val = readl(lldev->trca + HIDMA_TRCA_CTRLSTS_REG);
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] dmaengine: qcom_hidma: prevent disable in error
2016-10-06 19:33 ` Sinan Kaya
@ 2016-10-18 15:03 ` Vinod Koul
-1 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2016-10-18 15:03 UTC (permalink / raw)
To: Sinan Kaya
Cc: dmaengine, timur, cov, linux-arm-msm, linux-arm-kernel, linux-kernel
On Thu, Oct 06, 2016 at 03:33:14PM -0400, Sinan Kaya wrote:
> When an error is observed, we try to disable the channel and prevent
> further accesses from the client.
>
> Depending on the type of error, transitioning into disabled state might
> not be possible. Adding a check to make sure that HW is in enabled/running
> state before the disable transition happens.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] dmaengine: qcom_hidma: prevent disable in error
@ 2016-10-18 15:03 ` Vinod Koul
0 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2016-10-18 15:03 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 06, 2016 at 03:33:14PM -0400, Sinan Kaya wrote:
> When an error is observed, we try to disable the channel and prevent
> further accesses from the client.
>
> Depending on the type of error, transitioning into disabled state might
> not be possible. Adding a check to make sure that HW is in enabled/running
> state before the disable transition happens.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-18 15:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-06 19:33 [PATCH] dmaengine: qcom_hidma: prevent disable in error Sinan Kaya
2016-10-06 19:33 ` Sinan Kaya
2016-10-18 15:03 ` Vinod Koul
2016-10-18 15:03 ` Vinod Koul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.