cmake: platforms: xlnx: Update machine from 'zynqmp_' to 'xlnx_' #305

bentheredonethat · 2024-08-15T13:35:23Z

Match update so that the cmake platform files are coupled to vendor and not SOC which is previously 'zynqmp_'.

bentheredonethat · 2024-09-06T15:12:36Z

@arnopo @wmamills updated .cmake file names

arnopo

LGTM

edmooring

Looks good to go.

xiaoxiang781216 · 2024-10-08T07:32:06Z

cmake/platforms/xlnx-a53-freertos.cmake

@@ -1,5 +1,5 @@
 set (CMAKE_SYSTEM_PROCESSOR "aarch64"           CACHE STRING "")
-set (MACHINE                "zynqmp_a53"        CACHE STRING "")


keep the alignement

After addressing this comment it's good to go.

but still not aligned

xiaoxiang781216 · 2024-10-12T01:41:17Z

cmake/platforms/xlnx-r5-freertos.cmake

@@ -1,5 +1,5 @@
 set (CMAKE_SYSTEM_PROCESSOR "arm"              CACHE STRING "")
-set (MACHINE                "zynqmp_r5"        CACHE STRING "")
+set (MACHINE                "xlnx_r5"        CACHE STRING "")


xiaoxiang781216 · 2024-10-12T01:41:22Z

cmake/platforms/xlnx-r5-generic.cmake

@@ -1,5 +1,5 @@
 set (CMAKE_SYSTEM_PROCESSOR "arm"              CACHE STRING "")
-set (MACHINE                "zynqmp_r5"        CACHE STRING "")
+set (MACHINE                "xlnx_r5"        CACHE STRING "")


xiaoxiang781216 · 2024-10-12T01:41:38Z

cmake/platforms/xlnx-a53-freertos.cmake

@@ -1,5 +1,5 @@
 set (CMAKE_SYSTEM_PROCESSOR "aarch64"           CACHE STRING "")
-set (MACHINE                "zynqmp_a53"        CACHE STRING "")


but still not aligned

xiaoxiang781216 · 2024-10-12T01:41:46Z

cmake/platforms/xlnx-a53-generic.cmake

@@ -1,5 +1,5 @@
 set (CMAKE_SYSTEM_PROCESSOR "aarch64"           CACHE STRING "")
-set (MACHINE                "zynqmp_a53"        CACHE STRING "")
+set (MACHINE                "xlnx_a53"        CACHE STRING "")


arnopo · 2024-10-17T14:16:02Z

@bentheredonethat could you address the comment that we merge it for this release ( code freeze tomorrow evening)?

tnmysh · 2024-10-17T14:49:06Z

@bentheredonethat could you address the comment that we merge it for this release ( code freeze tomorrow evening)?

He is on vacation right now. I am not sure if I can push changes in this PR. I will find a way if it's possible, I will do it.

tnmysh · 2024-10-17T17:50:19Z

As discussed in RP call, this will be merged after release.

CC: @arnopo, @bentheredonethat

bentheredonethat · 2024-11-13T15:18:43Z

@xiaoxiang781216 @arnopo updted with alignment

Add IPI uio based API implementation. Signed-off-by: Wendy Liang <wendy.liang@xilinx.com>

Add IPI mailbox IPI implementation with the remoteproc kick sysfs API. Signed-off-by: Wendy Liang <wendy.liang@xilinx.com>

Change to use IPI common API so that it can swtich from IPI uio implementaion or IPI rproc sysfs implementation. Signed-off-by: Wendy Liang <wendy.liang@xilinx.com>

Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

Previously, TTC and IPI variables within libmetal demo for linux were hardcoded for zynqmp SoC. Now TTC and IPI are set based on whether target is zynqmp or versal. Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

Previously, TTC and IPI variables within libmetal demo for baremetal were hardcoded for zynqmp SoC. Now TTC and IPI are set based on whether target is zynqmp or versal. Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

