mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
24de7c29e5
Backport below changes for I2C QUP driver from v4.17: 0668bc44a426 i2c: qup: fix copyrights and update to SPDX identifier 7239872fb340 i2c: qup: fixed releasing dma without flush operation completion eb422b539c1f i2c: qup: minor code reorganization for use_dma 6d5f37f166bb i2c: qup: remove redundant variables for BAM SG count c5adc0fa63a9 i2c: qup: schedule EOT and FLUSH tags at the end of transfer 7e6c35fe602d i2c: qup: fix the transfer length for BAM RX EOT FLUSH tags 3f450d3eea14 i2c: qup: proper error handling for i2c error in BAM mode 08f15963bc75 i2c: qup: use the complete transfer length to choose DMA mode ecb6e1e5f435 i2c: qup: change completion timeout according to transfer length 6f2f0f6465ac i2c: qup: fix buffer overflow for multiple msg of maximum xfer len f7714b4e451b i2c: qup: send NACK for last read sub transfers fbfab1ab0658 i2c: qup: reorganization of driver code to remove polling for qup v1 7545c7dba169 i2c: qup: reorganization of driver code to remove polling for qup v2 This fixes various I2C issues observed on AP120C-AC board equipped with Atmel/Microchip AT97SC3205T TPM module. Tested-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
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;
|