qcacld-3.0: Change to set SAR index at init time

Changes to set SAR safety index at the driver init time.
Enhance gEnableSarSafety ini to enable timer / init
based SAR index configuration.

Change-Id: Ie50a887d566427fe4e4ff589bf3594c6b78e8c00
CRs-Fixed: 3576752

core/hdd/inc/hdd_sar_safety_config.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -25,6 +26,16 @@
 
 #ifdef SAR_SAFETY_FEATURE
 
+/*
+ * SAR_SAFETY_DISABLED - feature disabled
+ * SAR_SAFETY_ENABLED_TIMER - SAR feature enabled with timer mechanism
+ * SAR_SAFETY_ENABLED_INIT - SAR feature enabled at init time
+ * SAR_SAFETY_ENABLED_MAX - SAR max valid value
+ */
+#define SAR_SAFETY_DISABLED        0x0
+#define SAR_SAFETY_ENABLED_TIMER   BIT(0)
+#define SAR_SAFETY_ENABLED_INIT    BIT(1)
+#define SAR_SAFETY_ENABLED_MAX     0x3
 /*
  * <ini>
  * gSarSafetyTimeout - Specify SAR safety timeout value in milliseconds
@@ -198,24 +209,30 @@
 /*
  * <ini>
  * gEnableSarSafety - Enable/Disable SAR safety feature
+ * this ini is also used to set SAR index at init time
  *
  * @Min: 0
- * @Max: 1
+ * @Max: 3
  * Default: 0
  *
  * This ini is used to enable/disable SAR safety feature
- * Value 1 of this ini enables SAR safety feature and
- * value 0 of this ini disables SAR safety feature
+ * Value 0 of this ini disables SAR safety feature and
+ * value 1 of this ini enables SAR safety feature and
+ * value 2 of this ini enable setting SAR index at init time
+ * value 3 of this enables both modes
  *
  * Usage: External
  *
  * </ini>
  */
 
-#define CFG_ENABLE_SAR_SAFETY_FEATURE CFG_INI_BOOL( \
+#define CFG_ENABLE_SAR_SAFETY_FEATURE CFG_INI_UINT( \
 			"gEnableSarSafety", \
-			0, \
-			"Enable/Disable SAR safety feature")
+			SAR_SAFETY_DISABLED, \
+			SAR_SAFETY_ENABLED_MAX, \
+			SAR_SAFETY_DISABLED, \
+			CFG_VALUE_OR_DEFAULT, \
+			"Enable/Disable SAR safety feature type")
 
 /*
  * <ini>

core/hdd/inc/wlan_hdd_cfg.h

@@ -191,7 +191,7 @@ struct hdd_config {
 	uint32_t sar_safety_req_resp_retry;
 	uint32_t sar_safety_index;
 	uint32_t sar_safety_sleep_index;
-	bool enable_sar_safety;
+	uint8_t enable_sar_safety;
 	bool config_sar_safety_sleep_index;
 #endif
 	uint8_t nb_commands_interval;

core/hdd/inc/wlan_hdd_main.h

@@ -5397,4 +5397,16 @@ static inline void wlan_hdd_link_speed_update(struct wlan_objmgr_psoc *psoc,
  */
 void hdd_update_multicast_list(struct wlan_objmgr_vdev *vdev);
 
+/**
+ * hdd_set_sar_init_index() - Set SAR safety index at init.
+ * @hdd_ctx: HDD context
+ *
+ */
+#ifdef SAR_SAFETY_FEATURE
+void hdd_set_sar_init_index(struct hdd_context *hdd_ctx);
+#else
+static inline void hdd_set_sar_init_index(struct hdd_context *hdd_ctx)
+{}
+#endif
+
 #endif /* end #if !defined(WLAN_HDD_MAIN_H) */

core/hdd/src/wlan_hdd_driver_ops.c

