X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Ftf_ulp%2Fulp_port_db.c;h=a11e6786c04b2b8b047656a111036d3aa9829257;hb=46413898cf1df5798b8d1ea04522da0f0ce97205;hp=ea27ef41f93dc2710a495cd16ef4bbcfce26e64a;hpb=35a7fe80c29446eab49ffd7e81a4f610fd1f98ce;p=dpdk.git

diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
index ea27ef41f9..a11e6786c0 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -33,7 +33,7 @@ ulp_port_db_allocate_ifindex(struct bnxt_ulp_port_db *port_db)
  *
  * Returns 0 on success or negative number on failure.
  */
-int32_t	ulp_port_db_init(struct bnxt_ulp_context *ulp_ctxt)
+int32_t	ulp_port_db_init(struct bnxt_ulp_context *ulp_ctxt, uint8_t port_cnt)
 {
 	struct bnxt_ulp_port_db *port_db;
 
@@ -60,6 +60,18 @@ int32_t	ulp_port_db_init(struct bnxt_ulp_context *ulp_ctxt)
 			    "Failed to allocate mem for port interface list\n");
 		goto error_free;
 	}
+
+	/* Allocate the phy port list */
+	port_db->phy_port_list = rte_zmalloc("bnxt_ulp_phy_port_list",
+					     port_cnt *
+					     sizeof(struct ulp_phy_port_info),
+					     0);
+	if (!port_db->phy_port_list) {
+		BNXT_TF_DBG(ERR,
+			    "Failed to allocate mem for phy port list\n");
+		goto error_free;
+	}
+	port_db->phy_port_cnt = port_cnt;
 	return 0;
 
 error_free:
@@ -89,6 +101,7 @@ int32_t	ulp_port_db_deinit(struct bnxt_ulp_context *ulp_ctxt)
 	bnxt_ulp_cntxt_ptr2_port_db_set(ulp_ctxt, NULL);
 
 	/* Free up all the memory. */
+	rte_free(port_db->phy_port_list);
 	rte_free(port_db->ulp_intf_list);
 	rte_free(port_db);
 	return 0;
