Skip to content

Commit c0c50e3

Browse files
superna9999Wolfram Sang
authored andcommitted
i2c: qcom-geni: make sure I2C hub controllers can't use SE DMA
The I2C Hub controller is a simpler GENI I2C variant that doesn't support DMA at all, add a no_dma flag to make sure it nevers selects the SE DMA mode with mappable 32bytes long transfers. Fixes: cacd964 ("i2c: qcom-geni: add support for I2C Master Hub variant") Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Reviewed-by: Mukesh Kumar Savaliya <mukesh.savaliya@oss.qualcomm.com>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent e383f09 commit c0c50e3

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

drivers/i2c/busses/i2c-qcom-geni.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ struct geni_i2c_dev {
116116
dma_addr_t dma_addr;
117117
struct dma_chan *tx_c;
118118
struct dma_chan *rx_c;
119+
bool no_dma;
119120
bool gpi_mode;
120121
bool abort_done;
121122
bool is_tx_multi_desc_xfer;
@@ -447,7 +448,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
447448
size_t len = msg->len;
448449
struct i2c_msg *cur;
449450

450-
dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
451+
dma_buf = gi2c->no_dma ? NULL : i2c_get_dma_safe_msg_buf(msg, 32);
451452
if (dma_buf)
452453
geni_se_select_mode(se, GENI_SE_DMA);
453454
else
@@ -486,7 +487,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
486487
size_t len = msg->len;
487488
struct i2c_msg *cur;
488489

489-
dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
490+
dma_buf = gi2c->no_dma ? NULL : i2c_get_dma_safe_msg_buf(msg, 32);
490491
if (dma_buf)
491492
geni_se_select_mode(se, GENI_SE_DMA);
492493
else
@@ -1080,10 +1081,12 @@ static int geni_i2c_probe(struct platform_device *pdev)
10801081
goto err_resources;
10811082
}
10821083

1083-
if (desc && desc->no_dma_support)
1084+
if (desc && desc->no_dma_support) {
10841085
fifo_disable = false;
1085-
else
1086+
gi2c->no_dma = true;
1087+
} else {
10861088
fifo_disable = readl_relaxed(gi2c->se.base + GENI_IF_DISABLE_RO) & FIFO_IF_DISABLE;
1089+
}
10871090

10881091
if (fifo_disable) {
10891092
/* FIFO is disabled, so we can only use GPI DMA */

0 commit comments

Comments
 (0)