SDOCM00120682: TCP3D example and test now passes DEV.TCP3D_LLD.02.01.00.05
authorPragat Chaudhari <pragatc@ti.com>
Fri, 22 Jan 2016 19:49:59 +0000 (14:49 -0500)
committerPragat Chaudhari <pragatc@ti.com>
Fri, 22 Jan 2016 19:49:59 +0000 (14:49 -0500)
on C6657 EVM after update to CIC0 interrupts
(host interrupts)

docs/ReleaseNotes_TCP3DDriver.doc
docs/ReleaseNotes_TCP3DDriver.pdf
example/src/sample_int_reg.c
example/src/tcp3d_example_main.c
example/src/tcp3d_single_inst.h
package.xdc
tcp3dver.h
test/c6657/c66/bios/tcp3d_drv_test.cfg
test/src/sample_int_reg.c
test/src/tcp3d_single_inst.h

index e53f950d9cdfc231f20ba8466d6907fcce8f9cd4..0b00622579120a06b24b9e89e1cf3e66e34307f8 100644 (file)
Binary files a/docs/ReleaseNotes_TCP3DDriver.doc and b/docs/ReleaseNotes_TCP3DDriver.doc differ
index 626cada5855fb13044681ee0706495da4045ca9d..173e7f6cc7101982ce52377fe20df84631fda502 100644 (file)
Binary files a/docs/ReleaseNotes_TCP3DDriver.pdf and b/docs/ReleaseNotes_TCP3DDriver.pdf differ
index 5b6628acf2ceee341608910934d10555ff6f2b00..d754a04c0d92a763f8cb6770c5d0e30d1d7196cd 100644 (file)
@@ -87,6 +87,7 @@ unsigned int gemEvents[2];
 /* First 4 cores are connected from CP_INTC0 and last 4 cores are connected from CP_INTC1 */\r
 //unsigned int ccXferHostInt[NUM_EDMA3_INSTANCES][NUM_DSPS] = {\r
                                                                            /*    CP_INTC0      |     CP_INTC1      */\r
