Add support for Qmss_QueueType_INTC_SET[234]_QUEUE to allow all INTC/CIC queues

diff --git a/device/k2h/global-resource-list-arm-dsp.c b/device/k2h/global-resource-list-arm-dsp.c
old mode 100644 (file)
new mode 100755 (executable)
index d64485a..cc3df87
--- a/device/k2h/global-resource-list-arm-dsp.c
+++ b/device/k2h/global-resource-list-arm-dsp.c
@@ -7,16 +7,16 @@ const char rmGlobalResourceList[] = {
 0xed,
 0x00,
 0x00,
-0x0e,
-0x99,
+0x0f,
+0x29,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x0e,
-0x7c,
+0x0f,
+0x0c,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x44,
+0xd4,
 0x00,
 0x00,
 0x00,
@@ -653,6 +653,102 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x53,
 0x52,
 0x49,
@@ -1361,6 +1457,54 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -3825,20 +3969,4 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2h/global-resource-list-arm-dsp.dtb b/device/k2h/global-resource-list-arm-dsp.dtb
old mode 100644 (file)
new mode 100755 (executable)
index db2b914..92a7a11
Binary files a/device/k2h/global-resource-list-arm-dsp.dtb and b/device/k2h/global-resource-list-arm-dsp.dtb differ

diff --git a/device/k2h/global-resource-list-arm-dsp.dts b/device/k2h/global-resource-list-arm-dsp.dts
old mode 100644 (file)
new mode 100755 (executable)
index 00ae610..d854afc
--- a/device/k2h/global-resource-list-arm-dsp.dts
+++ b/device/k2h/global-resource-list-arm-dsp.dts
@@ -55,6 +55,12 @@
         INTC_QUEUE-qm1 {
             resource-range = <652 6>;
         }; 
+        INTC_SET2_QUEUE-qm1 {
+            resource-range = <658 8>;
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            resource-range = <666 6>;
+        }; 
         SRIO_QUEUE-qm1 {
             resource-range = <672 16>;
         }; 
@@ -97,6 +103,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             resource-range = <8192 512>;
         };
+        INTC_SET4_QUEUE-qm2 {
+            resource-range = <8844 20>;
+        }; 
         GIC400_QUEUE-qm2 {
             resource-range = <8704 32>;
         };    

diff --git a/device/k2h/global-resource-list.c b/device/k2h/global-resource-list.c
old mode 100644 (file)
new mode 100755 (executable)
index b39a36c..f5bf8ff
--- a/device/k2h/global-resource-list.c
+++ b/device/k2h/global-resource-list.c
@@ -8,7 +8,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x67,
+0xf7,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x58,
+0xe8,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x20,
+0xb0,
 0x00,
 0x00,
 0x00,
@@ -617,6 +617,102 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x53,
 0x52,
 0x49,
@@ -1325,6 +1421,54 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -3697,20 +3841,4 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2h/global-resource-list.dtb b/device/k2h/global-resource-list.dtb
old mode 100644 (file)
new mode 100755 (executable)
index aa2011f..3f29dc3
Binary files a/device/k2h/global-resource-list.dtb and b/device/k2h/global-resource-list.dtb differ

diff --git a/device/k2h/global-resource-list.dts b/device/k2h/global-resource-list.dts
old mode 100644 (file)
new mode 100755 (executable)
index 469afb9..e3a0c94
--- a/device/k2h/global-resource-list.dts
+++ b/device/k2h/global-resource-list.dts
@@ -52,6 +52,12 @@
         INTC_QUEUE-qm1 {
             resource-range = <652 6>;
         }; 
+        INTC_SET2_QUEUE-qm1 {
+            resource-range = <658 8>;
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            resource-range = <666 6>;
+        }; 
         SRIO_QUEUE-qm1 {
             resource-range = <672 16>;
         }; 
@@ -94,6 +100,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             resource-range = <8192 512>;
         };
+        INTC_SET4_QUEUE-qm2 {
+            resource-range = <8844 20>;
+        }; 
         GIC400_QUEUE-qm2 {
             resource-range = <8704 32>;
         };    

