| Message ID | 20191129133514.23224-1-l.stach@pengutronix.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 86bcd3a12999447faad60ec59c2d64d18d8e61ac |
| Headers | show |
| Series | Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash | expand |
On Fri, Nov 29, 2019 at 02:35:14PM +0100, Lucas Stach wrote: > F34 is a bit special as it reinitializes the device and related driver > structs during the firmware update. This clears the fn_irq_mask which > will then prevent F34 from receiving further interrupts, leading to > timeouts during the firmware update. Make sure to reinitialize the > IRQ enables at the appropriate times. > > The issue is in F34 code, but the commit in the fixes tag exposed the > issue, as before this commit things would work by accident. > > Fixes: 363c53875aef (Input: synaptics-rmi4 - avoid processing unknown IRQs) > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Applied, thank you. > --- > drivers/input/rmi4/rmi_f34v7.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c > index a4cabf52740c..74f7c6f214ff 100644 > --- a/drivers/input/rmi4/rmi_f34v7.c > +++ b/drivers/input/rmi4/rmi_f34v7.c > @@ -1189,6 +1189,9 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw) > { > int ret; > > + f34->fn->rmi_dev->driver->set_irq_bits(f34->fn->rmi_dev, > + f34->fn->irq_mask); > + > rmi_f34v7_read_queries_bl_version(f34); > > f34->v7.image = fw->data; > -- > 2.20.1 >
diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c index a4cabf52740c..74f7c6f214ff 100644 --- a/drivers/input/rmi4/rmi_f34v7.c +++ b/drivers/input/rmi4/rmi_f34v7.c @@ -1189,6 +1189,9 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw) { int ret; + f34->fn->rmi_dev->driver->set_irq_bits(f34->fn->rmi_dev, + f34->fn->irq_mask); + rmi_f34v7_read_queries_bl_version(f34); f34->v7.image = fw->data;
F34 is a bit special as it reinitializes the device and related driver structs during the firmware update. This clears the fn_irq_mask which will then prevent F34 from receiving further interrupts, leading to timeouts during the firmware update. Make sure to reinitialize the IRQ enables at the appropriate times. The issue is in F34 code, but the commit in the fixes tag exposed the issue, as before this commit things would work by accident. Fixes: 363c53875aef (Input: synaptics-rmi4 - avoid processing unknown IRQs) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/input/rmi4/rmi_f34v7.c | 3 +++ 1 file changed, 3 insertions(+)