Sync with open-amp project sha1 5fce292fd447

Synchronize code with sha1 5fce292fd447c2396731efeb7852ab7d84454aa1 Signed-off-by: Iuliana Prodan <[email protected]>
tomi-font · Oct 19, 2023 · 161567e · 161567e
1 parent 42b7c57
commit 161567e
Show file tree

Hide file tree

Showing 19 changed files with 1,355 additions and 404 deletions.
diff --git a/open-amp/README.md b/open-amp/README.md
@@ -96,6 +96,9 @@ library for it project:
   enabled on buffers.
 * **WITH_DCACHE_RSC_TABLE** (default OFF): Build with data cache operations
   enabled on resource table.
+* **WITH_DCACHE** (default OFF): Build with all cache operations
+  enabled. When set to ON, cache operations for vrings, buffers and resource
+  table are enabled.
 * **RPMSG_BUFFER_SIZE** (default 512): adjust the size of the RPMsg buffers.
   The default value of the RPMsg size is compatible with the Linux Kernel hard
   coded value. If you AMP configuration is Linux kernel host/ OpenAMP remote,

diff --git a/open-amp/cmake/options.cmake b/open-amp/cmake/options.cmake
@@ -78,22 +78,37 @@ if (NOT WITH_VIRTIO_DEVICE AND NOT WITH_VIRTIO_SLAVE)
 	add_definitions(-DVIRTIO_DRIVER_ONLY)
 endif (NOT WITH_VIRTIO_DEVICE AND NOT WITH_VIRTIO_SLAVE)
 
+option (WITH_VIRTIO_MMIO_DRV "Build with virtio mmio driver support enabled" OFF)
+
+if (WITH_VIRTIO_MMIO_DRV)
+  add_definitions(-DWITH_VIRTIO_MMIO_DRV)
+endif (WITH_VIRTIO_MMIO_DRV)
+
+option (WITH_DCACHE "Build with all cache operations enabled" OFF)
+
+if (WITH_DCACHE)
+  add_definitions(-DVIRTIO_USE_DCACHE)
+endif (WITH_DCACHE)
+
 option (WITH_DCACHE_VRINGS "Build with vrings cache operations enabled" OFF)
 
 if (WITH_DCACHE_VRINGS)
   add_definitions(-DVIRTIO_CACHED_VRINGS)
+  message(DEPRECATION "deprecated cmake option replaced by WITH_DCACHE" ...)
 endif (WITH_DCACHE_VRINGS)
 
-option (WITH_DCACHE_BUFFERS "Build with vrings cache operations enabled" OFF)
+option (WITH_DCACHE_BUFFERS "Build with buffers cache operations enabled" OFF)
 
 if (WITH_DCACHE_BUFFERS)
   add_definitions(-DVIRTIO_CACHED_BUFFERS)
+  message(DEPRECATION "deprecated cmake option replaced by WITH_DCACHE" ...)
 endif (WITH_DCACHE_BUFFERS)
 
 option (WITH_DCACHE_RSC_TABLE "Build with resource table cache operations enabled" OFF)
 
 if (WITH_DCACHE_RSC_TABLE)
   add_definitions(-DVIRTIO_CACHED_RSC_TABLE)
+  message(DEPRECATION "deprecated cmake option replaced by WITH_DCACHE" ...)
 endif (WITH_DCACHE_RSC_TABLE)
 
 # Set the complication flags

diff --git a/open-amp/lib/CMakeLists.txt b/open-amp/lib/CMakeLists.txt
@@ -10,6 +10,9 @@ collect (PROJECT_LIB_SOURCES version.c)
 add_subdirectory (virtio)
 add_subdirectory (rpmsg)
 add_subdirectory (remoteproc)
+if (WITH_VIRTIO_MMIO_DRV)
+add_subdirectory (virtio_mmio)
+endif (WITH_VIRTIO_MMIO_DRV)
 
 if (WITH_PROXY)
   add_subdirectory (proxy)