diff --git a/device/k2h/policy_dsp-only.c b/device/k2h/policy_dsp-only.c
old mode 100644 (file)
new mode 100755 (executable)
index 17e9faa..292911b
--- a/device/k2h/policy_dsp-only.c
+++ b/device/k2h/policy_dsp-only.c
@@ -7,16 +7,16 @@ const char rmDspOnlyPolicy[] = {
 0xed,
 0x00,
 0x00,
-0x12,
-0x80,
+0x13,
+0x34,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x12,
-0x64,
+0x13,
+0x18,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x12,
-0x2c,
+0xe0,
 0x00,
 0x00,
 0x00,
@@ -873,6 +873,126 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x53,
 0x52,
 0x49,
@@ -1749,6 +1869,66 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -4813,56 +4993,4 @@ const char rmDspOnlyPolicy[] = {
 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/k2h/policy_dsp-only.dtb b/device/k2h/policy_dsp-only.dtb
old mode 100644 (file)
new mode 100755 (executable)
index a022f4a..b729480
Binary files a/device/k2h/policy_dsp-only.dtb and b/device/k2h/policy_dsp-only.dtb differ

diff --git a/device/k2h/policy_dsp-only.dts b/device/k2h/policy_dsp-only.dts
old mode 100644 (file)
new mode 100755 (executable)
index c75cb63..e82c9d9
--- a/device/k2h/policy_dsp-only.dts
+++ b/device/k2h/policy_dsp-only.dts
@@ -48,6 +48,7 @@
             assignments = <0 64>, "iu = (*)";
         };
         
+        /* Queues match device specification and/or csl_qm_queue.h regardless of split or joint mode */
         LOW_PRIORITY_QUEUE-qm1 {
             assignments = <0 512>, "iu = (*)";
         };
@@ -60,6 +61,12 @@
         INTC_QUEUE-qm1 {
             assignments = <652 6>, "iu = (*)";
         }; 
+        INTC_SET2_QUEUE-qm1 {
+            assignments = <658 8>, "iu = (*)";
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            assignments = <666 6>, "iu = (*)";
+        }; 
         SRIO_QUEUE-qm1 {
             assignments = <672 16>, "iu = (*)";
         }; 
@@ -102,6 +109,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             assignments = <8192 512>, "iu = (*)";
         };
+        INTC_SET4_QUEUE-qm2 {
+            assignments = <8844 20>, "iu = (*)";
+        }; 
         GIC400_QUEUE-qm2 {
             assignments = <8704 32>, "iu = (*)";
         };    

diff --git a/device/k2h/policy_dsp_arm.c b/device/k2h/policy_dsp_arm.c
old mode 100644 (file)
new mode 100755 (executable)
index 18e16be..149eec6
--- a/device/k2h/policy_dsp_arm.c
+++ b/device/k2h/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x13,
-0x1c,
+0xd0,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x13,
-0x00,
+0xb4,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspPlusArmPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x12,
-0xc8,
+0x13,
+0x7c,
 0x00,
 0x00,
 0x00,
@@ -936,7 +936,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
+0x11,
 0x00,
 0x00,
 0x00,
@@ -949,6 +949,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x06,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -956,6 +961,121 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x0c,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -1877,6 +1997,66 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -4941,56 +5121,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/k2h/policy_dsp_arm.dtb b/device/k2h/policy_dsp_arm.dtb
old mode 100644 (file)
new mode 100755 (executable)
index 370cf2a..21799d0
Binary files a/device/k2h/policy_dsp_arm.dtb and b/device/k2h/policy_dsp_arm.dtb differ

diff --git a/device/k2h/policy_dsp_arm.dts b/device/k2h/policy_dsp_arm.dts
old mode 100644 (file)
new mode 100755 (executable)
index 108a8db..85685fd
--- a/device/k2h/policy_dsp_arm.dts
+++ b/device/k2h/policy_dsp_arm.dts
@@ -66,7 +66,13 @@
             assignments = <640  9>,  "iu = (*)";             
         };
         INTC_QUEUE-qm1 {
-            assignments = <652 6>,     "(*)";            /* Used by kernel */
+            assignments = <652 6>, "iu = (*)";
+        }; 
+        INTC_SET2_QUEUE-qm1 {
+            assignments = <658 8>, "(*)"; /* potentially used by kernel */
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            assignments = <666 6>, "iu = (*)";
         }; 
         SRIO_QUEUE-qm1 {
             assignments = <672 16>, "iu = (*)";
@@ -113,6 +119,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             assignments = <8192 512>, "iu = (*)";
         };
