]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mei: vsc: Don't re-init VSC from mei_vsc_hw_reset() on stop
authorHans de Goede <hansg@kernel.org>
Mon, 23 Jun 2025 08:50:44 +0000 (10:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2025 15:39:00 +0000 (16:39 +0100)
mei_vsc_hw_reset() gets called from mei_start() and mei_stop() in
the latter case we do not need to re-init the VSC by calling vsc_tp_init().

mei_stop() only happens on shutdown and driver unbind. On shutdown we
don't need to load + boot the firmware and if the driver later is
bound to the device again then mei_start() will do another reset.

The intr_enable flag is true when called from mei_start() and false on
mei_stop(). Skip vsc_tp_init() when intr_enable is false.

This avoids unnecessarily uploading the firmware, which takes 11 seconds.
This change reduces the poweroff/reboot time by 11 seconds.

Fixes: 386a766c4169 ("mei: Add MEI hardware support for IVSC device")
Signed-off-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Alexander Usyskin <alexander.usyskin@intel.com>
Link: https://lore.kernel.org/r/20250623085052.12347-3-hansg@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/platform-vsc.c

index 435760b1e86f7ac25ff710753c6b7960ac8ceccf..1ac85f0251c5f1f7f499fa9ccfe61f4f70f482a9 100644 (file)
@@ -256,6 +256,9 @@ static int mei_vsc_hw_reset(struct mei_device *mei_dev, bool intr_enable)
 
        vsc_tp_reset(hw->tp);
 
+       if (!intr_enable)
+               return 0;
+
        return vsc_tp_init(hw->tp, mei_dev->dev);
 }