Phase2 cleanup (Xilinx#9701)

* removed dead code -- unused enums, fields, statics and orphan prototypes

Signed-off-by: Bikash Singha <bisingha@xcobisingha50x.amd.com>

* removing redundant XCLBIN_HW_EMU checks

Signed-off-by: Bikash Singha <bisingha@xcobisingha50x.amd.com>

* Unify AIE PDI load path via zocl_load_sect, remove redundant shim flag logic

Signed-off-by: Bikash Singha <bisingha@xcobisingha50x.amd.com>

---------

Signed-off-by: Bikash Singha <bisingha@xcobisingha50x.amd.com>
Co-authored-by: Bikash Singha <bisingha@xcobisingha50x.amd.com>

Author: bisingha-xilinx

src/runtime_src/core/edge/drm/zocl/common/zocl_drv.c

@@ -224,7 +224,6 @@ static int zocl_pr_slot_init(struct drm_zocl_dev *zdev,
 
 		zocl_slot->partial_overlay_id = -1;
 		zocl_slot->slot_idx = i;
-		zocl_slot->slot_type = ZOCL_SLOT_TYPE_PHY;
 		zocl_slot->hwctx_ref_cnt = 0;
 
 		zdev->pr_slot[i] = zocl_slot;
@@ -245,7 +244,6 @@ static int zocl_pr_slot_init(struct drm_zocl_dev *zdev,
 		mutex_init(&zocl_slot->aie_lock);
 
 		zocl_slot->slot_idx = i;
-		zocl_slot->slot_type = ZOCL_SLOT_TYPE_VIRT;
 
 		zdev->pr_slot[i] = zocl_slot;
 	}

src/runtime_src/core/edge/drm/zocl/common/zocl_xclbin.c

@@ -155,39 +155,6 @@ zocl_load_bitstream(struct drm_zocl_dev *zdev, char *buffer, int length,
 	return zocl_fpga_mgr_load(zdev, buffer, length, 0);
 }
 
-/*
- * Load PDI for overlay xclbins that have the AM_LOAD_PDI action mask set.
- */
-int
-zocl_load_aie_only_pdi(struct drm_zocl_dev *zdev, struct drm_zocl_slot* slot, struct axlf *axlf,
-			char __user *xclbin, struct kds_client *client)
-{
-	uint64_t size = 0;
-	char *pdi_buf = NULL;
-	int ret = 0;
-
-	if (client && client->aie_ctx == ZOCL_CTX_SHARED) {
-		DRM_ERROR("%s Shared context can not load xclbin", __func__);
-		return -EPERM;
-	}
-
-	size = zocl_read_sect(PDI, &pdi_buf, axlf, xclbin);
-	if (size == 0)
-		return 0;
-
-	ret = zocl_fpga_mgr_load(zdev, pdi_buf, size, FPGA_MGR_PARTIAL_RECONFIG);
-	vfree(pdi_buf);
-
-	/* Mark AIE out of reset state after load PDI */
-	if (slot->aie) {
-		mutex_lock(&slot->aie_lock);
-		slot->aie->aie_reset = false;
-		mutex_unlock(&slot->aie_lock);
-	}
-
-	return ret;
-}
-
 int
 zocl_offsetof_sect(enum axlf_section_kind kind, void *sect,
 		struct axlf *axlf_full, char __user *xclbin_ptr)

src/runtime_src/core/edge/drm/zocl/edge/zocl_edge_xclbin.c

@@ -21,27 +21,6 @@
 #include "xrt_xclbin.h"
 #include "xclbin.h"
 
-static inline u32 xclbin_protocol(u32 prop)
-{
-	u32 intr_id = prop & IP_CONTROL_MASK;
-
-	return intr_id >> IP_CONTROL_SHIFT;
-}
-
-static inline u32 xclbin_intr_enable(u32 prop)
-{
-	u32 intr_enable = prop & IP_INT_ENABLE_MASK;
-
-	return intr_enable;
-}
-
-static inline u32 xclbin_intr_id(u32 prop)
-{
-	u32 intr_id = prop & IP_INTERRUPT_ID_MASK;
-
-	return intr_id >> IP_INTERRUPT_ID_SHIFT;
-}
-
 
 /*
  * Cache the xclbin blob so that it can be shared by processes.
@@ -106,7 +85,7 @@ zocl_xclbin_read_axlf(struct drm_zocl_dev *zdev, struct drm_zocl_axlf *axlf_obj,
 	void *aie_res = 0;
 	int ret = 0;
 	struct drm_zocl_slot *slot = NULL;
-	uint32_t qos = 0;
+	uint32_t flags = 0;
 	uint8_t hw_gen = axlf_obj->hw_gen;
 
 	/* Download the XCLBIN from user space to kernel space and validate */
@@ -162,13 +141,12 @@ zocl_xclbin_read_axlf(struct drm_zocl_dev *zdev, struct drm_zocl_axlf *axlf_obj,
 		return -EFAULT;
 	}
 
-	/* TODO : qos need to define */
-	qos |= axlf_obj->za_flags;
+	flags = axlf_obj->za_flags;
 	slot = zdev->pr_slot[slot_id];
 
 	mutex_lock(&slot->slot_xclbin_lock);
 	if (zocl_xclbin_same_uuid(slot,  &axlf_head.m_header.uuid)) {
-		if (qos & DRM_ZOCL_FORCE_PROGRAM) {
+		if (flags & DRM_ZOCL_FORCE_PROGRAM) {
 			// We come here if user sets force_xclbin_program
 			// option "true" in xrt.ini under [Runtime] section
 			DRM_WARN("%s Force xclbin download", __func__);
@@ -192,7 +170,7 @@ zocl_xclbin_read_axlf(struct drm_zocl_dev *zdev, struct drm_zocl_axlf *axlf_obj,
 
 	zocl_read_sect(AIE_RESOURCES, &aie_res, axlf, xclbin);
 
-	/* 1. We locked &zdev->slot_xclbin_lock so that no new contexts
+	/* 1. We locked slot->slot_xclbin_lock so that no new contexts
 	 * can be opened and/or closed
 	 * 2. A opened context would lock bitstream and hold it.
 	 * 3. If all contexts are closed, new kds would make sure all
@@ -229,16 +207,28 @@ zocl_xclbin_read_axlf(struct drm_zocl_dev *zdev, struct drm_zocl_axlf *axlf_obj,
 #endif
 	if (zocl_xclbin_needs_pdi_load(axlf)) {
 
-		ret = zocl_load_aie_only_pdi(zdev, slot, axlf, xclbin, client);
+		if (client && client->aie_ctx == ZOCL_CTX_SHARED) {
+			DRM_ERROR("%s Shared context can not load xclbin",
+				  __func__);
+			ret = -EPERM;
+			goto out0;
+		}
+
+		ret = zocl_load_sect(zdev, axlf, xclbin, PDI, slot);
 		if (ret)
 			goto out0;
 
+		/* Mark AIE out of reset state after load PDI */
+		if (slot->aie) {
+			mutex_lock(&slot->aie_lock);
+			slot->aie->aie_reset = false;
+			mutex_unlock(&slot->aie_lock);
+		}
+
 		zocl_cache_xclbin(zdev, slot, axlf, xclbin);
 
 	} else if ((axlf_obj->za_flags & DRM_ZOCL_PLATFORM_FLAT) &&
-		   axlf_head.m_header.m_mode == XCLBIN_FLAT &&
-		   axlf_head.m_header.m_mode != XCLBIN_HW_EMU &&
-		   axlf_head.m_header.m_mode != XCLBIN_HW_EMU_PR) {
+		   axlf_head.m_header.m_mode == XCLBIN_FLAT) {
 		/*
 		 * Load full bitstream, enabled in xrt runtime config
 		 * and xclbin has full bitstream and its not hw emulation

src/runtime_src/core/edge/drm/zocl/include/zocl_util.h

@@ -73,24 +73,6 @@ enum zocl_mem_type {
 	ZOCL_MEM_TYPE_STREAMING		= 2,
 };
 
-/* Possible slots Types for ZOCL */
-enum zocl_slot_type {
-	ZOCL_SLOT_TYPE_PHY			= 0,
-	ZOCL_SLOT_TYPE_VIRT			= 1
-};
-
-/*
- * Deprecated: PL_ONLY and AIE_ONLY types are no longer set in the unified
- * hw_context flow.  Retained for backward compatibility with legacy
- * xrt::device paths.  Will be removed in a future release.
- */
-enum zocl_xclbin_type {
-	ZOCL_XCLBIN_TYPE_FULL			= 0,
-	ZOCL_XCLBIN_TYPE_PL_ONLY		= 1,
-	ZOCL_XCLBIN_TYPE_AIE_ONLY		= 2,
-	ZOCL_XCLBIN_TYPE_PS			= 3
-};
-
 /*
  * Memory structure in zocl driver. There will be an array of this
  * structure where each element is representing each section in
@@ -124,8 +106,6 @@ struct aie_metadata {
 
 struct drm_zocl_slot {
 	u32			 slot_idx;
-	u32			 slot_type;
-	u32			 xclbin_type;
 	struct mem_topology	*topology;
 	struct ip_layout	*ip;
 	struct debug_ip_layout	*debug_ip;

src/runtime_src/core/edge/drm/zocl/include/zocl_xclbin.h

@@ -64,7 +64,6 @@ int zocl_xclbin_read_axlf(struct drm_zocl_dev *zdev,
 int zocl_xclbin_load_pdi(struct drm_zocl_dev *zdev, void *data,
 			struct drm_zocl_slot *slot);
 int zocl_xclbin_load_pskernel(struct drm_zocl_dev *zdev, void *data, uint32_t slot_id);
-bool zocl_xclbin_accel_adapter(int kds_mask);
 int zocl_xclbin_set_dtbo_path(struct drm_zocl_dev *zdev,
 		      struct drm_zocl_slot *slot, char *dtbo_path, uint32_t len);
 int zocl_reset(struct drm_zocl_dev *zdev, const char *buf, size_t count);
@@ -87,8 +86,5 @@ bool zocl_bitstream_is_locked(struct drm_zocl_dev *zdev,
 			      struct drm_zocl_slot *slot);
 int zocl_load_partial(struct drm_zocl_dev *zdev, const char *buffer, int length,
 		      struct drm_zocl_slot *slot);
-int
-zocl_load_aie_only_pdi(struct drm_zocl_dev *zdev, struct drm_zocl_slot* slot, struct axlf *axlf,
-			char __user *xclbin, struct kds_client *client);
 
 #endif /* _ZOCL_XCLBIN_H_ */

src/runtime_src/core/edge/drm/zocl/zert/zocl_ps_xclbin.c

@@ -325,7 +325,6 @@ zocl_xclbin_load_pskernel(struct drm_zocl_dev *zdev, void *data, uint32_t slot_i
 		return ret;
 	}
 
-	slot->xclbin_type = ZOCL_XCLBIN_TYPE_FULL;
 	/* Get full axlf header */
 	size_of_header = sizeof(struct axlf_section_header);
 	num_of_sections = axlf_head->m_header.m_numSections-1;

src/runtime_src/core/edge/include/zynq_ioctl.h

@@ -297,7 +297,7 @@ struct drm_zocl_pwrite_bo {
  * @handle:	GEM object handle
  * @pad:	Padding
  * @offset:	Offset into the object to read from
- * @size:	Length of data to wrreadite
+ * @size:	Length of data to read
  * @data_ptr:	Pointer to write the data into (pointers not 32/64 compatible)
  */
 struct drm_zocl_pread_bo {
@@ -423,7 +423,7 @@ struct drm_zocl_hw_ctx_execbuf {
 };
 
 /*
- * enum drm_zocl_platform_flags - can be used for axlf bitstream
+ * enum drm_zocl_axlf_flags - platform and load flags for axlf bitstream
  */
 enum drm_zocl_axlf_flags {
 	DRM_ZOCL_PLATFORM_BASE		= 0,
@@ -558,10 +558,8 @@ struct drm_zocl_close_cu_ctx {
  * used with DRM_IOCTL_ZOCL_OPEN_GRAPH_CTX
  *
  * @hw_context:	Open a graph context under this hw context handle
- * @graph_name:	Name of the graph on the device image for which the open context is being made
  * @flags:	Shared or Exclusive context (ZOCL_CTX_SHARED/ZOCL_CTX_EXCLUSIVE)
  * @graph_id:	graph id
- * @graph_context:	Reture the acquired graph index. This will be required for closing
  */
 struct drm_zocl_open_graph_ctx {
 	uint32_t	hw_context;

src/runtime_src/core/edge/user/shim.cpp

@@ -685,7 +685,7 @@ xclLoadAxlf(const axlf *buffer)
   std::string dtbo_path("");
 
 #ifndef __HWEM__
-  auto is_pr_platform = (buffer->m_header.m_mode == XCLBIN_PR || buffer->m_header.m_actionMask & AM_LOAD_PDI);
+  auto is_pr_platform = buffer->m_header.m_mode == XCLBIN_PR;
   auto is_flat_enabled = xrt_core::config::get_enable_flat(); //default value is false
   auto force_program = xrt_core::config::get_force_program_xclbin(); //default value is false
   auto overlay_header = xclbin::get_axlf_section(buffer, axlf_section_kind::OVERLAY);
@@ -1180,9 +1180,9 @@ int shim::prepare_hw_axlf(const axlf *buffer, struct drm_zocl_axlf *axlf_obj)
   std::string dtbo_path("");
 
 #ifndef __HWEM__
-  auto is_pr_platform = (buffer->m_header.m_mode == XCLBIN_PR || buffer->m_header.m_actionMask & AM_LOAD_PDI);
+  auto is_pr_platform = buffer->m_header.m_mode == XCLBIN_PR;
   auto is_flat_enabled = xrt_core::config::get_enable_flat(); //default value is false
-  auto force_program = xrt_core::config::get_force_program_xclbin() || buffer->m_header.m_actionMask & AM_LOAD_PDI;
+  auto force_program = xrt_core::config::get_force_program_xclbin();
   auto overlay_header = xclbin::get_axlf_section(buffer, axlf_section_kind::OVERLAY);
 
   if (is_pr_platform)