qcacld-3.0: Set max bandwidth with link id

Support wpa_cli driver SET_MAX_BW with two params:
[bw_index][link_id].

Change-Id: Id2a872152e308e94389cd1068013d7661b37659b
CRs-Fixed: 3522561

components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -4810,13 +4810,15 @@ QDF_STATUS ucfg_mlme_update_bss_rate_flags(struct wlan_objmgr_psoc *psoc,
  * @psoc: pointer to psoc object
  * @vdev_id: Vdev id
  * @ch_width: channel width to update
+ * @link_id: mlo link id
  *
  * Return: QDF_STATUS
  */
 QDF_STATUS
 ucfg_mlme_send_ch_width_update_with_notify(struct wlan_objmgr_psoc *psoc,
 					   uint8_t vdev_id,
-					   enum phy_ch_width ch_width);
+					   enum phy_ch_width ch_width,
+					   uint8_t link_id);
 
 /**
  * ucfg_mlme_is_chwidth_with_notify_supported() - Get chwidth with notify

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -7027,7 +7027,7 @@ static QDF_STATUS
 wlan_mlme_update_vdev_chwidth_with_notify(struct wlan_objmgr_psoc *psoc,
 					  struct wlan_objmgr_vdev *vdev,
 					  uint8_t vdev_id,
-					  enum phy_ch_width ch_width)
+					  wmi_host_channel_width ch_width)
 {
 	struct vdev_mlme_obj *vdev_mlme;
 	struct vdev_set_params param = {0};
@@ -7293,6 +7293,7 @@ wlan_mlme_send_ch_width_update_with_notify(struct wlan_objmgr_psoc *psoc,
 					   enum phy_ch_width ch_width)
 {
 	QDF_STATUS status;
+	wmi_host_channel_width wmi_chan_width;
 	enum phy_ch_width associated_ch_width;
 	struct wlan_channel *des_chan;
 	struct mlme_legacy_priv *mlme_priv;
@@ -7328,9 +7329,11 @@ wlan_mlme_send_ch_width_update_with_notify(struct wlan_objmgr_psoc *psoc,
 		return status;
 	}
 
+	wmi_chan_width = target_if_phy_ch_width_to_wmi_chan_width(ch_width);
+
 	/* update ch width to fw */
 	status = wlan_mlme_update_vdev_chwidth_with_notify(psoc, vdev, vdev_id,
-							   ch_width);
+							   wmi_chan_width);
 	if (QDF_IS_STATUS_ERROR(status))
 		mlme_err("vdev %d: Failed to update CW:%d to fw, status:%d",
 			 vdev_id, ch_width, status);

components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c

@@ -396,12 +396,15 @@ QDF_STATUS ucfg_mlme_update_bss_rate_flags(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS
 ucfg_mlme_send_ch_width_update_with_notify(struct wlan_objmgr_psoc *psoc,
 					   uint8_t vdev_id,
-					   enum phy_ch_width ch_width)
+					   enum phy_ch_width ch_width,
+					   uint8_t link_id)
 {
 	struct wlan_objmgr_vdev *vdev;
-	QDF_STATUS status;
+	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	enum QDF_OPMODE op_mode;
-	bool is_mlo_vdev;
+	struct wlan_objmgr_vdev *link_vdev;
+	bool is_mlo_link = false;
+	uint8_t link_vdev_id;
 
 	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
 						    WLAN_MLME_OBJMGR_ID);
@@ -411,16 +414,32 @@ ucfg_mlme_send_ch_width_update_with_notify(struct wlan_objmgr_psoc *psoc,
 	}
 
 	op_mode = wlan_vdev_mlme_get_opmode(vdev);
-	is_mlo_vdev = wlan_vdev_mlme_is_mlo_vdev(vdev);
-	if (op_mode != QDF_STA_MODE || is_mlo_vdev) {
-		mlme_legacy_debug("vdev %d: op mode %d, is_mlo_vdev:%d, CW update not supported",
-				  vdev_id, op_mode, is_mlo_vdev);
+	if (op_mode != QDF_STA_MODE) {
+		mlme_legacy_debug("vdev %d: op mode %d, CW update not supported",
+				  vdev_id, op_mode);
 		status = QDF_STATUS_E_NOSUPPORT;
 		goto release;
 	}
 
-	status = wlan_mlme_send_ch_width_update_with_notify(psoc, vdev,
-							    vdev_id, ch_width);
+	if (wlan_vdev_mlme_is_mlo_vdev(vdev) && link_id != 0xFF) {
+		link_vdev = mlo_get_vdev_by_link_id(vdev, link_id);
+		if (!link_vdev) {
+			mlme_legacy_debug("vdev is null for the link id:%u",
+					  link_id);
+			goto release;
+		}
+		is_mlo_link = true;
+		link_vdev_id = wlan_vdev_get_id(link_vdev);
+	} else {
+		link_vdev = vdev;
+		link_vdev_id = vdev_id;
+		mlme_legacy_debug("vdev mlme is not mlo vdev");
+	}
+	status = wlan_mlme_send_ch_width_update_with_notify(psoc, link_vdev,
+							    link_vdev_id,
+							    ch_width);
+	if (is_mlo_link)
+		mlo_release_vdev_ref(link_vdev);
 
 release:
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_OBJMGR_ID);

