qcacld-3.0: Advertise unspecified SAR versions as default to userspace

Currently, if fw sends any SAR version that is not having mapping
in host, host advertises SAR version unspecified to userspace.
And if userspace sends set SAR V1 to host, host converts it
to SAR V2 only if fw is configured to SAR V2 or Sar V3.

Instead of SAR version unspecified advertise SAR V1 to userspace
and add changes in host to convert SAR V1 to SAR V2 if fw is not
configured to SAR V1.

Change-Id: Ifd862cf9107ae3bbac9a4336b5c2a03c1bd5bb98
CRs-Fixed: 3326711

configs/default_defconfig

@@ -402,7 +402,7 @@ CONFIG_QCACLD_FEATURE_GREEN_AP := y
 CONFIG_QCACLD_FEATURE_APF := y
 
 #Flag to enable SARv1 -> SARv2 conversion
-CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 := n
+CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 := y
 
 #Flag to enable get firmware state
 CONFIG_QCACLD_FEATURE_FW_STATE := y

core/hdd/inc/hdd_config.h

@@ -1637,7 +1637,7 @@ struct dhcp_server {
  *
  * @Min: 0
  * @Max: 1
- * Default: 0
+ * Default: 1
  *
  * If user space is using SARV1 and FW is using SARV2 in BDF in that case
  * this ini is used to enable conversion from user specified SARV1 command
@@ -1652,7 +1652,7 @@ struct dhcp_server {
  */
 #define CFG_SAR_CONVERSION  CFG_INI_BOOL( \
 			"gEnableSARV1toSARV2", \
-			0, \
+			1, \
 			"Enable/Disable conversion from SARV1 to SARV2")
 
 /*

core/hdd/src/wlan_hdd_sar_limits.c

@@ -325,7 +325,9 @@ static u32 hdd_to_nl_sar_version(enum sar_version hdd_sar_version)
 	case (SAR_VERSION_3):
 		return QCA_WLAN_VENDOR_SAR_VERSION_3;
 	default:
-		return QCA_WLAN_VENDOR_SAR_VERSION_INVALID;
+		hdd_err("Unexpected SAR version received :%u, sending default to userspace",
+			hdd_sar_version);
+		return QCA_WLAN_VENDOR_SAR_VERSION_1;
 	}
 }
 
@@ -341,14 +343,14 @@ static u32 hdd_to_nl_sar_version(enum sar_version hdd_sar_version)
 static int hdd_sar_fill_capability_response(struct sk_buff *skb,
 					    struct hdd_context *hdd_ctx)
 {
-	int errno = 0;
+	int errno;
 	u32 attr;
 	u32 value;
 
 	attr = QCA_WLAN_VENDOR_ATTR_SAR_CAPABILITY_VERSION;
 	value = hdd_to_nl_sar_version(hdd_ctx->sar_version);
 
-	hdd_debug("SAR Version = %u", value);
+	hdd_debug("Sending SAR Version = %u to userspace", value);
 
 	errno = nla_put_u32(skb, attr, value);
 
@@ -548,8 +550,7 @@ hdd_convert_sarv1_to_sarv2(struct hdd_context *hdd_ctx,
 	struct sar_limit_cmd_row *row;
 
 	hdd_enter();
-	if (hdd_ctx->sar_version != SAR_VERSION_2 &&
-	    hdd_ctx->sar_version != SAR_VERSION_3) {
+	if (hdd_ctx->sar_version == SAR_VERSION_1) {
 		hdd_debug("SAR version: %d", hdd_ctx->sar_version);
 		return false;
 	}
@@ -773,8 +774,7 @@ static int __wlan_hdd_set_sar_power_limits(struct wiphy *wiphy,
 			QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SELECT_BDF0 &&
 		     sar_enable <=
 			QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SELECT_BDF4) &&
-		     (hdd_ctx->sar_version == SAR_VERSION_2 ||
-		      hdd_ctx->sar_version == SAR_VERSION_3) &&
+		     hdd_ctx->sar_version != SAR_VERSION_1 &&
 		     !hdd_ctx->config->enable_sar_conversion) {
 			hdd_err("SARV1 to SARV2 is disabled from ini");
 			return -EINVAL;