qcacmn: Replace reg_get_channel_state_for_freq

As part of upgrading legacy code with 6 GHz power APIs,
replace reg_get_channel_state_for_freq api with new api
reg_get_channel_state_for_pwrmode

Change-Id: I3e577148f0ee78f6ec8f96feef42be9ac920467d
CRs-Fixed: 3144822

umac/regulatory/core/src/reg_services_common.c

@@ -3938,27 +3938,6 @@ wlan_reg_get_usable_channel(struct wlan_objmgr_pdev *pdev,
 }
 #endif
 
-enum channel_state reg_get_channel_state_for_freq(struct wlan_objmgr_pdev *pdev,
-						  qdf_freq_t freq)
-{
-	enum channel_enum ch_idx;
-	struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
-
-	ch_idx = reg_get_chan_enum_for_freq(freq);
-
-	if (reg_is_chan_enum_invalid(ch_idx))
-		return CHANNEL_STATE_INVALID;
-
-	pdev_priv_obj = reg_get_pdev_obj(pdev);
-
-	if (!IS_VALID_PDEV_REG_OBJ(pdev_priv_obj)) {
-		reg_err("pdev reg obj is NULL");
-		return CHANNEL_STATE_INVALID;
-	}
-
-	return pdev_priv_obj->cur_chan_list[ch_idx].state;
-}
-
 /**
  * reg_get_nol_channel_state () - Get channel state from regulatory
  * and treat NOL channels as enabled channels
@@ -4240,8 +4219,9 @@ reg_get_5g_bonded_chan_array_for_freq(struct wlan_objmgr_pdev *pdev,
 
 	chan_cfreq =  bonded_chan_ptr->start_freq;
 	while (chan_cfreq <= bonded_chan_ptr->end_freq) {
-		temp_chan_state = reg_get_channel_state_for_freq(pdev,
-								 chan_cfreq);
+		temp_chan_state = reg_get_channel_state_for_pwrmode(
+						pdev, chan_cfreq,
+						REG_CURRENT_PWR_MODE);
 		if (temp_chan_state < chan_state)
 			chan_state = temp_chan_state;
 		chan_cfreq = chan_cfreq + 20;
@@ -4463,9 +4443,10 @@ static void reg_update_5g_bonded_channel_state_punc_for_freq(
 
 	chan_cfreq =  bonded_chan_ptr->start_freq;
 	while (chan_cfreq <= bonded_chan_ptr->end_freq) {
-		temp_chan_state =
-				reg_get_channel_state_for_freq(pdev,
-							       chan_cfreq);
+		temp_chan_state = reg_get_channel_state_for_pwrmode(
+							pdev,
+							chan_cfreq,
+							REG_CURRENT_PWR_MODE);
 		if (!reg_is_state_allowed(temp_chan_state))
 			puncture_bitmap |= BIT(i);
 		/* Remember of any of the sub20 channel is a DFS channel */