core/hdd/inc/wlan_hdd_cfg.h

@@ -505,10 +505,11 @@ int hdd_set_rx_stbc(struct wlan_hdd_link_info *link_info, int value);
  * @adapter: adapter being modified
  * @chwidth: new channel width of enum eSirMacHTChannelWidth
  * @bonding_mode: channel bonding mode of the new channel width
+ * @link_id: mlo link id
  *
  * Return: 0 on success, negative errno on failure
  */
 int hdd_update_channel_width(struct hdd_adapter *adapter,
 			     enum eSirMacHTChannelWidth chwidth,
-			     uint32_t bonding_mode);
+			     uint32_t bonding_mode, uint8_t link_id);
 #endif /* end #if !defined(HDD_CONFIG_H__) */

core/hdd/src/wlan_hdd_cfg.c

@@ -2415,7 +2415,7 @@ static QDF_STATUS hdd_update_bss_rate_flags(struct hdd_adapter *adapter,
 
 int hdd_update_channel_width(struct hdd_adapter *adapter,
 			     enum eSirMacHTChannelWidth chwidth,
-			     uint32_t bonding_mode)
+			     uint32_t bonding_mode, uint8_t link_id)
 {
 	struct hdd_context *hdd_ctx;
 	struct sme_config_params *sme_config;
@@ -2436,7 +2436,8 @@ int hdd_update_channel_width(struct hdd_adapter *adapter,
 			  adapter->deflink->vdev_id, ch_width);
 		status =
 		    ucfg_mlme_send_ch_width_update_with_notify(hdd_ctx->psoc,
-					adapter->deflink->vdev_id, ch_width);
+					adapter->deflink->vdev_id, ch_width,
+					link_id);
 		if (QDF_IS_STATUS_ERROR(status))
 			return -EIO;
 		status = hdd_update_bss_rate_flags(adapter, hdd_ctx->psoc,

core/hdd/src/wlan_hdd_cfg80211.c

@@ -8442,6 +8442,18 @@ const struct nla_policy wlan_hdd_wifi_config_policy[
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_UL_MU_CONFIG] = {.type = NLA_U8},
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_AP_ALLOWED_FREQ_LIST] = {
 		.type = NLA_NESTED},
+	[QCA_WLAN_VENDOR_ATTR_CONFIG_MLO_LINKS] = {
+		.type = NLA_NESTED },
+};
+
+#define WLAN_MAX_LINK_ID 15
+
+static const struct nla_policy bandwidth_mlo_policy[
+			QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1] = {
+	[QCA_WLAN_VENDOR_ATTR_CONFIG_CHANNEL_WIDTH] = {
+		.type = NLA_U8 },
+	[QCA_WLAN_VENDOR_ATTR_CONFIG_MLO_LINK_ID] = {
+		.type = NLA_U8 },
 };
 
 static const struct nla_policy