Previously, TTC and IPI variables within libmetal demo for FreeRTOS were hardcoded for zynqmp SoC. Now TTC and IPI are set based on whether target is zynqmp or versal. Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

Correct integer arithmetic errors in computing average latency. Collect and show min, max latency in addition to the average. Use floating point to compute and show throughput. Signed-off-by: Sergei Korneichuk <sergei.korneichuk@xilinx.com> Acked-by: ben Levinsky <ben.levinsky@xilinx.com>

Add an option to set METAL_LOG_DEBUG from the command line. Signed-off-by: Sergei Korneichuk <sergei.korneichuk@xilinx.com> Acked-for-series: Tanmay Shah <tanmay.shah@xilinx.com>

Update and keep the original ML_ERR, ML_INFO, ML_DBG. Revert this commit when the OpenAMP code is converted to use the new metal_*() macros. Signed-off-by: Sergei Korneichuk <sergei.korneichuk@amd.com>

Set WITH_FUNC_LINE_LOG to ON to match the original function, line number prefix in ML_ERR, ML_INFO, ML_DBG macros. Signed-off-by: Sergei Korneichuk <sergei.korneichuk@amd.com>

Add test to ensure that a linux device with multiple IO regions has each made accessible for both Read and Write and that each has IO regions created. Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com> Acked-by: Sergei Korneichuk <sergei.korneichuk@xilinx.com>

… Flow When building with freertos demo in System Device Tree (SDT) workflow, the application fails to build because it is set to extern. This symbol is not found in the SDT BSP. Match generic Libmetal AMP Demo and set this symbol to static to fix compilation issue. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> tanmay.shah@amd.com

There is compilation error of the Linux ZynqMP AMP Demo in shmem_throughput_demo.c due to the MB definition being re-defined. The MB symbol is provided in lib/utilities.h as part of commit 7643dda ("lib: utilities: Match upstream for MB/GB macros") Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Sergei Korneichuk <sergei.korneichuk@amd.com>

Enable Libmetal AMP Demo build for ZynqMP, Versal and Versal NET SOC's by: 1. Enable CMake build to pass in linker flags. This will enable Xilinx-AMD System Device Tree Flow BSP-based tooling to pass required linker flags 2. Enable System Device Flow compliant linker script where many sections are placed in DDR for space and entry point provided by BSP is _vector_table instead of _boot 3. Ensure symbols are present for both classic and System Device Flow flow for each of the above SOC's. Also improve readability by moving symbol definitions to common.h Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-for-series: Sergei Korneichuk <sergei.korneichuk@amd.com>

…resent Currently the file bspconfig.h file is used to determine if System Device Tree workflow is being used. Instead change condition to be if SDT is in CMAKE_C_FLAGS variable. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Sergei Korneichuk <sergei.korneichuk@amd.com>

Ensure that Versal-NET IPI values are present for Libmetal AMP Demo on Linux platform. As part of this, also copy convention in zynqmp_r5 area and move values to common.h Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Sergei Korneichuk <sergei.korneichuk@amd.com>

Base address is ff3600000. Remove extra zero. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Tanmay Shah <tanmay.shah@amd.com>

Enable application values for Linux platform to be overwritten via CMake Configure step. Also ZynqMP Bitmask is incorrect. Make sure it properly kicks RPU0. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Tanmay Shah <tanmay.shah@amd.com>

…nt in SDT flow As in SDT Workflow for Rigel there can be template application in BSP for Libmetal, let Rigel manage the dependency for template application in that case. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Tanmay Shah <tanmay.shah@amd.com>

Push required linking libs to CMake so that surrounding tooling does not have to manage pushing these in. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Reviewed-by: Tanmay Shah <tanmay.shah@amd.com>

…m Device Flow flow Port changes in 38d2939 to FreeRTOS demo Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Rajiv Mohan <rajiv.mohan@amd.com>