@@ -5458,7 +5439,8 @@ reg_get_5g_bonded_channel_for_freq(struct wlan_objmgr_pdev *pdev,
 				   **bonded_chan_ptr_ptr)
 {
 	if (ch_width == CH_WIDTH_20MHZ)
-		return reg_get_channel_state_for_freq(pdev, freq);
+		return reg_get_channel_state_for_pwrmode(pdev, freq,
+							 REG_CURRENT_PWR_MODE);
 
 	if (reg_is_ch_width_320(ch_width)) {
 		return reg_get_chan_state_for_320(pdev, freq, 0,

umac/regulatory/core/src/reg_services_common.h

@@ -901,20 +901,9 @@ reg_get_channel_list_with_power_for_freq(struct wlan_objmgr_pdev *pdev,
 					 struct channel_power *ch_list,
 					 uint8_t *num_chan);
 
-/**
- * reg_get_channel_state_for_freq() - Get channel state from regulatory
- * @pdev: Pointer to pdev
- * @freq: channel center frequency.
- *
- * Return: channel state
- */
-enum channel_state
-reg_get_channel_state_for_freq(struct wlan_objmgr_pdev *pdev,
-			       qdf_freq_t freq);
-
 #ifdef CONFIG_REG_6G_PWRMODE
 /**
- * reg_get_channel_state_for_freq() - Get channel state from regulatory
+ * reg_get_channel_state_for_pwrmode() - Get channel state from regulatory
  * @pdev: Pointer to pdev
  * @freq: channel center frequency.
  * @in_6g_pwr_type: 6g power type which decides 6G channel list lookup.

umac/regulatory/core/src/reg_utils.c

@@ -490,12 +490,15 @@ void reg_get_coex_unsafe_chan_reg_disable(
 #endif
 
 #ifdef CONFIG_CHAN_FREQ_API
-bool reg_is_passive_or_disable_for_freq(struct wlan_objmgr_pdev *pdev,
-					qdf_freq_t freq)
+bool reg_is_passive_or_disable_for_pwrmode(
+				struct wlan_objmgr_pdev *pdev,
+				qdf_freq_t freq,
+				enum supported_6g_pwr_types in_6g_pwr_mode)
 {
 	enum channel_state chan_state;
 
-	chan_state = reg_get_channel_state_for_freq(pdev, freq);
+	chan_state = reg_get_channel_state_for_pwrmode(pdev, freq,
+						       in_6g_pwr_mode);
 
 	return (chan_state == CHANNEL_STATE_DFS) ||
 		(chan_state == CHANNEL_STATE_DISABLE);

umac/regulatory/core/src/reg_utils.h

@@ -57,16 +57,20 @@ bool reg_is_world_ctry_code(uint16_t ctry_code);
  */
 bool reg_chan_has_dfs_attribute_for_freq(struct wlan_objmgr_pdev *pdev,
 					 qdf_freq_t freq);
+
 /**
- * reg_is_passive_or_disable_for_freq() - Check if the given channel is
+ * reg_is_passive_or_disable_for_pwrmode() - Check if the given channel is
  * passive or disabled.
  * @pdev: Pointer to physical dev
  * @chan: Channel frequency
+ * @in_6g_pwr_mode: Input 6GHz power mode
  *
  * Return: true if channel frequency is passive or disabled, else false.
  */
-bool reg_is_passive_or_disable_for_freq(struct wlan_objmgr_pdev *pdev,
-					qdf_freq_t freq);
+bool reg_is_passive_or_disable_for_pwrmode(
+				struct wlan_objmgr_pdev *pdev,
+				qdf_freq_t freq,
+				enum supported_6g_pwr_types in_6g_pwr_mode);
 #else
 static inline bool
 reg_chan_has_dfs_attribute_for_freq(struct wlan_objmgr_pdev *pdev,
@@ -76,8 +80,10 @@ reg_chan_has_dfs_attribute_for_freq(struct wlan_objmgr_pdev *pdev,
 }
 
 static inline bool
-reg_is_passive_or_disable_for_freq(struct wlan_objmgr_pdev *pdev,
-				   qdf_freq_t freq)
+reg_is_passive_or_disable_for_pwrmode(
+				struct wlan_objmgr_pdev *pdev,
+				qdf_freq_t freq,
+				enum supported_6g_pwr_types in_6g_pwr_mode)
 {
 	return false;
 }

umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -1742,15 +1742,18 @@ bool wlan_reg_is_dfs_for_freq(struct wlan_objmgr_pdev *pdev, qdf_freq_t freq);
 bool wlan_reg_is_dsrc_freq(qdf_freq_t freq);
 
 /**
- * wlan_reg_is_passive_or_disable_for_freq() - Checks chan state for passive
+ * wlan_reg_is_passive_or_disable_for_pwrmode() - Checks chan state for passive
  * and disabled
  * @pdev: pdev ptr
  * @freq: Channel center frequency
+ * @in_6g_pwr_mode: Input 6GHz power mode
  *
  * Return: true or false
  */
-bool wlan_reg_is_passive_or_disable_for_freq(struct wlan_objmgr_pdev *pdev,
-					     qdf_freq_t freq);
+bool wlan_reg_is_passive_or_disable_for_pwrmode(
+				struct wlan_objmgr_pdev *pdev,
+				qdf_freq_t freq,
+				enum supported_6g_pwr_types in_6g_pwr_mode);
 
 #ifdef CONFIG_REG_6G_PWRMODE
 /**

umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -1103,10 +1103,13 @@ bool wlan_reg_is_dfs_for_freq(struct wlan_objmgr_pdev *pdev, qdf_freq_t freq)
 	return reg_is_dfs_for_freq(pdev, freq);
 }
 
-bool wlan_reg_is_passive_or_disable_for_freq(struct wlan_objmgr_pdev *pdev,
-					     qdf_freq_t freq)
+bool wlan_reg_is_passive_or_disable_for_pwrmode(
+				struct wlan_objmgr_pdev *pdev,
+				qdf_freq_t freq,
+				enum supported_6g_pwr_types in_6g_pwr_mode)
 {
-	return reg_is_passive_or_disable_for_freq(pdev, freq);
+	return reg_is_passive_or_disable_for_pwrmode(pdev, freq,
+						     in_6g_pwr_mode);
 }
 
 #ifdef CONFIG_REG_6G_PWRMODE