qcacld-3.0: Add vendor cmd attribute to upgrade UDP QoS

Introduce a new attribute to configure access category override
for UDP frames of BE/BK category. Unlike, the earlier attribute
QCA_WLAN_VENDOR_ATTR_CONFIG_UDP_QOS_UPGRADE which will override
for all UDP frames, this attribute is for overriding only for
BE/BK based UDP frames.

CRs-Fixed: 3169564
Change-Id: I7c345c3dc7912dbfb68407e654c2c2b79bc20964

core/hdd/inc/wlan_hdd_main.h

@@ -999,6 +999,21 @@ struct wlm_multi_client_info_table {
 };
 #endif
 
+/**
+ * enum udp_qos_upgrade - Enumeration of the various User priority (UP) types
+ *			  UDP QoS upgrade request
+ * @UDP_QOS_UPGRADE_NONE: Do not upgrade UDP QoS AC
+ * @UDP_QOS_UPGRADE_BK_BE: Upgrade UDP QoS for BK/BE only
+ * @UDP_QOS_UPGRADE_ALL: Upgrade UDP QoS for all packets
+ * @UDP_QOS_UPGRADE_MAX: Max enum limit, not to add new beyond this
+ */
+enum udp_qos_upgrade {
+	UDP_QOS_UPGRADE_NONE,
+	UDP_QOS_UPGRADE_BK_BE,
+	UDP_QOS_UPGRADE_ALL,
+	UDP_QOS_UPGRADE_MAX
+};
+
 /**
  * struct hdd_adapter - hdd vdev/net_device context
  * @vdev: object manager vdev context
@@ -1026,6 +1041,7 @@ struct wlm_multi_client_info_table {
  *                          as per enum qca_sta_connect_fail_reason_codes
  * @upgrade_udp_qos_threshold: The threshold for user priority upgrade for
 			       any UDP packet.
+ * @udp_qos_upgrade_type: UDP QoS packet upgrade request type
  * @handle_feature_update: Handle feature update only if it is triggered
  *			   by hdd_netdev_feature_update
  * @netdev_features_update_work: work for handling the netdev features update
@@ -1244,6 +1260,7 @@ struct hdd_adapter {
 #endif
 	uint8_t link_status;
 	uint8_t upgrade_udp_qos_threshold;
+	enum udp_qos_upgrade udp_qos_upgrade_type;
 
 	/* variable for temperature in Celsius */
 	int temperature;
@@ -2303,7 +2320,7 @@ QDF_STATUS hdd_add_adapter_front(struct hdd_context *hdd_ctx,
 				 struct hdd_adapter *adapter);
 
 /**
- * typedef hdd_adapter_iterate_cb() – Iteration callback function
+ * typedef hdd_adapter_iterate_cb() - Iteration callback function
  * @adapter: current adapter of interest
  * @context: user context supplied to the iterator
  *
@@ -2318,7 +2335,7 @@ typedef QDF_STATUS (*hdd_adapter_iterate_cb)(struct hdd_adapter *adapter,
 					     void *context);
 
 /**
- * hdd_adapter_iterate() – Safely iterate over all adapters
+ * hdd_adapter_iterate() - Safely iterate over all adapters
  * @cb: callback function to invoke for each adapter
  * @context: user-supplied context to pass to @cb
  *

core/hdd/src/wlan_hdd_cfg80211.c

@@ -7789,6 +7789,8 @@ const struct nla_policy wlan_hdd_wifi_config_policy[
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_FT_OVER_DS] = {.type = NLA_U8 },
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_ARP_NS_OFFLOAD] = {.type = NLA_U8 },
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_DBAM] = {.type = NLA_U8 },
+	[QCA_WLAN_VENDOR_ATTR_CONFIG_UDP_QOS_UPGRADE_FOR_BE_BK] = {
+		.type = NLA_U8 },
 	[QCA_WLAN_VENDOR_ATTR_CONFIG_BEAMFORMER_PERIODIC_SOUNDING] = {
 		.type = NLA_U8 },
 };
@@ -8892,6 +8894,22 @@ static int hdd_config_scan_enable(struct hdd_adapter *adapter,
 	return 0;
 }
 
+/**
+ * hdd_config_udp_qos_upgrade_be_bk() - Set UDP QoS threshold for BE/BK AC.
+ * @adapter: adapter for which this configuration is to be applied
+ * @attr: NL attribute
+ *
+ * Returns: 0 on success, -EINVAL on failure
+ */
+static int hdd_config_udp_qos_upgrade_be_bk(struct hdd_adapter *adapter,
+					    const struct nlattr *attr)
+{
+	uint8_t priority = nla_get_u8(attr);
+
+	adapter->udp_qos_upgrade_type = UDP_QOS_UPGRADE_BK_BE;
+	return hdd_set_udp_qos_upgrade_config(adapter, priority);
+}
+
 /**
  * hdd_config_udp_qos_upgrade_threshold() - NL attribute handler to parse
  *					    priority upgrade threshold value.
@@ -8905,6 +8923,7 @@ static int hdd_config_udp_qos_upgrade_threshold(struct hdd_adapter *adapter,
 {
 	uint8_t priority = nla_get_u8(attr);
 
+	adapter->udp_qos_upgrade_type = UDP_QOS_UPGRADE_ALL;
 	return hdd_set_udp_qos_upgrade_config(adapter, priority);
 }
 
@@ -10484,6 +10503,8 @@ static const struct independent_setters independent_setters[] = {
 	{QCA_WLAN_VENDOR_ATTR_CONFIG_DBAM,
 	 hdd_set_dbam_config},
 #endif
+	{QCA_WLAN_VENDOR_ATTR_CONFIG_UDP_QOS_UPGRADE_FOR_BE_BK,
+	 hdd_config_udp_qos_upgrade_be_bk},
 	{QCA_WLAN_VENDOR_ATTR_CONFIG_BEAMFORMER_PERIODIC_SOUNDING,
 	 hdd_set_beamformer_periodic_sounding},
 };

core/hdd/src/wlan_hdd_wmm.c

@@ -1760,6 +1760,41 @@ QDF_STATUS hdd_wmm_adapter_close(struct hdd_adapter *adapter)
 	return QDF_STATUS_SUCCESS;
 }
 
+/**
+ * hdd_check_upgrade_vo_vi_qos() - Check and upgrade QOS for UDP packets
+ *				   based on request type received
+ * @adapter: [in] pointer to the adapter context (Should not be invalid)
+ * @user_pri: [out] priority set for this packet
+ *
+ * This function checks for the request type and upgrade based on request type
+ *
+ * UDP_QOS_UPGRADE_ALL: Upgrade QoS of all UDP packets if the current set
+ *	priority is below the pre-configured threshold for upgrade.
+ *
+ * UDP_QOS_UPGRADE_BK_BE: Upgrade QoS of all UDP packets if the current set
+ *	priority is below the AC VI.
+ */
+static inline void
+hdd_check_upgrade_vo_vi_qos(struct hdd_adapter *adapter,
+			    enum sme_qos_wmmuptype *user_pri)
+{
+	switch (adapter->udp_qos_upgrade_type) {
+	case UDP_QOS_UPGRADE_ALL:
+		if (*user_pri <
+		    qca_wlan_ac_to_sme_qos(adapter->upgrade_udp_qos_threshold))
+			*user_pri = qca_wlan_ac_to_sme_qos(
+					adapter->upgrade_udp_qos_threshold);
+		break;
+	case UDP_QOS_UPGRADE_BK_BE:
+		if (*user_pri < qca_wlan_ac_to_sme_qos(QCA_WLAN_AC_VI))
+			*user_pri = qca_wlan_ac_to_sme_qos(
+					adapter->upgrade_udp_qos_threshold);
+		break;
+	default:
+		break;
+	}
+}
+
 /**
  * hdd_check_and_upgrade_udp_qos() - Check and upgrade the qos for UDP packets
  *				     if the current set priority is below the
@@ -1794,11 +1829,7 @@ hdd_check_and_upgrade_udp_qos(struct hdd_adapter *adapter,
 		break;
 	case QCA_WLAN_AC_VI:
 	case QCA_WLAN_AC_VO:
-		if (*user_pri <
-		    qca_wlan_ac_to_sme_qos(adapter->upgrade_udp_qos_threshold))
-			*user_pri = qca_wlan_ac_to_sme_qos(
-					adapter->upgrade_udp_qos_threshold);
-
+		hdd_check_upgrade_vo_vi_qos(adapter, user_pri);
 		break;
 	default:
 		break;