@@ -746,6 +746,7 @@ static int __hdd_soc_probe(struct device *dev,
 	hdd_start_complete(0);
 	hdd_thermal_mitigation_register(hdd_ctx, dev);
 
+	hdd_set_sar_init_index(hdd_ctx);
 	hdd_soc_load_unlock(dev);
 
 	return 0;

core/hdd/src/wlan_hdd_main.c

@@ -13963,6 +13963,25 @@ static void hdd_sar_cfg_update(struct hdd_config *config,
 	config->config_sar_safety_sleep_index =
 			cfg_get(psoc, CFG_CONFIG_SAR_SAFETY_SLEEP_MODE_INDEX);
 }
+
+void hdd_set_sar_init_index(struct hdd_context *hdd_ctx)
+{
+	uint32_t index, enable = 0;
+
+	if (!hdd_ctx) {
+		hdd_err("hdd_ctx NULL");
+		return;
+	}
+	if (hdd_ctx->sar_version == SAR_VERSION_1) {
+		hdd_nofl_debug("FW SAR version: %d", hdd_ctx->sar_version);
+		return;
+	}
+
+	enable = hdd_ctx->config->enable_sar_safety;
+	index = hdd_ctx->config->sar_safety_index;
+	if (enable & SAR_SAFETY_ENABLED_INIT)
+		hdd_configure_sar_index(hdd_ctx, index);
+}
 #else
 static void hdd_sar_cfg_update(struct hdd_config *config,
 			       struct wlan_objmgr_psoc *psoc)

core/hdd/src/wlan_hdd_sar_limits.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1093,7 +1093,7 @@ config_sar_failed:
 
 void hdd_configure_sar_sleep_index(struct hdd_context *hdd_ctx)
 {
-	if (!hdd_ctx->config->enable_sar_safety)
+	if (!(hdd_ctx->config->enable_sar_safety & SAR_SAFETY_ENABLED_TIMER))
 		return;
 
 	if (hdd_ctx->config->config_sar_safety_sleep_index) {
@@ -1110,7 +1110,7 @@ void hdd_configure_sar_sleep_index(struct hdd_context *hdd_ctx)
 
 void hdd_configure_sar_resume_index(struct hdd_context *hdd_ctx)
 {
-	if (!hdd_ctx->config->enable_sar_safety)
+	if (!(hdd_ctx->config->enable_sar_safety & SAR_SAFETY_ENABLED_TIMER))
 		return;
 
 	hdd_nofl_debug("Configure SAR safety index %d on wlan resume",
@@ -1199,7 +1199,7 @@ static void hdd_sar_safety_timer_cb(void *user_data)
 
 void wlan_hdd_sar_unsolicited_timer_start(struct hdd_context *hdd_ctx)
 {
-	if (!hdd_ctx->config->enable_sar_safety)
+	if (!(hdd_ctx->config->enable_sar_safety & SAR_SAFETY_ENABLED_TIMER))
 		return;
 
 	if (qdf_atomic_read(
@@ -1216,7 +1216,7 @@ void wlan_hdd_sar_timers_reset(struct hdd_context *hdd_ctx)
 {
 	QDF_STATUS status;
 
-	if (!hdd_ctx->config->enable_sar_safety)
+	if (!(hdd_ctx->config->enable_sar_safety & SAR_SAFETY_ENABLED_TIMER))
 		return;
 
 	if (hdd_ctx->sar_version == SAR_VERSION_1)
@@ -1245,7 +1245,7 @@ void wlan_hdd_sar_timers_init(struct hdd_context *hdd_ctx)
 {
 	QDF_STATUS status;
 
-	if (!hdd_ctx->config->enable_sar_safety)
+	if (!(hdd_ctx->config->enable_sar_safety & SAR_SAFETY_ENABLED_TIMER))
 		return;
 
 	hdd_enter();
@@ -1271,7 +1271,7 @@ hdd_exit:
 
 void wlan_hdd_sar_timers_deinit(struct hdd_context *hdd_ctx)
 {
-	if (!hdd_ctx->config->enable_sar_safety)
+	if (!(hdd_ctx->config->enable_sar_safety & SAR_SAFETY_ENABLED_TIMER))
 		return;
 
 	hdd_enter();