Enable CMake tooling to designate output ELF name for FreeRTOS and Standalone targets. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Reviewed-by: Tanmay Shah <tanmay.shah@amd.com> Signed-off-by: Ben Levinsky <ben.levinsky@amd.com>

arnopo · 2024-11-19T13:48:36Z

@bentheredonethat could you rebase on main please?

@tnmysh could you review it that I merge it, please?

Match update so that the cmake platform files are coupled to vendor and not SOC which is previously 'zynqmp_'. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com>

bentheredonethat · 2024-11-19T15:15:22Z

@arnopo rebased

arnopo · 2024-11-26T12:53:24Z

@arnopo rebased
Seems that you have rebased too many things ;-)

arnopo requested review from edmooring, arnopo and tnmysh September 5, 2024 15:33

bentheredonethat force-pushed the update-xlnx-cmake-files branch from b15c31d to 9c7ba51 Compare September 6, 2024 15:12

arnopo requested a review from wmamills September 9, 2024 07:05

arnopo approved these changes Sep 9, 2024

View reviewed changes

edmooring approved these changes Oct 4, 2024

View reviewed changes

xiaoxiang781216 reviewed Oct 8, 2024

View reviewed changes

xiaoxiang781216 reviewed Oct 12, 2024

View reviewed changes

arnopo added this to the Release v2024.10 milestone Oct 17, 2024

arnopo removed this from the Release v2024.10 milestone Oct 18, 2024

bentheredonethat force-pushed the update-xlnx-cmake-files branch from 9c7ba51 to c97dab1 Compare November 13, 2024 15:18

Wendy Liang and others added 13 commits November 13, 2024 07:22

examples: linux: zynqmp: Add IPI uio based API implementation

130a908

Add IPI uio based API implementation. Signed-off-by: Wendy Liang <wendy.liang@xilinx.com>

examples: linux: add IPI with R5 rproc kick sysfs impelmentation

82f7603

Add IPI mailbox IPI implementation with the remoteproc kick sysfs API. Signed-off-by: Wendy Liang <wendy.liang@xilinx.com>

examples: linux: zynqmp: Use IPI commit API

81ca995

Change to use IPI common API so that it can swtich from IPI uio implementaion or IPI rproc sysfs implementation. Signed-off-by: Wendy Liang <wendy.liang@xilinx.com>

examples: linux: libmetal_amp_demod: add macro guards for IPI

c2533b4

Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

examples: linux: zynqmp_r5: dynamically set TTC and IPI vars

9f4a838

Previously, TTC and IPI variables within libmetal demo for linux were hardcoded for zynqmp SoC. Now TTC and IPI are set based on whether target is zynqmp or versal. Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

examples: generic: zynqmp_r5: dynamically set TTC and IPI vars

6c174a7

Previously, TTC and IPI variables within libmetal demo for baremetal were hardcoded for zynqmp SoC. Now TTC and IPI are set based on whether target is zynqmp or versal. Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

examples: freertos: zynqmp_r5: dynamically set TTC and IPI vars

1b5b5a5

Previously, TTC and IPI variables within libmetal demo for FreeRTOS were hardcoded for zynqmp SoC. Now TTC and IPI are set based on whether target is zynqmp or versal. Signed-off-by: Ben Levinsky <ben.levinsky@xilinx.com>

examples: linux: add an option to set debug log level

75159e7

Add an option to set METAL_LOG_DEBUG from the command line. Signed-off-by: Sergei Korneichuk <sergei.korneichuk@xilinx.com> Acked-for-series: Tanmay Shah <tanmay.shah@xilinx.com>

log: update ML_ERR, ML_INFO, ML_DBG macros

c7edeb0

Update and keep the original ML_ERR, ML_INFO, ML_DBG. Revert this commit when the OpenAMP code is converted to use the new metal_*() macros. Signed-off-by: Sergei Korneichuk <sergei.korneichuk@amd.com>

log: default to function, line number prefix

ed732a9

