qcacmn: Make freq to chan and vice versa conversion more generic

Add conversion from frequency to channel, for frequency falling
within two consecutive supported channels. Use the master
channel list of the pdev for the same. Add new API
wlan_reg_legacy_chan_to_freq to convert legacy 2G and 5G channel
number to frequency. Existing API wlan_reg_chan_to_freq would be
slowly deprecated.

Change-Id: Id7e1939b9e05b78c17751d13bb0b02a891f999ad
CRs-Fixed: 2526886

umac/regulatory/core/src/reg_services_common.c

@@ -1640,17 +1640,104 @@ uint32_t reg_freq_to_chan(struct wlan_objmgr_pdev *pdev,
 		return 0;
 	}
 
-	chan_list = pdev_priv_obj->cur_chan_list;
+	chan_list = pdev_priv_obj->mas_chan_list;
+	for (count = 0; count < NUM_CHANNELS; count++) {
+		if (chan_list[count].center_freq >= freq)
+			break;
+	}
 
-	for (count = 0; count < NUM_CHANNELS; count++)
-		if (chan_list[count].center_freq == freq)
-			return chan_list[count].chan_num;
+	if (count == NUM_CHANNELS)
+		goto end;
+
+	if (chan_list[count].center_freq == freq)
+		return chan_list[count].chan_num;
+
+	if (count == 0)
+		goto end;
 
+	if ((chan_list[count - 1].chan_num == INVALID_CHANNEL_NUM) ||
+	    (chan_list[count].chan_num == INVALID_CHANNEL_NUM)) {
+		reg_err("Frequency %d invalid in current reg domain", freq);
+		return 0;
+	}
+
+	return (chan_list[count - 1].chan_num +
+		(freq - chan_list[count - 1].center_freq) / 5);
+
+end:
 	reg_err("invalid frequency %d", freq);
+	return 0;
+}
+
+static uint16_t reg_compute_chan_to_freq(struct wlan_objmgr_pdev *pdev,
+					 uint8_t chan_num,
+					 enum channel_enum min_chan_range,
+					 enum channel_enum max_chan_range)
+{
+	uint16_t count;
+	struct regulatory_channel *chan_list;
+	struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
 
+	pdev_priv_obj = reg_get_pdev_obj(pdev);
+
+	if (!IS_VALID_PDEV_REG_OBJ(pdev_priv_obj)) {
+		reg_err("reg pdev priv obj is NULL");
+		return 0;
+	}
+
+	chan_list = pdev_priv_obj->mas_chan_list;
+
+	for (count = min_chan_range; count <= max_chan_range; count++) {
+		if (reg_chan_is_49ghz(pdev, chan_list[count].chan_num)) {
+			if (chan_list[count].chan_num == chan_num)
+				break;
+			continue;
+		} else if ((chan_list[count].chan_num >= chan_num) &&
+			   (chan_list[count].chan_num != INVALID_CHANNEL_NUM))
+			break;
+	}
+
+	if (count == max_chan_range + 1)
+		goto end;
+
+	if (chan_list[count].chan_num == chan_num) {
+		if (chan_list[count].chan_flags & REGULATORY_CHAN_DISABLED)
+			reg_err("Channel %d disabled in current reg domain",
+				chan_num);
+		return chan_list[count].center_freq;
+	}
+
+	if (count == min_chan_range)
+		goto end;
+
+	if ((chan_list[count - 1].chan_num == INVALID_CHANNEL_NUM) ||
+	    reg_chan_is_49ghz(pdev, chan_list[count - 1].chan_num) ||
+	    (chan_list[count].chan_num == INVALID_CHANNEL_NUM)) {
+		reg_err("Channel %d invalid in current reg domain",
+			chan_num);
+		return 0;
+	}
+
+	return (chan_list[count - 1].center_freq +
+		(chan_num - chan_list[count - 1].chan_num) * 5);
+
+end:
+
+	reg_debug_rl("Invalid channel %d", chan_num);
 	return 0;
 }
 
+uint16_t reg_legacy_chan_to_freq(struct wlan_objmgr_pdev *pdev,
+				 uint8_t chan_num)
+{
+	uint16_t min_chan_range = MIN_24GHZ_CHANNEL;
+	uint16_t max_chan_range = MAX_5GHZ_CHANNEL;
+
+	return reg_compute_chan_to_freq(pdev, chan_num,
+					min_chan_range,
+					max_chan_range);
+}
+
 #ifdef CONFIG_CHAN_NUM_API
 uint32_t reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 			  uint32_t chan_num)
@@ -1667,7 +1754,6 @@ uint32_t reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 	}
 
 	chan_list = pdev_priv_obj->cur_chan_list;
-
 	for (count = 0; count < NUM_CHANNELS; count++)
 		if (chan_list[count].chan_num == chan_num) {
 			if (reg_chan_in_range(chan_list,
@@ -1681,7 +1767,6 @@ uint32_t reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 		}
 
 	reg_debug_rl("invalid channel %d", chan_num);
-
 	return 0;
 }
 

umac/regulatory/core/src/reg_services_common.h

@@ -312,6 +312,16 @@ uint32_t reg_freq_to_chan(struct wlan_objmgr_pdev *pdev, uint32_t freq);
  */
 uint32_t reg_chan_to_freq(struct wlan_objmgr_pdev *pdev, uint32_t chan_num);
 
+/**
+ * reg_legacy_chan_to_freq() - Get freq from chan noumber, for 2G and 5G
+ * @pdev: Pointer to pdev
+ * @chan_num: Channel number
+ *
+ * Return: Channel frequency if success, otherwise 0
+ */
+uint16_t reg_legacy_chan_to_freq(struct wlan_objmgr_pdev *pdev,
+				 uint8_t chan_num);
+
 /**
  * reg_chan_is_49ghz() - Check if the input channel number is 4.9GHz
  * @pdev: Pdev pointer

umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -704,6 +704,15 @@ uint32_t wlan_reg_freq_to_chan(struct wlan_objmgr_pdev *pdev,
 uint32_t wlan_reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 			       uint32_t chan);
 
+/**
+ * wlan_reg_legacy_chan_to_freq () - convert chan to freq, for 2G and 5G
+ * @chan: channel number
+ *
+ * Return: frequency
+ */
+uint16_t wlan_reg_legacy_chan_to_freq(struct wlan_objmgr_pdev *pdev,
+				      uint8_t chan);
+
 /**
  * wlan_reg_is_us() - reg is us country
  * @country: The country information

umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -519,6 +519,12 @@ uint32_t wlan_reg_chan_to_freq(struct wlan_objmgr_pdev *pdev,
 
 qdf_export_symbol(wlan_reg_chan_to_freq);
 
+uint16_t wlan_reg_legacy_chan_to_freq(struct wlan_objmgr_pdev *pdev,
+				      uint8_t chan_num)
+{
+	return reg_legacy_chan_to_freq(pdev, chan_num);
+}
+
 #ifdef CONFIG_CHAN_NUM_API
 bool wlan_reg_chan_is_49ghz(struct wlan_objmgr_pdev *pdev,
 		uint8_t chan_num)