Skip to content

Commit fab3229

Browse files
Stephen Douthitgregkh
authored andcommitted
i2c: ismt: Don't duplicate the receive length for block reads
commit b6c159a9cb69c2cf0bf59d4e12c3a2da77e4d994 upstream. According to Table 15-14 of the C2000 EDS (Intel doc #510524) the rx data pointed to by the descriptor dptr contains the byte count. desc->rxbytes reports all bytes read on the wire, including the "byte count" byte. So if a device sends 4 bytes in response to a block read, on the wire and in the DMA buffer we see: count data1 data2 data3 data4 0x04 0xde 0xad 0xbe 0xef That's what we want to return in data->block to the next level. Instead we were actually prefixing that with desc->rxbytes: bad count count data1 data2 data3 data4 0x05 0x04 0xde 0xad 0xbe 0xef This was discovered while developing a BMC solution relying on the ipmi_ssif.c driver which was trying to interpret the bogus length field as part of the IPMI response. Signed-off-by: Stephen Douthit <stephend@adiengineering.com> Tested-by: Dan Priamo <danp@adiengineering.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e119fc4 commit fab3229

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/i2c/busses/i2c-ismt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ static int ismt_process_desc(const struct ismt_desc *desc,
339339
break;
340340
case I2C_SMBUS_BLOCK_DATA:
341341
case I2C_SMBUS_I2C_BLOCK_DATA:
342-
memcpy(&data->block[1], dma_buffer, desc->rxbytes);
343-
data->block[0] = desc->rxbytes;
342+
memcpy(data->block, dma_buffer, desc->rxbytes);
343+
data->block[0] = desc->rxbytes - 1;
344344
break;
345345
}
346346
return 0;

0 commit comments

Comments
 (0)