RDKB-58244: SMApp update based on status of the Mesh.Enable and HCM

Reason for change: SMApp continues to run when Mesh is disabled.
Test Procedure: 1. Disable getv Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.Enable and Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.MeshWifiOptimization.Mode
                2. Check if SM_APP is still running.

Risks: Low
Priority: P2

Signed-off-by: Maksym Holovatyi <[email protected]>

Author: HollowMax

include/wifi_events.h

@@ -164,6 +164,7 @@ typedef enum {
     wifi_event_type_sta_client_info,
     wifi_event_type_start_sta_channel_scan,
     wifi_event_type_csi_analytics_rfc,
+    wifi_event_type_sm_app_enable,
     wifi_event_command_max,
 
     wifi_event_monitor_diagnostics = wifi_event_type_base

source/apps/sm/wifi_sm.c

@@ -24,13 +24,15 @@
 #include "sm_cache.h"
 #include "sm_report.h"
 #include "wifi_hal.h"
+#include "wifi_ctrl.h"
 #include "wifi_mgr.h"
 #include "wifi_sm.h"
 #include "const.h"
 #include "sm_utils.h"
 
 #define DCA_TO_APP 1
 #define APP_TO_DCA 2
+#define BUS_SM_APP_ENABLE "Device.X_RDK_MeshAgent.SM_APP.Enable"
 
 typedef struct {
     sta_data_t  assoc_stats[BSS_MAX_NUM_STATIONS];
@@ -43,6 +45,9 @@ typedef struct {
     unsigned int    req_stats_vap_mask;
 } client_assoc_stats_t;
 
+static int sm_stats_to_monitor_set(wifi_app_t *app, bool enable);
+static void sm_events_subscribe(void);
+
 client_assoc_stats_t client_assoc_stats[MAX_NUM_RADIOS];
 
 int sm_survey_type_conversion(wifi_neighborScanMode_t *halw_scan_type, survey_type_t *app_stat_type, unsigned int conv_type)
@@ -556,7 +561,7 @@ int handle_sm_command_event(wifi_app_t *app, wifi_event_t *event)
     wifi_mgr_t *g_wifi_mgr = get_wifimgr_obj();
     stats_config_t *cur_stats_cfg = NULL;
     hash_map_t *cur_app_stats_cfg_map = app->data.u.sm_data.sm_stats_config_map;
-    bool off_scan_rfc = g_wifi_mgr->rfc_dml_parameters.wifi_offchannelscan_sm_rfc;
+    bool sm_app_enable, off_scan_rfc = g_wifi_mgr->rfc_dml_parameters.wifi_offchannelscan_sm_rfc;
 
     wifi_util_dbg_print(WIFI_SM, "inside %s:%d off_scan_rfc:%d\n",__func__, __LINE__,off_scan_rfc);
     if (event->sub_type == wifi_event_type_wifi_offchannelscan_sm_rfc )
@@ -583,6 +588,17 @@ int handle_sm_command_event(wifi_app_t *app, wifi_event_t *event)
                  cur_stats_cfg = hash_map_get_next(cur_app_stats_cfg_map, cur_stats_cfg);
            }
        }
+   } else if (event->sub_type == wifi_event_type_sm_app_enable) {
+       if (event->u.core_data.msg) {
+           sm_app_enable = *(bool *)event->u.core_data.msg;
+           wifi_util_dbg_print(WIFI_SM, "%s:%d: Received SM app enable event. sm_app_enable=%d\n",
+               __func__, __LINE__, sm_app_enable);
+           sm_stats_to_monitor_set(app, sm_app_enable);
+       } else {
+           wifi_util_error_print(WIFI_SM,
+               "inside %s:%d sub_type: wifi_event_type_sm_app_enable sm_app_enable=NULL\n",
+               __func__, __LINE__);
+       }
    }
    return RETURN_OK;
 }
@@ -797,14 +813,66 @@ int sm_event(wifi_app_t *app, wifi_event_t *event)
             monitor_event_sm(app, event);
         break;
         case wifi_event_type_command:
-            handle_sm_command_event(app,event);
+            handle_sm_command_event(app, event);
         break;
         default:
         break;
     }
     return RETURN_OK;
 }
 
