qcacld-3.0: Handle TWT disable reason code

When host sends TWT disable command to firmware, send reason code
also as part of it. So that firmware will check and take the
following action:
a. If host sends disable due SCC/MCC concurrency then firmware
will teardown the existing TWT session and send the teardown
reason code as concurrency to host.
b. If it's for other reason then it will take action based on
that.

Change-Id: I66b3d10e7d54319c3c6dcad57c78949bcdd11a26
CRs-Fixed: 3098864

core/hdd/inc/wlan_hdd_twt.h

@@ -176,19 +176,23 @@ QDF_STATUS hdd_send_twt_responder_enable_cmd(struct hdd_context *hdd_ctx);
  * hdd_send_twt_requestor_disable_cmd() - Send TWT requestor disable command
  * to target
  * @hdd_ctx: HDD Context
+ * @reason: Disable reason code
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS hdd_send_twt_requestor_disable_cmd(struct hdd_context *hdd_ctx);
+QDF_STATUS hdd_send_twt_requestor_disable_cmd(struct hdd_context *hdd_ctx,
+					      uint32_t reason);
 
 /**
  * hdd_send_twt_responder_disable_cmd() - Send TWT responder disable command
  * to target
  * @hdd_ctx: HDD Context
+ * @reason: Disable reason code
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx);
+QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx,
+					      uint32_t reason);
 
 /**
  * wlan_hdd_twt_init() - Initialize TWT
@@ -262,14 +266,28 @@ void hdd_send_twt_role_disable_cmd(struct hdd_context *hdd_ctx,
 void hdd_send_twt_del_all_sessions_to_userspace(struct hdd_adapter *adapter);
 
 /**
- * hdd_twt_concurrency_update_on_scc_mcc() - Send TWT disable command to fw if
- * SCC/MCC exists in two vdevs
- * @hdd_ctx: hdd context pointer
+ * hdd_twt_concurrency_update_on_scc() - Send TWT disable command to fw if
+ * SCC exists in two vdevs
+ * @pdev: pdev pointer
+ * @object: object pointer
+ * @arg: argument pointer
+ *
+ * Return: None
+ */
+void hdd_twt_concurrency_update_on_scc(struct wlan_objmgr_pdev *pdev,
+				       void *object, void *arg);
+
+/**
+ * hdd_twt_concurrency_update_on_mcc() - Send TWT disable command to fw if
+ * MCC exists in two vdevs
+ * @pdev: pdev pointer
+ * @object: object pointer
+ * @arg: argument pointer
  *
  * Return: None
  */
