qcacld-3.0: Update setband commands to support 6G

Update both the driver and vendor setband command to support the
new 6G band. Specific changes include:
	1. Update driver setband command to convert userspace
	   input into a setband bitmap.
	2. Update vendor setband command to accept a bitmask
	   or a value
	3. Add support API to convert between vendor mask and reg
	   bitmap.

Change-Id: Ic968261ce5c3712f1e73cac0cb5a5f030118753a
CRs-fixed: 2726314

core/hdd/inc/wlan_hdd_regulatory.h

@@ -69,14 +69,24 @@ void hdd_send_wiphy_regd_sync_event(struct hdd_context *hdd_ctx);
  */
 int hdd_reg_set_country(struct hdd_context *hdd_ctx, char *country_code);
 
+/**
+ * hdd_reg_legacy_setband_to_reg_wifi_band_bitmap() - Convert the user space
+ *	band input to a bitmap of band capabilities, with reg_wifi_band as the
+ *	bit value
+ * @qca_setband: user space/setband value band input, can be 0, 1, or 2
+ *
+ * Return: bitmap on top of reg_wifi_band of bands enabled
+ */
+uint32_t hdd_reg_legacy_setband_to_reg_wifi_band_bitmap(uint8_t qca_setband);
+
 /**
  * hdd_reg_set_band() - helper function for setting the regulatory band
  * @hdd_ctx: the HDD context to set the band for
- * @ui_band: the UI band to configure
+ * @band_bitmap: the band bitmap to configure
  *
  * Return: zero for success, non-zero error code for failure
  */