+static void sm_app_enable_handler(char *event_name, raw_data_t *p_data)
+{
+    bool sm_app_enable;
+
+    wifi_util_dbg_print(WIFI_SM, "%s:%d recvd event\n", __func__, __LINE__);
+
+    if ((strcmp(event_name, BUS_SM_APP_ENABLE) != 0) ||
+        (p_data->data_type != bus_data_type_boolean)) {
+        wifi_util_error_print(WIFI_SM, "%s:%d invalid event received,%s:%x\n", __func__, __LINE__,
+            event_name, p_data->data_type);
+        return;
+    }
+
+    sm_app_enable = p_data->raw_data.b;
+
+    push_event_to_ctrl_queue(&sm_app_enable, sizeof(sm_app_enable), wifi_event_type_command,
+        wifi_event_type_sm_app_enable, NULL);
+}
+
+static int sm_events_timer_task(void *args)
+{
+    sm_events_subscribe();
+    return TIMER_TASK_COMPLETE;
+}
+
+static void sm_events_subscribe(void)
+{
+    wifi_ctrl_t *ctrl = (wifi_ctrl_t *)get_wifictrl_obj();
+    wifi_bus_desc_t *bus_desc = get_bus_descriptor();
+    static int task_id = 0;
+    bool add_timer_task = false;
+
+    if (ctrl->sm_app_enable_subscribed == false) {
+        if (bus_desc->bus_event_subs_fn(&ctrl->handle, BUS_SM_APP_ENABLE, sm_app_enable_handler,
+                NULL, 0) != bus_error_success) {
+            wifi_util_dbg_print(WIFI_SM, "%s:%d: event:%s subscribe failed\n", __FUNCTION__,
+                __LINE__, BUS_SM_APP_ENABLE);
+            add_timer_task = true;
+        } else {
+            ctrl->sm_app_enable_subscribed = true;
+            wifi_util_info_print(WIFI_SM, "%s:%d: event:%s subscribe success\n", __FUNCTION__,
+                __LINE__, BUS_SM_APP_ENABLE);
+        }
+    }
+
+    if (add_timer_task && task_id == 0) {
+        scheduler_add_timer_task(ctrl->sched, FALSE, &task_id, sm_events_timer_task, NULL,
+            (ctrl->poll_period * 1000), 0, FALSE);
+    } else if (!add_timer_task && task_id != 0) {
+        scheduler_cancel_timer_task(ctrl->sched, task_id);
+    }
+}
 
 int sm_init(wifi_app_t *app, unsigned int create_flag)
 {
@@ -814,14 +882,16 @@ int sm_init(wifi_app_t *app, unsigned int create_flag)
     }
 
     dpp_init();
+    sm_events_subscribe();
 
-    app->data.u.sm_data.sm_stats_config_map  = hash_map_create();
-    app->data.u.sm_data.report_tasks_map  = hash_map_create();
+    app->data.u.sm_data.sm_stats_config_map = hash_map_create();
+    app->data.u.sm_data.report_tasks_map = hash_map_create();
 
     memset(client_assoc_stats, 0, sizeof(client_assoc_stats));
     rc = sm_report_init(app);
 
-    wifi_util_info_print(WIFI_SM, "%s:%d: Init SM app %s\n", __func__, __LINE__, rc ? "failure" : "success");
+    wifi_util_info_print(WIFI_SM, "%s:%d: Init SM app %s\n", __func__, __LINE__,
+        rc ? "failure" : "success");
 
     return rc;
 }

source/core/wifi_ctrl.h

@@ -243,6 +243,7 @@ typedef struct wifi_ctrl {
     bool                marker_list_config_subscribed;
     bool                wifi_sta_2g_status_subscribed;
     bool                wifi_sta_5g_status_subscribed;
+    bool                sm_app_enable_subscribed;
     bool                eth_bh_status_subscribed;
     bool                mesh_keep_out_chans_subscribed;
     wifiapi_t           wifiapi;

source/core/wifi_ctrl_queue_handlers.c

@@ -3601,6 +3601,7 @@ void handle_command_event(wifi_ctrl_t *ctrl, void *data, unsigned int len,
     case wifi_event_type_start_inst_msmt:
     case wifi_event_type_stop_inst_msmt:
     case wifi_event_type_xfinity_rrm:
+    case wifi_event_type_sm_app_enable:
         // not handle here
         break;
     default:

source/core/wifi_events.c

@@ -151,6 +151,7 @@ const char *wifi_event_subtype_to_string(wifi_event_subtype_t type)
         DOC2S(wifi_event_type_start_channel_scan)
         DOC2S(wifi_event_type_rsn_override_rfc)
         DOC2S(wifi_event_type_sta_client_info)
+        DOC2S(wifi_event_type_sm_app_enable)
         DOC2S(wifi_event_command_max)
         DOC2S(wifi_event_monitor_diagnostics)
         DOC2S(wifi_event_monitor_connect)