+#ifndef SOC_C6657\r
 unsigned int ccXferHostInt[5][8] = {\r
                                                                                {68u, 78u, 88u, 98u, 68u, 78u, 88u, 98u},\r
                                                                                {69u, 79u, 89u, 99u, 69u, 79u, 89u, 99u},\r
@@ -102,6 +103,25 @@ unsigned int edma3ErrHostInt[5][8] = {
                                                                                {67u, 77u, 87u, 97u, 67u, 77u, 87u, 97u},\r
                                                                                };\r
 \r
+#else /* SOC_C6657 */\r
+                                                                           /*    only CP_INTC0 for C6657 */\r
+\r
+unsigned int ccXferHostInt[5][8] = {\r
+                                                                               {0u, 20u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {1u, 21u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {2u, 22u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {3u, 23u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {4u, 24u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+};\r
+unsigned int edma3ErrHostInt[5][8] = {\r
+                                                                               {6u, 26u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {7u, 27u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {5u, 25u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {8u, 28u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {9u, 29u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               };\r
+#endif\r
+\r
 //extern unsigned int dsp_num;\r
 //extern unsigned int tpccRegionUsed;\r
 #if USE_LOCAL_CPINTC_DISPATCH\r
index 45f0156499a0a85d42cc7b625157aace15a2c1b9..93a5b44d0714a9a1fcb943189f961bf71f2333c5 100644 (file)
 #define START_CMD_PERIOD            1\r
 \r
 #ifdef CSL_PSC_PD_TCP3D_A\r
-/* Convert Keystone CSL definitions ti Keystone2 CSL definitions */\r
+/* Convert Keystone CSL definitions to Keystone2 CSL definitions */\r
 #define CSL_PSC_PD_TCP3D_01     CSL_PSC_PD_TCP3D_A\r
 #define CSL_PSC_LPSC_TCP3D_0    CSL_PSC_LPSC_TCP3D_A\r
 #endif\r
index 835060e5c06f945039074acf11fca66565418c5c..0333caf91ef978014814dfa71fb9fd4e7398de72 100644 (file)
@@ -36,7 +36,6 @@
 #ifndef _TCP3D_SINGLE_INST_H_\r
 #define _TCP3D_SINGLE_INST_H_\r
 \r
-\r
 #ifdef CSL_TCP3D_A\r
 /* Convert Keystone CSL definitions ti Keystone2 CSL definitions */\r
 #define CSL_EDMACC_2_REGS       CSL_EDMA2CC_REGS\r
 /**\r
  * Test TCP3D Notification Events\r
  */\r
+#ifdef SOC_C6657\r
+#define TCP3D_0_TEST_EVENT              23\r
+#else\r
 #define TCP3D_0_TEST_EVENT              7\r
+#endif\r
 \r
 /**\r
  * This gives the channel numbers to which the TCP3 decoder REVTs are mapped.\r
  * ((per Data sheet SPRS835C, SPRS893 and internal spec \r
  * intc_1.3.4.12.xlsx,TPCC2)\r
  */\r
+#ifdef SOC_C6657\r
+#define TCP3D_0_REVT0_CH_NUMBER         0\r
+#define TCP3D_0_REVT1_CH_NUMBER         1\r
+#else\r
 #define TCP3D_0_REVT0_CH_NUMBER         34\r
 #define TCP3D_0_REVT1_CH_NUMBER         35\r
-\r
+#endif\r
 INLINE UInt32 getHostIntrNum(UInt32 dspCoreID)\r
 {\r
     /* Host Interrupts for CPINTC0 (per spec - 0.0.1) */\r
+#ifdef SOC_C6657       \r
+    UInt32  hostIntr[] = {6u, 26u, 255u, 255u};\r
+#else\r
     UInt32  hostIntr[] = {13u, 29u, 45u, 61u};\r
+#endif    \r
 \r
     return hostIntr[dspCoreID];\r
 }\r
index 15d6e10bdbfe29a7b192909fac813d05b6048c5b..541a696bf9d8aadccd690b2f5f3ffca9f4d87385 100644 (file)
@@ -9,7 +9,7 @@
  * Copyright (C) 2012, 2015, Texas Instruments, Inc.\r
  *****************************************************************************/\r
 \r
-package ti.drv.tcp3d[2, 01, 00, 04] {\r
+package ti.drv.tcp3d[2, 01, 00, 05] {\r
     module Settings;\r
 }\r
 \r
index a579b026065bac53ab2b5b0773262b01c29fbcab..e672e6adad7f9a13fb3410ef6929f88eca2d26ba 100644 (file)
@@ -51,13 +51,13 @@ extern "C" {
  * format:
  *  0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
  */
-#define TCP3D_DRV_VERSION_ID                   (0x02010004)
+#define TCP3D_DRV_VERSION_ID                   (0x02010005)
 
 /**
  * @brief   This is the version string which describes the TCP3D Driver along with the
  * date and build information.
  */
-#define TCP3D_DRV_VERSION_STR                  "TCP3D Driver Revision: 02.01.00.04"
+#define TCP3D_DRV_VERSION_STR                  "TCP3D Driver Revision: 02.01.00.05"
 
 
 #ifdef __cplusplus
index 0fd7924c25120ab7ec3756275a21068866fb2d0e..8f26b0f139dda03e984eebc8e2507e133977f34c 100644 (file)
@@ -78,7 +78,7 @@ for (var i = 0; i < MultiProc.numProcessors; i++) {
 
 SharedRegion.setEntryMeta(0,
     { base: 0x0C000000,
-      len: 0x200000,
+      len: 0x100000,
       ownerProcId: 0,
       cacheLineSize: 64,
       isValid: true,
index 5b6628acf2ceee341608910934d10555ff6f2b00..d754a04c0d92a763f8cb6770c5d0e30d1d7196cd 100644 (file)
@@ -87,6 +87,7 @@ unsigned int gemEvents[2];
 /* First 4 cores are connected from CP_INTC0 and last 4 cores are connected from CP_INTC1 */\r
 //unsigned int ccXferHostInt[NUM_EDMA3_INSTANCES][NUM_DSPS] = {\r
                                                                            /*    CP_INTC0      |     CP_INTC1      */\r
+#ifndef SOC_C6657\r
 unsigned int ccXferHostInt[5][8] = {\r
                                                                                {68u, 78u, 88u, 98u, 68u, 78u, 88u, 98u},\r
                                                                                {69u, 79u, 89u, 99u, 69u, 79u, 89u, 99u},\r
@@ -102,6 +103,25 @@ unsigned int edma3ErrHostInt[5][8] = {
                                                                                {67u, 77u, 87u, 97u, 67u, 77u, 87u, 97u},\r
                                                                                };\r
 \r
+#else /* SOC_C6657 */\r
+                                                                           /*    only CP_INTC0 for C6657 */\r
+\r
+unsigned int ccXferHostInt[5][8] = {\r
+                                                                               {0u, 20u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {1u, 21u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {2u, 22u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {3u, 23u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {4u, 24u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+};\r
+unsigned int edma3ErrHostInt[5][8] = {\r
+                                                                               {6u, 26u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {7u, 27u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {5u, 25u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {8u, 28u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               {9u, 29u, 255u, 255u, 255u, 255u, 255u, 255u},\r
+                                                                               };\r
+#endif\r
+\r
 //extern unsigned int dsp_num;\r
 //extern unsigned int tpccRegionUsed;\r
 #if USE_LOCAL_CPINTC_DISPATCH\r
index 12f078e08dbf951788f486ad8d43b82b46fbdf12..0333caf91ef978014814dfa71fb9fd4e7398de72 100644 (file)
 /**\r
  * Test TCP3D Notification Events\r
  */\r
+#ifdef SOC_C6657\r
+#define TCP3D_0_TEST_EVENT              23\r
+#else\r
 #define TCP3D_0_TEST_EVENT              7\r
+#endif\r
 \r
 /**\r
  * This gives the channel numbers to which the TCP3 decoder REVTs are mapped.\r
  * ((per Data sheet SPRS835C, SPRS893 and internal spec \r
  * intc_1.3.4.12.xlsx,TPCC2)\r
  */\r
+#ifdef SOC_C6657\r
+#define TCP3D_0_REVT0_CH_NUMBER         0\r
+#define TCP3D_0_REVT1_CH_NUMBER         1\r
+#else\r
 #define TCP3D_0_REVT0_CH_NUMBER         34\r
 #define TCP3D_0_REVT1_CH_NUMBER         35\r
-\r
+#endif\r
 INLINE UInt32 getHostIntrNum(UInt32 dspCoreID)\r
 {\r
     /* Host Interrupts for CPINTC0 (per spec - 0.0.1) */\r
+#ifdef SOC_C6657       \r
+    UInt32  hostIntr[] = {6u, 26u, 255u, 255u};\r
+#else\r
     UInt32  hostIntr[] = {13u, 29u, 45u, 61u};\r
+#endif    \r
 \r
     return hostIntr[dspCoreID];\r
 }\r