Updated GRL and policies with latest Linux DTB. Also, corrected regular expression...

diff --git a/device/k2e/global-resource-list-arm-dsp.c b/device/k2e/global-resource-list-arm-dsp.c
index 0eb50b62c82bfb7d63cbbca861d8803665a75216..bb8834dcca8a07e6d9cf16faadb82657aee759fc 100644 (file)
--- a/device/k2e/global-resource-list-arm-dsp.c
+++ b/device/k2e/global-resource-list-arm-dsp.c
@@ -345,10 +345,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x50,
-0x41,
-0x53,
-0x53,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -364,6 +366,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -375,12 +379,12 @@ const char rmGlobalResourceList[] = {
 0x0e,
 0x00,
 0x00,
-0x03,
-0x80,
+0x02,
+0x10,
 0x00,
 0x00,
 0x00,
-0x80,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -389,10 +393,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x54,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -408,6 +414,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -420,11 +428,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x8c,
+0x30,
 0x00,
 0x00,
 0x00,
-0x06,
+0x0a,
 0x00,
 0x00,
 0x00,
@@ -433,19 +441,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x48,
-0x49,
-0x47,
-0x48,
+0x45,
+0x44,
+0x4d,
+0x41,
 0x5f,
-0x50,
-0x52,
-0x49,
-0x4f,
-0x52,
-0x49,
-0x54,
-0x59,
+0x31,
 0x5f,
 0x51,
 0x55,
@@ -460,6 +461,9 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -472,11 +476,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0xc0,
+0x3a,
 0x00,
 0x00,
 0x00,
-0x20,
+0x0b,
 0x00,
 0x00,
 0x00,
@@ -485,24 +489,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x53,
-0x54,
-0x41,
-0x52,
-0x56,
+0x45,
+0x44,
+0x4d,
 0x41,
-0x54,
-0x49,
-0x4f,
-0x4e,
 0x5f,
-0x43,
-0x4f,
-0x55,
-0x4e,
-0x54,
-0x45,
-0x52,
+0x32,
 0x5f,
 0x51,
 0x55,
@@ -532,11 +524,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0xe0,
+0x45,
 0x00,
 0x00,
 0x00,
-0x40,
+0x08,
 0x00,
 0x00,
 0x00,
@@ -545,20 +537,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x46,
-0x52,
-0x41,
-0x53,
-0x54,
-0x52,
-0x55,
-0x43,
-0x54,
-0x55,
-0x52,
 0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x33,
 0x5f,
 0x51,
 0x55,
@@ -587,12 +571,12 @@ const char rmGlobalResourceList[] = {
 0x0e,
 0x00,
 0x00,
-0x03,
-0x20,
+0x02,
+0x4d,
 0x00,
 0x00,
 0x00,
-0x20,
+0x10,
 0x00,
 0x00,
 0x00,
@@ -601,12 +585,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
 0x34,
-0x30,
-0x30,
 0x5f,
 0x51,
 0x55,
@@ -636,11 +620,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x10,
+0x5d,
 0x00,
 0x00,
 0x00,
-0x20,
+0x08,
 0x00,
 0x00,
 0x00,
@@ -649,12 +633,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
-0x5f,
-0x34,
+0x49,
+0x4e,
+0x54,
+0x43,
 0x5f,
 0x51,
 0x55,
@@ -670,8 +652,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -684,11 +664,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x5d,
+0x8c,
 0x00,
 0x00,
 0x00,
-0x08,
+0x06,
 0x00,
 0x00,
 0x00,
@@ -741,12 +721,19 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
+0x48,
+0x49,
+0x47,
+0x48,
 0x5f,
-0x30,
+0x50,
+0x52,
+0x49,
+0x4f,
+0x52,
+0x49,
+0x54,
+0x59,
 0x5f,
 0x51,
 0x55,
@@ -761,9 +748,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -776,11 +760,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x30,
+0xc0,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -789,12 +773,24 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x53,
+0x54,
+0x41,
+0x52,
+0x56,
 0x41,
+0x54,
+0x49,
+0x4f,
+0x4e,
 0x5f,
-0x31,
+0x43,
+0x4f,
+0x55,
+0x4e,
+0x54,
+0x45,
+0x52,
 0x5f,
 0x51,
 0x55,
@@ -824,11 +820,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x3a,
+0xe0,
 0x00,
 0x00,
 0x00,
-0x0b,
+0x40,
 0x00,
 0x00,
 0x00,
@@ -837,12 +833,20 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x49,
+0x4e,
+0x46,
+0x52,
 0x41,
-0x5f,
-0x32,
+0x53,
+0x54,
+0x52,
+0x55,
+0x43,
+0x54,
+0x55,
+0x52,
+0x45,
 0x5f,
 0x51,
 0x55,
@@ -871,12 +875,12 @@ const char rmGlobalResourceList[] = {
 0x0e,
 0x00,
 0x00,
-0x02,
-0x45,
+0x03,
+0x20,
 0x00,
 0x00,
 0x00,
-0x08,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -885,12 +889,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x33,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -906,8 +908,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -919,12 +919,12 @@ const char rmGlobalResourceList[] = {
 0x0e,
 0x00,
 0x00,
-0x02,
-0x4d,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x10,
+0x80,
 0x00,
 0x00,
 0x00,

diff --git a/device/k2e/global-resource-list-arm-dsp.dtb b/device/k2e/global-resource-list-arm-dsp.dtb
index 5554d13c3825579fdef3b39e6beea990c510f40b..f8a742ff2055b7bb51209616e7b66d28b86da163 100644 (file)
Binary files a/device/k2e/global-resource-list-arm-dsp.dtb and b/device/k2e/global-resource-list-arm-dsp.dtb differ

diff --git a/device/k2e/global-resource-list-arm-dsp.dts b/device/k2e/global-resource-list-arm-dsp.dts
index d3e22a688ae7df236a449b811160e413f2634e4d..c31a87a529156a9e847ba0f645c03dd4bd3d8037 100644 (file)
--- a/device/k2e/global-resource-list-arm-dsp.dts
+++ b/device/k2e/global-resource-list-arm-dsp.dts
@@ -33,30 +33,9 @@
         LOW_PRIORITY_QUEUE-qm1 {
             resource-range = <0 512>;
         };
-        PASS_QUEUE-qm1 {
-            resource-range = <896 128>;
-        };
-        INTC_QUEUE-qm1 {
-            resource-range = <652 6>;
-        }; 
-        HIGH_PRIORITY_QUEUE-qm1 {
-            resource-range = <704 32>;
-        };       
-        STARVATION_COUNTER_QUEUE-qm1 {
-            resource-range = <736 64>;
-        };  
-        INFRASTRUCTURE_QUEUE-qm1 {
-            resource-range = <800 32>;
-        }; 
         GIC400_QUEUE-qm1 {
             resource-range = <528 32>;
         };
-        EDMA_4_QUEUE-qm1 {
-            resource-range = <605 8>;
-        };
-        XGE_QUEUE-qm1 {
-            resource-range = <692 8>;
-        };
         EDMA_0_QUEUE-qm1 {
             resource-range = <560 10>;
         };
@@ -69,6 +48,27 @@
         EDMA_3_QUEUE-qm1 {
             resource-range = <589 16>;
         };
+        EDMA_4_QUEUE-qm1 {
+            resource-range = <605 8>;
+        };
+        INTC_QUEUE-qm1 {
+            resource-range = <652 6>;
+        }; 
+        XGE_QUEUE-qm1 {
+            resource-range = <692 8>;
+        };
+        HIGH_PRIORITY_QUEUE-qm1 {
+            resource-range = <704 32>;
+        };       
+        STARVATION_COUNTER_QUEUE-qm1 {
+            resource-range = <736 64>;
+        };  
+        INFRASTRUCTURE_QUEUE-qm1 {
+            resource-range = <800 32>;
+        }; 
+        PASS_QUEUE-qm1 {
+            resource-range = <896 128>;
+        };
         GENERAL_PURPOSE_QUEUE-qm1 {
             resource-range = <1024 7168>;
         };    

diff --git a/device/k2e/global-resource-list.c b/device/k2e/global-resource-list.c
index f248a50d42eace93dd2abf4f0400be25b337c18b..365598986f6a0034ebe459dd411d2556b0ac441e 100644 (file)
--- a/device/k2e/global-resource-list.c
+++ b/device/k2e/global-resource-list.c
@@ -309,10 +309,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x50,
-0x41,
-0x53,
-0x53,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -328,6 +330,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -339,12 +343,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x03,
-0x80,
+0x02,
+0x10,
 0x00,
 0x00,
 0x00,
-0x80,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -353,10 +357,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x54,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -372,6 +378,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -384,11 +392,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x8c,
+0x30,
 0x00,
 0x00,
 0x00,
-0x06,
+0x0a,
 0x00,
 0x00,
 0x00,
@@ -397,19 +405,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x48,
-0x49,
-0x47,
-0x48,
+0x45,
+0x44,
+0x4d,
+0x41,
 0x5f,
-0x50,
-0x52,
-0x49,
-0x4f,
-0x52,
-0x49,
-0x54,
-0x59,
+0x31,
 0x5f,
 0x51,
 0x55,
@@ -424,6 +425,9 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -436,11 +440,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0xc0,
+0x3a,
 0x00,
 0x00,
 0x00,
-0x20,
+0x0b,
 0x00,
 0x00,
 0x00,
@@ -449,24 +453,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x53,
-0x54,
-0x41,
-0x52,
-0x56,
+0x45,
+0x44,
+0x4d,
 0x41,
-0x54,
-0x49,
-0x4f,
-0x4e,
 0x5f,
-0x43,
-0x4f,
-0x55,
-0x4e,
-0x54,
-0x45,
-0x52,
+0x32,
 0x5f,
 0x51,
 0x55,
@@ -496,11 +488,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0xe0,
+0x45,
 0x00,
 0x00,
 0x00,
-0x40,
+0x08,
 0x00,
 0x00,
 0x00,
@@ -509,20 +501,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x46,
-0x52,
-0x41,
-0x53,
-0x54,
-0x52,
-0x55,
-0x43,
-0x54,
-0x55,
-0x52,
 0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x33,
 0x5f,
 0x51,
 0x55,
@@ -551,12 +535,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x03,
-0x20,
+0x02,
+0x4d,
 0x00,
 0x00,
 0x00,
-0x20,
+0x10,
 0x00,
 0x00,
 0x00,
@@ -565,12 +549,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
 0x34,
-0x30,
-0x30,
 0x5f,
 0x51,
 0x55,
@@ -600,11 +584,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x10,
+0x5d,
 0x00,
 0x00,
 0x00,
-0x20,
+0x08,
 0x00,
 0x00,
 0x00,
@@ -613,12 +597,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
-0x5f,
-0x34,
+0x49,
+0x4e,
+0x54,
+0x43,
 0x5f,
 0x51,
 0x55,
@@ -634,8 +616,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -648,11 +628,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x5d,
+0x8c,
 0x00,
 0x00,
 0x00,
-0x08,
+0x06,
 0x00,
 0x00,
 0x00,
@@ -705,12 +685,19 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
+0x48,
+0x49,
+0x47,
+0x48,
 0x5f,
-0x30,
+0x50,
+0x52,
+0x49,
+0x4f,
+0x52,
+0x49,
+0x54,
+0x59,
 0x5f,
 0x51,
 0x55,
@@ -725,9 +712,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -740,11 +724,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x30,
+0xc0,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -753,12 +737,24 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x53,
+0x54,
+0x41,
+0x52,
+0x56,
 0x41,
+0x54,
+0x49,
+0x4f,
+0x4e,
 0x5f,
-0x31,
+0x43,
+0x4f,
+0x55,
+0x4e,
+0x54,
+0x45,
+0x52,
 0x5f,
 0x51,
 0x55,
@@ -788,11 +784,11 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x02,
-0x3a,
+0xe0,
 0x00,
 0x00,
 0x00,
-0x0b,
+0x40,
 0x00,
 0x00,
 0x00,
@@ -801,12 +797,20 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x49,
+0x4e,
+0x46,
+0x52,
 0x41,
-0x5f,
-0x32,
+0x53,
+0x54,
+0x52,
+0x55,
+0x43,
+0x54,
+0x55,
+0x52,
+0x45,
 0x5f,
 0x51,
 0x55,
@@ -835,12 +839,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x02,
-0x45,
+0x03,
+0x20,
 0x00,
 0x00,
 0x00,
-0x08,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -849,12 +853,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x33,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -870,8 +872,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -883,12 +883,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x02,
-0x4d,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x10,
+0x80,
 0x00,
 0x00,
 0x00,

diff --git a/device/k2e/global-resource-list.dtb b/device/k2e/global-resource-list.dtb
index b1217dc319a492740c403ff20959ef56721c1987..adc81fa203a88128d73a8098e6cdc1787f2e9117 100644 (file)
Binary files a/device/k2e/global-resource-list.dtb and b/device/k2e/global-resource-list.dtb differ

diff --git a/device/k2e/global-resource-list.dts b/device/k2e/global-resource-list.dts
index 354a598ebe45ddae8e7e17ff399c292cefa0488e..cfe1c9aef77fdd5ad5abbc8d09ec41e0b2392a78 100644 (file)
--- a/device/k2e/global-resource-list.dts
+++ b/device/k2e/global-resource-list.dts
@@ -30,30 +30,9 @@
         LOW_PRIORITY_QUEUE-qm1 {
             resource-range = <0 512>;
         };
-        PASS_QUEUE-qm1 {
-            resource-range = <896 128>;
-        };
-        INTC_QUEUE-qm1 {
-            resource-range = <652 6>;
-        }; 
-        HIGH_PRIORITY_QUEUE-qm1 {
-            resource-range = <704 32>;
-        };       
-        STARVATION_COUNTER_QUEUE-qm1 {
-            resource-range = <736 64>;
-        };  
-        INFRASTRUCTURE_QUEUE-qm1 {
-            resource-range = <800 32>;
-        }; 
         GIC400_QUEUE-qm1 {
             resource-range = <528 32>;
         };
-        EDMA_4_QUEUE-qm1 {
-            resource-range = <605 8>;
-        };
-        XGE_QUEUE-qm1 {
-            resource-range = <692 8>;
-        };
         EDMA_0_QUEUE-qm1 {
             resource-range = <560 10>;
         };
@@ -66,6 +45,27 @@
         EDMA_3_QUEUE-qm1 {
             resource-range = <589 16>;
         };
+        EDMA_4_QUEUE-qm1 {
+            resource-range = <605 8>;
+        };
+        INTC_QUEUE-qm1 {
+            resource-range = <652 6>;
+        }; 
+        XGE_QUEUE-qm1 {
+            resource-range = <692 8>;
+        };
+        HIGH_PRIORITY_QUEUE-qm1 {
+            resource-range = <704 32>;
+        };       
+        STARVATION_COUNTER_QUEUE-qm1 {
+            resource-range = <736 64>;
+        };  
+        INFRASTRUCTURE_QUEUE-qm1 {
+            resource-range = <800 32>;
+        }; 
+        PASS_QUEUE-qm1 {
+            resource-range = <896 128>;
+        };
         GENERAL_PURPOSE_QUEUE-qm1 {
             resource-range = <1024 7168>;
         };    

diff --git a/device/k2e/policy_dsp-only.c b/device/k2e/policy_dsp-only.c
index 1ac0f06a4e7645d95e9db8d932a0fa3ebd3b00d0..5891b16c4c024a445aff92d7f6c41aefa8b6c803 100644 (file)
--- a/device/k2e/policy_dsp-only.c
+++ b/device/k2e/policy_dsp-only.c
@@ -481,10 +481,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x50,
-0x41,
-0x53,
-0x53,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -500,6 +502,8 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -511,12 +515,12 @@ const char rmDspOnlyPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x03,
-0x80,
+0x02,
+0x10,
 0x00,
 0x00,
 0x00,
-0x80,
+0x20,
 0x69,
 0x75,
 0x20,
@@ -537,10 +541,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x54,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -556,6 +562,8 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -568,11 +576,11 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x8c,
+0x30,
 0x00,
 0x00,
 0x00,
-0x06,
+0x0a,
 0x69,
 0x75,
 0x20,
@@ -593,19 +601,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x48,
-0x49,
-0x47,
-0x48,
+0x45,
+0x44,
+0x4d,
+0x41,
 0x5f,
-0x50,
-0x52,
-0x49,
-0x4f,
-0x52,
-0x49,
-0x54,
-0x59,
+0x31,
 0x5f,
 0x51,
 0x55,
@@ -620,6 +621,9 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -632,11 +636,11 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x02,
-0xc0,
+0x3a,
 0x00,
 0x00,
 0x00,
-0x20,
+0x0b,
 0x69,
 0x75,
 0x20,
@@ -657,24 +661,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x53,
-0x54,
-0x41,
-0x52,
-0x56,
+0x45,
+0x44,
+0x4d,
 0x41,
-0x54,
-0x49,
-0x4f,
-0x4e,
 0x5f,
-0x43,
-0x4f,
-0x55,
-0x4e,
-0x54,
-0x45,
-0x52,
+0x32,
 0x5f,
 0x51,
 0x55,
@@ -704,11 +696,11 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x02,
-0xe0,
+0x45,
 0x00,
 0x00,
 0x00,
-0x40,
+0x08,
 0x69,
 0x75,
 0x20,
@@ -729,20 +721,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x46,
-0x52,
-0x41,
-0x53,
-0x54,
-0x52,
-0x55,
-0x43,
-0x54,
-0x55,
-0x52,
 0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x33,
 0x5f,
 0x51,
 0x55,
@@ -771,12 +755,12 @@ const char rmDspOnlyPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x03,
-0x20,
+0x02,
+0x4d,
 0x00,
 0x00,
 0x00,
-0x20,
+0x10,
 0x69,
 0x75,
 0x20,
@@ -797,12 +781,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
 0x34,
-0x30,
-0x30,
 0x5f,
 0x51,
 0x55,
@@ -832,11 +816,11 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x10,
+0x5d,
 0x00,
 0x00,
 0x00,
-0x20,
+0x08,
 0x69,
 0x75,
 0x20,
@@ -857,12 +841,10 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
-0x5f,
-0x34,
+0x49,
+0x4e,
+0x54,
+0x43,
 0x5f,
 0x51,
 0x55,
@@ -878,8 +860,6 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -892,11 +872,11 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x5d,
+0x8c,
 0x00,
 0x00,
 0x00,
-0x08,
+0x06,
 0x69,
 0x75,
 0x20,
@@ -973,12 +953,19 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
+0x48,
+0x49,
+0x47,
+0x48,
 0x5f,
-0x30,
+0x50,
+0x52,
+0x49,
+0x4f,
+0x52,
+0x49,
+0x54,
+0x59,
 0x5f,
 0x51,
 0x55,
@@ -993,9 +980,6 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -1008,11 +992,11 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x30,
+0xc0,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x20,
 0x69,
 0x75,
 0x20,
@@ -1033,12 +1017,24 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x53,
+0x54,
+0x41,
+0x52,
+0x56,
 0x41,
+0x54,
+0x49,
+0x4f,
+0x4e,
 0x5f,
-0x31,
+0x43,
+0x4f,
+0x55,
+0x4e,
+0x54,
+0x45,
+0x52,
 0x5f,
 0x51,
 0x55,
@@ -1068,11 +1064,11 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x3a,
+0xe0,
 0x00,
 0x00,
 0x00,
-0x0b,
+0x40,
 0x69,
 0x75,
 0x20,
@@ -1093,12 +1089,20 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x49,
+0x4e,
+0x46,
+0x52,
 0x41,
-0x5f,
-0x32,
+0x53,
+0x54,
+0x52,
+0x55,
+0x43,
+0x54,
+0x55,
+0x52,
+0x45,
 0x5f,
 0x51,
 0x55,
@@ -1127,12 +1131,12 @@ const char rmDspOnlyPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x02,
-0x45,
+0x03,
+0x20,
 0x00,
 0x00,
 0x00,
-0x08,
+0x20,
 0x69,
 0x75,
 0x20,
@@ -1153,12 +1157,10 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x33,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -1174,8 +1176,6 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -1187,12 +1187,12 @@ const char rmDspOnlyPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x02,
-0x4d,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x10,
+0x80,
 0x69,
 0x75,
 0x20,

diff --git a/device/k2e/policy_dsp-only.dtb b/device/k2e/policy_dsp-only.dtb
index b0ab601b539c44adab32d3bf60ef0c1c607c7651..d9fceeec3527f0342f7354f3a89d4f4b2dabee22 100644 (file)
Binary files a/device/k2e/policy_dsp-only.dtb and b/device/k2e/policy_dsp-only.dtb differ

diff --git a/device/k2e/policy_dsp-only.dts b/device/k2e/policy_dsp-only.dts
index 96e30068308caa78c8fb7f14275ee30c097ab209..59bd4ed54f5645f1d4912cbea73e5d986236d448 100644 (file)
--- a/device/k2e/policy_dsp-only.dts
+++ b/device/k2e/policy_dsp-only.dts
@@ -38,30 +38,9 @@
         LOW_PRIORITY_QUEUE-qm1 {
             assignments = <0 512>, "iu = (*)";
         };
-        PASS_QUEUE-qm1 {
-            assignments = <896 128>, "iu = (*)";
-        };
-        INTC_QUEUE-qm1 {
-            assignments = <652 6>, "iu = (*)";
-        }; 
-        HIGH_PRIORITY_QUEUE-qm1 {
-            assignments = <704 32>, "iu = (*)";
-        };       
-        STARVATION_COUNTER_QUEUE-qm1 {
-            assignments = <736 64>, "iu = (*)";
-        };  
-        INFRASTRUCTURE_QUEUE-qm1 {
-            assignments = <800 32>, "iu = (*)";
-        }; 
         GIC400_QUEUE-qm1 {
             assignments = <528 32>, "iu = (*)";
         };
-        EDMA_4_QUEUE-qm1 {
-            assignments = <605 8>, "iu = (*)";
-        };
-        XGE_QUEUE-qm1 {
-            assignments = <692 8>, "iu = (*)";
-        };
         EDMA_0_QUEUE-qm1 {
             assignments = <560 10>, "iu = (*)";
         };
@@ -74,6 +53,27 @@
         EDMA_3_QUEUE-qm1 {
             assignments = <589 16>, "iu = (*)";
         };
+        EDMA_4_QUEUE-qm1 {
+            assignments = <605 8>, "iu = (*)";
+        };
+        INTC_QUEUE-qm1 {
+            assignments = <652 6>, "iu = (*)";
+        }; 
+        XGE_QUEUE-qm1 {
+            assignments = <692 8>, "iu = (*)";
+        };
+        HIGH_PRIORITY_QUEUE-qm1 {
+            assignments = <704 32>, "iu = (*)";
+        };       
+        STARVATION_COUNTER_QUEUE-qm1 {
+            assignments = <736 64>, "iu = (*)";
+        };  
+        INFRASTRUCTURE_QUEUE-qm1 {
+            assignments = <800 32>, "iu = (*)";
+        }; 
+        PASS_QUEUE-qm1 {
+            assignments = <896 128>, "iu = (*)";
+        };
         GENERAL_PURPOSE_QUEUE-qm1 {
             assignments = <1024 7168>, "iu = (*)";
         };    

diff --git a/device/k2e/policy_dsp_arm.c b/device/k2e/policy_dsp_arm.c
index 73575b3615410531b072d4358d955a075dab06ae..75f361826eb2ae926b5cf357ecdc60f53489349a 100644 (file)
--- a/device/k2e/policy_dsp_arm.c
+++ b/device/k2e/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0xb0,
+0xe4,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0x94,
+0xc8,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0x5c,
+0x90,
 0x00,
 0x00,
 0x00,
@@ -561,10 +561,12 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x50,
-0x41,
-0x53,
-0x53,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -580,27 +582,24 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
 0x00,
-0x11,
+0x0c,
 0x00,
 0x00,
 0x00,
 0x10,
 0x00,
 0x00,
-0x03,
-0x80,
+0x02,
+0x10,
 0x00,
 0x00,
 0x00,
-0x80,
-0x69,
-0x75,
-0x20,
-0x3d,
 0x20,
 0x28,
 0x2a,
@@ -609,18 +608,17 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
 0x02,
 0x00,
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x54,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -636,11 +634,13 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
 0x00,
-0x0c,
+0x11,
 0x00,
 0x00,
 0x00,
@@ -648,11 +648,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x8c,
+0x30,
 0x00,
 0x00,
 0x00,
-0x06,
+0x0a,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -660,24 +665,20 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
 0x00,
 0x01,
-0x48,
-0x49,
-0x47,
-0x48,
+0x45,
+0x44,
+0x4d,
+0x41,
 0x5f,
-0x50,
-0x52,
-0x49,
-0x4f,
-0x52,
-0x49,
-0x54,
-0x59,
+0x31,
 0x5f,
 0x51,
 0x55,
@@ -692,40 +693,26 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x03,
 0x00,
 0x00,
 0x00,
-0x33,
-0x00,
-0x00,
+0x03,
 0x00,
-0x10,
 0x00,
 0x00,
-0x02,
-0xc0,
+0x11,
 0x00,
 0x00,
 0x00,
 0x10,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
-0x28,
-0x2a,
-0x29,
-0x00,
 0x00,
 0x00,
 0x02,
-0xd0,
+0x3a,
 0x00,
 0x00,
 0x00,
-0x08,
+0x0b,
 0x69,
 0x75,
 0x20,
@@ -737,21 +724,6 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x02,
-0xd8,
-0x00,
-0x00,
-0x00,
-0x08,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
-0x28,
-0x2a,
-0x29,
-0x00,
 0x00,
 0x00,
 0x00,
@@ -761,24 +733,12 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x53,
-0x54,
-0x41,
-0x52,
-0x56,
+0x45,
+0x44,
+0x4d,
 0x41,
-0x54,
-0x49,
-0x4f,
-0x4e,
 0x5f,
-0x43,
-0x4f,
-0x55,
-0x4e,
-0x54,
-0x45,
-0x52,
+0x32,
 0x5f,
 0x51,
 0x55,
@@ -808,11 +768,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x02,
-0xe0,
+0x45,
 0x00,
 0x00,
 0x00,
-0x40,
+0x08,
 0x69,
 0x75,
 0x20,
@@ -833,20 +793,12 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x49,
-0x4e,
-0x46,
-0x52,
-0x41,
-0x53,
-0x54,
-0x52,
-0x55,
-0x43,
-0x54,
-0x55,
-0x52,
 0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x33,
 0x5f,
 0x51,
 0x55,
@@ -868,31 +820,19 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x1d,
+0x11,
 0x00,
 0x00,
 0x00,
 0x10,
 0x00,
 0x00,
-0x03,
-0x20,
-0x00,
-0x00,
-0x00,
-0x0c,
-0x28,
-0x2a,
-0x29,
-0x00,
-0x00,
-0x00,
-0x03,
-0x2c,
+0x02,
+0x4d,
 0x00,
 0x00,
 0x00,
-0x14,
+0x10,
 0x69,
 0x75,
 0x20,
@@ -913,12 +853,12 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
 0x34,
-0x30,
-0x30,
 0x5f,
 0x51,
 0x55,
@@ -940,7 +880,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
+0x11,
 0x00,
 0x00,
 0x00,
@@ -948,10 +888,15 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x10,
+0x5d,
 0x00,
 0x00,
 0x00,
+0x08,
+0x69,
+0x75,
+0x20,
+0x3d,
 0x20,
 0x28,
 0x2a,
@@ -960,17 +905,18 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
-0x5f,
-0x34,
+0x49,
+0x4e,
+0x54,
+0x43,
 0x5f,
 0x51,
 0x55,
@@ -986,13 +932,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
 0x00,
-0x11,
+0x0c,
 0x00,
 0x00,
 0x00,
@@ -1000,16 +944,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x5d,
+0x8c,
 0x00,
 0x00,
 0x00,
-0x08,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x06,
 0x28,
 0x2a,
 0x29,
@@ -1017,9 +956,6 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
 0x02,
 0x00,
 0x00,
@@ -1081,12 +1017,19 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
-0x41,
+0x48,
+0x49,
+0x47,
+0x48,
 0x5f,
-0x30,
+0x50,
+0x52,
+0x49,
+0x4f,
+0x52,
+0x49,
+0x54,
+0x59,
 0x5f,
 0x51,
 0x55,
@@ -1101,26 +1044,40 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x03,
 0x00,
 0x00,
 0x00,
-0x03,
+0x33,
 0x00,
 0x00,
 0x00,
-0x11,
+0x10,
+0x00,
+0x00,
+0x02,
+0xc0,
 0x00,
 0x00,
 0x00,
 0x10,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
 0x00,
 0x00,
 0x02,
-0x30,
+0xd0,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x08,
 0x69,
 0x75,
 0x20,
@@ -1132,6 +1089,21 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x02,
+0xd8,
+0x00,
+0x00,
+0x00,
+0x08,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -1141,12 +1113,24 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x53,
+0x54,
 0x41,
+0x52,
+0x56,
+0x41,
+0x54,
+0x49,
+0x4f,
+0x4e,
 0x5f,
-0x31,
+0x43,
+0x4f,
+0x55,
+0x4e,
+0x54,
+0x45,
+0x52,
 0x5f,
 0x51,
 0x55,
@@ -1176,11 +1160,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x02,
-0x3a,
+0xe0,
 0x00,
 0x00,
 0x00,
-0x0b,
+0x40,
 0x69,
 0x75,
 0x20,
@@ -1201,12 +1185,20 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x49,
+0x4e,
+0x46,
+0x52,
 0x41,
-0x5f,
-0x32,
+0x53,
+0x54,
+0x52,
+0x55,
+0x43,
+0x54,
+0x55,
+0x52,
+0x45,
 0x5f,
 0x51,
 0x55,
@@ -1228,19 +1220,31 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x1d,
 0x00,
 0x00,
 0x00,
 0x10,
 0x00,
 0x00,
-0x02,
-0x45,
+0x03,
+0x20,
 0x00,
 0x00,
 0x00,
-0x08,
+0x0c,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x03,
+0x2c,
+0x00,
+0x00,
+0x00,
+0x14,
 0x69,
 0x75,
 0x20,
@@ -1261,12 +1265,10 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x33,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -1282,8 +1284,6 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -1295,12 +1295,12 @@ const char rmDspPlusArmPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x02,
-0x4d,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x10,
+0x80,
 0x69,
 0x75,
 0x20,
@@ -1363,12 +1363,12 @@ const char rmDspPlusArmPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x03,
-0x80,
+0x04,
 0x00,
 0x00,
-0x0c,
-0x20,
+0x00,
+0x0b,
+0xa0,
 0x69,
 0x75,
 0x20,
@@ -2028,7 +2028,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x46,
 0x00,
 0x00,
 0x00,
@@ -2040,7 +2040,48 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x01,
+0x00,
+0x00,
+0x00,
+0x07,
+0x69,
+0x75,
 0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x09,
+0x00,
+0x00,
+0x00,
+0x15,
 0x69,
 0x75,
 0x20,
@@ -2053,6 +2094,17 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x1f,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -2765,56 +2817,4 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2e/policy_dsp_arm.dtb b/device/k2e/policy_dsp_arm.dtb
index f831b94978949c140b348c70748a9df83475ee16..70bddb35475af7de91843372d011bdb1ac6b81c1 100644 (file)
Binary files a/device/k2e/policy_dsp_arm.dtb and b/device/k2e/policy_dsp_arm.dtb differ

diff --git a/device/k2e/policy_dsp_arm.dts b/device/k2e/policy_dsp_arm.dts
index 89738176b3cc48aaa5535a25c5f8ee0760e22727..3cad9af6d1ff86d1c2651a0edbe920e695364e95 100644 (file)
--- a/device/k2e/policy_dsp_arm.dts
+++ b/device/k2e/policy_dsp_arm.dts
@@ -47,12 +47,30 @@
                           <128 128>, "     (*)", /* used by linux (accumulator-low-#); linux pairs these to channels 36-39 */
                           <256 256>, "iu = (*)"; /* suggested for channels 40-47 */
         };
-        PASS_QUEUE-qm1 {
-            assignments = <896 128>, "iu = (*)";       /* used by both kernel and DSP */
+        GIC400_QUEUE-qm1 {
+            assignments = <528 32>,   "(*)";             /* Used by Kernel */
+        };
+        EDMA_0_QUEUE-qm1 {
+            assignments = <560 10>, "iu = (*)";
+        };
+        EDMA_1_QUEUE-qm1 {
+            assignments = <570 11>, "iu = (*)";
+        };
+        EDMA_2_QUEUE-qm1 {
+            assignments = <581 8>, "iu = (*)";
+        };
+        EDMA_3_QUEUE-qm1 {
+            assignments = <589 16>, "iu = (*)";
+        };
+        EDMA_4_QUEUE-qm1 {
+            assignments = <605 8>, "iu = (*)";
         };
         INTC_QUEUE-qm1 {
             assignments = <652 6>,     "(*)";             /* Used by Kernel */
         }; 
+        XGE_QUEUE-qm1 {
+            assignments = <692 8>, "iu = (*)";
+        };
         HIGH_PRIORITY_QUEUE-qm1 {
             /* this is loosely coupled with accumulator-ch channels 0-15.  These queues are
              * just suggested to be paired with these channels, the accumulator can be sw
@@ -68,29 +86,11 @@
             assignments = <800  12>,   "(*)",             /* Used by Kernel */
                           <812  20>,   "iu = (*)";
         }; 
-        GIC400_QUEUE-qm1 {
-            assignments = <528 32>,   "(*)";             /* Used by Kernel */
-        };
-        EDMA_4_QUEUE-qm1 {
-            assignments = <605 8>, "iu = (*)";
-        };
-        XGE_QUEUE-qm1 {
-            assignments = <692 8>, "iu = (*)";
-        };
-        EDMA_0_QUEUE-qm1 {
-            assignments = <560 10>, "iu = (*)";
-        };
-        EDMA_1_QUEUE-qm1 {
-            assignments = <570 11>, "iu = (*)";
-        };
-        EDMA_2_QUEUE-qm1 {
-            assignments = <581 8>, "iu = (*)";
-        };
-        EDMA_3_QUEUE-qm1 {
-            assignments = <589 16>, "iu = (*)";
+        PASS_QUEUE-qm1 {
+            assignments = <896 128>, "iu = (*)";       /* used by both kernel and DSP */
         };
         GENERAL_PURPOSE_QUEUE-qm1 {
-            assignments = <896  3104>,  "iu = (*)",
+            assignments = <1024 2976>,  "iu = (*)",
                           <4000 64>,    "(*)",       /* Used by Kernel */
                           <4064 2336>,  "iu = (*)",
 
@@ -138,7 +138,11 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-rx-flow-id {
-            assignments = <0 32>, "iu = (*)";
+            assignments = <0  1>, "(*)",  /* Used by kernel - netrx0 */
+                          <1  7>, "iu = (*)",
+                          <8  1>, "(*)",  /* Used by kernel - netrx1 */
+                          <9 21>, "iu = (*)",
+                          <31 1>, "(*)";  /* Used by kernel - parx */
         };   
 
         qmss-qm1-rx-ch {

diff --git a/device/k2l/global-resource-list-arm-dsp.c b/device/k2l/global-resource-list-arm-dsp.c
index d9266a00d74a75a55cab1c36fceaf7b99bc95fcd..473764d5bd7c6ce06bff83c8bcc04766d971683f 100644 (file)
--- a/device/k2l/global-resource-list-arm-dsp.c
+++ b/device/k2l/global-resource-list-arm-dsp.c
@@ -345,10 +345,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x50,
-0x41,
-0x53,
-0x53,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -364,6 +366,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -375,12 +379,60 @@ const char rmGlobalResourceList[] = {
 0x0e,
 0x00,
 0x00,
+0x02,
+0x10,
+0x00,
+0x00,
+0x00,
+0x20,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x30,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 0x03,
-0x80,
 0x00,
 0x00,
 0x00,
-0x80,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x02,
+0x30,
+0x00,
+0x00,
+0x00,
+0x06,
 0x00,
 0x00,
 0x00,
@@ -424,7 +476,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x13,
+0x12,
 0x00,
 0x00,
 0x00,
@@ -741,54 +793,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
-0x34,
-0x30,
-0x30,
-0x5f,
-0x51,
-0x55,
-0x45,
-0x55,
-0x45,
-0x2d,
-0x71,
-0x6d,
-0x31,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x03,
-0x00,
-0x00,
-0x00,
-0x08,
-0x00,
-0x00,
-0x00,
-0x0e,
-0x00,
-0x00,
-0x02,
-0x10,
-0x00,
-0x00,
-0x00,
-0x20,
-0x00,
-0x00,
-0x00,
-0x02,
-0x00,
-0x00,
-0x00,
-0x01,
 0x49,
 0x51,
 0x4e,
@@ -833,12 +837,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x30,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -854,8 +856,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -867,12 +867,12 @@ const char rmGlobalResourceList[] = {
 0x0e,
 0x00,
 0x00,
-0x02,
-0x30,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x80,
 0x00,
 0x00,
 0x00,

diff --git a/device/k2l/global-resource-list-arm-dsp.dtb b/device/k2l/global-resource-list-arm-dsp.dtb
index 72852ef56e78c9171be1feed6e7c14334e078c73..be55cce07421b38601462df0b7810326d858f157 100644 (file)
Binary files a/device/k2l/global-resource-list-arm-dsp.dtb and b/device/k2l/global-resource-list-arm-dsp.dtb differ

diff --git a/device/k2l/global-resource-list-arm-dsp.dts b/device/k2l/global-resource-list-arm-dsp.dts
index c70a6d96105ce0055dadb1b71c36c19c365dbeb2..4a1a65342e66c59e986e6b31578b1abe5b092903 100644 (file)
--- a/device/k2l/global-resource-list-arm-dsp.dts
+++ b/device/k2l/global-resource-list-arm-dsp.dts
@@ -33,11 +33,14 @@
         LOW_PRIORITY_QUEUE-qm1 {
             resource-range = <0 512>;
         };
-        PASS_QUEUE-qm1 {
-            resource-range = <896 128>;
+        GIC400_QUEUE-qm1 {
+            resource-range = <528 32>;
+        };
+        EDMA_0_QUEUE-qm1 {
+            resource-range = <560 6>;
         };
         INTC_QUEUE-qm1 {
-            resource-range = <570 19>;
+            resource-range = <570 18>;
         }; 
         FFTC_A_QUEUE-qm1 {
             resource-range = <688 4>;
@@ -57,14 +60,11 @@
         INFRASTRUCTURE_QUEUE-qm1 {
             resource-range = <800 32>;
         }; 
-        GIC400_QUEUE-qm1 {
-            resource-range = <528 32>;
-        };
         IQNET_QUEUE-qm1 {
             resource-range = <832 48>;
         };
-        EDMA_0_QUEUE-qm1 {
-            resource-range = <560 10>;
+        PASS_QUEUE-qm1 {
+            resource-range = <896 128>;
         };
         GENERAL_PURPOSE_QUEUE-qm1 {
             resource-range = <1024 7168>;

diff --git a/device/k2l/global-resource-list.c b/device/k2l/global-resource-list.c
index 8d0342a4931ab2adaa60bc133b8ad6fb1d7528f1..4fb60c7e80022098611b5e7b799ac8bc6a253ab4 100644 (file)
--- a/device/k2l/global-resource-list.c
+++ b/device/k2l/global-resource-list.c
@@ -309,10 +309,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x50,
-0x41,
-0x53,
-0x53,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -328,6 +330,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -339,12 +343,60 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x02,
+0x10,
+0x00,
+0x00,
+0x00,
+0x20,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x30,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 0x03,
-0x80,
 0x00,
 0x00,
 0x00,
-0x80,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x30,
+0x00,
+0x00,
+0x00,
+0x06,
 0x00,
 0x00,
 0x00,
@@ -388,7 +440,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x13,
+0x12,
 0x00,
 0x00,
 0x00,
@@ -705,54 +757,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
-0x34,
-0x30,
-0x30,
-0x5f,
-0x51,
-0x55,
-0x45,
-0x55,
-0x45,
-0x2d,
-0x71,
-0x6d,
-0x31,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x03,
-0x00,
-0x00,
-0x00,
-0x08,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x02,
-0x10,
-0x00,
-0x00,
-0x00,
-0x20,
-0x00,
-0x00,
-0x00,
-0x02,
-0x00,
-0x00,
-0x00,
-0x01,
 0x49,
 0x51,
 0x4e,
@@ -797,12 +801,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x30,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -818,8 +820,6 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -831,12 +831,12 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x02,
-0x30,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x80,
 0x00,
 0x00,
 0x00,

diff --git a/device/k2l/global-resource-list.dtb b/device/k2l/global-resource-list.dtb
index a984db1a172c7caf1add3980228b22d2b1fe2b81..d68d8dd85d782cd7ed2b2ecf724e5b831dcf5f62 100644 (file)
Binary files a/device/k2l/global-resource-list.dtb and b/device/k2l/global-resource-list.dtb differ

diff --git a/device/k2l/global-resource-list.dts b/device/k2l/global-resource-list.dts
index cd530fe15c6d823c7eab937c9c2b322e685c2b38..eaddfc959346746be3cbf416bb5ca3d2393a5e39 100644 (file)
--- a/device/k2l/global-resource-list.dts
+++ b/device/k2l/global-resource-list.dts
@@ -30,11 +30,14 @@
         LOW_PRIORITY_QUEUE-qm1 {
             resource-range = <0 512>;
         };
-        PASS_QUEUE-qm1 {
-            resource-range = <896 128>;
+        GIC400_QUEUE-qm1 {
+            resource-range = <528 32>;
+        };
+        EDMA_0_QUEUE-qm1 {
+            resource-range = <560 6>;
         };
         INTC_QUEUE-qm1 {
-            resource-range = <570 19>;
+            resource-range = <570 18>;
         }; 
         FFTC_A_QUEUE-qm1 {
             resource-range = <688 4>;
@@ -54,14 +57,11 @@
         INFRASTRUCTURE_QUEUE-qm1 {
             resource-range = <800 32>;
         }; 
-        GIC400_QUEUE-qm1 {
-            resource-range = <528 32>;
-        };
         IQNET_QUEUE-qm1 {
             resource-range = <832 48>;
         };
-        EDMA_0_QUEUE-qm1 {
-            resource-range = <560 10>;
+        PASS_QUEUE-qm1 {
+            resource-range = <896 128>;
         };
         GENERAL_PURPOSE_QUEUE-qm1 {
             resource-range = <1024 7168>;

diff --git a/device/k2l/policy_dsp-only.c b/device/k2l/policy_dsp-only.c
index 6e57471620210b8a12701440cf0222c084a05192..7b147d7e77d2d30cb2993251a35d24e29a3bc5ac 100644 (file)
--- a/device/k2l/policy_dsp-only.c
+++ b/device/k2l/policy_dsp-only.c
@@ -481,10 +481,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x50,
-0x41,
-0x53,
-0x53,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -500,6 +502,8 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -511,12 +515,72 @@ const char rmDspOnlyPolicy[] = {
 0x10,
 0x00,
 0x00,
+0x02,
+0x10,
+0x00,
+0x00,
+0x00,
+0x20,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x45,
+0x44,
+0x4d,
+0x41,
+0x5f,
+0x30,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 0x03,
-0x80,
 0x00,
 0x00,
 0x00,
-0x80,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x30,
+0x00,
+0x00,
+0x00,
+0x06,
 0x69,
 0x75,
 0x20,
@@ -572,7 +636,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x13,
+0x12,
 0x69,
 0x75,
 0x20,
@@ -973,66 +1037,6 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
-0x34,
-0x30,
-0x30,
-0x5f,
-0x51,
-0x55,
-0x45,
-0x55,
-0x45,
-0x2d,
-0x71,
-0x6d,
-0x31,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x03,
-0x00,
-0x00,
-0x00,
-0x11,
-0x00,
-0x00,
-0x00,
-0x10,
-0x00,
-0x00,
-0x02,
-0x10,
-0x00,
-0x00,
-0x00,
-0x20,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
-0x28,
-0x2a,
-0x29,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x02,
-0x00,
-0x00,
-0x00,
-0x01,
 0x49,
 0x51,
 0x4e,
@@ -1089,12 +1093,10 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x30,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -1110,8 +1112,6 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -1123,12 +1123,12 @@ const char rmDspOnlyPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x02,
-0x30,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x80,
 0x69,
 0x75,
 0x20,

diff --git a/device/k2l/policy_dsp-only.dtb b/device/k2l/policy_dsp-only.dtb
index d6c9d840294325a2b9eef5af4695eccd74b0b218..6a72c3483683042530dba069d252ea6cf3a8fd41 100644 (file)
Binary files a/device/k2l/policy_dsp-only.dtb and b/device/k2l/policy_dsp-only.dtb differ

diff --git a/device/k2l/policy_dsp-only.dts b/device/k2l/policy_dsp-only.dts
index cc59861987937657ce4a69cd466f77b9ef8b92a8..cbf39ef26fbc024f686376c77117fa3d8ac451a0 100644 (file)
--- a/device/k2l/policy_dsp-only.dts
+++ b/device/k2l/policy_dsp-only.dts
@@ -38,11 +38,14 @@
         LOW_PRIORITY_QUEUE-qm1 {
             assignments = <0 512>, "iu = (*)";
         };
-        PASS_QUEUE-qm1 {
-            assignments = <896 128>, "iu = (*)";
+        GIC400_QUEUE-qm1 {
+            assignments = <528 32>, "iu = (*)";
+        };
+        EDMA_0_QUEUE-qm1 {
+            assignments = <560 6>, "iu = (*)";
         };
         INTC_QUEUE-qm1 {
-            assignments = <570 19>, "iu = (*)";
+            assignments = <570 18>, "iu = (*)";
         }; 
         FFTC_A_QUEUE-qm1 {
             assignments = <688 4>, "iu = (*)";
@@ -62,14 +65,11 @@
         INFRASTRUCTURE_QUEUE-qm1 {
             assignments = <800 32>, "iu = (*)";
         }; 
-        GIC400_QUEUE-qm1 {
-            assignments = <528 32>, "iu = (*)";
-        };
         IQNET_QUEUE-qm1 {
             assignments = <832 48>, "iu = (*)";
         };
-        EDMA_0_QUEUE-qm1 {
-            assignments = <560 10>, "iu = (*)";
+        PASS_QUEUE-qm1 {
+            assignments = <896 128>, "iu = (*)";
         };
         GENERAL_PURPOSE_QUEUE-qm1 {
             assignments = <1024 7168>, "iu = (*)";

diff --git a/device/k2l/policy_dsp_arm.c b/device/k2l/policy_dsp_arm.c
index 6e0acba91f0909d2596948f56873a9264d58ce11..2d583948f765d26f836173f6f26d5c2a34559e05 100644 (file)
--- a/device/k2l/policy_dsp_arm.c
+++ b/device/k2l/policy_dsp_arm.c
@@ -8,15 +8,15 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0d,
-0x08,
+0x3c,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x0c,
-0xec,
+0x0d,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0c,
-0xb4,
+0xe8,
 0x00,
 0x00,
 0x00,
@@ -561,10 +561,64 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x50,
+0x47,
+0x49,
+0x43,
+0x34,
+0x30,
+0x30,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x0c,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x10,
+0x00,
+0x00,
+0x00,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x45,
+0x44,
+0x4d,
 0x41,
-0x53,
-0x53,
+0x5f,
+0x30,
 0x5f,
 0x51,
 0x55,
@@ -580,6 +634,8 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
 0x03,
 0x00,
 0x00,
@@ -591,12 +647,12 @@ const char rmDspPlusArmPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x03,
-0x80,
+0x02,
+0x30,
 0x00,
 0x00,
 0x00,
-0x80,
+0x06,
 0x69,
 0x75,
 0x20,
@@ -652,7 +708,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x13,
+0x12,
 0x28,
 0x2a,
 0x29,
@@ -1089,58 +1145,6 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x47,
-0x49,
-0x43,
-0x34,
-0x30,
-0x30,
-0x5f,
-0x51,
-0x55,
-0x45,
-0x55,
-0x45,
-0x2d,
-0x71,
-0x6d,
-0x31,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x03,
-0x00,
-0x00,
-0x00,
-0x0c,
-0x00,
-0x00,
-0x00,
-0x10,
-0x00,
-0x00,
-0x02,
-0x10,
-0x00,
-0x00,
-0x00,
-0x20,
-0x28,
-0x2a,
-0x29,
-0x00,
-0x00,
-0x00,
-0x00,
-0x02,
-0x00,
-0x00,
-0x00,
-0x01,
 0x49,
 0x51,
 0x4e,
@@ -1197,12 +1201,10 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x45,
-0x44,
-0x4d,
+0x50,
 0x41,
-0x5f,
-0x30,
+0x53,
+0x53,
 0x5f,
 0x51,
 0x55,
@@ -1218,8 +1220,6 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
 0x03,
 0x00,
 0x00,
@@ -1231,12 +1231,12 @@ const char rmDspPlusArmPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x02,
-0x30,
+0x03,
+0x80,
 0x00,
 0x00,
 0x00,
-0x0a,
+0x80,
 0x69,
 0x75,
 0x20,
@@ -1299,12 +1299,12 @@ const char rmDspPlusArmPolicy[] = {
 0x10,
 0x00,
 0x00,
-0x03,
-0x80,
+0x04,
 0x00,
 0x00,
-0x0c,
-0x20,
+0x00,
+0x0b,
+0xa0,
 0x69,
 0x75,
 0x20,
@@ -2308,7 +2308,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x46,
 0x00,
 0x00,
 0x00,
@@ -2320,7 +2320,48 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x01,
+0x00,
+0x00,
+0x00,
+0x07,
+0x69,
+0x75,
+0x20,
+0x3d,
 0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x09,
+0x00,
+0x00,
+0x00,
+0x15,
 0x69,
 0x75,
 0x20,
@@ -2333,6 +2374,17 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x1f,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -3405,56 +3457,4 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2l/policy_dsp_arm.dtb b/device/k2l/policy_dsp_arm.dtb
index 9aca779068fd82069f0b6a71ddf92ce454b69a44..203cbde906d76e68c36ede0b7908c3a197e25246 100644 (file)
Binary files a/device/k2l/policy_dsp_arm.dtb and b/device/k2l/policy_dsp_arm.dtb differ

diff --git a/device/k2l/policy_dsp_arm.dts b/device/k2l/policy_dsp_arm.dts
index a2bf060021ea5d2956fc0676d42af2c976d036d8..4e75e5cea2f0cb6a9de840723851d26f3ca3482e 100644 (file)
--- a/device/k2l/policy_dsp_arm.dts
+++ b/device/k2l/policy_dsp_arm.dts
@@ -47,11 +47,14 @@
                           <128 128>, "     (*)", /* used by linux (accumulator-low-#); linux pairs these to channels 36-39 */
                           <256 256>, "iu = (*)"; /* suggested for channels 40-47 */
         };
-        PASS_QUEUE-qm1 {
-            assignments = <896 128>, "iu = (*)";       /* used by both kernel and DSP */
+        GIC400_QUEUE-qm1 {
+            assignments = <528 32>,   "(*)";             /* Used by Kernel */
+        };
+        EDMA_0_QUEUE-qm1 {
+            assignments = <560 6>, "iu = (*)";
         };
         INTC_QUEUE-qm1 {
-            assignments = <570 19>,     "(*)";             /* Used by Kernel */
+            assignments = <570 18>,     "(*)";             /* Used by Kernel */
         }; 
         FFTC_A_QUEUE-qm1 {
             assignments = <688 4>, "iu = (*)";
@@ -77,17 +80,14 @@
             assignments = <800  12>,   "(*)",             /* Used by Kernel */
                           <812  20>,   "iu = (*)";
         }; 
-        GIC400_QUEUE-qm1 {
-            assignments = <528 32>,   "(*)";             /* Used by Kernel */
-        };
         IQNET_QUEUE-qm1 {
             assignments = <832 48>, "iu = (*)";
         };
-        EDMA_0_QUEUE-qm1 {
-            assignments = <560 10>, "iu = (*)";
+        PASS_QUEUE-qm1 {
+            assignments = <896 128>, "iu = (*)";       /* used by both kernel and DSP */
         };
         GENERAL_PURPOSE_QUEUE-qm1 {
-            assignments = <896  3104>,  "iu = (*)",
+            assignments = <1024 2976>,  "iu = (*)",
                           <4000 64>,    "(*)",       /* Used by Kernel */
                           <4064 2336>,  "iu = (*)",
 
@@ -155,7 +155,11 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-rx-flow-id {
-            assignments = <0 32>, "iu = (*)";
+            assignments = <0  1>, "(*)",  /* Used by kernel - netrx0 */
+                          <1  7>, "iu = (*)",
+                          <8  1>, "(*)",  /* Used by kernel - netrx1 */
+                          <9 21>, "iu = (*)",
+                          <31 1>, "(*)";  /* Used by kernel - parx */
         };   
 
         qmss-qm1-rx-ch {

diff --git a/test/k2e/armv7/linux/dspClientTest/dsp_client.cfg.xs b/test/k2e/armv7/linux/dspClientTest/dsp_client.cfg.xs
index feda73298de0596158337d6b54b638059c11b0af..64274a4a721ab9d1d665eb795e2160ba8e4e20a1 100644 (file)
--- a/test/k2e/armv7/linux/dspClientTest/dsp_client.cfg.xs
+++ b/test/k2e/armv7/linux/dspClientTest/dsp_client.cfg.xs
@@ -53,56 +53,7 @@ xdc.useModule("ti.ipc.namesrv.NameServerRemoteRpmsg");
 print ("Program.cpu.deviceName = " + Program.cpu.deviceName);
 print ("Program.platformName = " + Program.platformName);
 
-if (Program.platformName.match(/6614/)) {
-    var VirtQueue = xdc.useModule('ti.ipc.family.tci6614.VirtQueue');
-    var Interrupt = xdc.useModule('ti.ipc.family.tci6614.Interrupt');
-
-    /* Note: MultiProc_self is set during VirtQueue_init based on DNUM. */
-    var MultiProc = xdc.useModule('ti.sdo.utils.MultiProc');
-    MultiProc.setConfig(null, ["HOST", "CORE0", "CORE1", "CORE2", "CORE3"]);
-
-    Program.sectMap[".text:_c_int00"] = new Program.SectionSpec();
-    Program.sectMap[".text:_c_int00"].loadSegment = "L2SRAM";
-    Program.sectMap[".text:_c_int00"].loadAlign = 0x400;
-
-    var Hwi = xdc.useModule('ti.sysbios.family.c64p.Hwi');
-    Hwi.enableException = true;
-
-    /* This makes the vrings address range 0xa0000000 to 0xa1ffffff uncachable.
-       We assume the rest is to be left cacheable.
-       Per sprugw0b.pdf
-        0184 8280h MAR160 Memory Attribute Register 160 A000 0000h - A0FF FFFFh
-        0184 8284h MAR161 Memory Attribute Register 161 A100 0000h - A1FF FFFFh
-    */
-    var Cache = xdc.useModule('ti.sysbios.family.c66.Cache');
-    /*  This doesn't work:
-         Cache.MAR160_191 = 0xFFFFFFFC;
-         So, need to do this:
-    */
-    Cache.setMarMeta(0xA0000000, 0x1FFFFFF, 0);
-
-    Program.global.sysMinBufSize = 0x8000;
-    SysMin.bufSize  =  Program.global.sysMinBufSize;
-
-    /* Enable Memory Translation module that operates on the Resource Table */
-    var Resource = xdc.useModule('ti.ipc.remoteproc.Resource');
-    Resource.loadSegment = Program.platform.dataMemory;
-
-    /*  COMMENT OUT TO SHUT OFF LOG FOR BENCHMARKS: */
-    /*
-    Diags.setMaskMeta("ti.ipc.family.tci6614.Interrupt", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.family.tci6614.VirtQueue", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.transports.TransportRpmsg",
-        Diags.INFO|Diags.USER1|Diags.STATUS,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.namesrv.NameServerRemoteRpmsg", Diags.INFO,
-        Diags.ALWAYS_ON);
-    */
-}
-else if (Program.platformName.match(/simKepler/) ||
-        Program.cpu.deviceName.match(/^TMS320C66AK2E05$/)) {
+if (Program.cpu.deviceName.match(/TMS320C66AK2E05/)) {
     var VirtQueue = xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
     var Interrupt = xdc.useModule('ti.ipc.family.tci6638.Interrupt');
 
@@ -151,7 +102,7 @@ else if (Program.platformName.match(/simKepler/) ||
     */
 }
 else {
-    throw("messageq_common.cfg.xs: Did not match any platform!");
+    throw("dsp_client.cfg.xs: Did not match any platform!");
 }
 
 Hwi.enableException = true;

diff --git a/test/k2h/armv7/linux/dspClientTest/dsp_client.cfg.xs b/test/k2h/armv7/linux/dspClientTest/dsp_client.cfg.xs
index ad94997dfdcf1f1e247a868c9c0787bab26a1650..b8bb25bbab4b02fa622fbfb10b6b6a8d58f97cea 100644 (file)
--- a/test/k2h/armv7/linux/dspClientTest/dsp_client.cfg.xs
+++ b/test/k2h/armv7/linux/dspClientTest/dsp_client.cfg.xs
@@ -53,56 +53,7 @@ xdc.useModule("ti.ipc.namesrv.NameServerRemoteRpmsg");
 print ("Program.cpu.deviceName = " + Program.cpu.deviceName);
 print ("Program.platformName = " + Program.platformName);
 
-if (Program.platformName.match(/6614/)) {
-    var VirtQueue = xdc.useModule('ti.ipc.family.tci6614.VirtQueue');
-    var Interrupt = xdc.useModule('ti.ipc.family.tci6614.Interrupt');
-
-    /* Note: MultiProc_self is set during VirtQueue_init based on DNUM. */
-    var MultiProc = xdc.useModule('ti.sdo.utils.MultiProc');
-    MultiProc.setConfig(null, ["HOST", "CORE0", "CORE1", "CORE2", "CORE3"]);
-
-    Program.sectMap[".text:_c_int00"] = new Program.SectionSpec();
-    Program.sectMap[".text:_c_int00"].loadSegment = "L2SRAM";
-    Program.sectMap[".text:_c_int00"].loadAlign = 0x400;
-
-    var Hwi = xdc.useModule('ti.sysbios.family.c64p.Hwi');
-    Hwi.enableException = true;
-
-    /* This makes the vrings address range 0xa0000000 to 0xa1ffffff uncachable.
-       We assume the rest is to be left cacheable.
-       Per sprugw0b.pdf
-        0184 8280h MAR160 Memory Attribute Register 160 A000 0000h - A0FF FFFFh
-        0184 8284h MAR161 Memory Attribute Register 161 A100 0000h - A1FF FFFFh
-    */
-    var Cache = xdc.useModule('ti.sysbios.family.c66.Cache');
-    /*  This doesn't work:
-         Cache.MAR160_191 = 0xFFFFFFFC;
-         So, need to do this:
-    */
-    Cache.setMarMeta(0xA0000000, 0x1FFFFFF, 0);
-
-    Program.global.sysMinBufSize = 0x8000;
-    SysMin.bufSize  =  Program.global.sysMinBufSize;
-
-    /* Enable Memory Translation module that operates on the Resource Table */
-    var Resource = xdc.useModule('ti.ipc.remoteproc.Resource');
-    Resource.loadSegment = Program.platform.dataMemory;
-
-    /*  COMMENT OUT TO SHUT OFF LOG FOR BENCHMARKS: */
-    /*
-    Diags.setMaskMeta("ti.ipc.family.tci6614.Interrupt", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.family.tci6614.VirtQueue", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.transports.TransportRpmsg",
-        Diags.INFO|Diags.USER1|Diags.STATUS,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.namesrv.NameServerRemoteRpmsg", Diags.INFO,
-        Diags.ALWAYS_ON);
-    */
-}
-else if (Program.platformName.match(/simKepler/) ||
-        Program.cpu.deviceName.match(/^TMS320TCI6636$/)) {
+if (Program.cpu.deviceName.match(/TMS320TCI6636/)) {
     var VirtQueue = xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
     var Interrupt = xdc.useModule('ti.ipc.family.tci6638.Interrupt');
 
@@ -152,7 +103,7 @@ else if (Program.platformName.match(/simKepler/) ||
     */
 }
 else {
-    throw("messageq_common.cfg.xs: Did not match any platform!");
+    throw("dsp_client.cfg.xs: Did not match any platform!");
 }
 
 Hwi.enableException = true;

diff --git a/test/k2k/armv7/linux/dspClientTest/dsp_client.cfg.xs b/test/k2k/armv7/linux/dspClientTest/dsp_client.cfg.xs
index 16fa8969aeee74078b5e2e6ac6abee66053e25f1..64b1bdf745710f4b46672f01f4c60355846db2f8 100644 (file)
--- a/test/k2k/armv7/linux/dspClientTest/dsp_client.cfg.xs
+++ b/test/k2k/armv7/linux/dspClientTest/dsp_client.cfg.xs
@@ -53,56 +53,7 @@ xdc.useModule("ti.ipc.namesrv.NameServerRemoteRpmsg");
 print ("Program.cpu.deviceName = " + Program.cpu.deviceName);
 print ("Program.platformName = " + Program.platformName);
 
-if (Program.platformName.match(/6614/)) {
-    var VirtQueue = xdc.useModule('ti.ipc.family.tci6614.VirtQueue');
-    var Interrupt = xdc.useModule('ti.ipc.family.tci6614.Interrupt');
-
-    /* Note: MultiProc_self is set during VirtQueue_init based on DNUM. */
-    var MultiProc = xdc.useModule('ti.sdo.utils.MultiProc');
-    MultiProc.setConfig(null, ["HOST", "CORE0", "CORE1", "CORE2", "CORE3"]);
-
-    Program.sectMap[".text:_c_int00"] = new Program.SectionSpec();
-    Program.sectMap[".text:_c_int00"].loadSegment = "L2SRAM";
-    Program.sectMap[".text:_c_int00"].loadAlign = 0x400;
-
-    var Hwi = xdc.useModule('ti.sysbios.family.c64p.Hwi');
-    Hwi.enableException = true;
-
-    /* This makes the vrings address range 0xa0000000 to 0xa1ffffff uncachable.
-       We assume the rest is to be left cacheable.
-       Per sprugw0b.pdf
-        0184 8280h MAR160 Memory Attribute Register 160 A000 0000h - A0FF FFFFh
-        0184 8284h MAR161 Memory Attribute Register 161 A100 0000h - A1FF FFFFh
-    */
-    var Cache = xdc.useModule('ti.sysbios.family.c66.Cache');
-    /*  This doesn't work:
-         Cache.MAR160_191 = 0xFFFFFFFC;
-         So, need to do this:
-    */
-    Cache.setMarMeta(0xA0000000, 0x1FFFFFF, 0);
-
-    Program.global.sysMinBufSize = 0x8000;
-    SysMin.bufSize  =  Program.global.sysMinBufSize;
-
-    /* Enable Memory Translation module that operates on the Resource Table */
-    var Resource = xdc.useModule('ti.ipc.remoteproc.Resource');
-    Resource.loadSegment = Program.platform.dataMemory;
-
-    /*  COMMENT OUT TO SHUT OFF LOG FOR BENCHMARKS: */
-    /*
-    Diags.setMaskMeta("ti.ipc.family.tci6614.Interrupt", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.family.tci6614.VirtQueue", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.transports.TransportRpmsg",
-        Diags.INFO|Diags.USER1|Diags.STATUS,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.namesrv.NameServerRemoteRpmsg", Diags.INFO,
-        Diags.ALWAYS_ON);
-    */
-}
-else if (Program.platformName.match(/simKepler/) ||
-        Program.cpu.deviceName.match(/^TMS320TCI6638$/)) {
+if (Program.cpu.deviceName.match(/TMS320TCI6638/)) {
     var VirtQueue = xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
     var Interrupt = xdc.useModule('ti.ipc.family.tci6638.Interrupt');
 
@@ -152,7 +103,7 @@ else if (Program.platformName.match(/simKepler/) ||
     */
 }
 else {
-    throw("messageq_common.cfg.xs: Did not match any platform!");
+    throw("dsp_client.cfg.xs: Did not match any platform!");
 }
 
 Hwi.enableException = true;

diff --git a/test/k2l/armv7/linux/dspClientTest/dsp_client.cfg.xs b/test/k2l/armv7/linux/dspClientTest/dsp_client.cfg.xs
index 882e2c0aa48c052bbec4b3b0b5255de7bf1fde2b..8c72b0fe1d1aa2669c45a9304bb7f9e3f441cce8 100644 (file)
--- a/test/k2l/armv7/linux/dspClientTest/dsp_client.cfg.xs
+++ b/test/k2l/armv7/linux/dspClientTest/dsp_client.cfg.xs
@@ -53,56 +53,7 @@ xdc.useModule("ti.ipc.namesrv.NameServerRemoteRpmsg");
 print ("Program.cpu.deviceName = " + Program.cpu.deviceName);
 print ("Program.platformName = " + Program.platformName);
 
-if (Program.platformName.match(/6614/)) {
-    var VirtQueue = xdc.useModule('ti.ipc.family.tci6614.VirtQueue');
-    var Interrupt = xdc.useModule('ti.ipc.family.tci6614.Interrupt');
-
-    /* Note: MultiProc_self is set during VirtQueue_init based on DNUM. */
-    var MultiProc = xdc.useModule('ti.sdo.utils.MultiProc');
-    MultiProc.setConfig(null, ["HOST", "CORE0", "CORE1", "CORE2", "CORE3"]);
-
-    Program.sectMap[".text:_c_int00"] = new Program.SectionSpec();
-    Program.sectMap[".text:_c_int00"].loadSegment = "L2SRAM";
-    Program.sectMap[".text:_c_int00"].loadAlign = 0x400;
-
-    var Hwi = xdc.useModule('ti.sysbios.family.c64p.Hwi');
-    Hwi.enableException = true;
-
-    /* This makes the vrings address range 0xa0000000 to 0xa1ffffff uncachable.
-       We assume the rest is to be left cacheable.
-       Per sprugw0b.pdf
-        0184 8280h MAR160 Memory Attribute Register 160 A000 0000h - A0FF FFFFh
-        0184 8284h MAR161 Memory Attribute Register 161 A100 0000h - A1FF FFFFh
-    */
-    var Cache = xdc.useModule('ti.sysbios.family.c66.Cache');
-    /*  This doesn't work:
-         Cache.MAR160_191 = 0xFFFFFFFC;
-         So, need to do this:
-    */
-    Cache.setMarMeta(0xA0000000, 0x1FFFFFF, 0);
-
-    Program.global.sysMinBufSize = 0x8000;
-    SysMin.bufSize  =  Program.global.sysMinBufSize;
-
-    /* Enable Memory Translation module that operates on the Resource Table */
-    var Resource = xdc.useModule('ti.ipc.remoteproc.Resource');
-    Resource.loadSegment = Program.platform.dataMemory;
-
-    /*  COMMENT OUT TO SHUT OFF LOG FOR BENCHMARKS: */
-    /*
-    Diags.setMaskMeta("ti.ipc.family.tci6614.Interrupt", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.family.tci6614.VirtQueue", Diags.USER1,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.transports.TransportRpmsg",
-        Diags.INFO|Diags.USER1|Diags.STATUS,
-        Diags.ALWAYS_ON);
-    Diags.setMaskMeta("ti.ipc.namesrv.NameServerRemoteRpmsg", Diags.INFO,
-        Diags.ALWAYS_ON);
-    */
-}
-else if (Program.platformName.match(/simKepler/) ||
-        Program.cpu.deviceName.match(/^TMS320TCI6630K2L$/)) {
+if (Program.cpu.deviceName.match(/TMS320TCI6630K2L/)) {
     var VirtQueue = xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
     var Interrupt = xdc.useModule('ti.ipc.family.tci6638.Interrupt');
 
@@ -151,7 +102,7 @@ else if (Program.platformName.match(/simKepler/) ||
     */
 }
 else {
-    throw("messageq_common.cfg.xs: Did not match any platform!");
+    throw("dsp_client.cfg.xs: Did not match any platform!");
 }
 
 Hwi.enableException = true;