firmware_loader: Refactor kill_pending_fw_fallback_reqs()

Rename 'only_kill_custom' and refactor logic related to it
to be more meaningful.

Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
Acked-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/1698330459-31776-1-git-send-email-quic_mojha@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c
index bf68e39478147f9ff573a9c037ce8e907d70b85f..b3ce07160281e7309d8471b91645b6385ae3ad3b 100644 (file)
--- a/drivers/base/firmware_loader/fallback.c
+++ b/drivers/base/firmware_loader/fallback.c
@@ -46,7 +46,7 @@ static inline int fw_sysfs_wait_timeout(struct fw_priv *fw_priv,  long timeout)
 
 static LIST_HEAD(pending_fw_head);
 
-void kill_pending_fw_fallback_reqs(bool only_kill_custom)
+void kill_pending_fw_fallback_reqs(bool kill_all)
 {
        struct fw_priv *fw_priv;
        struct fw_priv *next;
@@ -54,7 +54,7 @@ void kill_pending_fw_fallback_reqs(bool only_kill_custom)
        mutex_lock(&fw_lock);
        list_for_each_entry_safe(fw_priv, next, &pending_fw_head,
                                 pending_list) {
-               if (!fw_priv->need_uevent || !only_kill_custom)
+               if (kill_all || !fw_priv->need_uevent)
                         __fw_load_abort(fw_priv);
        }
        mutex_unlock(&fw_lock);

diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h
index 144148595660d579ef18227748b3721df4c5d5c6..ccf912bef6ca7865de4d48e2fb3ace0a68bb1ddc 100644 (file)
--- a/drivers/base/firmware_loader/fallback.h
+++ b/drivers/base/firmware_loader/fallback.h
@@ -13,7 +13,7 @@ int firmware_fallback_sysfs(struct firmware *fw, const char *name,
                            struct device *device,
                            u32 opt_flags,
                            int ret);
-void kill_pending_fw_fallback_reqs(bool only_kill_custom);
+void kill_pending_fw_fallback_reqs(bool kill_all);
 
 void fw_fallback_set_cache_timeout(void);
 void fw_fallback_set_default_timeout(void);
@@ -28,7 +28,7 @@ static inline int firmware_fallback_sysfs(struct firmware *fw, const char *name,
        return ret;
 }
 
-static inline void kill_pending_fw_fallback_reqs(bool only_kill_custom) { }
+static inline void kill_pending_fw_fallback_reqs(bool kill_all) { }
 static inline void fw_fallback_set_cache_timeout(void) { }
 static inline void fw_fallback_set_default_timeout(void) { }
 #endif /* CONFIG_FW_LOADER_USER_HELPER */

diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index b58c42f1b1ce658157c2c832bca8ea929286b139..522ccee781b41211356587322b5b0f920205c896 100644 (file)
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -1524,10 +1524,10 @@ static int fw_pm_notify(struct notifier_block *notify_block,
        case PM_SUSPEND_PREPARE:
        case PM_RESTORE_PREPARE:
                /*
-                * kill pending fallback requests with a custom fallback
-                * to avoid stalling suspend.
+                * Here, kill pending fallback requests will only kill
+                * non-uevent firmware request to avoid stalling suspend.
                 */
-               kill_pending_fw_fallback_reqs(true);
+               kill_pending_fw_fallback_reqs(false);
                device_cache_fw_images();
                break;
 
@@ -1612,7 +1612,7 @@ static int fw_shutdown_notify(struct notifier_block *unused1,
         * Kill all pending fallback requests to avoid both stalling shutdown,
         * and avoid a deadlock with the usermode_lock.
         */
-       kill_pending_fw_fallback_reqs(false);
+       kill_pending_fw_fallback_reqs(true);
 
        return NOTIFY_DONE;
 }