Skip to content

Commit ffdd205

Browse files
UpsylonbareAndi Shyti
authored andcommitted
i2c: stm32f7: support i2c_*_dma_safe_msg_buf APIs
`i2c_*_dma_safe_msg_buf` APIs operate on a `struct i2c_msg`. The get operation make sure the I2C buffer is DMA'able according to its buffer length, or if the memory use is DMA coherent for example and return a valid pointer for safe DMA access to be used. The put operation release the pointer. Prefer using generic API's than relying on private tests. Acked-by: Alain Volmat <[email protected]> Signed-off-by: Clément Le Goffic <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0ae982d commit ffdd205

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

drivers/i2c/busses/i2c-stm32f7.c

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -742,11 +742,14 @@ static void stm32f7_i2c_dma_callback(void *arg)
742742
{
743743
struct stm32f7_i2c_dev *i2c_dev = arg;
744744
struct stm32_i2c_dma *dma = i2c_dev->dma;
745+
struct stm32f7_i2c_msg *f7_msg = &i2c_dev->f7_msg;
745746

746747
stm32f7_i2c_disable_dma_req(i2c_dev);
747748
dmaengine_terminate_async(dma->chan_using);
748749
dma_unmap_single(i2c_dev->dev, dma->dma_buf, dma->dma_len,
749750
dma->dma_data_dir);
751+
if (!f7_msg->smbus)
752+
i2c_put_dma_safe_msg_buf(f7_msg->buf, i2c_dev->msg, true);
750753
complete(&dma->dma_complete);
751754
}
752755

@@ -882,6 +885,7 @@ static void stm32f7_i2c_xfer_msg(struct stm32f7_i2c_dev *i2c_dev,
882885
{
883886
struct stm32f7_i2c_msg *f7_msg = &i2c_dev->f7_msg;
884887
void __iomem *base = i2c_dev->base;
888+
u8 *dma_buf;
885889
u32 cr1, cr2;
886890
int ret;
887891

@@ -931,17 +935,23 @@ static void stm32f7_i2c_xfer_msg(struct stm32f7_i2c_dev *i2c_dev,
931935

932936
/* Configure DMA or enable RX/TX interrupt */
933937
i2c_dev->use_dma = false;
934-
if (i2c_dev->dma && f7_msg->count >= STM32F7_I2C_DMA_LEN_MIN
935-
&& !i2c_dev->atomic) {
936-
ret = stm32_i2c_prep_dma_xfer(i2c_dev->dev, i2c_dev->dma,
937-
msg->flags & I2C_M_RD,
938-
f7_msg->count, f7_msg->buf,
939-
stm32f7_i2c_dma_callback,
940-
i2c_dev);
941-
if (!ret)
942-
i2c_dev->use_dma = true;
943-
else
944-
dev_warn(i2c_dev->dev, "can't use DMA\n");
938+
if (i2c_dev->dma && !i2c_dev->atomic) {
939+
dma_buf = i2c_get_dma_safe_msg_buf(msg, STM32F7_I2C_DMA_LEN_MIN);
940+
if (dma_buf) {
941+
f7_msg->buf = dma_buf;
942+
ret = stm32_i2c_prep_dma_xfer(i2c_dev->dev, i2c_dev->dma,
943+
msg->flags & I2C_M_RD,
944+
f7_msg->count, f7_msg->buf,
945+
stm32f7_i2c_dma_callback,
946+
i2c_dev);
947+
if (ret) {
948+
dev_warn(i2c_dev->dev, "can't use DMA\n");
949+
i2c_put_dma_safe_msg_buf(f7_msg->buf, msg, false);
950+
f7_msg->buf = msg->buf;
951+
} else {
952+
i2c_dev->use_dma = true;
953+
}
954+
}
945955
}
946956

947957
if (!i2c_dev->use_dma) {

0 commit comments

Comments
 (0)