+        INTC_SET4_QUEUE-qm2 {
+            assignments = <8844 20>, "iu = (*)";
+        }; 
         GIC400_QUEUE-qm2 {
             assignments = <8704 32>,   "(*)";             /* Used by Kernel */
         };    

diff --git a/device/k2k/global-resource-list-arm-dsp.c b/device/k2k/global-resource-list-arm-dsp.c
old mode 100644 (file)
new mode 100755 (executable)
index 134f7b4..f2802df
--- a/device/k2k/global-resource-list-arm-dsp.c
+++ b/device/k2k/global-resource-list-arm-dsp.c
@@ -8,15 +8,15 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0f,
-0x15,
+0xa5,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x0e,
-0xf8,
+0x0f,
+0x88,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmGlobalResourceList[] = {
 0x1d,
 0x00,
 0x00,
-0x0e,
-0xc0,
+0x0f,
+0x50,
 0x00,
 0x00,
 0x00,
@@ -653,6 +653,102 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x53,
 0x52,
 0x49,
@@ -1361,6 +1457,54 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -3953,20 +4097,4 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2k/global-resource-list-arm-dsp.dtb b/device/k2k/global-resource-list-arm-dsp.dtb
old mode 100644 (file)
new mode 100755 (executable)
index 72e5614..6b57a76
Binary files a/device/k2k/global-resource-list-arm-dsp.dtb and b/device/k2k/global-resource-list-arm-dsp.dtb differ

diff --git a/device/k2k/global-resource-list-arm-dsp.dts b/device/k2k/global-resource-list-arm-dsp.dts
old mode 100644 (file)
new mode 100755 (executable)
index e6669a4..cdeeb5a
--- a/device/k2k/global-resource-list-arm-dsp.dts
+++ b/device/k2k/global-resource-list-arm-dsp.dts
@@ -55,6 +55,12 @@
         INTC_QUEUE-qm1 {
             resource-range = <652 6>;
         }; 
+        INTC_SET2_QUEUE-qm1 {
+            resource-range = <658 8>;
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            resource-range = <666 6>;
+        }; 
         SRIO_QUEUE-qm1 {
             resource-range = <672 16>;
         }; 
@@ -97,6 +103,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             resource-range = <8192 512>;
         };
+        INTC_SET4_QUEUE-qm2 {
+            resource-range = <8844 20>;
+        }; 
         GIC400_QUEUE-qm2 {
             resource-range = <8704 32>;
         };    

