qcacld-3.0: Add vendor command to configure peer A-MPDU count

Add vendor configure attribute handler for
QCA_WLAN_VENDOR_ATTR_CONFIG_PEER_AMPDU_CNT, pass the user space
peer A-MPDU count configure to target through WMI_PEER_AMPDU.

Adjust input validation of wlan_hdd_cfg80211_wifi_set_rx_blocksize(),
to avoid respond with error if other command with PEER MAC input,
because PEER MAC attribute can be reused by other vendor configure
command.

Change-Id: I21b8800d12328177853ebab4715a7a5ae4195e18
CRs-Fixed: 3611765

core/hdd/src/wlan_hdd_cfg80211.c

@@ -8493,6 +8493,7 @@ const struct nla_policy wlan_hdd_wifi_config_policy[
 		.type = NLA_NESTED},
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_MLO_LINKS] = {
 		.type = NLA_NESTED },
+	[QCA_WLAN_VENDOR_ATTR_CONFIG_PEER_AMPDU_CNT] = {.type = NLA_U16},
 };
 
 #define WLAN_MAX_LINK_ID 15
@@ -8860,12 +8861,10 @@ wlan_hdd_cfg80211_wifi_set_rx_blocksize(struct wlan_hdd_link_info *link_info,
 #define WINDOW_SIZE_VAL_MIN 1
 #define WINDOW_SIZE_VAL_MAX 64
 
-	if (tb[RX_BLOCKSIZE_PEER_MAC] ||
-	    tb[RX_BLOCKSIZE_WINLIMIT]) {
+	if (tb[RX_BLOCKSIZE_WINLIMIT]) {
 
 		/* if one is specified, both must be specified */
-		if (!tb[RX_BLOCKSIZE_PEER_MAC] ||
-		    !tb[RX_BLOCKSIZE_WINLIMIT]) {
+		if (!tb[RX_BLOCKSIZE_PEER_MAC]) {
 			hdd_err("Both Peer MAC and windows limit required");
 			return -EINVAL;
 		}
@@ -9009,6 +9008,68 @@ static int hdd_config_phy_mode(struct wlan_hdd_link_info *link_info,
 	return -EINVAL;
 }
 
+/**
+ * hdd_config_peer_ampdu() - Configure peer A-MPDU count
+ * @link_info: Link info pointer in HDD adapter
+ * @tb: nla attr sent from userspace
+ *
+ * Return: 0 on success; error number otherwise
+ */
+static int hdd_config_peer_ampdu(struct wlan_hdd_link_info *link_info,
+				 struct nlattr *tb[])
+{
+	struct hdd_adapter *adapter = link_info->adapter;
+	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+	struct nlattr *ampdu_cnt_attr =
+		tb[QCA_WLAN_VENDOR_ATTR_CONFIG_PEER_AMPDU_CNT];
+	struct nlattr *ampdu_mac_attr =
+		tb[QCA_WLAN_VENDOR_ATTR_CONFIG_PEER_MAC];
+	struct qdf_mac_addr peer_macaddr;
+	struct wlan_objmgr_vdev *vdev;
+	QDF_STATUS status;
+	bool is_sap;
+	uint16_t cfg_val;
+
+	if (!ampdu_cnt_attr)
+		return 0;
+
+	if (adapter->device_mode == QDF_SAP_MODE ||
+	    adapter->device_mode == QDF_P2P_GO_MODE)
+		is_sap = true;
+	else if (adapter->device_mode == QDF_STA_MODE ||
+		 adapter->device_mode == QDF_P2P_CLIENT_MODE)
+		is_sap = false;
+	else {
+		hdd_debug("mode not support");
+		return -EINVAL;
+	}
+
+	if (is_sap) {
+		if (!ampdu_mac_attr) {
+			hdd_debug("sap must provide peer mac attr");
+			return -EINVAL;
+		}
+		nla_memcpy(&peer_macaddr, ampdu_mac_attr, QDF_MAC_ADDR_SIZE);
+	} else {
+		vdev = hdd_objmgr_get_vdev_by_user(link_info, WLAN_OSIF_ID);
+		if (!vdev) {
+			hdd_debug("vdev is null");
+			return -EINVAL;
+		}
+		status = wlan_vdev_get_bss_peer_mac(vdev, &peer_macaddr);
+		hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_ID);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			hdd_debug("fail to get bss peer mac");
+			return -EINVAL;
+		}
+	}
+	cfg_val = nla_get_u16(ampdu_cnt_attr);
+	return sme_set_peer_ampdu(hdd_ctx->mac_handle,
+				  link_info->vdev_id,
+				  &peer_macaddr,
+				  cfg_val);
+}
+
 /**
  * hdd_set_roam_reason_vsie_status() - enable/disable inclusion of
  * roam reason vsie in Reassoc
@@ -12884,6 +12945,7 @@ static const interdependent_setter_fn interdependent_setters[] = {
 	hdd_config_phy_mode,
 	hdd_config_power,
 	hdd_set_channel_width,
+	hdd_config_peer_ampdu,
 };
 
 /**

core/sme/inc/sme_api.h

@@ -1203,6 +1203,18 @@ QDF_STATUS sme_set_idle_powersave_config(bool value);
 QDF_STATUS sme_notify_modem_power_state(mac_handle_t mac_handle,
 					uint32_t value);
 
+/**
+ * sme_set_peer_ampdu() - API to set peer A-MPDU count to target
+ * @mac_handle: mac handle
+ * @vdev_id: vdev id
+ * @peer_mac: peer mac address
+ * @cfg: A-MPDU count to configure
+ *
+ * Return: 0 if success, otherwise error code
+ */
+int sme_set_peer_ampdu(mac_handle_t mac_handle, uint8_t vdev_id,
+		       struct qdf_mac_addr *peer_mac, uint16_t cfg);
+
 /*SME API to convert convert the ini value to the ENUM used in csr and MAC*/
 ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value);
 int sme_update_ht_config(mac_handle_t mac_handle, uint8_t sessionId,

core/sme/src/common/sme_api.c

@@ -7719,6 +7719,71 @@ int16_t sme_get_ht_config(mac_handle_t mac_handle, uint8_t vdev_id,
 	}
 }
 
+/**
+ * sme_validate_peer_ampdu_cfg() - Function to validate peer A-MPDU configure
+ * @peer: peer object
+ * @cfg: peer A-MPDU configure value
+ *
+ * Return: true if success, otherwise false
+ */
+static bool sme_validate_peer_ampdu_cfg(struct wlan_objmgr_peer *peer,
+					uint16_t cfg)
+{
+	if (!cfg) {
+		sme_debug("peer ampdu count 0");
+		return false;
+	}
+
+	if (wlan_peer_get_peer_type(peer) == WLAN_PEER_SELF) {
+		sme_debug("self peer");
+		return false;
+	}
+
+	return true;
+}
+
+int sme_set_peer_ampdu(mac_handle_t mac_handle, uint8_t vdev_id,
+		       struct qdf_mac_addr *peer_mac, uint16_t cfg)
+{
+	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
+	struct wlan_objmgr_vdev *vdev;
+	QDF_STATUS status;
+	struct wlan_objmgr_peer *peer_obj;
+
+	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac_ctx->psoc,
+						    vdev_id,
+						    WLAN_LEGACY_SME_ID);
+	status = wlan_vdev_is_up(vdev);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		sme_debug("vdev id %d not up", vdev_id);
+		goto release_vdev_ref;
+	}
+	peer_obj = wlan_objmgr_vdev_find_peer_by_mac(vdev,
+						     peer_mac->bytes,
+						     WLAN_LEGACY_SME_ID);
+	if (!peer_obj) {
+		sme_debug("vdev id %d peer not found "QDF_MAC_ADDR_FMT,
+			  vdev_id,
+			  QDF_MAC_ADDR_REF(peer_mac->bytes));
+		status = QDF_STATUS_E_FAILURE;
+		goto release_vdev_ref;
+	}
+
+	if (!sme_validate_peer_ampdu_cfg(peer_obj, cfg)) {
+		status = QDF_STATUS_E_INVAL;
+		goto release_peer_ref;
+	}
+	status = sme_set_peer_param(peer_mac->bytes,
+				    WMI_HOST_PEER_AMPDU,
+				    cfg,
+				    vdev_id);
+release_peer_ref:
+	wlan_objmgr_peer_release_ref(peer_obj, WLAN_LEGACY_SME_ID);
+release_vdev_ref:
+	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
+	return qdf_status_to_os_return(status);
+}
+
 int sme_update_ht_config(mac_handle_t mac_handle, uint8_t vdev_id,
 			 uint16_t htCapab, int value)
 {