qcacmn: Intra-BSS changes for MLO

Use chip ID and destination peer to determine the target soc
and partner vdev for Intra-BSS in MLO case.

Change-Id: I709c52e74426c5e81b50c8063cad7669c0e7002d

dp/inc/cdp_txrx_mlo.h

@@ -69,4 +69,28 @@ static inline void cdp_soc_mlo_soc_teardown(ol_txrx_soc_handle soc,
 
 	soc->ops->mlo_ops->mlo_soc_teardown(soc, mlo_ctx);
 }
+
+/*
+ * cdp_update_mlo_ptnr_list - Add vdev to MLO partner list
+ * @soc: soc handle
+ * @vdev_ids: list of partner vdevs
+ * @num_vdevs: number of items in list
+ * @vdev_id: caller's vdev id
+ *
+ * return: QDF_STATUS
+ */
+static inline QDF_STATUS
+cdp_update_mlo_ptnr_list(ol_txrx_soc_handle soc, int8_t vdev_ids[],
+			 uint8_t num_vdevs, uint8_t vdev_id)
+{
+	if (!soc || !soc->ops || !soc->ops->mlo_ops)
+		return QDF_STATUS_E_INVAL;
+
+	if (soc->ops->mlo_ops->update_mlo_ptnr_list)
+		return soc->ops->mlo_ops->update_mlo_ptnr_list(soc, vdev_ids,
+						num_vdevs, vdev_id);
+
+	return QDF_STATUS_SUCCESS;
+}
+
 #endif /*_CDP_TXRX_MLO_H_*/

dp/inc/cdp_txrx_ops.h

@@ -116,6 +116,9 @@ struct cdp_mlo_ops {
 			      struct cdp_mlo_ctxt *mlo_ctxt);
 	void (*mlo_soc_teardown)(struct cdp_soc_t *cdp_soc,
 				 struct cdp_mlo_ctxt *mlo_ctxt);
+	QDF_STATUS (*update_mlo_ptnr_list)(struct cdp_soc_t *soc_hdl,
+					   int8_t *vdev_ids, uint8_t num_vdevs,
+					   uint8_t vdev_id);
 };
 #endif
 

dp/wifi3.0/be/dp_be.c

@@ -371,6 +371,57 @@ static QDF_STATUS dp_soc_detach_be(struct dp_soc *soc)
 	return QDF_STATUS_SUCCESS;
 }
 
+#ifdef WLAN_MLO_MULTI_CHIP
+static QDF_STATUS dp_mlo_peer_find_hash_attach_wrapper(struct dp_soc *soc)
+{
+	/* In case of MULTI chip MLO peer hash table when MLO global object
+	 * is created, avoid from SOC attach path
+	 */
+	return QDF_STATUS_SUCCESS;
+}
+
+static void dp_mlo_peer_find_hash_detach_wrapper(struct dp_soc *soc)
+{
+}
+
+static void dp_mlo_init_ptnr_list(struct dp_vdev *vdev)
+{
+	struct dp_vdev_be *be_vdev = dp_get_be_vdev_from_dp_vdev(vdev);
+
+	qdf_mem_set(be_vdev->partner_vdev_list,
+		    WLAN_MAX_MLO_CHIPS * WLAN_MAX_MLO_LINKS_PER_SOC,
+		    CDP_INVALID_VDEV_ID);
+}
+#else
+static QDF_STATUS dp_mlo_peer_find_hash_attach_wrapper(struct dp_soc *soc)
+{
+	dp_mld_peer_hash_obj_t mld_hash_obj;
+
+	mld_hash_obj = dp_mlo_get_peer_hash_obj(soc);
+
+	if (!mld_hash_obj)
+		return QDF_STATUS_E_FAILURE;
+
+	return dp_mlo_peer_find_hash_attach_be(mld_hash_obj, soc->max_peers);
+}
+
+static void dp_mlo_peer_find_hash_detach_wrapper(struct dp_soc *soc)
+{
+	dp_mld_peer_hash_obj_t mld_hash_obj;
+
+	mld_hash_obj = dp_mlo_get_peer_hash_obj(soc);
+
+	if (!mld_hash_obj)
+		return;
+
+	return dp_mlo_peer_find_hash_detach_be(mld_hash_obj);
+}
+
+static void dp_mlo_init_ptnr_list(struct dp_vdev *vdev)
+{
+}
+#endif
+
 static QDF_STATUS dp_soc_attach_be(struct dp_soc *soc,
 				   struct cdp_soc_attach_params *params)
 {
@@ -520,6 +571,8 @@ static QDF_STATUS dp_vdev_attach_be(struct dp_soc *soc, struct dp_vdev *vdev)
 					   HAL_TX_MCAST_CTRL_MEC_NOTIFY);
 	}
 