diff --git a/device/k2k/global-resource-list.c b/device/k2k/global-resource-list.c
old mode 100644 (file)
new mode 100755 (executable)
index 277db8a..4a28330
--- a/device/k2k/global-resource-list.c
+++ b/device/k2k/global-resource-list.c
@@ -7,16 +7,16 @@ const char rmGlobalResourceList[] = {
 0xed,
 0x00,
 0x00,
-0x0e,
-0xe3,
+0x0f,
+0x73,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x0e,
-0xd4,
+0x0f,
+0x64,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmGlobalResourceList[] = {
 0x0f,
 0x00,
 0x00,
-0x0e,
-0x9c,
+0x0f,
+0x2c,
 0x00,
 0x00,
 0x00,
@@ -617,6 +617,102 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x53,
 0x52,
 0x49,
@@ -1325,6 +1421,54 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -3825,20 +3969,4 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2k/global-resource-list.dtb b/device/k2k/global-resource-list.dtb
old mode 100644 (file)
new mode 100755 (executable)
index 8eebb45..ede8378
Binary files a/device/k2k/global-resource-list.dtb and b/device/k2k/global-resource-list.dtb differ

diff --git a/device/k2k/global-resource-list.dts b/device/k2k/global-resource-list.dts
old mode 100644 (file)
new mode 100755 (executable)
index 64c6d08..8eccfff
--- a/device/k2k/global-resource-list.dts
+++ b/device/k2k/global-resource-list.dts
@@ -52,6 +52,12 @@
         INTC_QUEUE-qm1 {
             resource-range = <652 6>;
         }; 
+        INTC_SET2_QUEUE-qm1 {
+            resource-range = <658 8>;
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            resource-range = <666 6>;
+        }; 
         SRIO_QUEUE-qm1 {
             resource-range = <672 16>;
         }; 
@@ -94,6 +100,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             resource-range = <8192 512>;
         };
+        INTC_SET4_QUEUE-qm2 {
+            resource-range = <8844 20>;
+        }; 
         GIC400_QUEUE-qm2 {
             resource-range = <8704 32>;
         };    

diff --git a/device/k2k/policy_dsp-only.c b/device/k2k/policy_dsp-only.c
old mode 100644 (file)
new mode 100755 (executable)
index 17e9faa..86668a1
--- a/device/k2k/policy_dsp-only.c
+++ b/device/k2k/policy_dsp-only.c
@@ -7,16 +7,16 @@ const char rmDspOnlyPolicy[] = {
 0xed,
 0x00,
 0x00,
-0x12,
-0x80,
+0x13,
+0xd4,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x12,
-0x64,
+0x13,
+0xb8,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspOnlyPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x12,
-0x2c,
+0x13,
+0x80,
 0x00,
 0x00,
 0x00,
@@ -873,6 +873,126 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x53,
 0x52,
 0x49,
@@ -1749,6 +1869,66 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -4588,25 +4768,17 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x02,
-0x00,
-0x00,
-0x00,
 0x01,
-0x70,
-0x61,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x01,
-0x70,
-0x61,
+0x78,
+0x67,
+0x65,
 0x2d,
-0x6c,
-0x75,
-0x74,
+0x72,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -4628,7 +4800,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x05,
+0x10,
 0x69,
 0x75,
 0x20,
@@ -4649,17 +4821,17 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x01,
-0x70,
-0x61,
-0x2d,
-0x66,
-0x69,
-0x72,
-0x6d,
-0x77,
-0x61,
-0x72,
+0x78,
+0x67,
 0x65,
+0x2d,
+0x74,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -4680,7 +4852,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x01,
+0x08,
 0x69,
 0x75,
 0x20,
@@ -4700,43 +4872,35 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x02,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x72,
+0x78,
+0x2d,
+0x66,
+0x6c,
+0x6f,
+0x77,
+0x2d,
+0x69,
+0x64,
 0x00,
 0x00,
 0x00,
-0x02,
 0x00,
 0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
 0x00,
-0x09,
-0x76,
-0x61,
-0x6c,
-0x69,
-0x64,
-0x2d,
-0x69,
-0x6e,
-0x73,
-0x74,
-0x61,
-0x6e,
-0x63,
-0x65,
-0x73,
 0x00,
-0x61,
-0x73,
-0x73,
-0x69,
-0x67,
-0x6e,
-0x6d,
-0x65,
-0x6e,
-0x74,
-0x73,
 0x00,
+0x10,
 0x00,
 0x00,
 0x00,
@@ -4744,6 +4908,15 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x20,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
 0x00,
 0x00,
 0x00,
@@ -4751,28 +4924,43 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x02,
 0x00,
 0x00,
 0x00,
+0x02,
 0x00,
 0x00,
 0x00,
+0x01,
+0x70,
+0x61,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
+0x01,
+0x70,
+0x61,
+0x2d,
+0x6c,
+0x75,
+0x74,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
+0x03,
 0x00,
 0x00,
 0x00,
+0x11,
 0x00,
 0x00,
 0x00,
+0x10,
 0x00,
 0x00,
 0x00,
@@ -4780,6 +4968,15 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x05,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
 0x00,
 0x00,
 0x00,
@@ -4787,19 +4984,35 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x02,
 0x00,
 0x00,
 0x00,
+0x01,
+0x70,
+0x61,
+0x2d,
+0x66,
+0x69,
+0x72,
+0x6d,
+0x77,
+0x61,
+0x72,
+0x65,
 0x00,
 0x00,
 0x00,
 0x00,
+0x03,
 0x00,
 0x00,
 0x00,
+0x11,
 0x00,
 0x00,
 0x00,
+0x10,
 0x00,
 0x00,
 0x00,
@@ -4807,6 +5020,15 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x01,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
 0x00,
 0x00,
 0x00,
@@ -4814,12 +5036,46 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x02,
 0x00,
 0x00,
 0x00,
+0x02,
 0x00,
 0x00,
 0x00,
+0x09,
+0x76,
+0x61,
+0x6c,
+0x69,
+0x64,
+0x2d,
+0x69,
+0x6e,
+0x73,
+0x74,
+0x61,
+0x6e,
+0x63,
+0x65,
+0x73,
+0x00,
+0x61,
+0x73,
+0x73,
+0x69,
+0x67,
+0x6e,
+0x6d,
+0x65,
+0x6e,
+0x74,
+0x73,
 0x00,
 0x00,
 0x00,

diff --git a/device/k2k/policy_dsp-only.dtb b/device/k2k/policy_dsp-only.dtb
old mode 100644 (file)
new mode 100755 (executable)
index a022f4a..2252456
Binary files a/device/k2k/policy_dsp-only.dtb and b/device/k2k/policy_dsp-only.dtb differ

diff --git a/device/k2k/policy_dsp-only.dts b/device/k2k/policy_dsp-only.dts
old mode 100644 (file)
new mode 100755 (executable)
index c75cb63..8c08bde
--- a/device/k2k/policy_dsp-only.dts
+++ b/device/k2k/policy_dsp-only.dts
@@ -48,6 +48,7 @@
             assignments = <0 64>, "iu = (*)";
         };
         
+        /* Queues match device specification and/or csl_qm_queue.h regardless of split or joint mode */
         LOW_PRIORITY_QUEUE-qm1 {
             assignments = <0 512>, "iu = (*)";
         };
@@ -60,6 +61,12 @@
         INTC_QUEUE-qm1 {
             assignments = <652 6>, "iu = (*)";
         }; 
+        INTC_SET2_QUEUE-qm1 {
+            assignments = <658 8>, "iu = (*)";
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            assignments = <666 6>, "iu = (*)";
+        }; 
         SRIO_QUEUE-qm1 {
             assignments = <672 16>, "iu = (*)";
         }; 
@@ -102,6 +109,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             assignments = <8192 512>, "iu = (*)";
         };
