Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "i2c: i2c-qcom-geni: Set IEOB for Go tre in a Read transfer"

Browse source 
This reverts commit ccc4bf40aa.
This change causes first touch transfer and every transfer after
an error condition to fail, so reverting the change.

Change-Id: Ic8018299897a0976b6e110959138b09ec6a5b42a
Signed-off-by: Vipin Deep Kaur <vkaur@codeaurora.org>
This commit is contained in:
Vipin Deep Kaur 2020-03-19 18:16:22 +05:30
parent 8c06c7547e
commit 3b01c7eef0
2 changed files with 4 additions and 8 deletions
drivers
dma/qcom
gpi.c
i2c/busses
i2c-qcom-geni.c

2
drivers/dma/qcom/gpi.c
View file

@ -2363,7 +2363,7 @@ struct dma_async_tx_descriptor *gpi_prep_slave_sg(struct dma_chan *chan,
tre = sg_virt(sg);
/* Check if last tre has ieob set */
if (sg_len != 1 && i == sg_len - 1) {
if (i == sg_len - 1) {
if ((((struct msm_gpi_tre *)tre)->dword[3] &
GPI_IEOB_BMSK) >> GPI_IEOB_BMSK_SHIFT)
gpii->ieob_set = true;

10
drivers/i2c/busses/i2c-qcom-geni.c
View file

@ -405,7 +405,7 @@ static void gi2c_gsi_tx_cb(void *ptr)
struct msm_gpi_dma_async_tx_cb_param *tx_cb = ptr;
struct geni_i2c_dev *gi2c = tx_cb->userdata;
if (tx_cb->completion_code == MSM_GPI_TCE_EOB && gi2c->is_shared) {
if (tx_cb->completion_code == MSM_GPI_TCE_EOB) {
complete(&gi2c->xfer);
} else if (!(gi2c->cur->flags & I2C_M_RD)) {
gi2c_gsi_cb_err(tx_cb, "TX");
@ -553,12 +553,8 @@ static int geni_i2c_gsi_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
if (msgs[i].flags & I2C_M_RD) {
go_t->dword[2] = MSM_GPI_I2C_GO_TRE_DWORD2(msgs[i].len);
if (gi2c->is_shared)
go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(1,
0, 0, 0, 0);
else
go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(1,
0, 0, 1, 0);
go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(1, 0, 0, 0,
0);
} else {
go_t->dword[2] = MSM_GPI_I2C_GO_TRE_DWORD2(0);
go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(0, 0, 0, 0,