@@ -10860,36 +10872,88 @@ static uint32_t hdd_mac_chwidth_to_bonding_mode(
 }
 
 int hdd_set_mac_chan_width(struct hdd_adapter *adapter,
-			   enum eSirMacHTChannelWidth chwidth)
+			   enum eSirMacHTChannelWidth chwidth,
+			   uint8_t link_id)
 {
 	uint32_t bonding_mode;
 
 	bonding_mode = hdd_mac_chwidth_to_bonding_mode(chwidth);
 
-	return hdd_update_channel_width(adapter, chwidth, bonding_mode);
+	return hdd_update_channel_width(adapter, chwidth,
+					bonding_mode, link_id);
 }
 
 /**
  * hdd_set_channel_width() - set channel width
  * @link_info: Link info pointer in HDD adapter.
- * @attr: nla attr sent by supplicant
+ * @tb: array of pointer to struct nlattr
  *
  * Return: 0 on success, negative errno on failure
  */
 static int hdd_set_channel_width(struct wlan_hdd_link_info *link_info,
-				 const struct nlattr *attr)
+				 struct nlattr *tb[])
 {
-	uint8_t nl80211_chwidth;
-	enum eSirMacHTChannelWidth chwidth;
+	int rem;
+	uint8_t nl80211_chwidth = 0xFF;
+	uint8_t link_id = 0xFF;
+	struct nlattr *tb2[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1];
+	struct nlattr *curr_attr;
+	struct nlattr *chn_bd = NULL;
+	struct nlattr *mlo_link_id;
 
-	nl80211_chwidth = nla_get_u8(attr);
-	chwidth = hdd_nl80211_chwidth_to_chwidth(nl80211_chwidth);
-	if (chwidth < 0) {
+	if (!tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MLO_LINKS])
+		goto skip_mlo;
+
+	nla_for_each_nested(curr_attr,
+			    tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MLO_LINKS], rem) {
+		if (wlan_cfg80211_nla_parse_nested(tb2,
+						QCA_WLAN_VENDOR_ATTR_CONFIG_MAX,
+						   curr_attr,
+						   bandwidth_mlo_policy)){
+			hdd_err_rl("nla_parse failed");
+			return -EINVAL;
+		}
+
+		chn_bd = tb2[QCA_WLAN_VENDOR_ATTR_CONFIG_CHANNEL_WIDTH];
+		mlo_link_id = tb2[QCA_WLAN_VENDOR_ATTR_CONFIG_MLO_LINK_ID];
+
+		if (!chn_bd || !mlo_link_id)
+			return 0;
+
+		nl80211_chwidth = nla_get_u8(chn_bd);
+		if (nl80211_chwidth < eHT_CHANNEL_WIDTH_20MHZ ||
+		    nl80211_chwidth > eHT_MAX_CHANNEL_WIDTH) {
+			hdd_err("Invalid channel width:%u", nl80211_chwidth);
+			return -EINVAL;
+		}
+
+		link_id = nla_get_u8(mlo_link_id);
+		if (link_id > WLAN_MAX_LINK_ID) {
+			hdd_debug("invalid link_id:%u", link_id);
+			return -EINVAL;
+		}
+	}
+
+	if (link_id != 0xFF)
+		goto set_chan_width;
+
+skip_mlo:
+	chn_bd = tb[QCA_WLAN_VENDOR_ATTR_CONFIG_CHANNEL_WIDTH];
+
+	if (!chn_bd)
+		return 0;
+
+	nl80211_chwidth = nla_get_u8(chn_bd);
+
+	if (nl80211_chwidth < eHT_CHANNEL_WIDTH_20MHZ ||
+	    nl80211_chwidth > eHT_MAX_CHANNEL_WIDTH) {
 		hdd_err("Invalid channel width");
 		return -EINVAL;
 	}
 