+        INTC_SET4_QUEUE-qm2 {
+            assignments = <8844 20>, "iu = (*)";
+        }; 
         GIC400_QUEUE-qm2 {
             assignments = <8704 32>, "iu = (*)";
         };    
@@ -264,6 +274,16 @@
         bcp-rx-flow-id {
             assignments = <0 64>, "iu = (*)";
         };           
+
+        xge-rx-ch {
+            assignments = <0 16>, "iu = (*)";
+        };
+        xge-tx-ch {
+            assignments = <0 8>, "iu = (*)";
+        };
+        xge-rx-flow-id {
+            assignments = <0 32>, "iu = (*)";
+        };           
     }; /* cppi */
 
     pa {

diff --git a/device/k2k/policy_dsp_arm.c b/device/k2k/policy_dsp_arm.c
old mode 100644 (file)
new mode 100755 (executable)
index 82ccb3d..a05e31b
--- a/device/k2k/policy_dsp_arm.c
+++ b/device/k2k/policy_dsp_arm.c
@@ -7,16 +7,16 @@ const char rmDspPlusArmPolicy[] = {
 0xed,
 0x00,
 0x00,
-0x13,
-0xbc,
+0x14,
+0x70,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x13,
-0xa0,
+0x14,
+0x54,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspPlusArmPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x13,
-0x68,
+0x14,
+0x1c,
 0x00,
 0x00,
 0x00,
@@ -936,7 +936,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
+0x11,
 0x00,
 0x00,
 0x00,
@@ -949,6 +949,123 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x06,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x32,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x0c,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x92,
+0x00,
+0x00,
+0x00,
+0x08,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x33,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x02,
+0x9a,
+0x00,
+0x00,
+0x00,
+0x06,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -956,6 +1073,9 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -1877,6 +1997,66 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x01,
+0x49,
+0x4e,
+0x54,
+0x43,
+0x5f,
+0x53,
+0x45,
+0x54,
+0x34,
+0x5f,
+0x51,
+0x55,
+0x45,
+0x55,
+0x45,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x22,
+0x8c,
+0x00,
+0x00,
+0x00,
+0x14,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
 0x47,
 0x49,
 0x43,
@@ -5069,56 +5249,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/k2k/policy_dsp_arm.dtb b/device/k2k/policy_dsp_arm.dtb
old mode 100644 (file)
new mode 100755 (executable)
index d1235a9..59fe266
Binary files a/device/k2k/policy_dsp_arm.dtb and b/device/k2k/policy_dsp_arm.dtb differ

diff --git a/device/k2k/policy_dsp_arm.dts b/device/k2k/policy_dsp_arm.dts
old mode 100644 (file)
new mode 100755 (executable)
index 5a6a715..20e3f26
--- a/device/k2k/policy_dsp_arm.dts
+++ b/device/k2k/policy_dsp_arm.dts
@@ -66,7 +66,13 @@
             assignments = <640  9>,  "iu = (*)";             
         };
         INTC_QUEUE-qm1 {
-            assignments = <652 6>,     "(*)";            /* Used by kernel */
+            assignments = <652 6>, "iu = (*)";
+        }; 
+        INTC_SET2_QUEUE-qm1 {
+            assignments = <658 8>, "(*)"; /* potentially used by kernel */
+        }; 
+        INTC_SET3_QUEUE-qm1 {
+            assignments = <666 6>, "iu = (*)";
         }; 
         SRIO_QUEUE-qm1 {
             assignments = <672 16>, "iu = (*)";
@@ -113,6 +119,9 @@
         LOW_PRIORITY_QUEUE-qm2 {
             assignments = <8192 512>, "iu = (*)";
         };
+        INTC_SET4_QUEUE-qm2 {
+            assignments = <8844 20>, "iu = (*)";
+        }; 
         GIC400_QUEUE-qm2 {
             assignments = <8704 32>,   "(*)";             /* Used by Kernel */
         };    

diff --git a/docs/ReleaseNotes_RM.doc b/docs/ReleaseNotes_RM.doc
index a09328ac57b84dcdab4ef9626c34db7279055c86..6ec09ebca7e845a2af158a4ce0475122aa2d845a 100644 (file)
Binary files a/docs/ReleaseNotes_RM.doc and b/docs/ReleaseNotes_RM.doc differ

diff --git a/docs/ReleaseNotes_RM.pdf b/docs/ReleaseNotes_RM.pdf
index eec1a4025a9da6da7912e904633361e78faac3f3..4067c3164488b29f13938179409ee8d25a3b51df 100644 (file)
Binary files a/docs/ReleaseNotes_RM.pdf and b/docs/ReleaseNotes_RM.pdf differ

diff --git a/package.xdc b/package.xdc
old mode 100644 (file)
new mode 100755 (executable)
index 51a5e08..c764e8e
--- a/package.xdc
+++ b/package.xdc
@@ -9,6 +9,6 @@
  * Copyright (C) 2012-2013, Texas Instruments, Inc.\r
  *****************************************************************************/\r
 \r
-package ti.drv.rm[02, 00, 00, 04] {\r
+package ti.drv.rm[02, 00, 00, 05] {\r
     module Settings;\r
 }\r

diff --git a/rmver.h b/rmver.h
old mode 100644 (file)
new mode 100755 (executable)
index a388b61..7dc2a4c
--- a/rmver.h
+++ b/rmver.h
@@ -51,13 +51,13 @@ extern "C" {
  * format:
  *  0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
  */
-#define RM_VERSION_ID                   (0x02000004)
+#define RM_VERSION_ID                   (0x02000005)
 
 /**
  * @brief   This is the version string which describes the RM along with the
  * date and build information.
  */
-#define RM_VERSION_STR                  "RM Revision: 02.00.00.04"
+#define RM_VERSION_STR                  "RM Revision: 02.00.00.05"
 
 
 #ifdef __cplusplus