Set WITH_FUNC_LINE_LOG to ON to match the original function, line number prefix in ML_ERR, ML_INFO, ML_DBG macros. Signed-off-by: Sergei Korneichuk <sergei.korneichuk@amd.com>

bentheredonethat added 10 commits November 13, 2024 07:48

examples: linux: zynqmp: Fix Typo in ZynqMP IPI Base address

22e8f5f

Base address is ff3600000. Remove extra zero. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Tanmay Shah <tanmay.shah@amd.com>

examples: zynqmp_r5: CMake: Add SDT-required libs as link dependencies

8eca38f

Push required linking libs to CMake so that surrounding tooling does not have to manage pushing these in. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Reviewed-by: Tanmay Shah <tanmay.shah@amd.com>

examples: freertos: zynqmp_r5: zynqmp_amp_demo: Add symbols for Syste…

7ae1fe9

…m Device Flow flow Port changes in 38d2939 to FreeRTOS demo Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Acked-by: Rajiv Mohan <rajiv.mohan@amd.com>

tnmysh approved these changes Nov 19, 2024

View reviewed changes

cmake: platforms: xlnx: Update machine from 'zynqmp_' to 'xlnx_'

9dbceb6

Match update so that the cmake platform files are coupled to vendor and not SOC which is previously 'zynqmp_'. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com>

bentheredonethat force-pushed the update-xlnx-cmake-files branch from c97dab1 to 9dbceb6 Compare November 19, 2024 15:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cmake: platforms: xlnx: Update machine from 'zynqmp_' to 'xlnx_' #305

cmake: platforms: xlnx: Update machine from 'zynqmp_' to 'xlnx_' #305

bentheredonethat commented Aug 15, 2024

bentheredonethat commented Sep 6, 2024

arnopo left a comment

edmooring left a comment

xiaoxiang781216 Oct 8, 2024

tnmysh Oct 11, 2024

xiaoxiang781216 Oct 12, 2024

xiaoxiang781216 Oct 12, 2024

xiaoxiang781216 Oct 12, 2024

xiaoxiang781216 Oct 12, 2024

xiaoxiang781216 Oct 12, 2024

arnopo commented Oct 17, 2024

tnmysh commented Oct 17, 2024

tnmysh commented Oct 17, 2024

bentheredonethat commented Nov 13, 2024

arnopo commented Nov 19, 2024

bentheredonethat commented Nov 19, 2024

arnopo commented Nov 26, 2024

		@@ -1,5 +1,5 @@
		set (CMAKE_SYSTEM_PROCESSOR "aarch64" CACHE STRING "")
		set (MACHINE "zynqmp_a53" CACHE STRING "")

cmake: platforms: xlnx: Update machine from 'zynqmp_' to 'xlnx_' #305

Are you sure you want to change the base?

cmake: platforms: xlnx: Update machine from 'zynqmp_' to 'xlnx_' #305

Conversation

bentheredonethat commented Aug 15, 2024

bentheredonethat commented Sep 6, 2024

arnopo left a comment

Choose a reason for hiding this comment

edmooring left a comment

Choose a reason for hiding this comment

xiaoxiang781216 Oct 8, 2024

Choose a reason for hiding this comment

tnmysh Oct 11, 2024

Choose a reason for hiding this comment

xiaoxiang781216 Oct 12, 2024

Choose a reason for hiding this comment

xiaoxiang781216 Oct 12, 2024

Choose a reason for hiding this comment

xiaoxiang781216 Oct 12, 2024

Choose a reason for hiding this comment

xiaoxiang781216 Oct 12, 2024

Choose a reason for hiding this comment

xiaoxiang781216 Oct 12, 2024

Choose a reason for hiding this comment

arnopo commented Oct 17, 2024

tnmysh commented Oct 17, 2024

tnmysh commented Oct 17, 2024

bentheredonethat commented Nov 13, 2024

arnopo commented Nov 19, 2024

bentheredonethat commented Nov 19, 2024

arnopo commented Nov 26, 2024