-	return hdd_set_mac_chan_width(link_info->adapter, chwidth);
+set_chan_width:
+	return hdd_set_mac_chan_width(link_info->adapter,
+				      nl80211_chwidth, link_id);
 }
 
 /**
@@ -11833,8 +11897,6 @@ static const struct independent_setters independent_setters[] = {
 	 hdd_config_tx_stbc},
 	{QCA_WLAN_VENDOR_ATTR_CONFIG_RX_STBC,
 	 hdd_config_rx_stbc},
-	{QCA_WLAN_VENDOR_ATTR_CONFIG_CHANNEL_WIDTH,
-	 hdd_set_channel_width},
 	{QCA_WLAN_VENDOR_ATTR_CONFIG_DYNAMIC_BW,
 	 hdd_set_dynamic_bw},
 	{QCA_WLAN_VENDOR_ATTR_CONFIG_NSS,
@@ -12681,6 +12743,7 @@ static const interdependent_setter_fn interdependent_setters[] = {
 	hdd_process_generic_set_cmd,
 	hdd_config_phy_mode,
 	hdd_config_power,
+	hdd_set_channel_width,
 };
 
 /**
@@ -12981,6 +13044,7 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
 	uint8_t wmm_mode = 0;
 	uint32_t bss_max_idle_period = 0;
 	uint32_t cmd_id;
+	uint8_t link_id = 0xFF;
 	struct keep_alive_req keep_alive_req = {0};
 	struct set_wfatest_params wfa_param = {0};
 	struct wlan_hdd_link_info *link_info = adapter->link_info;
@@ -13695,7 +13759,8 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
 		if (cfg_val)
 			hdd_update_channel_width(
 					adapter, eHT_CHANNEL_WIDTH_20MHZ,
-					WNI_CFG_CHANNEL_BONDING_MODE_DISABLE);
+					WNI_CFG_CHANNEL_BONDING_MODE_DISABLE,
+					link_id);
 	}
 
 	cmd_id = QCA_WLAN_VENDOR_ATTR_WIFI_TEST_CONFIG_ER_SU_PPDU_TYPE;
@@ -13705,7 +13770,8 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
 		if (cfg_val) {
 			hdd_update_channel_width(
 					adapter, eHT_CHANNEL_WIDTH_20MHZ,
-					WNI_CFG_CHANNEL_BONDING_MODE_DISABLE);
+					WNI_CFG_CHANNEL_BONDING_MODE_DISABLE,
+					link_id);
 			hdd_set_tx_stbc(link_info, 0);
 			hdd_set_11ax_rate(adapter, 0x400, NULL);
 			status = wma_cli_set_command(
@@ -13725,6 +13791,7 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
 		} else {
 			hdd_update_channel_width(
 					adapter, eHT_CHANNEL_WIDTH_160MHZ,
+					link_id,
 					WNI_CFG_CHANNEL_BONDING_MODE_ENABLE);
 			hdd_set_tx_stbc(link_info, 1);
 			hdd_set_11ax_rate(adapter, 0xFFFF, NULL);

core/hdd/src/wlan_hdd_cfg80211.h

@@ -967,11 +967,13 @@ int hdd_set_phy_mode(struct hdd_adapter *adapter,
  * hdd_set_mac_chan_width() - set channel width
  * @adapter: Handle to hdd_adapter
  * @chwidth: given channel width
+ * @link_id: mlo link id
  *
  * Return: 0 on success, negative errno on failure
  */
 int hdd_set_mac_chan_width(struct hdd_adapter *adapter,
-			   enum eSirMacHTChannelWidth chwidth);
+			   enum eSirMacHTChannelWidth chwidth,
+			   uint8_t link_id);
 
 /**
  * hdd_is_legacy_connection() - Is adapter connection is legacy

core/hdd/src/wlan_hdd_cm_disconnect.c

@@ -513,6 +513,7 @@ static void hdd_cm_restore_ch_width(struct wlan_objmgr_vdev *vdev,
 	struct mlme_legacy_priv *mlme_priv;
 	enum eSirMacHTChannelWidth max_bw;
 	struct wlan_channel *des_chan;
+	uint8_t link_id = 0xFF;
 	int ret;
 	uint8_t vdev_id = wlan_vdev_get_id(vdev);
 	enum phy_ch_width assoc_ch_width;
@@ -533,7 +534,7 @@ static void hdd_cm_restore_ch_width(struct wlan_objmgr_vdev *vdev,
 	cm_update_associated_ch_info(vdev, false);
 
 	max_bw = get_max_bw();
-	ret = hdd_set_mac_chan_width(adapter, max_bw);
+	ret = hdd_set_mac_chan_width(adapter, max_bw, link_id);
 	if (ret) {
 		hdd_err("vdev %d : fail to set max ch width", vdev_id);
 		return;

core/hdd/src/wlan_hdd_main.c

@@ -21420,6 +21420,7 @@ uint8_t *hdd_ch_width_str(enum phy_ch_width ch_width)
 int hdd_we_set_ch_width(struct wlan_hdd_link_info *link_info, int ch_width)
 {
 	int i;
+	uint8_t link_id = 0xFF;
 
 	/* updating channel bonding only on 5Ghz */
 	hdd_debug("wmi_vdev_param_chwidth val %d", ch_width);
@@ -21430,7 +21431,8 @@ int hdd_we_set_ch_width(struct wlan_hdd_link_info *link_info, int ch_width)
 			continue;
 
 		return hdd_update_channel_width(link_info->adapter, ch_width,
-						chwidth_info[i].bonding_mode);
+						chwidth_info[i].bonding_mode,
+						link_id);
 	}
 
 	hdd_err("Invalid ch_width %d", ch_width);

core/hdd/src/wlan_hdd_son.c

@@ -145,6 +145,7 @@ static int hdd_son_set_chwidth(struct wlan_objmgr_vdev *vdev,
 {
 	enum eSirMacHTChannelWidth chwidth;
 	struct wlan_hdd_link_info *link_info;
+	uint8_t link_id = 0xFF;
 
 	if (!vdev) {
 		hdd_err("null vdev");
@@ -159,7 +160,7 @@ static int hdd_son_set_chwidth(struct wlan_objmgr_vdev *vdev,
 
 	chwidth = hdd_son_chan_width_to_chan_width(son_chwidth);
 
-	return hdd_set_mac_chan_width(link_info->adapter, chwidth);
+	return hdd_set_mac_chan_width(link_info->adapter, chwidth, link_id);
 }
 
 /**