Tests: Update Tests to Remove INTMEM type usage

Update the tests to remove usage of the INTMEM type
which is deprecated starting in Linux kernel 4.1.

Note that this is a compatibility break with k3.14
and the tests only support k4.1 and newer kernels
now.

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

diff --git a/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h b/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h
index ea4b7d06505153145d019b2a179febfdb77ecce0..79ba71da7202420c7073a1ee2a9bcf03f5477c2d 100644 (file)
--- a/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h
+++ b/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h
@@ -120,7 +120,7 @@
 struct my_resource_table {
     struct resource_table base;
 
-    UInt32 offset[18];  /* Should match 'num' in actual definition */
+    UInt32 offset[17];  /* Should match 'num' in actual definition */
 
     /* rpmsg vdev entry */
     struct fw_rsc_vdev rpmsg_vdev;

diff --git a/packages/ti/ipc/tests/Dsp_vayu_power.cfg b/packages/ti/ipc/tests/Dsp_vayu_power.cfg
index 41ace57c89fefc5f55f323e78a115173549b48cd..e60eb83443530de170039c7afd4e83adcac1adcc 100644 (file)
--- a/packages/ti/ipc/tests/Dsp_vayu_power.cfg
+++ b/packages/ti/ipc/tests/Dsp_vayu_power.cfg
@@ -45,6 +45,4 @@ Idle.addFunc('&IpcPower_idle'); /* IpcPower_idle must be at the end */
  * IpcPower_callIdle must be placed in L2SRAM and not external memory
  * to avoid CPU hang when going into idle
  */
-var Resource = xdc.useModule('ti.ipc.remoteproc.Resource');
-Resource.customTable = true;
 Program.sectMap[".text:IpcPower_callIdle"] = "L2SRAM";

diff --git a/packages/ti/ipc/tests/power_rsc_table_vayu_dsp.h b/packages/ti/ipc/tests/power_rsc_table_vayu_dsp.h
deleted file mode 100644 (file)
index 4370776..0000000
--- a/packages/ti/ipc/tests/power_rsc_table_vayu_dsp.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright (c) 2015, Texas Instruments Incorporated
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * *  Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * *  Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * *  Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- *  ======== power_rsc_table_vayu_dsp.h ========
- *
- *  Define the resource table entries for all DSP cores. This adds
- *  an entry on top of the default resource table for L2 internal memory,
- *  in order to accomodate for a silicon bug workaround.
- *
- */
-
-#ifndef _POWER_RSC_TABLE_VAYU_DSP_H_
-#define _POWER_RSC_TABLE_VAYU_DSP_H_
-
-#include <ti/ipc/remoteproc/rsc_types.h>
-
-/* DSP Memory Map */
-#define L4_DRA7XX_BASE          0x4A000000
-
-#define L4_PERIPHERAL_L4CFG     (L4_DRA7XX_BASE)
-#define DSP_PERIPHERAL_L4CFG    0x4A000000
-
-#define L4_PERIPHERAL_L4PER1    0x48000000
-#define DSP_PERIPHERAL_L4PER1   0x48000000
-
-#define L4_PERIPHERAL_L4PER2    0x48400000
-#define DSP_PERIPHERAL_L4PER2   0x48400000
-
-#define L4_PERIPHERAL_L4PER3    0x48800000
-#define DSP_PERIPHERAL_L4PER3   0x48800000
-
-#define L4_PERIPHERAL_L4EMU     0x54000000
-#define DSP_PERIPHERAL_L4EMU    0x54000000
-
-#define L3_PERIPHERAL_DMM       0x4E000000
-#define DSP_PERIPHERAL_DMM      0x4E000000
-
-#define L3_TILER_MODE_0_1       0x60000000
-#define DSP_TILER_MODE_0_1      0x60000000
-
-#define L3_TILER_MODE_2         0x70000000
-#define DSP_TILER_MODE_2        0x70000000
-
-#define L3_TILER_MODE_3         0x78000000
-#define DSP_TILER_MODE_3        0x78000000
-
-#define DSP_MEM_TEXT            0x95000000
-/* Co-locate alongside TILER region for easier flushing */
-#define DSP_MEM_IOBUFS          0x80000000
-#define DSP_MEM_DATA            0x95100000
-#define DSP_MEM_HEAP            0x95200000
-#define DSP_INTMEM_L2           0x800000
-#if defined (DSP_1)
-#define PHYS_MEM_L2_RAM         0x40800000
-#elif defined (DSP_2)
-#define PHYS_MEM_L2_RAM         0x41000000
-#endif
-#define DSP_MEM_L2_RAM_SIZE   0x00040000
-
-#define DSP_MEM_IPC_DATA        0x9F000000
-#define DSP_MEM_IPC_VRING       0xA0000000
-#define DSP_MEM_RPMSG_VRING0    0xA0000000
-#define DSP_MEM_RPMSG_VRING1    0xA0004000
-#define DSP_MEM_VRING_BUFS0     0xA0040000
-#define DSP_MEM_VRING_BUFS1     0xA0080000
-
-#define DSP_MEM_IPC_VRING_SIZE  SZ_1M
-#define DSP_MEM_IPC_DATA_SIZE   SZ_1M
-#define DSP_MEM_TEXT_SIZE       SZ_1M
-#define DSP_MEM_DATA_SIZE       SZ_1M
-#define DSP_MEM_HEAP_SIZE       (SZ_1M * 3)
-#define DSP_MEM_IOBUFS_SIZE     (SZ_1M * 90)
-
-/*
- * Assign fixed RAM addresses to facilitate a fixed MMU table.
- */
-/* See CMA BASE addresses in Linux side: arch/arm/mach-omap2/remoteproc.c */
-#if defined (DSP_1)
-#define PHYS_MEM_IPC_VRING      0x99000000
-#elif defined (DSP_2)
-#define PHYS_MEM_IPC_VRING      0x9F000000
-#endif
-
-/* Need to be identical to that of IPU */
-#define PHYS_MEM_IOBUFS         0xBA300000
-
-/*
- * Sizes of the virtqueues (expressed in number of buffers supported,
- * and must be power of 2)
- */
-#define DSP_RPMSG_VQ0_SIZE      256
-#define DSP_RPMSG_VQ1_SIZE      256
-
-/* flip up bits whose indices represent features we support */
-#define RPMSG_DSP_C0_FEATURES         1
-
-struct my_resource_table {
-    struct resource_table base;
-
-    UInt32 offset[18];  /* Should match 'num' in actual definition */
-
-    /* rpmsg vdev entry */
-    struct fw_rsc_vdev rpmsg_vdev;
-    struct fw_rsc_vdev_vring rpmsg_vring0;
-    struct fw_rsc_vdev_vring rpmsg_vring1;
-
-    /* text carveout entry */
-    struct fw_rsc_carveout text_cout;
-
-    /* data carveout entry */
-    struct fw_rsc_carveout data_cout;
-
-    /* heap carveout entry */
-    struct fw_rsc_carveout heap_cout;
-
-    /* ipcdata carveout entry */
-    struct fw_rsc_carveout ipcdata_cout;
-
-    /* trace entry */
-    struct fw_rsc_trace trace;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem0;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem1;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem2;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem3;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem4;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem5;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem6;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem7;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem8;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem9;
-
-    /* devmem entry */
-    struct fw_rsc_devmem devmem10;
-
-    /* L2 intmem entry */
-    struct fw_rsc_intmem l2_intmem;
-};
-
-extern char ti_trace_SysMin_Module_State_0_outbuf__A;
-#define TRACEBUFADDR (UInt32)&ti_trace_SysMin_Module_State_0_outbuf__A
-
-#pragma DATA_SECTION(ti_ipc_remoteproc_ResourceTable, ".resource_table")
-#pragma DATA_ALIGN(ti_ipc_remoteproc_ResourceTable, 4096)
-
-struct my_resource_table ti_ipc_remoteproc_ResourceTable = {
-    1,      /* we're the first version that implements this */
-    18,     /* number of entries in the table */
-    0, 0,   /* reserved, must be zero */
-    /* offsets to entries */
-    {
-        offsetof(struct my_resource_table, rpmsg_vdev),
-        offsetof(struct my_resource_table, text_cout),
-        offsetof(struct my_resource_table, data_cout),
-        offsetof(struct my_resource_table, heap_cout),
-        offsetof(struct my_resource_table, ipcdata_cout),
-        offsetof(struct my_resource_table, trace),
-        offsetof(struct my_resource_table, devmem0),
-        offsetof(struct my_resource_table, devmem1),
-        offsetof(struct my_resource_table, devmem2),
-        offsetof(struct my_resource_table, devmem3),
-        offsetof(struct my_resource_table, devmem4),
-        offsetof(struct my_resource_table, devmem5),
-        offsetof(struct my_resource_table, devmem6),
-        offsetof(struct my_resource_table, devmem7),
-        offsetof(struct my_resource_table, devmem8),
-        offsetof(struct my_resource_table, devmem9),
-        offsetof(struct my_resource_table, devmem10),
-        offsetof(struct my_resource_table, l2_intmem),
-    },
-
-    /* rpmsg vdev entry */
-    {
-        TYPE_VDEV, VIRTIO_ID_RPMSG, 0,
-        RPMSG_DSP_C0_FEATURES, 0, 0, 0, 2, { 0, 0 },
-        /* no config data */
-    },
-    /* the two vrings */
-    { DSP_MEM_RPMSG_VRING0, 4096, DSP_RPMSG_VQ0_SIZE, 1, 0 },
-    { DSP_MEM_RPMSG_VRING1, 4096, DSP_RPMSG_VQ1_SIZE, 2, 0 },
-
-    {
-        TYPE_CARVEOUT,
-        DSP_MEM_TEXT, 0,
-        DSP_MEM_TEXT_SIZE, 0, 0, "DSP_MEM_TEXT",
-    },
-
-    {
-        TYPE_CARVEOUT,
-        DSP_MEM_DATA, 0,
-        DSP_MEM_DATA_SIZE, 0, 0, "DSP_MEM_DATA",
-    },
-
-    {
-        TYPE_CARVEOUT,
-        DSP_MEM_HEAP, 0,
-        DSP_MEM_HEAP_SIZE, 0, 0, "DSP_MEM_HEAP",
-    },
-
-    {
-        TYPE_CARVEOUT,
-        DSP_MEM_IPC_DATA, 0,
-        DSP_MEM_IPC_DATA_SIZE, 0, 0, "DSP_MEM_IPC_DATA",
-    },
-
-    {
-        TYPE_TRACE, TRACEBUFADDR, 0x8000, 0, "trace:dsp",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_MEM_IPC_VRING, PHYS_MEM_IPC_VRING,
-        DSP_MEM_IPC_VRING_SIZE, 0, 0, "DSP_MEM_IPC_VRING",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_MEM_IOBUFS, PHYS_MEM_IOBUFS,
-        DSP_MEM_IOBUFS_SIZE, 0, 0, "DSP_MEM_IOBUFS",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_TILER_MODE_0_1, L3_TILER_MODE_0_1,
-        SZ_256M, 0, 0, "DSP_TILER_MODE_0_1",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_TILER_MODE_2, L3_TILER_MODE_2,
-        SZ_128M, 0, 0, "DSP_TILER_MODE_2",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_TILER_MODE_3, L3_TILER_MODE_3,
-        SZ_128M, 0, 0, "DSP_TILER_MODE_3",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_PERIPHERAL_L4CFG, L4_PERIPHERAL_L4CFG,
-        SZ_16M, 0, 0, "DSP_PERIPHERAL_L4CFG",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_PERIPHERAL_L4PER1, L4_PERIPHERAL_L4PER1,
-        SZ_2M, 0, 0, "DSP_PERIPHERAL_L4PER1",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_PERIPHERAL_L4PER2, L4_PERIPHERAL_L4PER2,
-        SZ_4M, 0, 0, "DSP_PERIPHERAL_L4PER2",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_PERIPHERAL_L4PER3, L4_PERIPHERAL_L4PER3,
-        SZ_8M, 0, 0, "DSP_PERIPHERAL_L4PER3",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_PERIPHERAL_L4EMU, L4_PERIPHERAL_L4EMU,
-        SZ_16M, 0, 0, "DSP_PERIPHERAL_L4EMU",
-    },
-
-    {
-        TYPE_DEVMEM,
-        DSP_PERIPHERAL_DMM, L3_PERIPHERAL_DMM,
-        SZ_1M, 0, 0, "DSP_PERIPHERAL_DMM",
-    },
-
-    {
-        TYPE_INTMEM, 1,
-        DSP_INTMEM_L2, PHYS_MEM_L2_RAM,
-        DSP_MEM_L2_RAM_SIZE, 0, "DSP_MEM_L2_RAM",
-    },
-};
-
-#endif /* _POWER_RSC_TABLE_VAYU_DSP_H_ */

diff --git a/packages/ti/ipc/tests/test_omx.c b/packages/ti/ipc/tests/test_omx.c
index 272e3f61a62c66075f467ee0c1776294421c1903..68c2925cd0fae6002c1960d1f58adc6bb928c8a1 100644 (file)
--- a/packages/ti/ipc/tests/test_omx.c
+++ b/packages/ti/ipc/tests/test_omx.c
@@ -59,11 +59,6 @@
 #include <ti/srvmgr/rpmsg_omx.h>
 #include <ti/srvmgr/omx_packet.h>
 
-/* Custom resource table with L2 RAM entry for silicon bug workaround */
-#if (defined(DSP) && defined(VAYU))
-#include "power_rsc_table_vayu_dsp.h"
-#endif
-
 /* Turn on/off printf's */
 #define CHATTER 0