| Message ID | 1471512289-10648-6-git-send-email-benjamin.tissoires@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Resending as plain text On 08/18/2016 02:24 AM, Benjamin Tissoires wrote: > From: Dennis Wassenberg <dennis.wassenberg@secunet.com> > > First check if there are data available passed by the transport device. > If data available use these data. If there are no data available > try to read the rmi block if dsata are passed this way. > > This is the way the other rmi function handlers will do this. > That why apply this to f03 as well. > > This will fix corrupted or missing data issues. > This patch is needed on HID devices because the firmware reads F03 data registers and adds them to the HID attention report. Reading those registers from the driver after the firmware read them will result in invalid data. Which is exactly what Dennis is describing here. > Signed-off-by: Dennis Wassenberg <dennis.wassenberg@secunet.com> > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Reviewed-by: Andrew Duggan <aduggan@synaptics.com> > --- > drivers/input/rmi4/rmi_f03.c | 37 +++++++++++++++++++++++++++---------- > 1 file changed, 27 insertions(+), 10 deletions(-) > > diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c > index 9945512..daae1c95 100644 > --- a/drivers/input/rmi4/rmi_f03.c > +++ b/drivers/input/rmi4/rmi_f03.c > @@ -158,6 +158,7 @@ static int rmi_f03_config(struct rmi_function *fn) > > static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits) > { > + struct rmi_device *rmi_dev = fn->rmi_dev; > struct f03_data *f03 = dev_get_drvdata(&fn->dev); > u16 data_addr = fn->fd.data_base_addr; > const u8 ob_len = f03->rx_queue_length * RMI_F03_OB_SIZE; > @@ -166,16 +167,32 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits) > u8 ob_data; > unsigned int serio_flags; > int i; > - int retval; > - > - /* Grab all of the data registers, and check them for data */ > - retval = rmi_read_block(fn->rmi_dev, data_addr + RMI_F03_OB_OFFSET, > - &obs, ob_len); > - if (retval) { > - dev_err(&fn->dev, "%s: Failed to read F03 output buffers.\n", > - __func__); > - serio_interrupt(f03->serio, 0, SERIO_TIMEOUT); > - return retval; > + int ret; > + > + if (!rmi_dev || !rmi_dev->xport) > + return -ENODEV; > + > + if (rmi_dev->xport->attn_data) { > + /* First grab the data passed by the transport device */ > + if (rmi_dev->xport->attn_size < ob_len) { > + dev_warn(&fn->dev, "F03 interrupted, but data is missing!\n"); > + return 0; > + } > + > + memcpy(obs, rmi_dev->xport->attn_data, ob_len); > + > + rmi_dev->xport->attn_data += ob_len; > + rmi_dev->xport->attn_size -= ob_len; > + } else { > + /* Grab all of the data registers, and check them for data */ > + ret = rmi_read_block(fn->rmi_dev, data_addr + RMI_F03_OB_OFFSET, > + &obs, ob_len); > + if (ret) { > + dev_err(&fn->dev, "%s: Failed to read F03 output buffers.\n", > + __func__); > + serio_interrupt(f03->serio, 0, SERIO_TIMEOUT); > + return ret; > + } > } > > for (i = 0; i < ob_len; i += RMI_F03_OB_SIZE) { > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c index 9945512..daae1c95 100644 --- a/drivers/input/rmi4/rmi_f03.c +++ b/drivers/input/rmi4/rmi_f03.c @@ -158,6 +158,7 @@ static int rmi_f03_config(struct rmi_function *fn) static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits) { + struct rmi_device *rmi_dev = fn->rmi_dev; struct f03_data *f03 = dev_get_drvdata(&fn->dev); u16 data_addr = fn->fd.data_base_addr; const u8 ob_len = f03->rx_queue_length * RMI_F03_OB_SIZE; @@ -166,16 +167,32 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits) u8 ob_data; unsigned int serio_flags; int i; - int retval; - - /* Grab all of the data registers, and check them for data */ - retval = rmi_read_block(fn->rmi_dev, data_addr + RMI_F03_OB_OFFSET, - &obs, ob_len); - if (retval) { - dev_err(&fn->dev, "%s: Failed to read F03 output buffers.\n", - __func__); - serio_interrupt(f03->serio, 0, SERIO_TIMEOUT); - return retval; + int ret; + + if (!rmi_dev || !rmi_dev->xport) + return -ENODEV; + + if (rmi_dev->xport->attn_data) { + /* First grab the data passed by the transport device */ + if (rmi_dev->xport->attn_size < ob_len) { + dev_warn(&fn->dev, "F03 interrupted, but data is missing!\n"); + return 0; + } + + memcpy(obs, rmi_dev->xport->attn_data, ob_len); + + rmi_dev->xport->attn_data += ob_len; + rmi_dev->xport->attn_size -= ob_len; + } else { + /* Grab all of the data registers, and check them for data */ + ret = rmi_read_block(fn->rmi_dev, data_addr + RMI_F03_OB_OFFSET, + &obs, ob_len); + if (ret) { + dev_err(&fn->dev, "%s: Failed to read F03 output buffers.\n", + __func__); + serio_interrupt(f03->serio, 0, SERIO_TIMEOUT); + return ret; + } } for (i = 0; i < ob_len; i += RMI_F03_OB_SIZE) {