icnss2: refractor chain1 regulator voting

Refractor chain1 regulator voting.

Change-Id: I151de783bdc8518290b7069432f5b71d626d5e3e
CRs-Fixed: 3715778

icnss2/main.c

@@ -925,6 +925,12 @@ static int icnss_driver_event_server_arrive(struct icnss_priv *priv,
 
 	set_bit(ICNSS_WLFW_CONNECTED, &priv->state);
 
+	if (priv->device_id == ADRASTEA_DEVICE_ID) {
+		ret = icnss_hw_power_on(priv);
+		if (ret)
+			goto fail;
+	}
+
 	ret = wlfw_ind_register_send_sync_msg(priv);
 	if (ret < 0) {
 		if (ret == -EALREADY) {
@@ -990,12 +996,20 @@ static int icnss_driver_event_server_arrive(struct icnss_priv *priv,
 		goto fail;
 	}
 
-	ret = icnss_hw_power_on(priv);
-	if (ret)
-		goto fail;
+	if (priv->device_id == ADRASTEA_DEVICE_ID && priv->is_chain1_supported) {
+		ret = icnss_power_on_chain1_reg(priv);
+		if (ret) {
+			ignore_assert = true;
+			goto fail;
+		}
+	}
 
 	if (priv->device_id == WCN6750_DEVICE_ID ||
 	    priv->device_id == WCN6450_DEVICE_ID) {
+		ret = icnss_hw_power_on(priv);
+		if (ret)
+			goto fail;
+
 		ret = wlfw_device_info_send_msg(priv);
 		if (ret < 0) {
 			ignore_assert = true;

icnss2/main.h

@@ -484,7 +484,6 @@ struct icnss_priv {
 	struct list_head icnss_tcdev_list;
 	struct mutex tcdev_lock;
 	bool is_chain1_supported;
-	bool chain_reg_info_updated;
 	u32 hw_trc_override;
 	struct icnss_dms_data dms;
 	u8 use_nv_mac;

icnss2/power.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 #include <linux/clk.h>
 #include <linux/delay.h>
@@ -27,7 +27,7 @@ static struct icnss_vreg_cfg icnss_adrestea_vreg_list[] = {
 	{"vdd-cx-mx", 752000, 752000, 0, 0, 0, false, true},
 	{"vdd-1.8-xo", 1800000, 1800000, 0, 0, 0, false, true},
 	{"vdd-1.3-rfa", 1304000, 1304000, 0, 0, 0, false, true},
-	{"vdd-3.3-ch1", 3312000, 3312000, 0, 0, 0, false, true},
+	{"vdd-3.3-ch1", 3312000, 3312000, 0, 0, 0, false, false},
 	{"vdd-3.3-ch0", 3312000, 3312000, 0, 0, 0, false, true},
 };
 
@@ -385,14 +385,6 @@ static int icnss_vreg_on(struct icnss_priv *priv)
 	list_for_each_entry(vreg, vreg_list, list) {
 		if (IS_ERR_OR_NULL(vreg->reg) || !vreg->cfg.is_supported)
 			continue;
-		if (!priv->chain_reg_info_updated &&
-		    !strcmp(ICNSS_CHAIN1_REGULATOR, vreg->cfg.name)) {
-			priv->chain_reg_info_updated = true;
-			if (!priv->is_chain1_supported) {
-				vreg->cfg.is_supported = false;
-				continue;
-			}
-		}
 
 		ret = icnss_vreg_on_single(vreg);
 		if (ret)
@@ -730,6 +722,26 @@ int icnss_power_off(struct device *dev)
 }
 EXPORT_SYMBOL(icnss_power_off);
 
+int icnss_power_on_chain1_reg(struct icnss_priv *priv)
+{
+	struct list_head *vreg_list = &priv->vreg_list;
+	struct icnss_vreg_info *vreg = NULL;
+	int ret = 0;
+
+	list_for_each_entry(vreg, vreg_list, list) {
+		if (!strcmp(ICNSS_CHAIN1_REGULATOR, vreg->cfg.name) && priv->is_chain1_supported) {
+			vreg->cfg.is_supported = true;
+			ret = icnss_vreg_on_single(vreg);
+			break;
+		}
+	}
+
+	/* Setting chain1 supported to false as chain1 regulator cfg already updated */
+	priv->is_chain1_supported = false;
+
+	return ret;
+}
+
 void icnss_put_resources(struct icnss_priv *priv)
 {
 	icnss_put_clk(priv);

icnss2/power.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef __ICNSS_POWER_H__
@@ -8,6 +9,7 @@
 
 int icnss_hw_power_on(struct icnss_priv *priv);
 int icnss_hw_power_off(struct icnss_priv *priv);
+int icnss_power_on_chain1_reg(struct icnss_priv *priv);
 int icnss_get_clk(struct icnss_priv *priv);
 int icnss_get_vreg(struct icnss_priv *priv);
 void icnss_put_resources(struct icnss_priv *priv);