From aa80beefd1588c9f4e3d10014880b859f25da008 Mon Sep 17 00:00:00 2001 From: Richard Byron Date: Wed, 20 May 2026 15:55:32 -0700 Subject: [PATCH] Fix for CR1254161 --- profile/device/aie_trace/aie_trace_offload.cpp | 6 ++---- profile/device/aie_trace/ve2/aie_trace_offload_ve2.cpp | 9 ++------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/profile/device/aie_trace/aie_trace_offload.cpp b/profile/device/aie_trace/aie_trace_offload.cpp index 789e5a71..2a0f58a4 100644 --- a/profile/device/aie_trace/aie_trace_offload.cpp +++ b/profile/device/aie_trace/aie_trace_offload.cpp @@ -33,7 +33,6 @@ * Only compile this on edge+versal build */ #if defined (XRT_ENABLE_AIE) && ! defined (XRT_X86_BUILD) && ! defined (XDP_CLIENT_BUILD) -#include #include "core/include/xrt.h" #include "core/edge/user/shim.h" #endif @@ -213,10 +212,9 @@ bool AIETraceOffload::initReadTrace() if(XRT_NULL_BO_EXPORT == boExportHandle) { throw std::runtime_error("Unable to export BO while attaching to AIE Driver"); } - XAie_MemAttach(devInst, &memInst, 0, 0, 0, prop, boExportHandle); + XAie_MemAttach(devInst, &memInst, 0, 0, bufAllocSz, prop, boExportHandle); - char* vaddr = reinterpret_cast(mmap(NULL, bufAllocSz, PROT_READ | PROT_WRITE, MAP_SHARED, boExportHandle, 0)); - XAie_DmaSetAddrLen(&(gmioDMAInsts[i].shimDmaInst), (uint64_t)vaddr, bufAllocSz); + XAie_DmaSetAddrOffsetLen(&(gmioDMAInsts[i].shimDmaInst), &memInst, 0, static_cast(bufAllocSz)); XAie_DmaEnableBd(&(gmioDMAInsts[i].shimDmaInst)); diff --git a/profile/device/aie_trace/ve2/aie_trace_offload_ve2.cpp b/profile/device/aie_trace/ve2/aie_trace_offload_ve2.cpp index 83a514b5..8f98e900 100644 --- a/profile/device/aie_trace/ve2/aie_trace_offload_ve2.cpp +++ b/profile/device/aie_trace/ve2/aie_trace_offload_ve2.cpp @@ -36,11 +36,7 @@ #include "xdp/profile/plugin/aie_trace/x86/aie_trace_kernel_config.h" #include -#include - - - namespace xdp { @@ -152,10 +148,9 @@ bool AIETraceOffload::initReadTrace() if(XRT_NULL_BO_EXPORT == boExportHandle) { throw std::runtime_error("Unable to export BO while attaching to AIE Driver"); } - XAie_MemAttach(devInst, &memInst, 0, 0, 0, prop, boExportHandle); + XAie_MemAttach(devInst, &memInst, 0, 0, bufAllocSz, prop, boExportHandle); - char* vaddr = reinterpret_cast(mmap(NULL, bufAllocSz, PROT_READ | PROT_WRITE, MAP_SHARED, boExportHandle, 0)); - XAie_DmaSetAddrLen(&(gmioDMAInsts[i].shimDmaInst), (uint64_t)vaddr, bufAllocSz); + XAie_DmaSetAddrOffsetLen(&(gmioDMAInsts[i].shimDmaInst), &memInst, 0, static_cast(bufAllocSz)); XAie_DmaEnableBd(&(gmioDMAInsts[i].shimDmaInst));