Commit e621132f authored by Dennis Wassenberg's avatar Dennis Wassenberg Committed by Dmitry Torokhov

Input: synaptics-rmi4 - f03 - grab data passed by transport device

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.

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.
Reviewed-by: default avatarAndrew Duggan <aduggan@synaptics.com>
Signed-off-by: default avatarDennis Wassenberg <dennis.wassenberg@secunet.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c5e8848f
...@@ -163,6 +163,7 @@ static int rmi_f03_config(struct rmi_function *fn) ...@@ -163,6 +163,7 @@ static int rmi_f03_config(struct rmi_function *fn)
static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits) 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); struct f03_data *f03 = dev_get_drvdata(&fn->dev);
u16 data_addr = fn->fd.data_base_addr; u16 data_addr = fn->fd.data_base_addr;
const u8 ob_len = f03->rx_queue_length * RMI_F03_OB_SIZE; const u8 ob_len = f03->rx_queue_length * RMI_F03_OB_SIZE;
...@@ -173,15 +174,31 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits) ...@@ -173,15 +174,31 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
int i; int i;
int error; int error;
/* Grab all of the data registers, and check them for data */ if (!rmi_dev || !rmi_dev->xport)
error = rmi_read_block(fn->rmi_dev, data_addr + RMI_F03_OB_OFFSET, return -ENODEV;
&obs, ob_len);
if (error) { if (rmi_dev->xport->attn_data) {
dev_err(&fn->dev, /* First grab the data passed by the transport device */
"%s: Failed to read F03 output buffers: %d\n", if (rmi_dev->xport->attn_size < ob_len) {
__func__, error); dev_warn(&fn->dev, "F03 interrupted, but data is missing!\n");
serio_interrupt(f03->serio, 0, SERIO_TIMEOUT); return 0;
return error; }
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 */
error = rmi_read_block(fn->rmi_dev, data_addr + RMI_F03_OB_OFFSET,
&obs, ob_len);
if (error) {
dev_err(&fn->dev,
"%s: Failed to read F03 output buffers: %d\n",
__func__, error);
serio_interrupt(f03->serio, 0, SERIO_TIMEOUT);
return error;
}
} }
for (i = 0; i < ob_len; i += RMI_F03_OB_SIZE) { for (i = 0; i < ob_len; i += RMI_F03_OB_SIZE) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment