qcacld-3.0: Refactor the SB disconnect allowed logic in LIM

Currently each SB disconnect API, uses similar but not exact
logic to decide if disconnect is already is progress and
can the new disconnect be allowed.

Move this code to a new API lim_is_sb_disconnect_allowed and
use the same API from all the places so that logic remain exact
the same.

Also add the check at few missing places.

Change-Id: If3c966ff0f36cb7dffe99ef33bfe1ec37e7a6fb2
CRs-Fixed: 3076049

core/mac/src/pe/include/lim_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -274,6 +275,20 @@ void lim_send_heart_beat_timeout_ind(struct mac_context *mac, struct pe_session
 tMgmtFrmDropReason lim_is_pkt_candidate_for_drop(struct mac_context *mac,
 						 uint8_t *pRxPacketInfo,
 						 uint32_t subType);
+
+bool lim_is_sb_disconnect_allowed_fl(struct pe_session *session,
+				     const char *func, uint32_t line);
+
+/**
+ * lim_is_sb_disconnect_allowed() - check pe session state to see if disconnect
+ * is already in progress.
+ * @session: pe session
+ *
+ * Return: false if disconnect is already in progress
+ */
+#define lim_is_sb_disconnect_allowed(session) \
+	lim_is_sb_disconnect_allowed_fl(session, __func__, __LINE__)
+
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 /**
  * pe_roam_synch_callback() - Callback registered at wma, gets invoked when

core/mac/src/pe/lim/lim_api.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1735,6 +1736,24 @@ void lim_ps_offload_handle_missed_beacon_ind(struct mac_context *mac,
 	lim_send_heart_beat_timeout_ind(mac, pe_session);
 }
 
+bool lim_is_sb_disconnect_allowed_fl(struct pe_session *session,
+				     const char *func, uint32_t line)
+{
+	if (session->limMlmState == eLIM_MLM_LINK_ESTABLISHED_STATE &&
+	    session->limSmeState != eLIM_SME_WT_DISASSOC_STATE &&
+	    session->limSmeState != eLIM_SME_WT_DEAUTH_STATE)
+		return true;
+
+	pe_nofl_info("%s:%u: Vdev %d (%d): limMlmState %s(%x) limSmeState %s(%x)",
+		     func, line, session->vdev_id, session->peSessionId,
+		     lim_mlm_state_str(session->limMlmState),
+		     session->limMlmState,
+		     lim_sme_state_str(session->limSmeState),
+		     session->limSmeState);
+
+	return false;
+}
+
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 static void pe_set_rmf_caps(struct mac_context *mac_ctx,
 			    struct pe_session *ft_session,
@@ -2312,13 +2331,8 @@ pe_disconnect_callback(struct mac_context *mac, uint8_t vdev_id,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (!((session->limMlmState == eLIM_MLM_LINK_ESTABLISHED_STATE) &&
-	      (session->limSmeState != eLIM_SME_WT_DISASSOC_STATE) &&
-	      (session->limSmeState != eLIM_SME_WT_DEAUTH_STATE))) {
-		pe_info("Cannot handle in mlmstate %d sme state %d as vdev_id:%d is not in connected state",
-			session->limMlmState, session->limSmeState, vdev_id);
+	if (!lim_is_sb_disconnect_allowed(session))
 		return QDF_STATUS_SUCCESS;
-	}
 
 	if (!(deauth_disassoc_frame ||
 	      deauth_disassoc_frame_len > SIR_MAC_MIN_IE_LEN))

core/mac/src/pe/lim/lim_link_monitoring_algo.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -201,17 +202,7 @@ void lim_delete_sta_context(struct mac_context *mac_ctx,
 	case HAL_DEL_STA_REASON_CODE_SA_QUERY_TIMEOUT:
 	case HAL_DEL_STA_REASON_CODE_XRETRY:
 		if (LIM_IS_STA_ROLE(session_entry) && !msg->is_tdls) {
-			if (!((session_entry->limMlmState ==
-			    eLIM_MLM_LINK_ESTABLISHED_STATE) &&
-			    (session_entry->limSmeState !=
-			    eLIM_SME_WT_DISASSOC_STATE) &&
-			    (session_entry->limSmeState !=
-			    eLIM_SME_WT_DEAUTH_STATE))) {
-				pe_err("Do not process in limMlmState %s(%x) limSmeState %s(%x)",
-				  lim_mlm_state_str(session_entry->limMlmState),
-				  session_entry->limMlmState,
-				  lim_sme_state_str(session_entry->limSmeState),
-				  session_entry->limSmeState);
+			if (!lim_is_sb_disconnect_allowed(session_entry)) {
 				qdf_mem_free(msg);
 				return;
 			}
@@ -262,10 +253,7 @@ void lim_delete_sta_context(struct mac_context *mac_ctx,
 		break;
 
 	case HAL_DEL_STA_REASON_CODE_BTM_DISASSOC_IMMINENT:
-		if (session_entry->limMlmState !=
-		    eLIM_MLM_LINK_ESTABLISHED_STATE) {
-			pe_err("BTM request received in state %s",
-				lim_mlm_state_str(session_entry->limMlmState));
+		if (!lim_is_sb_disconnect_allowed(session_entry)) {
 			qdf_mem_free(msg);
 			lim_msg->bodyptr = NULL;
 			return;
@@ -357,6 +345,15 @@ lim_tear_down_link_with_ap(struct mac_context *mac, uint8_t sessionId,
 		pe_err("Session Does not exist for given sessionID");
 		return;
 	}
+
+	pe_info("Session %d Vdev %d reason code %d trigger %d",
+		pe_session->peSessionId, pe_session->vdev_id, reasonCode,
+		trigger);
+
+	/* Add the check here in case caller missed the check */
+	if (!lim_is_sb_disconnect_allowed(pe_session))
+		return;
+
 	/**
 	 * Heart beat failed for upto threshold value
 	 * and AP did not respond for Probe request.
@@ -364,10 +361,6 @@ lim_tear_down_link_with_ap(struct mac_context *mac, uint8_t sessionId,
 	 */
 	pe_session->pmmOffloadInfo.bcnmiss = false;
 
-	pe_info("Session %d Vdev %d reason code %d trigger %d",
-		pe_session->peSessionId, pe_session->vdev_id, reasonCode,
-		trigger);
-
 	/* Announce loss of link to Roaming algorithm */
 	/* and cleanup by sending SME_DISASSOC_REQ to SME */
 
@@ -471,9 +464,7 @@ void lim_handle_heart_beat_failure(struct mac_context *mac_ctx,
 	session->LimHBFailureStatus = false;
 
 	if (LIM_IS_STA_ROLE(session) &&
-	    (session->limMlmState == eLIM_MLM_LINK_ESTABLISHED_STATE) &&
-	    (session->limSmeState != eLIM_SME_WT_DISASSOC_STATE) &&
-	    (session->limSmeState != eLIM_SME_WT_DEAUTH_STATE)) {
+	    lim_is_sb_disconnect_allowed(session)) {
 		if (!mac_ctx->sys.gSysEnableLinkMonitorMode) {
 			goto hb_handler_fail;
 		}

core/mac/src/pe/lim/lim_process_deauth_frame.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -81,8 +82,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 	}
 
 	if (LIM_IS_STA_ROLE(pe_session) &&
-	    ((eLIM_SME_WT_DISASSOC_STATE == pe_session->limSmeState) ||
-	     (eLIM_SME_WT_DEAUTH_STATE == pe_session->limSmeState))) {
+	    !lim_is_sb_disconnect_allowed(pe_session)) {
 		/*Every 15th deauth frame will be logged in kmsg */
 		if (!(mac->lim.deauthMsgCnt & 0xF)) {
 			pe_debug("received Deauth frame in DEAUTH_WT_STATE"

core/mac/src/pe/lim/lim_process_disassoc_frame.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -100,8 +101,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 	}
 
 	if (LIM_IS_STA_ROLE(pe_session) &&
-		((eLIM_SME_WT_DISASSOC_STATE == pe_session->limSmeState) ||
-		(eLIM_SME_WT_DEAUTH_STATE == pe_session->limSmeState))) {
+	    !lim_is_sb_disconnect_allowed(pe_session)) {
 		if (!(mac->lim.disassocMsgCnt & 0xF)) {
 			pe_debug("received Disassoc frame in %s"
 				"already processing previously received Disassoc frame, dropping this %d",

core/mac/src/pe/lim/lim_utils.c

@@ -1878,10 +1878,7 @@ static void __lim_process_channel_switch_timeout(struct pe_session *pe_session)
 		 * then we cannot switch the channel. Just disassociate from AP.
 		 * We will find a better AP !!!
 		 */
-		if ((pe_session->limMlmState ==
-		   eLIM_MLM_LINK_ESTABLISHED_STATE) &&
-		   (pe_session->limSmeState != eLIM_SME_WT_DISASSOC_STATE) &&
-		   (pe_session->limSmeState != eLIM_SME_WT_DEAUTH_STATE)) {
+		if (lim_is_sb_disconnect_allowed(pe_session)) {
 			pe_err("Invalid channel! Disconnect");
 			lim_tear_down_link_with_ap(mac, pe_session->peSessionId,
 					   REASON_UNSUPPORTED_CHANNEL_CSA,
@@ -4585,18 +4582,13 @@ void lim_handle_heart_beat_failure_timeout(struct mac_context *mac_ctx)
 		lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_HB_FAILURE_TIMEOUT,
 					psession_entry, 0, 0);
 #endif
-		if ((psession_entry->limMlmState ==
-					eLIM_MLM_LINK_ESTABLISHED_STATE) &&
-			(psession_entry->limSmeState !=
-					eLIM_SME_WT_DISASSOC_STATE) &&
-			(psession_entry->limSmeState !=
-					eLIM_SME_WT_DEAUTH_STATE) &&
-			((!LIM_IS_CONNECTION_ACTIVE(psession_entry)) ||
-			/*
-			 * Disconnect even if we have not received a single
-			 * beacon after connection.
-			 */
-			 (psession_entry->currentBssBeaconCnt == 0))) {
+		if (lim_is_sb_disconnect_allowed(psession_entry) &&
+		    (!LIM_IS_CONNECTION_ACTIVE(psession_entry) ||
+		     /*
+		      * Disconnect even if we have not received a single
+		      * beacon after connection.
+		      */
+		     !psession_entry->currentBssBeaconCnt)) {
 			pe_nofl_info("HB fail vdev %d",psession_entry->vdev_id);
 			lim_send_deauth_mgmt_frame(mac_ctx,
 				REASON_DISASSOC_DUE_TO_INACTIVITY,