On Wed, Apr 15, 2015 at 05:22:26PM -0700, Ellen Wang wrote:
> 1. cp2112_xfer() byte swaps smbus words incorrectly:
>
> While i2c is by and large big endian, smbus transactions are
> little endian. This only affects word operands. Essentially,
> all occurences of be16 in cp2112_xfer() are now le16.
>
> 2. I2C_SMBUS_BYTE write in cp2112_xfer() should pass "command"
> as the single data byte, not "data->byte":
>
> When tickled the right way, this actually segfaults the kernel
> because "data" is NULL.
>
> 3. cp2112_i2c_xfer() only supports a single i2c_msg and only
> reads up to 61 bytes:
>
> This is a serious limitation. For example, the at24 eeprom driver
> generates paired write and read messages (for eeprom address and data).
> And the reads can be quite large. The fix consists of a loop
Well, at24 detects how many bytes it got and continues from there.
> to go through all the messages, and a loop around cp2112_read()
> to pick up all the returned data. For extra credit, it now also
> supports write-read pairs and implements them as
> CP2112_DATA_WRITE_READ_REQUEST.
>
> Signed-off-by: Ellen Wang <ellen@xxxxxxxxxxxxxxxxxxx>
> ---
> This is a funny driver that is a bridge from usb hid to i2c.
> So while it officially belongs to hid, most of the functionality
> is about i2c. So I'm sending this patch to both linux-input
> and linux-i2c. David Barksdale <dbarksdale@xxxxxxxxxxx> is
> the original author/owner in the .c file.
Probably, this would be best an MFD driver with the i2c and gpio
functionality sourced out to the relevant subsystems. Dunno how well
this works with hid drivers, though.
> While this patch contains three bug fixes, the first two are
> quite trivial. I'm hoping it's OK to glom them into one.
Then, it should be easy to factor them out? Really, the "one patch per
issue" rule is extremly helpful when fixing regressions.
> ---
> drivers/hid/hid-cp2112.c | 147 +++++++++++++++++++++++++++++-----------------
> 1 file changed, 92 insertions(+), 55 deletions(-)
>
> diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
> index 3318de6..3999af3 100644
> --- a/drivers/hid/hid-cp2112.c
> +++ b/drivers/hid/hid-cp2112.c
> @@ -444,11 +444,30 @@ static int cp2112_i2c_write_req(void *buf, u8 slave_address, u8 *data,
> return data_length + 3;
> }
>
> +static int cp2112_i2c_write_read_req(void *buf, u8 slave_address,
> + u8 *addr, int addr_length,
> + int read_length)
> +{
> + struct cp2112_write_read_req_report *report = buf;
> +
> + if (read_length < 1 || read_length > 512 ||
> + addr_length > sizeof(report->target_address))
> + return -EINVAL;
This shows the drawback of having I2C master drivers not in the
i2c-directory: It easily misses updates to the i2c-core.
We now have the i2c-quirk infrastructure (2187f03a9576c4) which this
driver should make use of. It can describe this...
> + for (m = msgs; m < msgs + num; m++) {
> + /*
> + * If the top two messages are a write followed by a read,
> + * then we do them together as CP2112_DATA_WRITE_READ_REQUEST.
> + * Otherwise, process one message.
> + */
> +
and this and the core will check the messages for you. It should
simplify your code, too.
Attachment:
signature.asc
Description: Digital signature