+	dp_mlo_init_ptnr_list(vdev);
+
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -529,6 +582,8 @@ static QDF_STATUS dp_vdev_detach_be(struct dp_soc *soc, struct dp_vdev *vdev)
 	struct dp_vdev_be *be_vdev = dp_get_be_vdev_from_dp_vdev(vdev);
 
 	dp_tx_put_bank_profile(be_soc, be_vdev);
+	dp_clr_mlo_ptnr_list(soc, vdev);
+
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -1075,44 +1130,6 @@ dp_mlo_peer_find_hash_detach_be(dp_mld_peer_hash_obj_t mld_hash_obj)
 	}
 }
 
-#ifdef WLAN_MLO_MULTI_CHIP
-static QDF_STATUS dp_mlo_peer_find_hash_attach_wrapper(struct dp_soc *soc)
-{
-	/* In case of MULTI chip MLO peer hash table when MLO global object
-	 * is created, avoid from SOC attach path
-	 */
-	return QDF_STATUS_SUCCESS;
-}
-
-static void dp_mlo_peer_find_hash_detach_wrapper(struct dp_soc *soc)
-{
-}
-#else
-static QDF_STATUS dp_mlo_peer_find_hash_attach_wrapper(struct dp_soc *soc)
-{
-	dp_mld_peer_hash_obj_t mld_hash_obj;
-
-	mld_hash_obj = dp_mlo_get_peer_hash_obj(soc);
-
-	if (!mld_hash_obj)
-		return QDF_STATUS_E_FAILURE;
-
-	return dp_mlo_peer_find_hash_attach_be(mld_hash_obj, soc->max_peers);
-}
-
-static void dp_mlo_peer_find_hash_detach_wrapper(struct dp_soc *soc)
-{
-	dp_mld_peer_hash_obj_t mld_hash_obj;
-
-	mld_hash_obj = dp_mlo_get_peer_hash_obj(soc);
-
-	if (!mld_hash_obj)
-		return;
-
-	return dp_mlo_peer_find_hash_detach_be(mld_hash_obj);
-}
-#endif
-
 static struct dp_peer *
 dp_mlo_peer_find_hash_find_be(struct dp_soc *soc,
 			      uint8_t *peer_mac_addr,

dp/wifi3.0/be/dp_be.h

@@ -252,6 +252,11 @@ struct dp_vdev_be {
 	struct dp_vdev vdev;
 	int8_t bank_id;
 	uint8_t vdev_id_check_en;
+
+#ifdef WLAN_MLO_MULTI_CHIP
+	/* partner list used for Intra-BSS */
+	uint8_t partner_vdev_list[WLAN_MAX_MLO_CHIPS][WLAN_MAX_MLO_LINKS_PER_SOC];
+#endif
 };
 
 /**
@@ -314,6 +319,7 @@ dp_mlo_get_peer_hash_obj(struct dp_soc *soc)
 	return be_soc->ml_ctxt;
 }
 
+void  dp_clr_mlo_ptnr_list(struct dp_soc *soc, struct dp_vdev *vdev);
 #else
 typedef struct dp_soc_be *dp_mld_peer_hash_obj_t;
 
@@ -322,6 +328,11 @@ dp_mlo_get_peer_hash_obj(struct dp_soc *soc)
 {
 	return dp_get_be_soc_from_dp_soc(soc);
 }
+
+static inline void  dp_clr_mlo_ptnr_list(struct dp_soc *soc,
+					 struct dp_vdev *vdev)
+{
+}
 #endif
 
 /*

dp/wifi3.0/be/dp_be_rx.c

@@ -1143,10 +1143,10 @@ dp_rx_intrabss_fwd_mlo_allow(struct dp_peer *ta_peer,
 	   false - not allow
  */
 static bool
-dp_rx_intrabss_ucast_check_be(struct dp_soc *soc, qdf_nbuf_t nbuf,
+dp_rx_intrabss_ucast_check_be(qdf_nbuf_t nbuf,
 			      struct dp_peer *ta_peer,
 			      struct hal_rx_msdu_metadata *msdu_metadata,
-			      uint8_t *p_tx_vdev_id)
+			      struct dp_be_intrabss_params *params)
 {
 	uint16_t da_peer_id;
 	struct dp_peer *da_peer;
@@ -1155,22 +1155,96 @@ dp_rx_intrabss_ucast_check_be(struct dp_soc *soc, qdf_nbuf_t nbuf,
 		return false;
 
 	da_peer_id = dp_rx_peer_metadata_peer_id_get_be(
-						soc,
+						params->dest_soc,
 						msdu_metadata->da_idx);
-	da_peer = dp_peer_get_ref_by_id(soc, da_peer_id, DP_MOD_ID_RX);
+	da_peer = dp_peer_get_ref_by_id(params->dest_soc, da_peer_id,
+					DP_MOD_ID_RX);
 	if (!da_peer)
 		return false;
-	*p_tx_vdev_id = da_peer->vdev->vdev_id;
+	params->tx_vdev_id = da_peer->vdev->vdev_id;
 	dp_peer_unref_delete(da_peer, DP_MOD_ID_RX);
 
 	return true;
 }
 #else
+#ifdef WLAN_MLO_MULTI_CHIP
 static bool
-dp_rx_intrabss_ucast_check_be(struct dp_soc *soc, qdf_nbuf_t nbuf,
+dp_rx_intrabss_ucast_check_be(qdf_nbuf_t nbuf,
 			      struct dp_peer *ta_peer,
 			      struct hal_rx_msdu_metadata *msdu_metadata,
-			      uint8_t *p_tx_vdev_id)
+			      struct dp_be_intrabss_params *params)
+{
+	uint16_t da_peer_id;
+	struct dp_peer *da_peer;
+	bool ret = false;
+	uint8_t dest_chip_id;
+	uint8_t soc_idx;
+	struct dp_vdev_be *be_vdev =
+		dp_get_be_vdev_from_dp_vdev(ta_peer->vdev);
+
+	if (!(qdf_nbuf_is_da_valid(nbuf) || qdf_nbuf_is_da_mcbc(nbuf)))
+		return false;
+
+	dest_chip_id = HAL_RX_DEST_CHIP_ID_GET(msdu_metadata);
+	qdf_assert_always(dest_chip_id <= (DP_MLO_MAX_DEST_CHIP_ID - 1));
+
+	/* validate chip_id, get a ref, and re-assign soc */
+	params->dest_soc = dp_mlo_get_soc_ref_by_chip_id(
+					dp_mlo_get_peer_hash_obj(params->dest_soc),
+					dest_chip_id);
+	if (!params->dest_soc)
+		return false;
+
+	da_peer_id = dp_rx_peer_metadata_peer_id_get_be(params->dest_soc,
+							msdu_metadata->da_idx);
+	da_peer = dp_peer_get_ref_by_id(params->dest_soc, da_peer_id,
+					DP_MOD_ID_RX);
+	if (!da_peer)
+		return false;
+	/* soc unref if needed */
+
+	params->tx_vdev_id = da_peer->vdev->vdev_id;
+
+	/* If the source or destination peer in the isolation
+	 * list then dont forward instead push to bridge stack.
+	 */
+	if (dp_get_peer_isolation(ta_peer) ||
+	    dp_get_peer_isolation(da_peer))
+		goto rel_da_peer;
+
+	if (da_peer->bss_peer || da_peer == ta_peer)
+		goto rel_da_peer;
+
+	/* Same vdev, support Inra-BSS */
+	if (da_peer->vdev == ta_peer->vdev) {
+		ret = true;
+		goto rel_da_peer;
+	}
+
+	/* MLO specific Intra-BSS check */
+	if (dp_rx_intrabss_fwd_mlo_allow(ta_peer, da_peer)) {
+		/* index of soc in the array */
+		soc_idx = dest_chip_id << DP_MLO_DEST_CHIP_ID_SHIFT;
+		if (!(be_vdev->partner_vdev_list[soc_idx][0] ==
+		      params->tx_vdev_id) &&
+		    !(be_vdev->partner_vdev_list[soc_idx][1] ==
+		      params->tx_vdev_id)) {
+			/*dp_soc_unref_delete(soc);*/
+			goto rel_da_peer;
+		}
+		ret = true;
+	}
+
+rel_da_peer:
+	dp_peer_unref_delete(da_peer, DP_MOD_ID_RX);
+	return ret;
+}
+#else
+static bool
+dp_rx_intrabss_ucast_check_be(qdf_nbuf_t nbuf,
+			      struct dp_peer *ta_peer,
+			      struct hal_rx_msdu_metadata *msdu_metadata,
+			      struct dp_be_intrabss_params *params)
 {
 	uint16_t da_peer_id;
 	struct dp_peer *da_peer;
@@ -1180,14 +1254,15 @@ dp_rx_intrabss_ucast_check_be(struct dp_soc *soc, qdf_nbuf_t nbuf,
 		return false;
 
 	da_peer_id = dp_rx_peer_metadata_peer_id_get_be(
-						soc,
+						params->dest_soc,
 						msdu_metadata->da_idx);
-	da_peer = dp_peer_get_ref_by_id(soc, da_peer_id,
+
+	da_peer = dp_peer_get_ref_by_id(params->dest_soc, da_peer_id,
 					DP_MOD_ID_RX);
 	if (!da_peer)
 		return false;
 
-	*p_tx_vdev_id = da_peer->vdev->vdev_id;
+	params->tx_vdev_id = da_peer->vdev->vdev_id;
 	/* If the source or destination peer in the isolation
 	 * list then dont forward instead push to bridge stack.
 	 */
@@ -1214,7 +1289,9 @@ rel_da_peer:
 	dp_peer_unref_delete(da_peer, DP_MOD_ID_RX);
 	return ret;
 }
-#endif
+#endif /* WLAN_MLO_MULTI_CHIP */
+#endif /* INTRA_BSS_FWD_OFFLOAD */
+
 /*
  * dp_rx_intrabss_fwd_be() - API for intrabss fwd. For EAPOL
  *  pkt with DA not equal to vdev mac addr, fwd is not allowed.
@@ -1230,11 +1307,12 @@ bool dp_rx_intrabss_fwd_be(struct dp_soc *soc, struct dp_peer *ta_peer,
 			   uint8_t *rx_tlv_hdr, qdf_nbuf_t nbuf,
 			   struct hal_rx_msdu_metadata msdu_metadata)
 {
-	uint8_t tx_vdev_id;
 	uint8_t tid = qdf_nbuf_get_tid_val(nbuf);
 	uint8_t ring_id = QDF_NBUF_CB_RX_CTX_ID(nbuf);
 	struct cdp_tid_rx_stats *tid_stats = &ta_peer->vdev->pdev->stats.
 					tid_stats.tid_rx_stats[ring_id][tid];
+	bool ret = false;
+	struct dp_be_intrabss_params params;
 
 	/* if it is a broadcast pkt (eg: ARP) and it is not its own
 	 * source, then clone the pkt and send the cloned pkt for
@@ -1244,15 +1322,23 @@ bool dp_rx_intrabss_fwd_be(struct dp_soc *soc, struct dp_peer *ta_peer,
 	 * like igmpsnoop decide whether to forward or not with
 	 * Mcast enhancement.
 	 */
-	if (qdf_nbuf_is_da_mcbc(nbuf) && !ta_peer->bss_peer)
+	if (qdf_nbuf_is_da_mcbc(nbuf) && !ta_peer->bss_peer) {
 		return dp_rx_intrabss_mcbc_fwd(soc, ta_peer, rx_tlv_hdr,
 					       nbuf, tid_stats);
+	}
 
-	if (dp_rx_intrabss_ucast_check_be(soc, nbuf, ta_peer,
+	if (dp_rx_intrabss_eapol_drop_check(soc, ta_peer, rx_tlv_hdr,
-					  &msdu_metadata, &tx_vdev_id))
+					    nbuf))
-		return dp_rx_intrabss_ucast_fwd(soc, ta_peer, tx_vdev_id,
+		return true;
-						rx_tlv_hdr, nbuf, tid_stats);
 
-	return false;
+	params.dest_soc = soc;
+	if (dp_rx_intrabss_ucast_check_be(nbuf, ta_peer,
+					  &msdu_metadata, &params)) {
+		ret = dp_rx_intrabss_ucast_fwd(params.dest_soc, ta_peer,
+					       params.tx_vdev_id,
+					       rx_tlv_hdr, nbuf, tid_stats);
+	}
+
+	return ret;
 }
 #endif

dp/wifi3.0/be/dp_be_rx.h

@@ -23,6 +23,17 @@
 #include <dp_types.h>
 #include "dp_be.h"
 
+/*
+ * dp_be_intrabss_params
+ *
+ * @dest_soc: dest soc to forward the packet to
+ * @tx_vdev_id: vdev id retrieved from dest peer
+ */
+struct dp_be_intrabss_params {
+	struct dp_soc *dest_soc;
+	uint8_t tx_vdev_id;
+};
+
 #ifndef QCA_HOST_MODE_WIFI_DISABLED
 
 /*

dp/wifi3.0/be/mlo/dp_mlo.c

@@ -21,7 +21,8 @@
 #include <dp_be.h>
 #include <dp_htt.h>
 #include <dp_internal.h>
-
+#include <wlan_cfg.h>
+#include <wlan_mlo_mgr_cmn.h>
 /*
  * dp_mlo_ctxt_attach_wifi3 () – Attach DP MLO context
  *
@@ -148,9 +149,168 @@ static void dp_mlo_soc_teardown(struct cdp_soc_t *soc_hdl,
 	dp_mlo_set_soc_by_chip_id(mlo_ctxt, NULL, be_soc->mlo_chip_id);
 }
 
+static QDF_STATUS dp_mlo_add_ptnr_vdev(struct dp_vdev *vdev1,
+				       struct dp_vdev *vdev2,
+				       struct dp_soc *soc, uint8_t pdev_id)
+{
+	struct dp_soc_be *soc_be = dp_get_be_soc_from_dp_soc(soc);
+	struct dp_vdev_be *vdev2_be = dp_get_be_vdev_from_dp_vdev(vdev2);
+
+	/* return when valid entry  exists */
+	if (vdev2_be->partner_vdev_list[soc_be->mlo_chip_id][pdev_id] !=
+							CDP_INVALID_VDEV_ID)
+		return QDF_STATUS_SUCCESS;
+
+	if (dp_vdev_get_ref(soc, vdev1, DP_MOD_ID_RX) !=
+	    QDF_STATUS_SUCCESS) {
+		qdf_info("%pK: unable to get vdev reference vdev %pK vdev_id %u",
+			 soc, vdev1, vdev1->vdev_id);
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	vdev2_be->partner_vdev_list[soc_be->mlo_chip_id][pdev_id] =
+						vdev1->vdev_id;
+
+	mlo_debug("Add vdev%d to vdev%d list, mlo_chip_id = %d pdev_id = %d\n",
+		  vdev1->vdev_id, vdev2->vdev_id, soc_be->mlo_chip_id, pdev_id);
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS dp_update_mlo_ptnr_list(struct cdp_soc_t *soc_hdl,
+				   int8_t partner_vdev_ids[], uint8_t num_vdevs,
+				   uint8_t self_vdev_id)
+{
+	int i, j;
+	struct dp_soc *self_soc = cdp_soc_t_to_dp_soc(soc_hdl);
+	struct dp_vdev *self_vdev;
+	QDF_STATUS ret = QDF_STATUS_SUCCESS;
+	struct dp_soc_be *be_soc = dp_get_be_soc_from_dp_soc(self_soc);
+	struct dp_mlo_ctxt *dp_mlo = be_soc->ml_ctxt;
+
+	if (!dp_mlo)
+		return QDF_STATUS_E_FAILURE;
+
+	self_vdev = dp_vdev_get_ref_by_id(self_soc, self_vdev_id, DP_MOD_ID_RX);
+	if (!self_vdev)
+		return QDF_STATUS_E_FAILURE;
+
+	/* go through the input vdev id list and if there are partner vdevs,
+	 * - then add the current vdev's id to partner vdev's list using pdev_id and
+	 * increase the reference
+	 * - add partner vdev to self list  and increase  the reference
+	 */
+	for (i = 0; i < num_vdevs; i++) {
+		if (partner_vdev_ids[i] == CDP_INVALID_VDEV_ID)
+			continue;
+
+		for (j = 0; j < WLAN_MAX_MLO_CHIPS; j++) {
+			struct dp_soc *soc =
+				dp_mlo_get_soc_ref_by_chip_id(dp_mlo, j);
+			if (soc) {
+				struct dp_vdev *vdev;
+
+				vdev = dp_vdev_get_ref_by_id(soc,
+					partner_vdev_ids[i], DP_MOD_ID_RX);
+				if (vdev) {
+					if (vdev == self_vdev) {
+						dp_vdev_unref_delete(soc,
+							vdev, DP_MOD_ID_RX);
+						/*dp_soc_unref_delete(soc); */
+						continue;
+					}
+					if (qdf_is_macaddr_equal(
+						(struct qdf_mac_addr *)self_vdev->mld_mac_addr.raw,
+						(struct qdf_mac_addr *)vdev->mld_mac_addr.raw)) {
+						if (dp_mlo_add_ptnr_vdev(self_vdev,
+							vdev, self_soc,
+							self_vdev->pdev->pdev_id) !=
+							QDF_STATUS_SUCCESS) {
+							dp_err("Unable to add self to partner vdev's list");
+							dp_vdev_unref_delete(soc,
+								vdev, DP_MOD_ID_RX);
+							/* TODO - release soc ref here */
+							/* dp_soc_unref_delete(soc);*/
+							ret = QDF_STATUS_E_FAILURE;
+							goto exit;
+						}
+						/* add to self list */
+						if (dp_mlo_add_ptnr_vdev(vdev, self_vdev, soc,
+							vdev->pdev->pdev_id) !=
+							QDF_STATUS_SUCCESS) {
+							dp_err("Unable to add vdev to self vdev's list");
+							dp_vdev_unref_delete(self_soc,
+								vdev, DP_MOD_ID_RX);
+							/* TODO - relase soc ref here */
+							/* dp_soc_unref_delete(soc);*/
+							ret = QDF_STATUS_E_FAILURE;
+							goto exit;
+						}
+					}
+					dp_vdev_unref_delete(soc, vdev,
+							     DP_MOD_ID_RX);
+				} /* vdev */
+				/* TODO - release soc ref here */
+				/* dp_soc_unref_delete(soc); */
+			} /* soc */
+		} /* for */
+	} /* for */
+
+exit:
+	dp_vdev_unref_delete(self_soc, self_vdev, DP_MOD_ID_RX);
+	return ret;
+}
+
+void dp_clr_mlo_ptnr_list(struct dp_soc *soc, struct dp_vdev *vdev)
+{
+	struct dp_soc_be *be_soc = dp_get_be_soc_from_dp_soc(soc);
+	struct dp_vdev_be *vdev_be = dp_get_be_vdev_from_dp_vdev(vdev);
+	struct dp_mlo_ctxt *dp_mlo = be_soc->ml_ctxt;
+	uint8_t soc_id = be_soc->mlo_chip_id;
+	uint8_t pdev_id = vdev->pdev->pdev_id;
+	int i, j;
+
+	for (i = 0; i < WLAN_MAX_MLO_CHIPS; i++) {
+		for (j = 0; j < WLAN_MAX_MLO_LINKS_PER_SOC; j++) {
+			struct dp_vdev *pr_vdev;
+			struct dp_soc *pr_soc;
+			struct dp_soc_be *pr_soc_be;
+			struct dp_pdev *pr_pdev;
+			struct dp_vdev_be *pr_vdev_be;
+
+			if (vdev_be->partner_vdev_list[i][j] ==
+			    CDP_INVALID_VDEV_ID)
+				continue;
+
+			pr_soc = dp_mlo_get_soc_ref_by_chip_id(dp_mlo, i);
+			pr_soc_be = dp_get_be_soc_from_dp_soc(pr_soc);
+			pr_vdev = dp_vdev_get_ref_by_id(pr_soc,
+						vdev_be->partner_vdev_list[i][j],
+						DP_MOD_ID_RX);
+			if (!pr_vdev)
+				continue;
+
+			/* release ref and remove self vdev from partner list */
+			pr_vdev_be = dp_get_be_vdev_from_dp_vdev(pr_vdev);
+			dp_vdev_unref_delete(soc, vdev, DP_MOD_ID_RX);
+			pr_vdev_be->partner_vdev_list[soc_id][pdev_id] =
+				CDP_INVALID_VDEV_ID;
+
+			/* release ref and remove partner vdev from self list */
+			dp_vdev_unref_delete(pr_soc, pr_vdev, DP_MOD_ID_RX);
+			pr_pdev = pr_vdev->pdev;
+			vdev_be->partner_vdev_list[pr_soc_be->mlo_chip_id][pr_pdev->pdev_id] =
+				CDP_INVALID_VDEV_ID;
+
+			dp_vdev_unref_delete(pr_soc, pr_vdev, DP_MOD_ID_RX);
+		}
+	}
+}
+
 static struct cdp_mlo_ops dp_mlo_ops = {
 	.mlo_soc_setup = dp_mlo_soc_setup,
 	.mlo_soc_teardown = dp_mlo_soc_teardown,
+	.update_mlo_ptnr_list = dp_update_mlo_ptnr_list,
 };
 
 void dp_soc_mlo_fill_params(struct dp_soc *soc,

dp/wifi3.0/be/mlo/dp_mlo.h

@@ -24,6 +24,12 @@
 
 /* Max number of peers supported */
 #define DP_MAX_MLO_PEER 512
+
+/* Max number of chips supported */
+#define DP_MLO_MAX_DEST_CHIP_ID 3
+/* shift value to index into the array, used instead of mult by 2 */
+#define DP_MLO_DEST_CHIP_ID_SHIFT 1
+
 /*
  * dp_mlo_ctxt
  *
@@ -93,4 +99,7 @@ void dp_soc_mlo_fill_params(struct dp_soc *soc,
  */
 void dp_pdev_mlo_fill_params(struct dp_pdev *pdev,
 			     struct cdp_pdev_attach_params *params);
+struct dp_soc*
+dp_mlo_get_soc_ref_by_chip_id(struct dp_mlo_ctxt *ml_ctxt, uint8_t chip_id);
+
 #endif /* __DP_MLO_H */

dp/wifi3.0/dp_rx.c

@@ -576,10 +576,6 @@ bool dp_rx_intrabss_ucast_fwd(struct dp_soc *soc, struct dp_peer *ta_peer,
 {
 	uint16_t len;
 
-	if (dp_rx_intrabss_eapol_drop_check(soc, ta_peer, rx_tlv_hdr,
-					    nbuf))
-		return true;
-
 	len = QDF_NBUF_CB_RX_PKT_LEN(nbuf);
 
 	/* linearize the nbuf just before we send to

dp/wifi3.0/li/dp_li_rx.c

@@ -176,6 +176,10 @@ dp_rx_intrabss_fwd_li(struct dp_soc *soc,
 		return dp_rx_intrabss_mcbc_fwd(soc, ta_peer, rx_tlv_hdr,
 					       nbuf, tid_stats);
 
+	if (dp_rx_intrabss_eapol_drop_check(soc, ta_peer, rx_tlv_hdr,
+					    nbuf))
+		return true;
+
 	if (dp_rx_intrabss_ucast_check_li(soc, nbuf, ta_peer,
 					  &msdu_metadata, &tx_vdev_id))
 		return dp_rx_intrabss_ucast_fwd(soc, ta_peer, tx_vdev_id,

hal/wifi3.0/be/hal_be_rx.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016-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
@@ -22,6 +23,9 @@
 #include "hal_be_hw_headers.h"
 #include "hal_rx.h"
 
+#define HAL_RX_DA_IDX_CHIP_ID_OFFSET    14
+#define HAL_RX_DA_IDX_CHIP_ID_MASK      0x3
+
 /*
  * macro to set the cookie into the rxdma ring entry
  */
@@ -181,6 +185,11 @@
 		RX_MSDU_DESC_INFO_INTRA_BSS_OFFSET)) &	\
 		RX_MSDU_DESC_INFO_INTRA_BSS_MASK)
 
+#define HAL_RX_MSDU_DEST_CHIP_ID_GET(msdu_info_ptr) \
+	((*_OFFSET_TO_WORD_PTR(msdu_info_ptr,		\
+		RX_MSDU_DESC_INFO_DEST_CHIP_ID_OFFSET)) & \
+		RX_MSDU_DESC_INFO_DEST_CHIP_ID_MASK)
+
 #define HAL_RX_MPDU_ENCRYPT_TYPE_GET(_rx_mpdu_info)	\
 	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_mpdu_info,	\
 	RX_MPDU_INFO_ENCRYPT_TYPE_OFFSET)),		\
@@ -200,6 +209,9 @@
 	(((struct reo_destination_ring *)	\
 	   reo_desc)->rx_msdu_desc_info_details)))
 
