Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d77a0f28 authored by Michael Walle's avatar Michael Walle Committed by Greg Kroah-Hartman
Browse files

i2c: at91: use dma safe buffers 



[ Upstream commit 03fbb903c8bf7e53e101e8d9a7b261264317c411 ]

The supplied buffer might be on the stack and we get the following error
message:
[    3.312058] at91_i2c e0070600.i2c: rejecting DMA map of vmalloc memory

Use i2c_{get,put}_dma_safe_msg_buf() to get a DMA-able memory region if
necessary.

Fixes: 60937b2c ("i2c: at91: add dma support")
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e4db5f4b

drivers/i2c/busses/i2c-at91-master.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -609,6 +609,7 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) 
	unsigned int_addr_flag = 0;

	unsigned int_addr_flag = 0;

	struct i2c_msg *m_start = msg;

	struct i2c_msg *m_start = msg;

	bool is_read;

	bool is_read;

	u8 *dma_buf;





	dev_dbg(&adap->dev, "at91_xfer: processing %d messages:\n", num);

	dev_dbg(&adap->dev, "at91_xfer: processing %d messages:\n", num);
@@ -656,7 +657,17 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) 
	dev->msg = m_start;

	dev->msg = m_start;

	dev->recv_len_abort = false;

	dev->recv_len_abort = false;





	if (dev->use_dma) {

		dma_buf = i2c_get_dma_safe_msg_buf(m_start, 1);

		if (!dma_buf) {

			ret = -ENOMEM;

			goto out;

		}

		dev->buf = dma_buf;

	}



	ret = at91_do_twi_transfer(dev);

	ret = at91_do_twi_transfer(dev);

	i2c_put_dma_safe_msg_buf(dma_buf, m_start, !ret);





	ret = (ret < 0) ? ret : num;

	ret = (ret < 0) ? ret : num;

out:

out: