Browse Source

qcacld-3.0: Update multiple generic INI items using MLME CFG [Part 2]

Replace usage of the below INI Items using MLME CFG instead of HDD config.

gEnableSelfRecovery
gSapDot11mc
gEnableFatalEvent
gSub20ChannelWidth
goptimize_chan_avoid_event
fw_timeout_crash
DroppedPktDisconnectTh
gItoRepeatCount

Change-Id: Ib46b9fc6c4bbc5ede0be7a5cb88064808962839d
CRs-Fixed: 2327611
Vignesh Viswanathan 6 years ago
parent
commit
35e179602f

+ 1 - 1
mlme/dispatcher/inc/cfg_mlme_generic.h

@@ -400,7 +400,7 @@
  * <ini>
  * <ini>
  * gDroppedPktDisconnectTh - Sets dropped packet threshold in firmware
  * gDroppedPktDisconnectTh - Sets dropped packet threshold in firmware
  * @Min: 0
  * @Min: 0
- * @Max: 512
+ * @Max: 65535
  * @Default: 512
  * @Default: 512
  *
  *
  * This INI is the packet drop threshold will trigger disconnect from remote
  * This INI is the packet drop threshold will trigger disconnect from remote

+ 49 - 9
mlme/dispatcher/inc/wlan_mlme_api.h

@@ -198,34 +198,34 @@ QDF_STATUS wlan_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc,
 					 uint8_t band_capability);
 					 uint8_t band_capability);
 
 
 /**
 /**
- * wlan_mlme_get_prevent_link_down_cfg() - Get the prevent link down config
+ * wlan_mlme_get_prevent_link_down() - Get the prevent link down config
  * @psoc: pointer to psoc object
  * @psoc: pointer to psoc object
  * @prevent_link_down: Pointer to the variable from caller
  * @prevent_link_down: Pointer to the variable from caller
  *
  *
  * Return: QDF Status
  * Return: QDF Status
  */
  */
-QDF_STATUS wlan_mlme_get_prevent_link_down_cfg(struct wlan_objmgr_psoc *psoc,
-					       bool *prevent_link_down);
+QDF_STATUS wlan_mlme_get_prevent_link_down(struct wlan_objmgr_psoc *psoc,
+					   bool *prevent_link_down);
 
 
 /**
 /**
- * wlan_mlme_get_select_5ghz_margin_cfg() - Get the select 5Ghz margin config
+ * wlan_mlme_get_select_5ghz_margin() - Get the select 5Ghz margin config
  * @psoc: pointer to psoc object
  * @psoc: pointer to psoc object
  * @select_5ghz_margin: Pointer to the variable from caller
  * @select_5ghz_margin: Pointer to the variable from caller
  *
  *
  * Return: QDF Status
  * Return: QDF Status
  */
  */
-QDF_STATUS wlan_mlme_get_select_5ghz_margin_cfg(struct wlan_objmgr_psoc *psoc,
-						uint8_t *select_5ghz_margin);
+QDF_STATUS wlan_mlme_get_select_5ghz_margin(struct wlan_objmgr_psoc *psoc,
+					    uint8_t *select_5ghz_margin);
 
 
 /**
 /**
- * wlan_mlme_get_crash_inject_cfg() - Get the crash inject config
+ * wlan_mlme_get_crash_inject() - Get the crash inject config
  * @psoc: pointer to psoc object
  * @psoc: pointer to psoc object
  * @crash_inject: Pointer to the variable from caller
  * @crash_inject: Pointer to the variable from caller
  *
  *
  * Return: QDF Status
  * Return: QDF Status
  */
  */
-QDF_STATUS wlan_mlme_get_crash_inject_cfg(struct wlan_objmgr_psoc *psoc,
-					  bool *crash_inject);
+QDF_STATUS wlan_mlme_get_crash_inject(struct wlan_objmgr_psoc *psoc,
+				      bool *crash_inject);
 
 
 /**
 /**
  * wlan_mlme_get_lpass_support() - Get the LPASS Support config
  * wlan_mlme_get_lpass_support() - Get the LPASS Support config
@@ -237,6 +237,46 @@ QDF_STATUS wlan_mlme_get_crash_inject_cfg(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS wlan_mlme_get_lpass_support(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS wlan_mlme_get_lpass_support(struct wlan_objmgr_psoc *psoc,
 				       bool *lpass_support);
 				       bool *lpass_support);
 
 
+/**
+ * wlan_mlme_get_self_recovery() - Get the self recovery config
+ * @psoc: pointer to psoc object
+ * @self_recovery: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS wlan_mlme_get_self_recovery(struct wlan_objmgr_psoc *psoc,
+				       bool *self_recovery);
+
+/**
+ * wlan_mlme_get_sub_20_chan_width() - Get the sub 20 chan width config
+ * @psoc: pointer to psoc object
+ * @sub_20_chan_width: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS wlan_mlme_get_sub_20_chan_width(struct wlan_objmgr_psoc *psoc,
+					   uint8_t *sub_20_chan_width);
+
+/**
+ * wlan_mlme_get_fw_timeout_crash() - Get the fw timeout crash config
+ * @psoc: pointer to psoc object
+ * @fw_timeout_crash: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS wlan_mlme_get_fw_timeout_crash(struct wlan_objmgr_psoc *psoc,
+					  bool *fw_timeout_crash);
+
+/**
+ * wlan_mlme_get_ito_repeat_count() - Get the fw timeout crash config
+ * @psoc: pointer to psoc object
+ * @ito_repeat_count: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS wlan_mlme_get_ito_repeat_count(struct wlan_objmgr_psoc *psoc,
+					  uint8_t *ito_repeat_count);
+
 /**
 /**
  * wlan_mlme_get_acs_with_more_param() - Get the acs_with_more_param flag
  * wlan_mlme_get_acs_with_more_param() - Get the acs_with_more_param flag
  * @psoc: pointer to psoc object
  * @psoc: pointer to psoc object

+ 68 - 12
mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -178,45 +178,45 @@ QDF_STATUS ucfg_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc,
 }
 }
 
 
 /**
 /**
- * ucfg_mlme_get_prevent_link_down_cfg() - Get the prevent link down config
+ * ucfg_mlme_get_prevent_link_down() - Get the prevent link down config
  * @psoc: pointer to psoc object
  * @psoc: pointer to psoc object
  * @prevent_link_down: Pointer to the variable from caller
  * @prevent_link_down: Pointer to the variable from caller
  *
  *
  * Return: QDF Status
  * Return: QDF Status
  */
  */
 static inline
 static inline
-QDF_STATUS ucfg_mlme_get_prevent_link_down_cfg(struct wlan_objmgr_psoc *psoc,
-					       bool *prevent_link_down)
+QDF_STATUS ucfg_mlme_get_prevent_link_down(struct wlan_objmgr_psoc *psoc,
+					   bool *prevent_link_down)
 {
 {
-	return wlan_mlme_get_prevent_link_down_cfg(psoc, prevent_link_down);
+	return wlan_mlme_get_prevent_link_down(psoc, prevent_link_down);
 }
 }
 
 
 /**
 /**
- * ucfg_mlme_get_select_5ghz_margin_cfg() - Get the select 5Ghz margin config
+ * ucfg_mlme_get_select_5ghz_margin() - Get the select 5Ghz margin config
  * @psoc: pointer to psoc object
  * @psoc: pointer to psoc object
  * @select_5ghz_margin: Pointer to the variable from caller
  * @select_5ghz_margin: Pointer to the variable from caller
  *
  *
  * Return: QDF Status
  * Return: QDF Status
  */
  */
 static inline
 static inline
-QDF_STATUS ucfg_mlme_get_select_5ghz_margin_cfg(struct wlan_objmgr_psoc *psoc,
-						uint8_t *select_5ghz_margin)
+QDF_STATUS ucfg_mlme_get_select_5ghz_margin(struct wlan_objmgr_psoc *psoc,
+					    uint8_t *select_5ghz_margin)
 {
 {
-	return wlan_mlme_get_select_5ghz_margin_cfg(psoc, select_5ghz_margin);
+	return wlan_mlme_get_select_5ghz_margin(psoc, select_5ghz_margin);
 }
 }
 
 
 /**
 /**
- * ucfg_mlme_get_crash_inject_cfg() - Get the crash inject config
+ * ucfg_mlme_get_crash_inject() - Get the crash inject config
  * @psoc: pointer to psoc object
  * @psoc: pointer to psoc object
  * @crash_inject: Pointer to the variable from caller
  * @crash_inject: Pointer to the variable from caller
  *
  *
  * Return: QDF Status
  * Return: QDF Status
  */
  */
 static inline
 static inline
-QDF_STATUS ucfg_mlme_get_crash_inject_cfg(struct wlan_objmgr_psoc *psoc,
-					  bool *crash_inject)
+QDF_STATUS ucfg_mlme_get_crash_inject(struct wlan_objmgr_psoc *psoc,
+				      bool *crash_inject)
 {
 {
-	return wlan_mlme_get_crash_inject_cfg(psoc, crash_inject);
+	return wlan_mlme_get_crash_inject(psoc, crash_inject);
 }
 }
 
 
 /**
 /**
@@ -233,6 +233,62 @@ QDF_STATUS ucfg_mlme_get_lpass_support(struct wlan_objmgr_psoc *psoc,
 	return wlan_mlme_get_lpass_support(psoc, lpass_support);
 	return wlan_mlme_get_lpass_support(psoc, lpass_support);
 }
 }
 
 
+/**
+ * ucfg_mlme_get_self_recovery() - Get the self recovery config
+ * @psoc: pointer to psoc object
+ * @self_recovery: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+static inline
+QDF_STATUS ucfg_mlme_get_self_recovery(struct wlan_objmgr_psoc *psoc,
+				       bool *self_recovery)
+{
+	return wlan_mlme_get_self_recovery(psoc, self_recovery);
+}
+
+/**
+ * ucfg_mlme_get_sub_20_chan_width() - Get the sub 20 chan width config
+ * @psoc: pointer to psoc object
+ * @sub_20_chan_width: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+static inline
+QDF_STATUS ucfg_mlme_get_sub_20_chan_width(struct wlan_objmgr_psoc *psoc,
+					   uint8_t *sub_20_chan_width)
+{
+	return wlan_mlme_get_sub_20_chan_width(psoc, sub_20_chan_width);
+}
+
+/**
+ * ucfg_mlme_get_fw_timeout_crash() - Get the fw timeout crash config
+ * @psoc: pointer to psoc object
+ * @fw_timeout_crash: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+static inline
+QDF_STATUS ucfg_mlme_get_fw_timeout_crash(struct wlan_objmgr_psoc *psoc,
+					  bool *fw_timeout_crash)
+{
+	return wlan_mlme_get_fw_timeout_crash(psoc, fw_timeout_crash);
+}
+
+/**
+ * ucfg_mlme_get_ito_repeat_count() - Get the fw timeout crash config
+ * @psoc: pointer to psoc object
+ * @ito_repeat_count: Pointer to the variable from caller
+ *
+ * Return: QDF Status
+ */
+static inline
+QDF_STATUS ucfg_mlme_get_ito_repeat_count(struct wlan_objmgr_psoc *psoc,
+					  uint8_t *ito_repeat_count)
+{
+	return wlan_mlme_get_ito_repeat_count(psoc, ito_repeat_count);
+}
+
 /**
 /**
  * ucfg_mlme_get_acs_with_more_param() - Get the flag for acs with
  * ucfg_mlme_get_acs_with_more_param() - Get the flag for acs with
  *					 more param
  *					 more param

+ 70 - 6
mlme/dispatcher/src/wlan_mlme_api.c

@@ -123,8 +123,8 @@ QDF_STATUS wlan_mlme_set_band_capability(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 	return QDF_STATUS_SUCCESS;
 }
 }
 
 
-QDF_STATUS wlan_mlme_get_prevent_link_down_cfg(struct wlan_objmgr_psoc *psoc,
-					       bool *prevent_link_down)
+QDF_STATUS wlan_mlme_get_prevent_link_down(struct wlan_objmgr_psoc *psoc,
+					   bool *prevent_link_down)
 {
 {
 	struct wlan_mlme_psoc_obj *mlme_obj;
 	struct wlan_mlme_psoc_obj *mlme_obj;
 
 
@@ -139,8 +139,8 @@ QDF_STATUS wlan_mlme_get_prevent_link_down_cfg(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 	return QDF_STATUS_SUCCESS;
 }
 }
 
 
-QDF_STATUS wlan_mlme_get_select_5ghz_margin_cfg(struct wlan_objmgr_psoc *psoc,
-						uint8_t *select_5ghz_margin)
+QDF_STATUS wlan_mlme_get_select_5ghz_margin(struct wlan_objmgr_psoc *psoc,
+					    uint8_t *select_5ghz_margin)
 {
 {
 	struct wlan_mlme_psoc_obj *mlme_obj;
 	struct wlan_mlme_psoc_obj *mlme_obj;
 
 
@@ -155,8 +155,8 @@ QDF_STATUS wlan_mlme_get_select_5ghz_margin_cfg(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 	return QDF_STATUS_SUCCESS;
 }
 }
 
 
-QDF_STATUS wlan_mlme_get_crash_inject_cfg(struct wlan_objmgr_psoc *psoc,
-					  bool *crash_inject)
+QDF_STATUS wlan_mlme_get_crash_inject(struct wlan_objmgr_psoc *psoc,
+				      bool *crash_inject)
 {
 {
 	struct wlan_mlme_psoc_obj *mlme_obj;
 	struct wlan_mlme_psoc_obj *mlme_obj;
 
 
@@ -187,6 +187,70 @@ QDF_STATUS wlan_mlme_get_lpass_support(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 	return QDF_STATUS_SUCCESS;
 }
 }
 
 
+QDF_STATUS wlan_mlme_get_self_recovery(struct wlan_objmgr_psoc *psoc,
+				       bool *self_recovery)
+{
+	struct wlan_mlme_psoc_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_obj(psoc);
+	if (!mlme_obj) {
+		mlme_err("Failed to get MLME Obj");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	*self_recovery = mlme_obj->cfg.gen.self_recovery;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS wlan_mlme_get_sub_20_chan_width(struct wlan_objmgr_psoc *psoc,
+					   uint8_t *sub_20_chan_width)
+{
+	struct wlan_mlme_psoc_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_obj(psoc);
+	if (!mlme_obj) {
+		mlme_err("Failed to get MLME Obj");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	*sub_20_chan_width = mlme_obj->cfg.gen.sub_20_chan_width;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS wlan_mlme_get_fw_timeout_crash(struct wlan_objmgr_psoc *psoc,
+					  bool *fw_timeout_crash)
+{
+	struct wlan_mlme_psoc_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_obj(psoc);
+	if (!mlme_obj) {
+		mlme_err("Failed to get MLME Obj");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	*fw_timeout_crash = mlme_obj->cfg.gen.fw_timeout_crash;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS wlan_mlme_get_ito_repeat_count(struct wlan_objmgr_psoc *psoc,
+					  uint8_t *ito_repeat_count)
+{
+	struct wlan_mlme_psoc_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_obj(psoc);
+	if (!mlme_obj) {
+		mlme_err("Failed to get MLME Obj");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	*ito_repeat_count = mlme_obj->cfg.gen.ito_repeat_count;
+
+	return QDF_STATUS_SUCCESS;
+}
+
 void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
 void wlan_mlme_get_sap_inactivity_override(struct wlan_objmgr_psoc *psoc,
 					   bool *val)
 					   bool *val)
 {
 {