Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib: xlnx: Avoid mapping in MPU for region mapped by bsp #282

Merged
merged 1 commit into from
Feb 19, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 54 additions & 1 deletion lib/system/generic/xlnx/sys.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2022, Xilinx Inc. and Contributors. All rights reserved.
* Copyright (c) 2022-2023 Advanced Micro Devices, Inc. All Rights Reserved.
* Copyright (c) 2022-2024 Advanced Micro Devices, Inc. All Rights Reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
Expand Down Expand Up @@ -72,12 +72,65 @@ void metal_weak metal_generic_default_poll(void)
metal_asm volatile("wfi");
}

/*
* VERSAL_NET is used since XMpu_Config structure is
* different for r52(versal net) and r5(zynqmp) to avoid build failure
*/
#ifdef VERSAL_NET
void *metal_machine_io_mem_map_versal_net(void *va, metal_phys_addr_t pa,
size_t size, unsigned int flags)
{
void *__attribute__((unused)) physaddr;
u32 req_end_addr = pa + size;
XMpu_Config mpu_config;
u32 req_addr = pa;
u32 mmap_req = 1;
u32 base_end_addr;
u32 cnt;

/* Get the MPU Config enties */
Xil_GetMPUConfig(mpu_config);

for (cnt = 0; cnt < MAX_POSSIBLE_MPU_REGS; cnt++) {

if (!mpu_config[cnt].flags & XMPU_VALID_REGION)
continue;

base_end_addr = mpu_config[cnt].Size + mpu_config[cnt].BaseAddress;

if (mpu_config[cnt].BaseAddress <= req_addr && base_end_addr >= req_end_addr) {
/*
* Mapping available for requested region in MPU table
* If no change in Attribute for region then additional
* mapping in MPU table is not required
*/
if (mpu_config[cnt].Attribute == flags) {
mmap_req = 0;
break;
}
}
}

/* if mapping is required we call Xil_MemMap to get the mapping done */
if (mmap_req == 1) {
physaddr = Xil_MemMap(pa, size, flags);
metal_assert(physaddr == (void *)pa);
}

return va;
}
#endif

void *metal_machine_io_mem_map(void *va, metal_phys_addr_t pa,
size_t size, unsigned int flags)
{
void *__attribute__((unused)) physaddr;

#ifdef VERSAL_NET
va = metal_machine_io_mem_map_versal_net(va, pa, size, flags);
#else
physaddr = Xil_MemMap(pa, size, flags);
metal_assert(physaddr == (void *)pa);
#endif
return va;
}
Loading