tests: gatempapp: update cmem and sr0 addresses to align with kernel

Update the cmem and sr0 addresses to align with default values for
linux kernel.

Signed-off-by: Angela Stegmaier <angelabaker@ti.com>

3 files changed, 23 insertions, 9 deletions

diff --git a/packages/ti/ipc/tests/gatempapp.c b/packages/ti/ipc/tests/gatempapp.c
index 09b4407..6e048a7 100644
--- a/packages/ti/ipc/tests/gatempapp.c
+++ b/packages/ti/ipc/tests/gatempapp.c
@@ -55,6 +55,7 @@
 #include <ti/ipc/MessageQ.h>
 #include <ti/ipc/MultiProc.h>
 #include <ti/ipc/GateMP.h>
+#include <ti/ipc/remoteproc/Resource.h>
 
 /* sytem header files */
 #include <stdlib.h>
@@ -63,9 +64,6 @@
 #include "gatempapp_rsc_table_vayu_dsp.h"
 #include "GateMPAppCommon.h"
 
-#define PHYSICAL_OFFSET  0xBA300000  /* base physical address of shared mem */
-#define VIRTUAL_OFFSET   0x80000000  /* base virtual address of shared mem */
-
 /* module structure */
 typedef struct {
     UInt16              hostProcId;         /* host processor id */
@@ -183,7 +181,10 @@ Int Server_exec()
     physAddr = msg->payload;
 
     /* translate the physical address to slave virtual addr */
-    intPtr = (volatile UInt32 *)(physAddr - PHYSICAL_OFFSET + VIRTUAL_OFFSET);
+    if (Resource_physToVirt(physAddr, (UInt32 *)&intPtr)) {
+        Log_error1("Server_exec: Failed to translate phys addr %p to virt addr", physAddr);
+        goto leave;
+    }
 
     /* send message back */
     queId = MessageQ_getReplyQueue(msg); /* type-cast not needed */
diff --git a/packages/ti/ipc/tests/gatempapp_rsc_table_vayu_dsp.h b/packages/ti/ipc/tests/gatempapp_rsc_table_vayu_dsp.h
index 55b48b8..f1471fb 100644
--- a/packages/ti/ipc/tests/gatempapp_rsc_table_vayu_dsp.h
+++ b/packages/ti/ipc/tests/gatempapp_rsc_table_vayu_dsp.h
@@ -82,10 +82,11 @@
 #define DSP_MEM_IOBUFS          0x80000000
 #define DSP_MEM_DATA            0x95100000
 #define DSP_MEM_HEAP            0x95200000
+#define DSP_MEM_CMEM            0x95500000
 
 //0x85900000
-#define DSP_SR0_VIRT            0xBFC00000
-#define DSP_SR0                 0xBFC00000
+#define DSP_SR0_VIRT            0xBFD00000
+#define DSP_SR0                 0xBFD00000
 
 #define DSP_MEM_IPC_DATA        0x9F000000
 #define DSP_MEM_IPC_VRING       0xA0000000
@@ -101,6 +102,7 @@
 #define DSP_MEM_HEAP_SIZE       (SZ_1M * 3)
 #define DSP_MEM_IOBUFS_SIZE     (SZ_1M * 89)
 #define DSP_SR0_SIZE            (SZ_1M * 1)
+#define DSP_MEM_CMEM_SIZE       (SZ_1M * 4)
 
 /*
  * Assign fixed RAM addresses to facilitate a fixed MMU table.
@@ -110,6 +112,7 @@
 
 /* Need to be identical to that of IPU */
 #define PHYS_MEM_IOBUFS         0xBA300000
+#define PHYS_MEM_CMEM           0x95400000
 
 /*
  * Sizes of the virtqueues (expressed in number of buffers supported,
@@ -124,7 +127,7 @@
 struct my_resource_table {
     struct resource_table base;
 
-    UInt32 offset[19];  /* Should match 'num' in actual definition */
+    UInt32 offset[20];  /* Should match 'num' in actual definition */
 
     /* rpmsg vdev entry */
     struct fw_rsc_vdev rpmsg_vdev;
@@ -184,6 +187,9 @@ struct my_resource_table {
 
     /* devmem entry */
     struct fw_rsc_devmem devmem12;
+
+    /* devmem entry */
+    struct fw_rsc_devmem devmem13;
 };
 
 extern char ti_trace_SysMin_Module_State_0_outbuf__A;
@@ -194,7 +200,7 @@ extern char ti_trace_SysMin_Module_State_0_outbuf__A;
 
 struct my_resource_table ti_ipc_remoteproc_ResourceTable = {
     1,      /* we're the first version that implements this */
-    19,     /* number of entries in the table */
+    20,     /* number of entries in the table */
     0, 0,   /* reserved, must be zero */
     /* offsets to entries */
     {
@@ -217,6 +223,7 @@ struct my_resource_table ti_ipc_remoteproc_ResourceTable = {
         offsetof(struct my_resource_table, devmem10),
         offsetof(struct my_resource_table, devmem11),
         offsetof(struct my_resource_table, devmem12),
+        offsetof(struct my_resource_table, devmem13),
     },
 
     /* rpmsg vdev entry */
@@ -271,6 +278,12 @@ struct my_resource_table ti_ipc_remoteproc_ResourceTable = {
 
     {
         TYPE_DEVMEM,
+        DSP_MEM_CMEM, PHYS_MEM_CMEM,
+        DSP_MEM_CMEM_SIZE, 0, 0, "DSP_MEM_CMEM",
+    },
+
+    {
+        TYPE_DEVMEM,
         DSP_TILER_MODE_0_1, L3_TILER_MODE_0_1,
         SZ_256M, 0, 0, "DSP_TILER_MODE_0_1",
     },
diff --git a/packages/ti/ipc/tests/package.bld b/packages/ti/ipc/tests/package.bld
index 47da580..eebfa03 100644
--- a/packages/ti/ipc/tests/package.bld
+++ b/packages/ti/ipc/tests/package.bld
@@ -214,7 +214,7 @@ Build.platformTable["ti.platforms.sdp5430:DSP"] = {
 /* Shared region definition used in GateMP app */
 var evmDRA7XX_SR_0 = {
         name: "SR_0", space: "data", access: "RWX",
-        base: 0xBFC00000, len: 0x100000,
+        base: 0xBFD00000, len: 0x100000,
         comment: "SR#0 Memory (1 MB)"
 };