-void hdd_twt_concurrency_update_on_scc_mcc(struct wlan_objmgr_pdev *pdev,
-					   void *object, void *arg);
+void hdd_twt_concurrency_update_on_mcc(struct wlan_objmgr_pdev *pdev,
+				       void *object, void *arg);
 
 /**
  * hdd_twt_concurrency_update_on_dbs() - Send TWT enable command to fw if DBS
@@ -368,13 +386,15 @@ QDF_STATUS hdd_send_twt_responder_enable_cmd(struct hdd_context *hdd_ctx)
 }
 
 static inline
-QDF_STATUS hdd_send_twt_requestor_disable_cmd(struct hdd_context *hdd_ctx)
+QDF_STATUS hdd_send_twt_requestor_disable_cmd(struct hdd_context *hdd_ctx,
+					      uint32_t reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
 
 static inline
-QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx)
+QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx,
+					      uint32_t reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
@@ -413,8 +433,14 @@ void hdd_send_twt_del_all_sessions_to_userspace(struct hdd_adapter *adapter)
 }
 
 static inline
-void hdd_twt_concurrency_update_on_scc_mcc(struct wlan_objmgr_pdev *pdev,
-					   void *object, void *arg)
+void hdd_twt_concurrency_update_on_scc(struct wlan_objmgr_pdev *pdev,
+				       void *object, void *arg)
+{
+}
+
+static inline
+void hdd_twt_concurrency_update_on_mcc(struct wlan_objmgr_pdev *pdev,
+				       void *object, void *arg)
 {
 }
 

core/hdd/src/wlan_hdd_hostapd.c

@@ -6867,6 +6867,7 @@ wlan_hdd_update_twt_responder(struct hdd_context *hdd_ctx,
 			      struct cfg80211_ap_settings *params)
 {
 	bool twt_res_svc_cap, enable_twt;
+	uint32_t reason;
 
 	enable_twt = ucfg_mlme_is_twt_enabled(hdd_ctx->psoc);
 	ucfg_mlme_get_twt_res_service_cap(hdd_ctx->psoc, &twt_res_svc_cap);
@@ -6874,10 +6875,12 @@ wlan_hdd_update_twt_responder(struct hdd_context *hdd_ctx,
 					twt_res_svc_cap,
 					(enable_twt && params->twt_responder)));
 	hdd_debug("cfg80211 TWT responder:%d", params->twt_responder);
-	if (enable_twt && params->twt_responder)
+	if (enable_twt && params->twt_responder) {
 		hdd_send_twt_responder_enable_cmd(hdd_ctx);
-	else
-		hdd_send_twt_responder_disable_cmd(hdd_ctx);
+	} else {
+		reason = HOST_TWT_DISABLE_REASON_NONE;
+		hdd_send_twt_responder_disable_cmd(hdd_ctx, reason);
+	}
 }
 #else
 static inline void

core/hdd/src/wlan_hdd_twt.c

@@ -116,9 +116,11 @@ void hdd_twt_del_dialog_in_ps_disable(struct hdd_context *hdd_ctx,
 void hdd_send_twt_role_disable_cmd(struct hdd_context *hdd_ctx,
 				   enum twt_role role)
 {
+	uint32_t reason;
 	uint8_t pdev_id = hdd_ctx->pdev->pdev_objmgr.wlan_pdev_id;
 
-	osif_twt_send_responder_disable_cmd(hdd_ctx->psoc, pdev_id);
+	reason = HOST_TWT_DISABLE_REASON_NONE;
+	osif_twt_send_responder_disable_cmd(hdd_ctx->psoc, pdev_id, reason);
 }
 
 int hdd_test_config_twt_setup_session(struct hdd_adapter *adapter,
@@ -144,11 +146,12 @@ int hdd_test_config_twt_terminate_session(struct hdd_adapter *adapter,
 	return 0;
 }
 
-QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx)
+QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx,
+					      uint32_t reason)
 {
 	uint8_t pdev_id = hdd_ctx->pdev->pdev_objmgr.wlan_pdev_id;
 
-	osif_twt_send_responder_disable_cmd(hdd_ctx->psoc, pdev_id);
+	osif_twt_send_responder_disable_cmd(hdd_ctx->psoc, pdev_id, reason);
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -624,7 +627,8 @@ int hdd_test_config_twt_setup_session(struct hdd_adapter *adapter,
 						     &congestion_timeout);
 		if (congestion_timeout) {
 			ret = qdf_status_to_os_return(
-			hdd_send_twt_requestor_disable_cmd(adapter->hdd_ctx));
+			hdd_send_twt_requestor_disable_cmd(adapter->hdd_ctx,
+							   0));
 			if (ret) {
 				hdd_err("Failed to disable TWT");
 				return ret;
@@ -2096,7 +2100,8 @@ static int hdd_twt_setup_session(struct hdd_adapter *adapter,
 
 	if (congestion_timeout) {
 		ret = qdf_status_to_os_return(
-			hdd_send_twt_requestor_disable_cmd(adapter->hdd_ctx));
+			hdd_send_twt_requestor_disable_cmd(adapter->hdd_ctx,
+							   0));
 		if (ret) {
 			hdd_err("Failed to disable TWT");
 			return ret;
@@ -4451,7 +4456,8 @@ QDF_STATUS hdd_send_twt_responder_enable_cmd(struct hdd_context *hdd_ctx)
 	return status;
 }
 
-QDF_STATUS hdd_send_twt_requestor_disable_cmd(struct hdd_context *hdd_ctx)
+QDF_STATUS hdd_send_twt_requestor_disable_cmd(struct hdd_context *hdd_ctx,
+					      uint32_t reason)
 {
 	uint8_t pdev_id = hdd_ctx->pdev->pdev_objmgr.wlan_pdev_id;
 	struct twt_enable_disable_conf twt_en_dis = {0};
@@ -4485,7 +4491,8 @@ timeout:
 	return status;
 }
 
-QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx)
+QDF_STATUS hdd_send_twt_responder_disable_cmd(struct hdd_context *hdd_ctx,
+					      uint32_t reason)
 {
 	uint8_t pdev_id = hdd_ctx->pdev->pdev_objmgr.wlan_pdev_id;
 	struct twt_enable_disable_conf twt_en_dis = {0};
@@ -4633,8 +4640,8 @@ void hdd_send_twt_role_disable_cmd(struct hdd_context *hdd_ctx,
 	}
 }
 
-void hdd_twt_concurrency_update_on_scc_mcc(struct wlan_objmgr_pdev *pdev,
-					   void *object, void *arg)
+void hdd_twt_concurrency_update_on_scc(struct wlan_objmgr_pdev *pdev,
+				       void *object, void *arg)
 {
 	struct wlan_objmgr_vdev *vdev = (struct wlan_objmgr_vdev *)object;
 	struct twt_conc_arg *twt_arg = arg;
@@ -4643,7 +4650,8 @@ void hdd_twt_concurrency_update_on_scc_mcc(struct wlan_objmgr_pdev *pdev,
 	if (vdev->vdev_mlme.vdev_opmode == QDF_SAP_MODE &&
 	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
 		hdd_debug("Concurrency exist on SAP vdev");
-		status = hdd_send_twt_responder_disable_cmd(twt_arg->hdd_ctx);
+		status = hdd_send_twt_responder_disable_cmd(twt_arg->hdd_ctx,
+							    0);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			hdd_err("TWT responder disable cmd to firmware failed");
 			return;
@@ -4654,7 +4662,39 @@ void hdd_twt_concurrency_update_on_scc_mcc(struct wlan_objmgr_pdev *pdev,
 	if (vdev->vdev_mlme.vdev_opmode == QDF_STA_MODE &&
 	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
 		hdd_debug("Concurrency exist on STA vdev");
-		status = hdd_send_twt_requestor_disable_cmd(twt_arg->hdd_ctx);
+		status = hdd_send_twt_requestor_disable_cmd(twt_arg->hdd_ctx,
+							    0);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			hdd_err("TWT requestor disable cmd to firmware failed");
+			return;
+		}
+	}
+}
+
+void hdd_twt_concurrency_update_on_mcc(struct wlan_objmgr_pdev *pdev,
+				       void *object, void *arg)
+{
+	struct wlan_objmgr_vdev *vdev = (struct wlan_objmgr_vdev *)object;
+	struct twt_conc_arg *twt_arg = arg;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
+
+	if (vdev->vdev_mlme.vdev_opmode == QDF_SAP_MODE &&
+	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
+		hdd_debug("Concurrency exist on SAP vdev");
+		status = hdd_send_twt_responder_disable_cmd(twt_arg->hdd_ctx,
+							    0);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			hdd_err("TWT responder disable cmd to firmware failed");
+			return;
+		}
+		sme_twt_update_beacon_template(twt_arg->hdd_ctx->mac_handle);
+	}
+
+	if (vdev->vdev_mlme.vdev_opmode == QDF_STA_MODE &&
+	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
+		hdd_debug("Concurrency exist on STA vdev");
+		status = hdd_send_twt_requestor_disable_cmd(twt_arg->hdd_ctx,
+							    0);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			hdd_err("TWT requestor disable cmd to firmware failed");
 			return;
@@ -4724,16 +4764,27 @@ void __hdd_twt_update_work_handler(struct hdd_context *hdd_ctx)
 		}
 		break;
 	case 2:
-		if (policy_mgr_current_concurrency_is_scc(hdd_ctx->psoc) ||
-		    policy_mgr_current_concurrency_is_mcc(hdd_ctx->psoc)) {
+		if (policy_mgr_current_concurrency_is_scc(hdd_ctx->psoc)) {
+			status = wlan_objmgr_pdev_iterate_obj_list(
+					hdd_ctx->pdev,
+					WLAN_VDEV_OP,
+					hdd_twt_concurrency_update_on_scc,
+					&twt_arg, 0,
+					WLAN_HDD_ID_OBJ_MGR);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				hdd_err("2port concurrency,SAP/STA not in SCC");
+				return;
+			}
+		} else if (policy_mgr_current_concurrency_is_mcc(
+							hdd_ctx->psoc)) {
 			status = wlan_objmgr_pdev_iterate_obj_list(
 					hdd_ctx->pdev,
 					WLAN_VDEV_OP,
-					hdd_twt_concurrency_update_on_scc_mcc,
+					hdd_twt_concurrency_update_on_mcc,
 					&twt_arg, 0,
 					WLAN_HDD_ID_OBJ_MGR);
 			if (QDF_IS_STATUS_ERROR(status)) {
-				hdd_err("SAP not in SCC/MCC concurrency");
+				hdd_err("2port concurrency,SAP/STA not in MCC");
 				return;
 			}
 		} else if (policy_mgr_is_current_hwmode_dbs(hdd_ctx->psoc)) {
@@ -4744,18 +4795,36 @@ void __hdd_twt_update_work_handler(struct hdd_context *hdd_ctx)
 					&twt_arg, 0,
 					WLAN_HDD_ID_OBJ_MGR);
 			if (QDF_IS_STATUS_ERROR(status)) {
-				hdd_err("SAP not in DBS case");
+				hdd_err("2port concurrency,SAP/STA not in DBS");
 				return;
 			}
 		}
 		break;
 	case 3:
-		status = wlan_objmgr_pdev_iterate_obj_list(
+		if (policy_mgr_current_concurrency_is_scc(hdd_ctx->psoc)) {
+			status = wlan_objmgr_pdev_iterate_obj_list(
+					hdd_ctx->pdev,
+					WLAN_VDEV_OP,
+					hdd_twt_concurrency_update_on_scc,
+					&twt_arg, 0,
+					WLAN_HDD_ID_OBJ_MGR);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				hdd_err("3port concurrency,SAP/STA not in SCC");
+				return;
+			}
+		}
+		if (policy_mgr_current_concurrency_is_mcc(hdd_ctx->psoc)) {
+			status = wlan_objmgr_pdev_iterate_obj_list(
 					hdd_ctx->pdev,
 					WLAN_VDEV_OP,
-					hdd_twt_concurrency_update_on_scc_mcc,
+					hdd_twt_concurrency_update_on_mcc,
 					&twt_arg, 0,
 					WLAN_HDD_ID_OBJ_MGR);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				hdd_err("3port concurrency,SAP/STA not in MCC");
+				return;
+			}
+		}
 		break;
 	default:
 		hdd_err("Unexpected number of connection");

os_if/twt/inc/osif_twt_internal.h

@@ -62,22 +62,24 @@ int osif_twt_send_responder_enable_cmd(struct wlan_objmgr_psoc *psoc,
  * to target
  * @psoc: pointer to global psoc structure
  * @pdev_id: pdev id
+ * @reason: disable reason code
  *
  * Return: errno
  */
 int osif_twt_send_requestor_disable_cmd(struct wlan_objmgr_psoc *psoc,
-					uint8_t pdev_id);
+					uint8_t pdev_id, uint32_t reason);
 
 /**
  * osif_twt_send_responder_disable_cmd() - Send TWT responder disable command
  * to target
  * @psoc: pointer to global psoc structure
  * @pdev_id: pdev id
+ * @reason: disable reason code
  *
  * Return: errno
  */
 int osif_twt_send_responder_disable_cmd(struct wlan_objmgr_psoc *psoc,
-					uint8_t pdev_id);
+					uint8_t pdev_id, uint32_t reason);
 
 /**
  * osif_twt_concurrency_update_handler() - Handle TWT concurrency scenario
@@ -91,7 +93,7 @@ void osif_twt_concurrency_update_handler(struct wlan_objmgr_psoc *psoc,
 #else
 static inline
 int osif_twt_send_requestor_disable_cmd(struct wlan_objmgr_psoc *psoc,
-					uint8_t pdev_id)
+					uint8_t pdev_id, uint32_t reason)
 {
 	return 0;
 }

os_if/twt/src/osif_twt_ext_req.c

@@ -872,23 +872,25 @@ int osif_twt_send_responder_enable_cmd(struct wlan_objmgr_psoc *psoc,
 }
 
 int osif_twt_send_requestor_disable_cmd(struct wlan_objmgr_psoc *psoc,
-					uint8_t pdev_id)
+					uint8_t pdev_id, uint32_t reason)
 {
 	struct twt_disable_param req = {0};
 
 	req.pdev_id = pdev_id;
 	req.ext_conf_present = true;
+	req.dis_reason_code = reason;
 
 	return osif_twt_requestor_disable(psoc, &req);
 }
 
 int osif_twt_send_responder_disable_cmd(struct wlan_objmgr_psoc *psoc,
-					uint8_t pdev_id)
+					uint8_t pdev_id, uint32_t reason)
 {
 	struct twt_disable_param req = {0};
 
 	req.pdev_id = pdev_id;
 	req.ext_conf_present = true;
+	req.dis_reason_code = reason;
 
 	return osif_twt_responder_disable(psoc, &req);
 }
@@ -932,7 +934,7 @@ int osif_twt_setup_req(struct wlan_objmgr_vdev *vdev,
 	int ret = 0;
 	uint8_t vdev_id, pdev_id;
 	struct twt_add_dialog_param params = {0};
-	uint32_t congestion_timeout = 0;
+	uint32_t congestion_timeout = 0, reason;
 	uint8_t peer_cap;
 	QDF_STATUS qdf_status;
 
@@ -988,7 +990,9 @@ int osif_twt_setup_req(struct wlan_objmgr_vdev *vdev,
 	ucfg_twt_cfg_get_congestion_timeout(psoc, &congestion_timeout);
 
 	if (congestion_timeout) {
-		ret = osif_twt_send_requestor_disable_cmd(psoc, pdev_id);
+		reason = HOST_TWT_DISABLE_REASON_CHANGE_CONGESTION_TIMEOUT;
+		ret = osif_twt_send_requestor_disable_cmd(psoc, pdev_id,
+							  reason);
 		if (ret) {
 			osif_err("Failed to disable TWT");
 			return ret;
@@ -1188,19 +1192,57 @@ int osif_twt_sta_teardown_req(struct wlan_objmgr_vdev *vdev,
 }
 
 static void
-osif_twt_concurrency_update_on_scc_mcc(struct wlan_objmgr_pdev *pdev,
-				       void *object, void *arg)
+osif_twt_concurrency_update_on_scc(struct wlan_objmgr_pdev *pdev,
+				   void *object, void *arg)
+{
+	struct wlan_objmgr_vdev *vdev = object;
+	struct twt_conc_context *twt_arg = arg;
+	QDF_STATUS status;
+	uint8_t pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev);
+	uint32_t reason;
+
+	if (vdev->vdev_mlme.vdev_opmode == QDF_SAP_MODE &&
+	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
+		osif_debug("Concurrency exist on SAP vdev");
+		reason = HOST_TWT_DISABLE_REASON_CONCURRENCY_SCC;
+		status = osif_twt_send_responder_disable_cmd(twt_arg->psoc,
+							     pdev_id, reason);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			osif_err("TWT responder disable cmd to fw failed");
+			return;
+		}
+		ucfg_twt_update_beacon_template();
+	}
+
+	if (vdev->vdev_mlme.vdev_opmode == QDF_STA_MODE &&
+	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
+		osif_debug("Concurrency exist on STA vdev");
+		reason = HOST_TWT_DISABLE_REASON_CONCURRENCY_SCC;
+		status = osif_twt_send_requestor_disable_cmd(twt_arg->psoc,
+							     pdev_id, reason);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			osif_err("TWT requestor disable cmd to fw failed");
+			return;
+		}
+	}
+}
+
+static void
+osif_twt_concurrency_update_on_mcc(struct wlan_objmgr_pdev *pdev,
+				   void *object, void *arg)
 {
 	struct wlan_objmgr_vdev *vdev = object;
 	struct twt_conc_context *twt_arg = arg;
 	QDF_STATUS status;
 	uint8_t pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev);
+	uint32_t reason;
 
 	if (vdev->vdev_mlme.vdev_opmode == QDF_SAP_MODE &&
 	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
 		osif_debug("Concurrency exist on SAP vdev");
+		reason = HOST_TWT_DISABLE_REASON_CONCURRENCY_MCC;
 		status = osif_twt_send_responder_disable_cmd(twt_arg->psoc,
-							     pdev_id);
+							     pdev_id, reason);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			osif_err("TWT responder disable cmd to fw failed");
 			return;
@@ -1211,8 +1253,9 @@ osif_twt_concurrency_update_on_scc_mcc(struct wlan_objmgr_pdev *pdev,
 	if (vdev->vdev_mlme.vdev_opmode == QDF_STA_MODE &&
 	    vdev->vdev_mlme.mlme_state == WLAN_VDEV_S_UP) {
 		osif_debug("Concurrency exist on STA vdev");
+		reason = HOST_TWT_DISABLE_REASON_CONCURRENCY_MCC;
 		status = osif_twt_send_requestor_disable_cmd(twt_arg->psoc,
-							     pdev_id);
+							     pdev_id, reason);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			osif_err("TWT requestor disable cmd to fw failed");
 			return;
@@ -1282,16 +1325,26 @@ void osif_twt_concurrency_update_handler(struct wlan_objmgr_psoc *psoc,
 		}
 		break;
 	case 2:
-		if (policy_mgr_current_concurrency_is_scc(psoc) ||
-		    policy_mgr_current_concurrency_is_mcc(psoc)) {
+		if (policy_mgr_current_concurrency_is_scc(psoc)) {
+			status = wlan_objmgr_pdev_iterate_obj_list(
+					pdev,
+					WLAN_VDEV_OP,
+					osif_twt_concurrency_update_on_scc,
+					&twt_arg, 0,
+					WLAN_TWT_ID);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				osif_err("2port conc: SAP/STA not in SCC");
+				return;
+			}
+		} else if (policy_mgr_current_concurrency_is_mcc(psoc)) {
 			status = wlan_objmgr_pdev_iterate_obj_list(
 					pdev,
 					WLAN_VDEV_OP,
-					osif_twt_concurrency_update_on_scc_mcc,
+					osif_twt_concurrency_update_on_mcc,
 					&twt_arg, 0,
 					WLAN_TWT_ID);
 			if (QDF_IS_STATUS_ERROR(status)) {
-				osif_err("SAP not in SCC/MCC concurrency");
+				osif_err("2port conc: SAP/STA not in MCC");
 				return;
 			}
 		} else if (policy_mgr_is_current_hwmode_dbs(psoc)) {
@@ -1308,12 +1361,29 @@ void osif_twt_concurrency_update_handler(struct wlan_objmgr_psoc *psoc,
 		}
 		break;
 	case 3:
-		status = wlan_objmgr_pdev_iterate_obj_list(
+		if (policy_mgr_current_concurrency_is_scc(psoc)) {
+			status = wlan_objmgr_pdev_iterate_obj_list(
 					pdev,
 					WLAN_VDEV_OP,
-					osif_twt_concurrency_update_on_scc_mcc,
+					osif_twt_concurrency_update_on_scc,
 					&twt_arg, 0,
 					WLAN_TWT_ID);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				osif_err("3port conc: SAP/STA not in SCC");
+				return;
+			}
+		} else if (policy_mgr_current_concurrency_is_mcc(psoc)) {
+			status = wlan_objmgr_pdev_iterate_obj_list(
+					pdev,
+					WLAN_VDEV_OP,
+					osif_twt_concurrency_update_on_mcc,
+					&twt_arg, 0,
+					WLAN_TWT_ID);
+			if (QDF_IS_STATUS_ERROR(status)) {
+				osif_err("3port conc: SAP/STA not in MCC");
+				return;
+			}
+		}
 		break;
 	default:
 		osif_err("Unexpected number of connections: %d",