+#define HAL_RX_DEST_CHIP_ID_GET(msdu_metadata) \
+	(((msdu_metadata)->da_idx >> HAL_RX_DA_IDX_CHIP_ID_OFFSET) &	\
+	 HAL_RX_DA_IDX_CHIP_ID_MASK)
 /**
  * enum hal_be_rx_wbm_error_source: Indicates which module initiated the
  * release of this buffer or descriptor

umac/mlo_mgr/src/wlan_mlo_mgr_ap.c

@@ -23,7 +23,56 @@
 #include <wlan_mlo_mgr_cmn.h>
 #include <wlan_mlo_mgr_main.h>
 #include <wlan_utility.h>
+#ifdef WLAN_MLO_MULTI_CHIP
+#include "cdp_txrx_mlo.h"
+#endif
 
+#ifdef WLAN_MLO_MULTI_CHIP
+bool mlo_ap_vdev_attach(struct wlan_objmgr_vdev *vdev,
+			uint8_t link_id,
+			uint16_t vdev_count)
+{
+	struct wlan_mlo_dev_context *dev_ctx;
+	uint8_t pr_vdev_ids[WLAN_UMAC_MLO_MAX_VDEVS] = { CDP_INVALID_VDEV_ID };
+	struct wlan_objmgr_psoc *psoc;
+	int i;
+
+	if (!vdev || !vdev->mlo_dev_ctx || !vdev->mlo_dev_ctx->ap_ctx) {
+		mlo_err("Invalid input");
+		return false;
+	}
+
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc)
+		return false;
+
+	dev_ctx = vdev->mlo_dev_ctx;
+	wlan_vdev_set_link_id(vdev, link_id);
+	wlan_vdev_mlme_feat_ext2_cap_set(vdev, WLAN_VDEV_FEXT2_MLO);
+
+	/**
+	 * every link will trigger mlo_ap_vdev_attach,
+	 * and they should provide the same vdev_count.
+	 */
+	mlo_dev_lock_acquire(dev_ctx);
+	dev_ctx->ap_ctx->num_ml_vdevs = vdev_count;
+	mlo_dev_lock_release(dev_ctx);
+
+	for (i = 0; i < WLAN_UMAC_MLO_MAX_VDEVS; i++) {
+		if (dev_ctx->wlan_vdev_list[i])
+			pr_vdev_ids[i] = wlan_vdev_get_id(dev_ctx->wlan_vdev_list[i]);
+	}
+
+	if (cdp_update_mlo_ptnr_list(wlan_psoc_get_dp_handle(psoc),
+				pr_vdev_ids, WLAN_UMAC_MLO_MAX_VDEVS,
+				wlan_vdev_get_id(vdev) != QDF_STATUS_SUCCESS)) {
+		mlo_debug("Failed to add vdev to partner vdev list, vdev id:%d",
+			 wlan_vdev_get_id(vdev));
+	}
+
+	return true;
+}
+#else
 bool mlo_ap_vdev_attach(struct wlan_objmgr_vdev *vdev,
 			uint8_t link_id,
 			uint16_t vdev_count)
@@ -49,6 +98,7 @@ bool mlo_ap_vdev_attach(struct wlan_objmgr_vdev *vdev,
 
 	return true;
 }
+#endif
 
 void mlo_ap_get_vdev_list(struct wlan_objmgr_vdev *vdev,
 			  uint16_t *vdev_count,

wlan_cfg/wlan_cfg.h

@@ -90,6 +90,7 @@
 /* Max number of chips that can participate in MLO */
 #if defined(WLAN_FEATURE_11BE_MLO) && defined(WLAN_MLO_MULTI_CHIP)
 #define WLAN_MAX_MLO_CHIPS 3
+#define WLAN_MAX_MLO_LINKS_PER_SOC 2
 #else
 #define WLAN_MAX_MLO_CHIPS 1
 #endif