-int hdd_reg_set_band(struct net_device *dev, u8 ui_band);
+int hdd_reg_set_band(struct net_device *dev, uint32_t band_bitmap);
 
 /**
  * hdd_update_indoor_channel() - enable/disable indoor channel

core/hdd/src/wlan_hdd_cfg80211.c

@@ -12165,9 +12165,25 @@ static int wlan_hdd_cfg80211_get_bus_size(struct wiphy *wiphy,
 }
 
 const struct nla_policy setband_policy[QCA_WLAN_VENDOR_ATTR_MAX + 1] = {
-		[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE] = {.type = NLA_U32}
+	[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE] = {.type = NLA_U32},
+	[QCA_WLAN_VENDOR_ATTR_SETBAND_MASK] = {.type = NLA_U32},
 };
 
+static uint32_t
+wlan_vendor_bitmap_to_reg_wifi_band_bitmap(uint32_t vendor_bitmap)
+{
+	uint32_t reg_bitmap = 0;
+
+	if (vendor_bitmap & QCA_SETBAND_2G)
+		reg_bitmap |= BIT(REG_BAND_2G);
+	if (vendor_bitmap & QCA_SETBAND_5G)
+		reg_bitmap |= BIT(REG_BAND_5G);
+	if (vendor_bitmap & QCA_SETBAND_6G)
+		reg_bitmap |= BIT(REG_BAND_6G);
+
+	return reg_bitmap;
+}
+
 /**
  *__wlan_hdd_cfg80211_setband() - set band
  * @wiphy: Pointer to wireless phy
@@ -12185,6 +12201,7 @@ static int __wlan_hdd_cfg80211_setband(struct wiphy *wiphy,
 	struct net_device *dev = wdev->netdev;
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX + 1];
 	int ret;
+	uint32_t reg_wifi_band_bitmap = 0, band_val, band_mask;
 
 	hdd_enter();
 
@@ -12198,13 +12215,23 @@ static int __wlan_hdd_cfg80211_setband(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!tb[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE]) {
+	if (tb[QCA_WLAN_VENDOR_ATTR_SETBAND_MASK]) {
+		band_mask = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_SETBAND_MASK]);
+		reg_wifi_band_bitmap =
+			wlan_vendor_bitmap_to_reg_wifi_band_bitmap(band_mask);
+	} else if (tb[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE]) {
+		band_val = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE]);
+		reg_wifi_band_bitmap =
+			hdd_reg_legacy_setband_to_reg_wifi_band_bitmap(
+								      band_val);
+	}
+
+	if (!reg_wifi_band_bitmap) {
 		hdd_err("attr SETBAND_VALUE failed");
 		return -EINVAL;
 	}
 
-	ret = hdd_reg_set_band(dev,
-		nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE]));
+	ret = hdd_reg_set_band(dev, reg_wifi_band_bitmap);
 
 	hdd_exit();
 	return ret;

core/hdd/src/wlan_hdd_ioctl.c

@@ -2583,6 +2583,7 @@ static int drv_cmd_set_band(struct hdd_adapter *adapter,
 {
 	int err;
 	uint8_t band;
+	uint32_t band_bitmap;
 
 	/*
 	 * Parse the band value passed from userspace. The first 8 bytes
@@ -2594,7 +2595,9 @@ static int drv_cmd_set_band(struct hdd_adapter *adapter,
 		return err;
 	}
 
-	return hdd_reg_set_band(adapter->dev, band);
+	band_bitmap = hdd_reg_legacy_setband_to_reg_wifi_band_bitmap(band);
+
+	return hdd_reg_set_band(adapter->dev, band_bitmap);
 }
 
 static int drv_cmd_set_wmmps(struct hdd_adapter *adapter,

core/hdd/src/wlan_hdd_regulatory.c

@@ -749,34 +749,42 @@ int hdd_reg_set_country(struct hdd_context *hdd_ctx, char *country_code)
 	return qdf_status_to_os_return(status);
 }
 
-int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
+uint32_t hdd_reg_legacy_setband_to_reg_wifi_band_bitmap(uint8_t qca_setband)
 {
-	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
-	mac_handle_t mac_handle;
-	enum band_info band;
-	QDF_STATUS status;
-	struct hdd_context *hdd_ctx;
-	enum band_info current_band;
-	enum band_info connected_band;
+	uint32_t band_bitmap = 0;
 
-	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-
-	switch (ui_band) {
-	case WLAN_HDD_UI_BAND_AUTO:
-		band = BAND_ALL;
+	switch (qca_setband) {
+	case QCA_SETBAND_AUTO:
+		band_bitmap |= (BIT(REG_BAND_2G) | BIT(REG_BAND_5G));
 		break;
-	case WLAN_HDD_UI_BAND_5_GHZ:
-		band = BAND_5G;
+	case QCA_SETBAND_5G:
+		band_bitmap |= BIT(REG_BAND_5G);
 		break;
-	case WLAN_HDD_UI_BAND_2_4_GHZ:
-		band = BAND_2G;
+	case QCA_SETBAND_2G:
+		band_bitmap |= BIT(REG_BAND_2G);
 		break;
 	default:
-		hdd_err("Invalid band value %u", ui_band);
+		hdd_err("Invalid band value %u", qca_setband);
+		return 0;
+	}
+
+	return band_bitmap;
+}
+
+int hdd_reg_set_band(struct net_device *dev, uint32_t band_bitmap)
+{
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	struct hdd_context *hdd_ctx;
+	uint32_t current_band;
+
+	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+
+	if (!band_bitmap) {
+		hdd_err("Can't disable all bands");
 		return -EINVAL;
 	}
 
-	hdd_debug("change band to %u", band);
+	hdd_debug("change band to %u", band_bitmap);
 
 	if (ucfg_reg_get_curr_band(hdd_ctx->pdev, &current_band) !=
 	    QDF_STATUS_SUCCESS) {
@@ -784,57 +792,17 @@ int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
 		return -EIO;
 	}
 
-	if (current_band == band)
+	if (current_band == band_bitmap) {
+		hdd_debug("band is the same so not updating");
 		return 0;
-
-	hdd_ctx->curr_band = band;
-
-	/* Change band request received.
-	 * Abort pending scan requests, flush the existing scan results,
-	 * and change the band capability
-	 */
-	hdd_debug("Current band value = %u, new setting %u ",
-			current_band, band);
-
-	mac_handle = hdd_ctx->mac_handle;
-	hdd_for_each_adapter(hdd_ctx, adapter) {
-		wlan_abort_scan(hdd_ctx->pdev, INVAL_PDEV_ID,
-				adapter->vdev_id, INVALID_SCAN_ID, false);
-		connected_band = hdd_conn_get_connected_band(
-				WLAN_HDD_GET_STATION_CTX_PTR(adapter));
-
-		/* Handling is done only for STA and P2P */
-		if (band != BAND_ALL &&
-		    ((adapter->device_mode == QDF_STA_MODE) ||
-		     (adapter->device_mode == QDF_P2P_CLIENT_MODE)) &&
-		    (hdd_conn_is_connected(
-				WLAN_HDD_GET_STATION_CTX_PTR(adapter)))
-			&& (connected_band != band)) {
-			status = QDF_STATUS_SUCCESS;
-
-			/* STA already connected on current
-			 * band, So issue disconnect first,
-			 * then change the band
-			 */
-
-			hdd_debug("STA (Device mode %s(%d)) connected in band %u, Changing band to %u, Issuing Disconnect",
-				  qdf_opmode_str(adapter->device_mode),
-				  adapter->device_mode, current_band, band);
-
-			status = wlan_hdd_disconnect(adapter,
-					eCSR_DISCONNECT_REASON_UNSPECIFIED,
-					eSIR_MAC_OPER_CHANNEL_BAND_CHANGE);
-			if (status) {
-				hdd_err("Hdd disconnect failed, status: %d",
-					status);
-				return -EINVAL;
-			}
-		}
-		ucfg_scan_flush_results(hdd_ctx->pdev, NULL);
 	}
 
-	if (QDF_IS_STATUS_ERROR(ucfg_reg_set_band(hdd_ctx->pdev, band))) {
-		hdd_err("Failed to set the band value to %u", band);
+	hdd_ctx->curr_band = wlan_reg_band_bitmap_to_band_info(band_bitmap);
+
+	if (QDF_IS_STATUS_ERROR(ucfg_reg_set_band(hdd_ctx->pdev,
+						  band_bitmap))) {
+		hdd_err("Failed to set the band bitmap value to %u",
+			band_bitmap);
 		return -EINVAL;
 	}