prima: Use freezable power efficient workqueue

Port to prima from qcacld-3.0 AnggaSP/android_kernel_xiaomi_msm8998@9bcaef9#diff-047bb9f1606259aac5bf22c23363f84b Signed-off-by: starlight5234 <[email protected]>
Couchpotato-sauce · Jul 9, 2021 · 8ee8ef6 · 8ee8ef6
1 parent abbfdc3
commit 8ee8ef6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1638,7 +1638,8 @@ static void hdd_check_and_move_if_sap_is_on_dfs_chan(hdd_context_t *hdd_ctx,
         }
 
         hddLog(LOG1, "Schedule workqueue to move the SAP to non DFS channel");
-        schedule_delayed_work(&hdd_ctx->ecsa_chan_change_work,
+        queue_delayed_work(system_freezable_power_efficient_wq,
+                            &hdd_ctx->ecsa_chan_change_work,
                             msecs_to_jiffies(ECSA_DFS_CHAN_CHANGE_DEFER_TIME));
     }
 }
@@ -2279,7 +2280,8 @@ hdd_schedule_ecsa_chan_change_work(hdd_context_t *hdd_ctx,
        time_diff = ECSA_SCC_CHAN_CHANGE_DEFER_INTERVAL - time_diff;
 
    hddLog(LOG1, FL("schedule ecsa_chan_change_work after %d ms"), time_diff);
-   schedule_delayed_work(&hdd_ctx->ecsa_chan_change_work,
+   queue_delayed_work(system_freezable_power_efficient_wq,
+                          &hdd_ctx->ecsa_chan_change_work,
                           msecs_to_jiffies(time_diff));
 }
 
@@ -4376,7 +4378,8 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3
                          (pHostapdAdapter->sessionCtx.ap.operatingChannel !=
                           pRoamInfo->chan_info.chan_id))
                  {
-                     schedule_delayed_work(&pHddCtx->ecsa_chan_change_work, 0);
+                     queue_delayed_work(system_freezable_power_efficient_wq,
+                                         &pHddCtx->ecsa_chan_change_work, 0);
                  }
                  else
                      hddLog(LOG1, FL("SAP restart not required"));

diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5606,7 +5606,8 @@ static int __wlan_hdd_cfg80211_set_spoofed_mac_oui(struct wiphy *wiphy,
             pHddCtx->spoofMacAddr.isEnabled = FALSE;
     }
 
-    schedule_delayed_work(&pHddCtx->spoof_mac_addr_work,
+    queue_delayed_work(system_freezable_power_efficient_wq,
+                          &pHddCtx->spoof_mac_addr_work,
                           msecs_to_jiffies(MAC_ADDR_SPOOFING_DEFER_INTERVAL));
 
     EXIT();
@@ -14911,7 +14912,8 @@ static eHalStatus hdd_cfg80211_scan_done_callback(tHalHandle halHandle,
         /* Generate new random mac addr for next scan */
         hddLog(VOS_TRACE_LEVEL_INFO, "scan completed - generate new spoof mac addr");
 
-        schedule_delayed_work(&pHddCtx->spoof_mac_addr_work,
+        queue_delayed_work(system_freezable_power_efficient_wq,
+                           &pHddCtx->spoof_mac_addr_work,
                            msecs_to_jiffies(MAC_ADDR_SPOOFING_DEFER_INTERVAL));
     }
 

diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
@@ -13432,7 +13432,8 @@ void wlan_hdd_defer_scan_init_work(hdd_context_t *pHddCtx,
         pHddCtx->scan_ctxt.attempt = 0;
         pHddCtx->scan_ctxt.magic = TDLS_CTX_MAGIC;
     }
-    schedule_delayed_work(&pHddCtx->scan_ctxt.scan_work, delay);
+    queue_delayed_work(system_freezable_power_efficient_wq,
+                          &pHddCtx->scan_ctxt.scan_work, delay);
 }
 
 void wlan_hdd_init_deinit_defer_scan_context(scan_context_t *scan_ctx)

diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_p2p.c
@@ -835,7 +835,8 @@ static int wlan_hdd_request_remain_on_channel( struct wiphy *wiphy,
 
                 mutex_unlock(&pHddCtx->roc_lock);
 
-                schedule_delayed_work(&pAdapter->roc_work,
+                queue_delayed_work(system_freezable_power_efficient_wq,
+                        &pAdapter->roc_work,
                         msecs_to_jiffies(pHddCtx->cfg_ini->gP2PListenDeferInterval));
                 hddLog(VOS_TRACE_LEVEL_INFO, "Defer interval is %hu, pAdapter %pK",
                         pHddCtx->cfg_ini->gP2PListenDeferInterval, pAdapter);