Xilinx · stephenneuendorffer · Nov 21, 2023 · Dec 14, 2023 · Dec 14, 2023 · Jan 4, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.so*
+driver/include
diff --git a/driver/src/common/xaie_helper.c b/driver/src/common/xaie_helper.c
@@ -1756,7 +1756,7 @@ AieRC XAie_AddCustomTxnOp(XAie_DevInst *DevInst, u8 OpNumber, void* Args, size_t
 
 		/* check memory allocation before increase Cmd vector */
 		char* tmpBuff = malloc(size);
-		if(tmpBuff == 0U) {
+		if(tmpBuff == NULL) {
 			XAIE_ERROR("Fail to malloc %d size memory for DataPtr\n", size);
 			return XAIE_ERR;
 		}

diff --git a/driver/src/common/xaie_helper.h b/driver/src/common/xaie_helper.h
@@ -87,14 +87,8 @@
 /* Generate value with a set bit at given Index */
 #define BIT(Index)		(1 << (Index))
 
-/*
- * __attribute is not supported for windows. remove it conditionally.
- */
-#ifdef _MSC_VER
-#define XAIE_PACK_ATTRIBUTE
-#else
-#define XAIE_PACK_ATTRIBUTE  __attribute__((packed, aligned(4)))
-#endif
+/* Suppress warning of unused parameter */
+#define UNUSED(_x) (_x = _x)
 
 /* Data structure to capture the dma status */
 typedef struct {

diff --git a/driver/src/common/xaie_txn.h b/driver/src/common/xaie_txn.h
@@ -39,7 +39,8 @@ typedef enum {
 	XAIE_IO_CUSTOM_OP_TCT = XAIE_IO_CUSTOM_OP_BEGIN,
 	XAIE_IO_CUSTOM_OP_DDR_PATCH,
 	XAIE_IO_CUSTOM_OP_NEXT,
-	XAIE_IO_CUSTOM_OP_MAX = UCHAR_MAX,
+	/* add new op here */
+	XAIE_IO_CUSTOM_OP_MAX
 } XAie_TxnOpcode;
 
 struct XAie_TxnCmd {

diff --git a/driver/src/core/xaie_core_aie.c b/driver/src/core/xaie_core_aie.c
@@ -21,8 +21,6 @@
 *
 ******************************************************************************/
 /***************************** Include Files *********************************/
-#include <unistd.h>
-
 #include "xaie_core_aie.h"
 #include "xaie_events_aie.h"
 #include "xaie_feature_config.h"

diff --git a/driver/src/core/xaie_elfloader.c b/driver/src/core/xaie_elfloader.c
@@ -595,7 +595,7 @@ AieRC XAie_LoadElfPartial(XAie_DevInst *DevInst, XAie_LocType Loc,
 		return XAIE_INVALID_ARGS;
 	}
 
-	Fd = fopen(ElfPtr, "r");
+	Fd = fopen(ElfPtr, "rb");
 	if(Fd == XAIE_NULL) {
 		XAIE_ERROR("Unable to open elf file, %d: %s\n",
 			errno, strerror(errno));

diff --git a/driver/src/device/xaie_device_aie.c b/driver/src/device/xaie_device_aie.c
@@ -530,7 +530,6 @@ AieRC _XAie_RequestTiles(XAie_DevInst *DevInst, XAie_BackendTilesArray *Args)
 AieRC _XAie_SetColumnClk(XAie_DevInst *DevInst, XAie_BackendColumnReq *Args)
 {
 	AieRC RC;
-	u8 flag;
 	u32 StartBit, EndBit;
 
 	u32 PartEndCol = DevInst->StartCol + DevInst->NumCols - 1;

diff --git a/driver/src/device/xaie_device_aieml.c b/driver/src/device/xaie_device_aieml.c
@@ -50,16 +50,13 @@
 ******************************************************************************/
 u8 _XAieMl_GetTTypefromLoc(XAie_DevInst *DevInst, XAie_LocType Loc)
 {
-	u8 ColType;
-
 	if(Loc.Col >= DevInst->NumCols) {
 		XAIE_ERROR("Invalid column: %d\n", Loc.Col);
 		return XAIEGBL_TILE_TYPE_MAX;
 	}
 
 	if(Loc.Row == 0U) {
-		ColType = (DevInst->StartCol + Loc.Col) % 4U;
-		if((ColType == 0U) || (ColType == 1U)) {
+		if((DevInst->StartCol + Loc.Col) == 0U) {
 			return XAIEGBL_TILE_TYPE_SHIMPL;
 		}
 
@@ -431,8 +428,6 @@ static AieRC _XAieMl_PmSetShimClk(XAie_DevInst *DevInst,
 AieRC _XAieMl_SetColumnClk(XAie_DevInst *DevInst, XAie_BackendColumnReq *Args)
 {
 	AieRC RC;
-	u32 ColClockStatus;
-
 	u32 StartBit, EndBit;
 	u32 PartEndCol = DevInst->StartCol + DevInst->NumCols - 1;
 

diff --git a/driver/src/global/xaiegbl.c b/driver/src/global/xaiegbl.c
@@ -185,7 +185,8 @@ AieRC XAie_CfgInitialize(XAie_DevInst *InstPtr, XAie_Config *ConfigPtr)
 	InstPtr->MemTileNumRows = ConfigPtr->MemTileNumRows;
 	InstPtr->AieTileRowStart = ConfigPtr->AieTileRowStart;
 	InstPtr->AieTileNumRows = ConfigPtr->AieTileNumRows;
-	InstPtr->EccStatus = XAIE_ENABLE;
+	//InstPtr->EccStatus = XAIE_ENABLE;
+	InstPtr->EccStatus = XAIE_DISABLE; // IPU
 	InstPtr->TxnList.Next = NULL;
 
 	RC = _XAie_RscMgrInit(InstPtr);
@@ -196,7 +197,7 @@ AieRC XAie_CfgInitialize(XAie_DevInst *InstPtr, XAie_Config *ConfigPtr)
 	memcpy(&InstPtr->PartProp, &ConfigPtr->PartProp,
 		sizeof(ConfigPtr->PartProp));
 
-	RC = XAie_IOInit(InstPtr);
+	RC = XAie_IOInit(InstPtr, ConfigPtr->Backend);
 	if(RC != XAIE_OK) {
 		return RC;
 	}
@@ -998,12 +999,11 @@ AieRC XAie_PerfUtilization(XAie_DevInst *DevInst, XAie_PerfInst *PerfInst)
 		PartRange.Num = DevInst->NumCols;
 		XAIE_DBG("Start Col: %d\tnum: %d\n", PartRange.Start, PartRange.Num);
 		PerfInst->Range = &PartRange;
-	} else if (PerfInst->Range->Num <= 0U ||
+	} else if (PerfInst->Range->Num == 0U ||
 			PerfInst->Range->Num > DevInst->NumCols) {
 		XAIE_ERROR("Invalid range!\n");
 		return XAIE_INVALID_ARGS;
-	} else if(PerfInst->Range->Start < 0U ||
-			PerfInst->Range->Start >= DevInst->NumCols) {
+	} else if(PerfInst->Range->Start >= DevInst->NumCols) {
 		XAIE_ERROR("Invalid range!\n");
 		return XAIE_INVALID_ARGS;
 	}

diff --git a/driver/src/global/xaiegbl.h b/driver/src/global/xaiegbl.h
@@ -92,6 +92,7 @@ typedef enum {
 	XAIE_IO_BACKEND_DEBUG, /* IO debug backend */
 	XAIE_IO_BACKEND_LINUX, /* Linux kernel backend */
 	XAIE_IO_BACKEND_SOCKET, /* Socket backend */
+	XAIE_IO_BACKEND_AMDAIR, /* Use with amdair driver */
 	XAIE_IO_BACKEND_MAX
 } XAie_BackendType;
 
@@ -182,6 +183,7 @@ typedef struct {
 	u8 AieTileRowStart;
 	u8 AieTileNumRows;
 	XAie_PartitionProp PartProp;
+	XAie_BackendType Backend;
 } XAie_Config;
 
 /*
@@ -763,7 +765,7 @@ static inline void XAie_SetupConfigPartProp(XAie_Config *ConfigPtr, u32 Nid,
 *		more memory from the user application for resource management.
 *
 *******************************************************************************/
-#define XAie_InstDeclare(Inst, ConfigPtr) XAie_DevInst Inst = { 0 }
+#define XAie_InstDeclare(Inst, ConfigPtr) XAie_DevInst Inst = {}
 
 /*****************************************************************************/
 /**

diff --git a/driver/src/global/xaiegbl_defs.h b/driver/src/global/xaiegbl_defs.h
@@ -66,6 +66,15 @@ typedef uint64_t		u64;
 
 #define __FORCE_INLINE__			__attribute__((always_inline))
 
+/*
+ * __attribute is not supported for windows. remove it conditionally.
+ */
+#ifdef _MSC_VER
+#define XAIE_PACK_ATTRIBUTE
+#else
+#define XAIE_PACK_ATTRIBUTE  __attribute__((packed, aligned(4)))
+#endif
+
 /************************** Variable Definitions *****************************/
 /************************** Function Prototypes  *****************************/
 #endif		/* end of protection macro */

diff --git a/driver/src/interrupt/xaie_interrupt_init.c b/driver/src/interrupt/xaie_interrupt_init.c
@@ -722,7 +722,7 @@ static AieRC XAie_ErrorHandlingReserveRsc(XAie_DevInst *DevInst)
 	}
 
 	for(u32 i = 0; i < ShimUserRscNum; i++) {
-		ShimRscsBc[i].Loc = (XAie_LocType)XAie_TileLoc((u8)i, 0);
+		ShimRscsBc[i].Loc = XAie_TileLoc((u8)i, 0);
 		ShimRscsBc[i].Mod = (u32)XAIE_PL_MOD;
 		ShimRscsBc[i].RscType = (u32)XAIE_BCAST_CHANNEL_RSC;
 	}