@@ -110,6 +123,7 @@ int32_t	ulp_port_db_dev_port_intf_update(struct bnxt_ulp_context *ulp_ctxt,
 	struct ulp_phy_port_info *port_data;
 	struct bnxt_ulp_port_db *port_db;
 	struct ulp_interface_info *intf;
+	struct ulp_func_if_info *func;
 	uint32_t ifindex;
 	int32_t rc;
 
@@ -134,20 +148,50 @@ int32_t	ulp_port_db_dev_port_intf_update(struct bnxt_ulp_context *ulp_ctxt,
 	intf = &port_db->ulp_intf_list[ifindex];
 
 	intf->type = bnxt_get_interface_type(port_id);
+	intf->drv_func_id = bnxt_get_fw_func_id(port_id,
+						BNXT_ULP_INTF_TYPE_INVALID);
+
+	func = &port_db->ulp_func_id_tbl[intf->drv_func_id];
+	if (!func->func_valid) {
+		func->func_svif = bnxt_get_svif(port_id, true,
+						BNXT_ULP_INTF_TYPE_INVALID);
+		func->func_spif = bnxt_get_phy_port_id(port_id);
+		func->func_parif =
+			bnxt_get_parif(port_id, BNXT_ULP_INTF_TYPE_INVALID);
+		func->func_vnic =
+			bnxt_get_vnic_id(port_id, BNXT_ULP_INTF_TYPE_INVALID);
+		func->phy_port_id = bnxt_get_phy_port_id(port_id);
+		func->func_valid = true;
+		func->ifindex = ifindex;
+	}
 
-	intf->func_id = bnxt_get_fw_func_id(port_id);
-	intf->func_svif = bnxt_get_svif(port_id, 1);
-	intf->func_spif = bnxt_get_phy_port_id(port_id);
-	intf->func_parif = bnxt_get_parif(port_id);
-	intf->default_vnic = bnxt_get_vnic_id(port_id);
-	intf->phy_port_id = bnxt_get_phy_port_id(port_id);
+	if (intf->type == BNXT_ULP_INTF_TYPE_VF_REP) {
+		intf->vf_func_id =
+			bnxt_get_fw_func_id(port_id, BNXT_ULP_INTF_TYPE_VF_REP);
+
+		func = &port_db->ulp_func_id_tbl[intf->vf_func_id];
+		func->func_svif =
+			bnxt_get_svif(port_id, true, BNXT_ULP_INTF_TYPE_VF_REP);
+		func->func_spif =
+			bnxt_get_phy_port_id(port_id);
+		func->func_parif =
+			bnxt_get_parif(port_id, BNXT_ULP_INTF_TYPE_INVALID);
+		func->func_vnic =
+			bnxt_get_vnic_id(port_id, BNXT_ULP_INTF_TYPE_VF_REP);
+		func->phy_port_id = bnxt_get_phy_port_id(port_id);
+		func->ifindex = ifindex;
+	}
 
-	if (intf->type == BNXT_ULP_INTF_TYPE_PF) {
-		port_data = &port_db->phy_port_list[intf->phy_port_id];
-		port_data->port_svif = bnxt_get_svif(port_id, 0);
+	port_data = &port_db->phy_port_list[func->phy_port_id];
+	if (!port_data->port_valid) {
+		port_data->port_svif =
+			bnxt_get_svif(port_id, false,
+				      BNXT_ULP_INTF_TYPE_INVALID);
 		port_data->port_spif = bnxt_get_phy_port_id(port_id);
-		port_data->port_parif = bnxt_get_parif(port_id);
+		port_data->port_parif =
+			bnxt_get_parif(port_id, BNXT_ULP_INTF_TYPE_INVALID);
 		port_data->port_vport = bnxt_get_vport(port_id);
+		port_data->port_valid = true;
 	}
 
 	return 0;
@@ -194,6 +238,7 @@ ulp_port_db_dev_port_to_ulp_index(struct bnxt_ulp_context *ulp_ctxt,
 int32_t
 ulp_port_db_function_id_get(struct bnxt_ulp_context *ulp_ctxt,
 			    uint32_t ifindex,
+			    uint32_t fid_type,
 			    uint16_t *func_id)
 {
 	struct bnxt_ulp_port_db *port_db;
@@ -203,7 +248,12 @@ ulp_port_db_function_id_get(struct bnxt_ulp_context *ulp_ctxt,
 		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
 		return -EINVAL;
 	}
-	*func_id =  port_db->ulp_intf_list[ifindex].func_id;
+
+	if (fid_type == BNXT_ULP_DRV_FUNC_FID)
+		*func_id =  port_db->ulp_intf_list[ifindex].drv_func_id;
+	else
+		*func_id =  port_db->ulp_intf_list[ifindex].vf_func_id;
+
 	return 0;
 }
 
@@ -212,7 +262,7 @@ ulp_port_db_function_id_get(struct bnxt_ulp_context *ulp_ctxt,
  *
  * ulp_ctxt [in] Ptr to ulp context
  * ifindex [in] ulp ifindex
- * dir [in] the direction for the flow.
+ * svif_type [in] the svif type of the given ifindex.
  * svif [out] the svif of the given ifindex.
  *
  * Returns 0 on success or negative number on failure.
@@ -220,21 +270,27 @@ ulp_port_db_function_id_get(struct bnxt_ulp_context *ulp_ctxt,
 int32_t
 ulp_port_db_svif_get(struct bnxt_ulp_context *ulp_ctxt,
 		     uint32_t ifindex,
-		     uint32_t dir,
+		     uint32_t svif_type,
 		     uint16_t *svif)
 {
 	struct bnxt_ulp_port_db *port_db;
-	uint16_t phy_port_id;
+	uint16_t phy_port_id, func_id;
 
 	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
 	if (!port_db || ifindex >= port_db->ulp_intf_list_size || !ifindex) {
 		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
 		return -EINVAL;
 	}
-	if (dir == ULP_DIR_EGRESS) {
-		*svif = port_db->ulp_intf_list[ifindex].func_svif;
+
+	if (svif_type == BNXT_ULP_DRV_FUNC_SVIF) {
+		func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+		*svif = port_db->ulp_func_id_tbl[func_id].func_svif;
+	} else if (svif_type == BNXT_ULP_VF_FUNC_SVIF) {
+		func_id = port_db->ulp_intf_list[ifindex].vf_func_id;
+		*svif = port_db->ulp_func_id_tbl[func_id].func_svif;
 	} else {
-		phy_port_id = port_db->ulp_intf_list[ifindex].phy_port_id;
+		func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+		phy_port_id = port_db->ulp_func_id_tbl[func_id].phy_port_id;
 		*svif = port_db->phy_port_list[phy_port_id].port_svif;
 	}
 
@@ -246,7 +302,7 @@ ulp_port_db_svif_get(struct bnxt_ulp_context *ulp_ctxt,
  *
  * ulp_ctxt [in] Ptr to ulp context
  * ifindex [in] ulp ifindex
- * dir [in] the direction for the flow.
+ * spif_type [in] the spif type of the given ifindex.
  * spif [out] the spif of the given ifindex.
  *
  * Returns 0 on success or negative number on failure.
@@ -254,21 +310,27 @@ ulp_port_db_svif_get(struct bnxt_ulp_context *ulp_ctxt,
 int32_t
 ulp_port_db_spif_get(struct bnxt_ulp_context *ulp_ctxt,
 		     uint32_t ifindex,
-		     uint32_t dir,
+		     uint32_t spif_type,
 		     uint16_t *spif)
 {
 	struct bnxt_ulp_port_db *port_db;
-	uint16_t phy_port_id;
+	uint16_t phy_port_id, func_id;
 
 	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
 	if (!port_db || ifindex >= port_db->ulp_intf_list_size || !ifindex) {
 		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
 		return -EINVAL;
 	}
-	if (dir == ULP_DIR_EGRESS) {
-		*spif = port_db->ulp_intf_list[ifindex].func_spif;
+
+	if (spif_type == BNXT_ULP_DRV_FUNC_SPIF) {
+		func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+		*spif = port_db->ulp_func_id_tbl[func_id].func_spif;
+	} else if (spif_type == BNXT_ULP_VF_FUNC_SPIF) {
+		func_id = port_db->ulp_intf_list[ifindex].vf_func_id;
+		*spif = port_db->ulp_func_id_tbl[func_id].func_spif;
 	} else {
-		phy_port_id = port_db->ulp_intf_list[ifindex].phy_port_id;
+		func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+		phy_port_id = port_db->ulp_func_id_tbl[func_id].phy_port_id;
 		*spif = port_db->phy_port_list[phy_port_id].port_spif;
 	}
 
@@ -280,7 +342,7 @@ ulp_port_db_spif_get(struct bnxt_ulp_context *ulp_ctxt,
  *
  * ulp_ctxt [in] Ptr to ulp context
  * ifindex [in] ulp ifindex
- * dir [in] the direction for the flow.
+ * parif_type [in] the parif type of the given ifindex.
  * parif [out] the parif of the given ifindex.
  *
  * Returns 0 on success or negative number on failure.
@@ -288,23 +350,30 @@ ulp_port_db_spif_get(struct bnxt_ulp_context *ulp_ctxt,
 int32_t
 ulp_port_db_parif_get(struct bnxt_ulp_context *ulp_ctxt,
 		     uint32_t ifindex,
-		     uint32_t dir,
+		     uint32_t parif_type,
 		     uint16_t *parif)
 {
 	struct bnxt_ulp_port_db *port_db;
-	uint16_t phy_port_id;
+	uint16_t phy_port_id, func_id;
 
 	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
 	if (!port_db || ifindex >= port_db->ulp_intf_list_size || !ifindex) {
 		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
 		return -EINVAL;
 	}
-	if (dir == ULP_DIR_EGRESS) {
-		*parif = port_db->ulp_intf_list[ifindex].func_parif;
+	if (parif_type == BNXT_ULP_DRV_FUNC_PARIF) {
+		func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+		*parif = port_db->ulp_func_id_tbl[func_id].func_parif;
+	} else if (parif_type == BNXT_ULP_VF_FUNC_PARIF) {
+		func_id = port_db->ulp_intf_list[ifindex].vf_func_id;
+		*parif = port_db->ulp_func_id_tbl[func_id].func_parif;
 	} else {
-		phy_port_id = port_db->ulp_intf_list[ifindex].phy_port_id;
+		func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+		phy_port_id = port_db->ulp_func_id_tbl[func_id].phy_port_id;
 		*parif = port_db->phy_port_list[phy_port_id].port_parif;
 	}
+	/* Parif needs to be reset to a free partition */
+	*parif += BNXT_ULP_FREE_PARIF_BASE;
 
 	return 0;
 }
@@ -321,16 +390,26 @@ ulp_port_db_parif_get(struct bnxt_ulp_context *ulp_ctxt,
 int32_t
 ulp_port_db_default_vnic_get(struct bnxt_ulp_context *ulp_ctxt,
 			     uint32_t ifindex,
+			     uint32_t vnic_type,
 			     uint16_t *vnic)
 {
 	struct bnxt_ulp_port_db *port_db;
+	uint16_t func_id;
 
 	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
 	if (!port_db || ifindex >= port_db->ulp_intf_list_size || !ifindex) {
 		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
 		return -EINVAL;
 	}
-	*vnic = port_db->ulp_intf_list[ifindex].default_vnic;
+
+	if (vnic_type == BNXT_ULP_DRV_FUNC_VNIC) {
+		func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+		*vnic = port_db->ulp_func_id_tbl[func_id].func_vnic;
+	} else {
+		func_id = port_db->ulp_intf_list[ifindex].vf_func_id;
+		*vnic = port_db->ulp_func_id_tbl[func_id].func_vnic;
+	}
+
 	return 0;
 }
 
@@ -348,14 +427,157 @@ ulp_port_db_vport_get(struct bnxt_ulp_context *ulp_ctxt,
 		      uint32_t ifindex, uint16_t *vport)
 {
 	struct bnxt_ulp_port_db *port_db;
-	uint16_t phy_port_id;
+	uint16_t phy_port_id, func_id;
 
 	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
 	if (!port_db || ifindex >= port_db->ulp_intf_list_size || !ifindex) {
 		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
 		return -EINVAL;
 	}
-	phy_port_id = port_db->ulp_intf_list[ifindex].phy_port_id;
+
+	func_id = port_db->ulp_intf_list[ifindex].drv_func_id;
+	phy_port_id = port_db->ulp_func_id_tbl[func_id].phy_port_id;
 	*vport = port_db->phy_port_list[phy_port_id].port_vport;
 	return 0;
 }
+
+/*
+ * Api to get the vport for a given physical port.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * phy_port [in] physical port index
+ * out_port [out] the port of the given physical index
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_phy_port_vport_get(struct bnxt_ulp_context *ulp_ctxt,
+			       uint32_t phy_port,
+			       uint16_t *out_port)
+{
+	struct bnxt_ulp_port_db *port_db;
+
+	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
+	if (!port_db || phy_port >= port_db->phy_port_cnt) {
+		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+		return -EINVAL;
+	}
+	*out_port = port_db->phy_port_list[phy_port].port_vport;
+	return 0;
+}
+
+/*
+ * Api to get the svif for a given physical port.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * phy_port [in] physical port index
+ * svif [out] the svif of the given physical index
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_phy_port_svif_get(struct bnxt_ulp_context *ulp_ctxt,
+			      uint32_t phy_port,
+			      uint16_t *svif)
+{
+	struct bnxt_ulp_port_db *port_db;
+
+	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
+	if (!port_db || phy_port >= port_db->phy_port_cnt) {
+		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+		return -EINVAL;
+	}
+	*svif = port_db->phy_port_list[phy_port].port_svif;
+	return 0;
+}
+
+/*
+ * Api to get the port type for a given ulp ifindex.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * ifindex [in] ulp ifindex
+ *
+ * Returns port type.
+ */
+enum bnxt_ulp_intf_type
+ulp_port_db_port_type_get(struct bnxt_ulp_context *ulp_ctxt,
+			  uint32_t ifindex)
+{
+	struct bnxt_ulp_port_db *port_db;
+
+	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
+	if (!port_db || ifindex >= port_db->ulp_intf_list_size || !ifindex) {
+		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+		return BNXT_ULP_INTF_TYPE_INVALID;
+	}
+	return port_db->ulp_intf_list[ifindex].type;
+}
+
+/*
+ * Api to get the ulp ifindex for a given function id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * func_id [in].device func id
+ * ifindex [out] ulp ifindex
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_dev_func_id_to_ulp_index(struct bnxt_ulp_context *ulp_ctxt,
+				     uint32_t func_id, uint32_t *ifindex)
+{
+	struct bnxt_ulp_port_db *port_db;
+
+	*ifindex = 0;
+	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
+	if (!port_db || func_id >= BNXT_PORT_DB_MAX_FUNC) {
+		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+		return -EINVAL;
+	}
+	if (!port_db->ulp_func_id_tbl[func_id].func_valid)
+		return -ENOENT;
+
+	*ifindex = port_db->ulp_func_id_tbl[func_id].ifindex;
+	return 0;
+}
+
+/*
+ * Api to get the function id for a given port id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * port_id [in] dpdk port id
+ * func_id [out] the function id of the given ifindex.
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt,
+			     uint16_t port_id, uint16_t *func_id)
+{
+	struct bnxt_ulp_port_db *port_db;
+	uint32_t ifindex;
+
+	port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);
+	if (!port_db || port_id >= RTE_MAX_ETHPORTS) {
+		BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+		return -EINVAL;
+	}
+	ifindex = port_db->dev_port_list[port_id];
+	if (!ifindex)
+		return -ENOENT;
+
+	switch (port_db->ulp_intf_list[ifindex].type) {
+	case BNXT_ULP_INTF_TYPE_TRUSTED_VF:
+	case BNXT_ULP_INTF_TYPE_PF:
+		*func_id =  port_db->ulp_intf_list[ifindex].drv_func_id;
+		break;
+	case BNXT_ULP_INTF_TYPE_VF:
+	case BNXT_ULP_INTF_TYPE_VF_REP:
+		*func_id =  port_db->ulp_intf_list[ifindex].vf_func_id;
+		break;
+	default:
+		*func_id = 0;
+		break;
+	}
+	return 0;
+}