mirror of https://github.com/hak5/openwrt.git
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 7239872fb3400b21a8f5547257f9f86455867bd6 Mon Sep 17 00:00:00 2001
|
|
From: Abhishek Sahu <absahu@codeaurora.org>
|
|
Date: Mon, 12 Mar 2018 18:44:51 +0530
|
|
Subject: [PATCH 02/13] i2c: qup: fixed releasing dma without flush operation
|
|
completion
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The QUP BSLP BAM generates the following error sometimes if the
|
|
current I2C DMA transfer fails and the flush operation has been
|
|
scheduled
|
|
|
|
“bam-dma-engine 7884000.dma: Cannot free busy channel”
|
|
|
|
If any I2C error comes during BAM DMA transfer, then the QUP I2C
|
|
interrupt will be generated and the flush operation will be
|
|
carried out to make I2C consume all scheduled DMA transfer.
|
|
Currently, the same completion structure is being used for BAM
|
|
transfer which has already completed without reinit. It will make
|
|
flush operation wait_for_completion_timeout completed immediately
|
|
and will proceed for freeing the DMA resources where the
|
|
descriptors are still in process.
|
|
|
|
Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
|
|
Acked-by: Sricharan R <sricharan@codeaurora.org>
|
|
Reviewed-by: Austin Christ <austinwc@codeaurora.org>
|
|
Reviewed-by: Andy Gross <andy.gross@linaro.org>
|
|
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
|
|
---
|
|
drivers/i2c/busses/i2c-qup.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/i2c/busses/i2c-qup.c
|
|
+++ b/drivers/i2c/busses/i2c-qup.c
|
|
@@ -835,6 +835,8 @@ static int qup_i2c_bam_do_xfer(struct qu
|
|
}
|
|
|
|
if (ret || qup->bus_err || qup->qup_err) {
|
|
+ reinit_completion(&qup->xfer);
|
|
+
|
|
if (qup_i2c_change_state(qup, QUP_RUN_STATE)) {
|
|
dev_err(qup->dev, "change to run state timed out");
|
|
goto desc_err;
|