* [PATCH 1/1] i2c-ismt: add the support of the I2C_SMBUS_I2C_BLOCK_DATA transaction type
@ 2013-11-15 0:52 robert.valiquette-ral2JQCrhuEAvxtiuMwx3w
2013-11-19 0:09 ` Heasley, Seth
[not found] ` <5285704e.jwiZWyk8R3ZEoySS%robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
0 siblings, 2 replies; 3+ messages in thread
From: robert.valiquette-ral2JQCrhuEAvxtiuMwx3w @ 2013-11-15 0:52 UTC (permalink / raw)
To: wsa-z923LK4zBo2bacvFa/9K2g, nhorman-2XuSBdqkA4R54TAoqtyWWQ,
seth.heasley-ral2JQCrhuEAvxtiuMwx3w
Cc: robert.valiquette-ral2JQCrhuEAvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-i2c-u79uwXL29TY76Z2rM5mHXA
This patch adds the support of the I2C_SMBUS_I2C_BLOCK_DATA transaction type for the iSMT SMBus Controller.
Signed-off-by: Robert Valiquette <robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
--- a/drivers/i2c/busses/i2c-ismt.c 2013-11-14 11:36:15.830322000 -0500
+++ b/drivers/i2c/busses/i2c-ismt.c 2013-11-14 16:01:56.532356000 -0500
@@ -344,6 +344,7 @@
data->word = dma_buffer[0] | (dma_buffer[1] << 8);
break;
case I2C_SMBUS_BLOCK_DATA:
+ case I2C_SMBUS_I2C_BLOCK_DATA:
memcpy(&data->block[1], dma_buffer, desc->rxbytes);
data->block[0] = desc->rxbytes;
break;
@@ -509,6 +510,41 @@
}
break;
+ case I2C_SMBUS_I2C_BLOCK_DATA:
+ /* Make sure the lenght is valid */
+ if (data->block[0] < 1)
+ data->block[0] = 1;
+
+ if (data->block[0] > I2C_SMBUS_BLOCK_MAX)
+ data->block[0] = I2C_SMBUS_BLOCK_MAX;
+
+ if (read_write == I2C_SMBUS_WRITE) {
+ /* i2c Block Write */
+ dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA: WRITE\n");
+ dma_size = data->block[0] + 1;
+ dma_direction = DMA_TO_DEVICE;
+ desc->wr_len_cmd = dma_size;
+ desc->control |= ISMT_DESC_I2C;
+ priv->dma_buffer[0] = command;
+ memcpy(&priv->dma_buffer[1], &data->block[1], dma_size);
+ } else {
+ /* i2c Block Read */
+ dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA: READ\n");
+ dma_size = data->block[0];
+ dma_direction = DMA_FROM_DEVICE;
+ desc->rd_len = dma_size;
+ desc->wr_len_cmd = command;
+ desc->control |= (ISMT_DESC_I2C | ISMT_DESC_CWRL);
+ /*
+ * Per the "Table 15-15. I2C Commands",
+ * in the External Design Specification (EDS),
+ * (Document Number: 508084, Revision: 2.0),
+ * the _rw bit must be 0
+ */
+ desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, 0);
+ }
+ break;
+
default:
dev_err(dev, "Unsupported transaction %d\n",
size);
@@ -582,6 +618,7 @@
I2C_FUNC_SMBUS_WORD_DATA |
I2C_FUNC_SMBUS_PROC_CALL |
I2C_FUNC_SMBUS_BLOCK_DATA |
+ I2C_FUNC_SMBUS_I2C_BLOCK |
I2C_FUNC_SMBUS_PEC;
}
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH 1/1] i2c-ismt: add the support of the I2C_SMBUS_I2C_BLOCK_DATA transaction type
2013-11-15 0:52 [PATCH 1/1] i2c-ismt: add the support of the I2C_SMBUS_I2C_BLOCK_DATA transaction type robert.valiquette-ral2JQCrhuEAvxtiuMwx3w
@ 2013-11-19 0:09 ` Heasley, Seth
[not found] ` <5285704e.jwiZWyk8R3ZEoySS%robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
1 sibling, 0 replies; 3+ messages in thread
From: Heasley, Seth @ 2013-11-19 0:09 UTC (permalink / raw)
To: Valiquette, Robert, wsa@the-dreams.de, nhorman@tuxdriver.com
Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
Ralston, James D
> This patch adds the support of the I2C_SMBUS_I2C_BLOCK_DATA
> transaction type for the iSMT SMBus Controller.
>
> Signed-off-by: Robert Valiquette <robert.valiquette@intel.com>
> ---
> --- a/drivers/i2c/busses/i2c-ismt.c 2013-11-14 11:36:15.830322000 -0500
> +++ b/drivers/i2c/busses/i2c-ismt.c 2013-11-14 16:01:56.532356000 -0500
> @@ -344,6 +344,7 @@
> data->word = dma_buffer[0] | (dma_buffer[1] << 8);
> break;
> case I2C_SMBUS_BLOCK_DATA:
> + case I2C_SMBUS_I2C_BLOCK_DATA:
> memcpy(&data->block[1], dma_buffer, desc-
> >rxbytes);
> data->block[0] = desc->rxbytes;
> break;
> @@ -509,6 +510,41 @@
> }
> break;
>
> + case I2C_SMBUS_I2C_BLOCK_DATA:
> + /* Make sure the lenght is valid */
> + if (data->block[0] < 1)
> + data->block[0] = 1;
> +
> + if (data->block[0] > I2C_SMBUS_BLOCK_MAX)
> + data->block[0] = I2C_SMBUS_BLOCK_MAX;
> +
> + if (read_write == I2C_SMBUS_WRITE) {
> + /* i2c Block Write */
> + dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA:
> WRITE\n");
> + dma_size = data->block[0] + 1;
> + dma_direction = DMA_TO_DEVICE;
> + desc->wr_len_cmd = dma_size;
> + desc->control |= ISMT_DESC_I2C;
> + priv->dma_buffer[0] = command;
> + memcpy(&priv->dma_buffer[1], &data->block[1],
> dma_size);
> + } else {
> + /* i2c Block Read */
> + dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA:
> READ\n");
> + dma_size = data->block[0];
> + dma_direction = DMA_FROM_DEVICE;
> + desc->rd_len = dma_size;
> + desc->wr_len_cmd = command;
> + desc->control |= (ISMT_DESC_I2C |
> ISMT_DESC_CWRL);
> + /*
> + * Per the "Table 15-15. I2C Commands",
> + * in the External Design Specification (EDS),
> + * (Document Number: 508084, Revision: 2.0),
> + * the _rw bit must be 0
> + */
> + desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, 0);
> + }
> + break;
> +
> default:
> dev_err(dev, "Unsupported transaction %d\n",
> size);
> @@ -582,6 +618,7 @@
> I2C_FUNC_SMBUS_WORD_DATA |
> I2C_FUNC_SMBUS_PROC_CALL |
> I2C_FUNC_SMBUS_BLOCK_DATA |
> + I2C_FUNC_SMBUS_I2C_BLOCK |
> I2C_FUNC_SMBUS_PEC;
> }
>
Acked-by: Seth Heasley <seth.heasley@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread[parent not found: <5285704e.jwiZWyk8R3ZEoySS%robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH 1/1] i2c-ismt: add the support of the I2C_SMBUS_I2C_BLOCK_DATA transaction type
[not found] ` <5285704e.jwiZWyk8R3ZEoySS%robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
@ 2014-01-13 16:46 ` Wolfram Sang
0 siblings, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2014-01-13 16:46 UTC (permalink / raw)
To: robert.valiquette-ral2JQCrhuEAvxtiuMwx3w
Cc: nhorman-2XuSBdqkA4R54TAoqtyWWQ,
seth.heasley-ral2JQCrhuEAvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-i2c-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
On Thu, Nov 14, 2013 at 07:52:30PM -0500, robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org wrote:
> This patch adds the support of the I2C_SMBUS_I2C_BLOCK_DATA transaction type for the iSMT SMBus Controller.
Wrap the long line next time, please.
>
> Signed-off-by: Robert Valiquette <robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
> + /* Make sure the lenght is valid */
Fixed the typo and applied to for-next, thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-13 16:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-15 0:52 [PATCH 1/1] i2c-ismt: add the support of the I2C_SMBUS_I2C_BLOCK_DATA transaction type robert.valiquette-ral2JQCrhuEAvxtiuMwx3w
2013-11-19 0:09 ` Heasley, Seth
[not found] ` <5285704e.jwiZWyk8R3ZEoySS%robert.valiquette-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2014-01-13 16:46 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).