Input: synaptics-rmi4 - reset after writing partition table

When recovering from a bad partition table (for example after an
interrupted update), a reset is necessary for the new partition table to
become effective. Without this reset, writing the core code partition
will fail with status 0x03 (Invalid Command).

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20220608124808.51402-6-matthias.schiffer@ew.tq-group.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c
index 19b94b1c1a339afa9c8e5a5e5d833a459ee067d6..9b78f98bb21cc993501ba9ba4bc6c30a7479d304 100644 (file)
--- a/drivers/input/rmi4/rmi_f34v7.c
+++ b/drivers/input/rmi4/rmi_f34v7.c
@@ -1146,6 +1146,14 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
                goto fail;
        dev_info(&f34->fn->dev, "%s: Partition table programmed\n", __func__);
 
+       /*
+        * Reset to reload partition table - as the previous firmware has been
+        * erased, we remain in bootloader mode.
+        */
+       ret = rmi_scan_pdt(f34->fn->rmi_dev, NULL, rmi_initial_reset);
+       if (ret < 0)
+               dev_warn(&f34->fn->dev, "RMI reset failed!\n");
+
        dev_info(&f34->fn->dev, "Writing firmware (%d bytes)...\n",
                 f34->v7.img.ui_firmware.size);