qcacld-3.0: Allow fw to send all beacons of connected AP

In order to process QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING
vendor command, driver sends remove beacon filter cmd to fw to
allow fw to send all beacons of connected AP to driver.
But in some cases fw may wakeup host in wow mode.
To avoid these cases, with this change beacon reporting feature
will use WMI_VDEV_PARAM_NTH_BEACON_TO_HOST
command to FW instead of WMI_RMV_BCN_FILTER_CMDID
With WMI_VDEV_PARAM_NTH_BEACON_TO_HOST, in case of active reporting,
fw should send all beacons of connected AP to HOST
and also no wakeup of driver should happen in wow mode.

Change-Id: I9d0e255a6d4accb523bf4613146574239e7e0d09
CRs-Fixed: 2471627

core/hdd/inc/wlan_hdd_bcn_recv.h

@@ -62,7 +62,8 @@ void hdd_beacon_recv_pause_indication(hdd_handle_t hdd_handle,
 	.info.vendor_id = QCA_NL80211_VENDOR_ID,			\
 	.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING,	\
 	.flags = WIPHY_VENDOR_CMD_NEED_WDEV |				\
-		WIPHY_VENDOR_CMD_NEED_RUNNING,				\
+		 WIPHY_VENDOR_CMD_NEED_NETDEV |				\
+		 WIPHY_VENDOR_CMD_NEED_RUNNING,				\
 	.doit = wlan_hdd_cfg80211_bcn_rcv_start				\
 },
 

core/hdd/src/wlan_hdd_bcn_recv.c

@@ -29,9 +29,16 @@
 #include "wlan_hdd_main.h"
 #include "osif_sync.h"
 #include "wlan_hdd_bcn_recv.h"
+#include <linux/limits.h>
+
+#define SET_BIT(value, mask) ((value) |= (1 << (mask)))
 
 #define BOOTTIME QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_BOOTTIME_WHEN_RECEIVED
 
+#ifndef CHAR_BIT
+#define CHAR_BIT 8	/* Normally in <limits.h> */
+#endif
+
 static const struct nla_policy
 beacon_reporting_params[QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_MAX + 1] = {
 	[QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE] = {.type = NLA_U8},
@@ -165,15 +172,18 @@ static void hdd_send_bcn_recv_info(hdd_handle_t hdd_handle,
  * @hdd_ctx: Pointer to hdd context
  * @adapter: Pointer to network adapter
  * @active_report: Active reporting flag
+ * @nth_value: Beacon report period
  *
  * This function process beacon reporting start operation.
  */
 static int hdd_handle_beacon_reporting_start_op(struct hdd_context *hdd_ctx,
 						struct hdd_adapter *adapter,
-						bool active_report)
+						bool active_report,
+						uint32_t nth_value)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	int errno;
+	uint32_t mask = 0;
 
 	if (active_report) {
 		/* Register beacon report callback */
@@ -195,10 +205,18 @@ static int hdd_handle_beacon_reporting_start_op(struct hdd_context *hdd_ctx,
 			errno = qdf_status_to_os_return(qdf_status);
 			return errno;
 		}
+		/* Update Beacon report period in case of active reporting */
+		nth_value = 1;
+		/*
+		 * Set MSB which indicates fw to don't wakeup host in wow
+		 * mode in case of active beacon report.
+		 */
+		mask = (sizeof(uint32_t) * CHAR_BIT) - 1;
+		SET_BIT(nth_value, mask);
 	}
 	/* Handle beacon receive start indication */
 	qdf_status = sme_handle_bcn_recv_start(hdd_ctx->mac_handle,
-					       adapter->vdev_id);
+					       adapter->vdev_id, nth_value);
 	if (QDF_IS_STATUS_ERROR(qdf_status)) {
 		hdd_err("bcn rcv start failed with status=%d", qdf_status);
 		errno = qdf_status_to_os_return(qdf_status);
@@ -276,7 +294,7 @@ static int __wlan_hdd_cfg80211_bcn_rcv_start(struct wiphy *wiphy,
 	struct net_device *dev = wdev->netdev;
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_MAX + 1];
-	uint32_t bcn_report;
+	uint32_t bcn_report, nth_value = 1;
 	int errno;
 	bool active_report;
 
@@ -318,6 +336,11 @@ static int __wlan_hdd_cfg80211_bcn_rcv_start(struct wiphy *wiphy,
 		nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE]);
 	hdd_debug("Bcn Report: OP type:%d", bcn_report);
 
+	if (tb[QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_PERIOD])
+		nth_value =
+			nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_PERIOD]);
+	hdd_debug("Beacon Report: Period: %d", nth_value);
+
 	switch (bcn_report) {
 	case QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START:
 		if (sme_is_beacon_report_started(hdd_ctx->mac_handle,
@@ -327,7 +350,8 @@ static int __wlan_hdd_cfg80211_bcn_rcv_start(struct wiphy *wiphy,
 		}
 		errno = hdd_handle_beacon_reporting_start_op(hdd_ctx,
 							     adapter,
-							     active_report);
+							     active_report,
+							     nth_value);
 		break;
 	case QCA_WLAN_VENDOR_BEACON_REPORTING_OP_STOP:
 		if (sme_is_beacon_report_started(hdd_ctx->mac_handle,

core/sme/inc/sme_api.h

@@ -1584,6 +1584,7 @@ QDF_STATUS sme_update_mimo_power_save(mac_handle_t mac_handle,
  * beacons of the current connected AP
  * @mac_handle: Opaque handle to the global MAC context
  * @vdev_id: SME session id
+ * @nth_value: Beacon report period
  *
  * This function remove beacon filter. It allow fw to send
  * all beacons from connected peer to driver.
@@ -1591,7 +1592,8 @@ QDF_STATUS sme_update_mimo_power_save(mac_handle_t mac_handle,
  * Return: QDF_STATUS enumeration
  */
 QDF_STATUS sme_handle_bcn_recv_start(mac_handle_t mac_handle,
-				     uint32_t vdev_id);
+				     uint32_t vdev_id,
+				     uint32_t nth_value);
 
 /**
  * sme_is_beacon_report_started() - Check bcn recv started

core/sme/src/common/sme_api.c

@@ -12634,11 +12634,12 @@ QDF_STATUS sme_update_mimo_power_save(mac_handle_t mac_handle,
 
 #ifdef WLAN_BCN_RECV_FEATURE
 QDF_STATUS sme_handle_bcn_recv_start(mac_handle_t mac_handle,
-				     uint32_t vdev_id)
+				     uint32_t vdev_id, uint32_t nth_value)
 {
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *session;
 	QDF_STATUS status;
+	int ret;
 
 	session = CSR_GET_SESSION(mac_ctx, vdev_id);
 	if (!session) {
@@ -12660,20 +12661,25 @@ QDF_STATUS sme_handle_bcn_recv_start(mac_handle_t mac_handle,
 		}
 		session->is_bcn_recv_start = true;
 		sme_release_global_lock(&mac_ctx->sme);
+	}
 
-		/*
-		 * Remove beacon filter. It allows fw to send all
-		 * beacons of connected AP to driver.
-		 */
-		status = sme_remove_beacon_filter(mac_handle, vdev_id);
-		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			status = sme_acquire_global_lock(&mac_ctx->sme);
-			if (QDF_IS_STATUS_SUCCESS(status)) {
-				session->is_bcn_recv_start = false;
-				sme_release_global_lock(&mac_ctx->sme);
-			}
-			sme_err("sme_remove_beacon_filter() failed");
+	/*
+	 * Allows fw to send beacons of connected AP to driver.
+	 * MSB set : means fw do not wakeup host in wow mode
+	 * LSB set: Value of beacon report period (say n), Means fw sends nth
+	 * beacons of connected AP to HOST
+	 */
+	ret = sme_cli_set_command(vdev_id,
+				  WMI_VDEV_PARAM_NTH_BEACON_TO_HOST,
+				  nth_value, VDEV_CMD);
+	if (ret) {
+		status = sme_acquire_global_lock(&mac_ctx->sme);
+		if (QDF_IS_STATUS_SUCCESS(status)) {
+			session->is_bcn_recv_start = false;
+			sme_release_global_lock(&mac_ctx->sme);
 		}
+		sme_err("WMI_VDEV_PARAM_NTH_BEACON_TO_HOST %d", ret);
+		status = qdf_status_from_os_return(ret);
 	}
 
 	return status;
@@ -12684,6 +12690,7 @@ void sme_stop_beacon_report(mac_handle_t mac_handle, uint32_t session_id)
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *session;
 	QDF_STATUS status;
+	int ret;
 
 	if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) {
 		sme_err("CSR session not valid: %d", session_id);
@@ -12695,6 +12702,11 @@ void sme_stop_beacon_report(mac_handle_t mac_handle, uint32_t session_id)
 		sme_err("vdev_id %d not found", session_id);
 		return;
 	}
+	ret = sme_cli_set_command(session_id,
+				  WMI_VDEV_PARAM_NTH_BEACON_TO_HOST, 0,
+				  VDEV_CMD);
+	if (ret)
+		sme_err("WMI_VDEV_PARAM_NTH_BEACON_TO_HOST command failed to FW");
 	status = sme_acquire_global_lock(&mac_ctx->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		session->is_bcn_recv_start = false;