SDOCM00103974: allow internal/external linking RAM automatic allocation

diff --git a/device/k2e/global-resource-list-arm-dsp.c b/device/k2e/global-resource-list-arm-dsp.c
index bb8834dcca8a07e6d9cf16faadb82657aee759fc..6cac073afcfa8b1f2206974d19ff2c72168f72bc 100644 (file)
--- a/device/k2e/global-resource-list-arm-dsp.c
+++ b/device/k2e/global-resource-list-arm-dsp.c
@@ -7,8 +7,8 @@ const char rmGlobalResourceList[] = {
 0xed,
 0x00,
 0x00,
-0x06,
-0xe1,
+0x07,
+0x11,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x06,
-0xc4,
+0xf4,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x06,
-0x8c,
+0xbc,
 0x00,
 0x00,
 0x00,
@@ -213,6 +213,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -234,10 +238,54 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
+0x0e,
+0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x07,
+0xc0,
+0x00,
+0x00,
 0x00,
 0x00,
 0x02,
@@ -1793,4 +1841,84 @@ const char rmGlobalResourceList[] = {
 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,
+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/global-resource-list-arm-dsp.dtb b/device/k2e/global-resource-list-arm-dsp.dtb
index f8a742ff2055b7bb51209616e7b66d28b86da163..12ddfd3d6b61562cd450f5d8ada7dc71368c88fd 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 c31a87a529156a9e847ba0f645c03dd4bd3d8037..0fc7e81eb6959a7de4e218f2a1c9f99f0ce4f5c5 100644 (file)
--- a/device/k2e/global-resource-list-arm-dsp.dts
+++ b/device/k2e/global-resource-list-arm-dsp.dts
@@ -19,9 +19,13 @@
         };
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm1 {
+            /* hw allows max of 16K "internal" descriptors */
+            resource-range = <0x00000000 0x00004000>;
+        };
+        linkram-ext-qm1 {
+            /* hw allows max of 496K "external" descriptors */
+            resource-range = <0x00004000 0x0007C000>;
         };
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2e/global-resource-list.c b/device/k2e/global-resource-list.c
index 365598986f6a0034ebe459dd411d2556b0ac441e..a8d2ea7403f3cb243cb81ddff8dfa3a7489f5ba1 100644 (file)
--- a/device/k2e/global-resource-list.c
+++ b/device/k2e/global-resource-list.c
@@ -8,7 +8,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x06,
-0xaf,
+0xdf,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x06,
-0xa0,
+0xd0,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x06,
-0x68,
+0x98,
 0x00,
 0x00,
 0x00,
@@ -177,6 +177,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -198,12 +202,56 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x07,
+0xc0,
+0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -1745,52 +1793,4 @@ const char rmGlobalResourceList[] = {
 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/global-resource-list.dtb b/device/k2e/global-resource-list.dtb
index adc81fa203a88128d73a8098e6cdc1787f2e9117..7c10ce51861af29b2722a39fffd845ba4eb9fc0a 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 cfe1c9aef77fdd5ad5abbc8d09ec41e0b2392a78..9badb39c9980f4dad27c8f0035d7be1f96abfed8 100644 (file)
--- a/device/k2e/global-resource-list.dts
+++ b/device/k2e/global-resource-list.dts
@@ -16,9 +16,13 @@
         };
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm1 {
+            /* hw allows max of 16K "internal" descriptors */
+            resource-range = <0x00000000 0x00004000>;
+        };
+        linkram-ext-qm1 {
+            /* hw allows max of 496K "external" descriptors */
+            resource-range = <0x00004000 0x0007C000>;
         };
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2e/policy_dsp-only.c b/device/k2e/policy_dsp-only.c
index 5891b16c4c024a445aff92d7f6c41aefa8b6c803..c33312c3e77c2617a896b62a3afad1c117ed62f9 100644 (file)
--- a/device/k2e/policy_dsp-only.c
+++ b/device/k2e/policy_dsp-only.c
@@ -7,8 +7,8 @@ const char rmDspOnlyPolicy[] = {
 0xed,
 0x00,
 0x00,
-0x08,
-0xc4,
+0x09,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x08,
-0xa8,
+0xe4,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x08,
-0x70,
+0xac,
 0x00,
 0x00,
 0x00,
@@ -313,6 +313,10 @@ const char rmDspOnlyPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -334,8 +338,64 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x40,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x07,
+0xc0,
 0x00,
 0x69,
 0x75,
@@ -2305,4 +2365,72 @@ 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,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 };

diff --git a/device/k2e/policy_dsp-only.dtb b/device/k2e/policy_dsp-only.dtb
index d9fceeec3527f0342f7354f3a89d4f4b2dabee22..0fad06b02e85a129c7fe11fd2edd2bbaadedab93 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 59bd4ed54f5645f1d4912cbea73e5d986236d448..017c74d0a1a9867f5e775e5d3d1e581622246228 100644 (file)
--- a/device/k2e/policy_dsp-only.dts
+++ b/device/k2e/policy_dsp-only.dts
@@ -26,9 +26,13 @@
             assignments = <0 1>, "iu = (*)";
         };
         
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            assignments = <0x00000000 0x00080000>, "iu = (*)";
+        linkram-int-qm1 {
+            /* hw allows max of 16K "internal" descriptors */
+            assignments = <0x00000000 0x00004000>, "iu = (*)";
+        };
+        linkram-ext-qm1 {
+            /* hw allows max of 496K "external" descriptors */
+            assignments = <0x00004000 0x0007C000>, "iu = (*)";
         };
         
         memory-regions-qm1 {

diff --git a/device/k2e/policy_dsp_arm.c b/device/k2e/policy_dsp_arm.c
index e678e6ab7d96ba8b54cac72c1dc4439ca774f45e..45b4168222371e6cf8b557c92a19a1c87ab88c76 100644 (file)
--- a/device/k2e/policy_dsp_arm.c
+++ b/device/k2e/policy_dsp_arm.c
@@ -7,8 +7,8 @@ const char rmDspPlusArmPolicy[] = {
 0xed,
 0x00,
 0x00,
-0x0a,
-0xec,
+0x0b,
+0x18,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0xd0,
+0xfc,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0x98,
+0xc4,
 0x00,
 0x00,
 0x00,
@@ -305,6 +305,10 @@ const char rmDspPlusArmPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -316,7 +320,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x2e,
+0x11,
 0x00,
 0x00,
 0x00,
@@ -340,6 +344,45 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x1d,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
 0x40,
 0x00,
 0x00,
@@ -355,8 +398,8 @@ const char rmDspPlusArmPolicy[] = {
 0x60,
 0x00,
 0x00,
-0x01,
-0x20,
+0x00,
+0xe0,
 0x00,
 0x69,
 0x75,
@@ -372,6 +415,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -2817,4 +2861,88 @@ 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,
+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 753491304a37af2d7a329678b6966145047958e6..7aeca58cc68b591a1d436a78be39875effea5183 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 559ea8e7e74adc89bc7aa8b52576fd34176bb890..56678b0fc8f92e538000dbe263fbc55e58e45956 100644 (file)
--- a/device/k2e/policy_dsp_arm.dts
+++ b/device/k2e/policy_dsp_arm.dts
@@ -26,11 +26,14 @@
             assignments = <0 1>, "(*)";             /* Used by Kernel */
         };
         
-        linkram-qm1 {
-            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
-            assignments = <0x00000000 0x00004000>, "iu = (*)",
-                          <0x00004000 0x00002000>, "(*)", /* Used by Kernel */
-                          <0x00006000 0x00012000>, "iu = (*)";
+        linkram-int-qm1 {
+            /* linux provided 0x14000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00000000 0x00004000>, "iu = (*)";
+        };
+        linkram-ext-qm1 {
+            /* linux provided 0x14000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00004000 0x00002000>, "(*)", /* used by Kernel */
+                          <0x00006000 0x0000E000>, "iu = (*)";
         };
         
         memory-regions-qm1 {

diff --git a/device/k2h/global-resource-list-arm-dsp.c b/device/k2h/global-resource-list-arm-dsp.c
index 474fcf542ca3fb81ddf11bd7e9b9550a9003f080..3d634cf74bc089d1c234333365cb4097e467d0a8 100644 (file)
--- a/device/k2h/global-resource-list-arm-dsp.c
+++ b/device/k2h/global-resource-list-arm-dsp.c
@@ -8,7 +8,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x10,
-0x29,
+0x89,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x10,
-0x0c,
+0x6c,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmGlobalResourceList[] = {
 0x1d,
 0x00,
 0x00,
-0x0f,
-0xd4,
+0x10,
+0x34,
 0x00,
 0x00,
 0x00,
@@ -301,6 +301,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -322,8 +326,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
 0x00,
 0x00,
 0x00,
@@ -341,6 +345,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -362,10 +370,98 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
+0x0e,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
 0x00,
 0x00,
 0x02,
@@ -4225,4 +4321,36 @@ const char rmGlobalResourceList[] = {
 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/global-resource-list-arm-dsp.dtb b/device/k2h/global-resource-list-arm-dsp.dtb
index e7c29552e170803f3bb097b724e0040f6fed355f..3a707d77910323d7dc638bc1a9987a6c29514ca9 100644 (file)
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
index 7d17d8513ca4e624bbf9933989d74e7e8e831cd4..032a778362e1f625e1b98498b285fdf14e916d5a 100644 (file)
--- a/device/k2h/global-resource-list-arm-dsp.dts
+++ b/device/k2h/global-resource-list-arm-dsp.dts
@@ -25,13 +25,21 @@
         }; 
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
+        linkram-int-qm1 {
             /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+            resource-range = <0x00000000 0x00008000>;
         };
-        linkram-qm2 {
+        linkram-int-qm2 {
             /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+            resource-range = <0x00000000 0x00008000>;
+        };      
+        linkram-ext-qm1 {
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00008000 0x00078000>;
+        };
+        linkram-ext-qm2 {
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00008000 0x00078000>;
         };      
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2h/global-resource-list.c b/device/k2h/global-resource-list.c
index 4d18f8864020f83f1d48bd29e1cb0b7cf0544ac7..83c7d4af9d6fa165c98e55c9be1cc0eef43bf475 100644 (file)
--- a/device/k2h/global-resource-list.c
+++ b/device/k2h/global-resource-list.c
@@ -7,16 +7,16 @@ const char rmGlobalResourceList[] = {
 0xed,
 0x00,
 0x00,
-0x0f,
-0xf7,
+0x10,
+0x57,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x0f,
-0xe8,
+0x10,
+0x48,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmGlobalResourceList[] = {
 0x0f,
 0x00,
 0x00,
-0x0f,
-0xb0,
+0x10,
+0x10,
 0x00,
 0x00,
 0x00,
@@ -265,6 +265,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -286,8 +290,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
 0x00,
 0x00,
 0x00,
@@ -305,6 +309,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -326,12 +334,100 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -4097,4 +4193,36 @@ const char rmGlobalResourceList[] = {
 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/global-resource-list.dtb b/device/k2h/global-resource-list.dtb
index 0e52bf9220a7e6bef9a8244b65aa9099f5db0819..ca10d4b4503f7ac48bd8cb98896cf409586fd813 100644 (file)
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
index cf5d568d27328ac617d46b311d7cde77d783ec29..f421a3a5f61e8ce52431b23ad0948b3767ac0daf 100644 (file)
--- a/device/k2h/global-resource-list.dts
+++ b/device/k2h/global-resource-list.dts
@@ -22,13 +22,21 @@
         }; 
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm1 {
+            /* hw allows max of 32K "internal" descriptors */
+            resource-range = <0x00000000 0x00008000>;
         };
-        linkram-qm2 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm2 {
+            /* hw allows max of 32K "internal" descriptors */
+            resource-range = <0x00000000 0x00008000>;
+        };      
+        linkram-ext-qm1 {
+            /* hw allows max of 480K "external" descriptors */
+            resource-range = <0x00008000 0x00078000>;
+        };
+        linkram-ext-qm2 {
+            /* hw allows max of 480K "external" descriptors */
+            resource-range = <0x00008000 0x00078000>;
         };      
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2h/policy_dsp-only.c b/device/k2h/policy_dsp-only.c
index 8a58a1116f4b2c00c2d479a098c7ecab697b36f4..47d5c36f9169a156a3d4dcebb2ab1b7d7b28584c 100644 (file)
--- a/device/k2h/policy_dsp-only.c
+++ b/device/k2h/policy_dsp-only.c
@@ -8,7 +8,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x14,
-0x7c,
+0xf4,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x14,
-0x60,
+0xd8,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x14,
-0x28,
+0xa0,
 0x00,
 0x00,
 0x00,
@@ -425,6 +425,10 @@ const char rmDspOnlyPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -446,8 +450,8 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
 0x00,
 0x69,
 0x75,
@@ -477,6 +481,10 @@ const char rmDspOnlyPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -498,8 +506,120 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
 0x00,
 0x69,
 0x75,
@@ -5249,4 +5369,12 @@ const char rmDspOnlyPolicy[] = {
 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
index ffab4477433aed381c8846fd055153caa0a0f57f..16a463c544408ec913b8dc16fc708e0f8a85d971 100644 (file)
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
index 8be6abe90ae6e4ca00882c170a0b49a4273c1e3b..1acc0edaf763e889529d00331a7201be762e0682 100644 (file)
--- a/device/k2h/policy_dsp-only.dts
+++ b/device/k2h/policy_dsp-only.dts
@@ -32,13 +32,21 @@
             assignments = <0 1>, "iu = (*)";
         };
         
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            assignments = <0x00000000 0x00080000>, "iu = (*)";
+        linkram-int-qm1 {
+            /* hw allows max of 32K "internal" descriptors */
+            assignments = <0x00000000 0x00008000>, "iu = (*)";
         };
-        linkram-qm2 {
-            /* hw allows max of 512K descriptors */
-            assignments = <0x00000000 0x00080000>, "iu = (*)";
+        linkram-int-qm2 {
+            /* hw allows max of 32K "internal" descriptors */
+            assignments = <0x00000000 0x00008000>, "iu = (*)";
+        };  
+        linkram-ext-qm1 {
+            /* hw allows max of 480K "external" descriptors */
+            assignments = <0x00008000 0x00078000>, "iu = (*)";
+        };
+        linkram-ext-qm2 {
+            /* hw allows max of 480K "external" descriptors */
+            assignments = <0x00008000 0x00078000>, "iu = (*)";
         };  
         
         memory-regions-qm1 {

diff --git a/device/k2h/policy_dsp_arm.c b/device/k2h/policy_dsp_arm.c
index 58d8fa1a51ac69ca1e980dfa0911227e5f6f455a..0897ed104f61e47e8a080e82c6a8ca1887e38376 100644 (file)
--- a/device/k2h/policy_dsp_arm.c
+++ b/device/k2h/policy_dsp_arm.c
@@ -8,15 +8,15 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x17,
-0x14,
+0x8c,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x16,
-0xf8,
+0x17,
+0x70,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspPlusArmPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x16,
-0xc0,
+0x17,
+0x38,
 0x00,
 0x00,
 0x00,
@@ -409,6 +409,10 @@ const char rmDspPlusArmPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -459,7 +463,7 @@ const char rmDspPlusArmPolicy[] = {
 0x60,
 0x00,
 0x00,
-0x01,
+0x00,
 0x20,
 0x00,
 0x69,
@@ -489,6 +493,10 @@ const char rmDspPlusArmPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -539,8 +547,119 @@ const char rmDspPlusArmPolicy[] = {
 0x60,
 0x00,
 0x00,
+0x00,
+0x20,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
 0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x01,
+0x00,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
 0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x01,
+0x00,
 0x00,
 0x69,
 0x75,
@@ -556,6 +675,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -6017,4 +6137,12 @@ const char rmDspPlusArmPolicy[] = {
 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
index 77b5b88181651b1b26fe595115eb5cfc63123d31..678e76c6701a3ba81169c8665d517ca71c3a1133 100644 (file)
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
index 9ce17a0cc9de9b3aa876e7f8720f9093a246456c..e5b7c8aa41bf8909edbaa272f8e08f09c1e5fbaa 100644 (file)
--- a/device/k2h/policy_dsp_arm.dts
+++ b/device/k2h/policy_dsp_arm.dts
@@ -18,6 +18,7 @@
                       "RM_Client7";
        
     qmss {
+        /* QMSS in joint mode affects only -qm1 resource */
         control-qm1 {
             assignments = <0 1>, "iu = (*)";
         };
@@ -31,19 +32,27 @@
         linkram-control-qm2 {
             assignments = <0 1>, "(*)";             /* Used by Kernel */
         };
-        
-        linkram-qm1 {
+
+        linkram-int-qm1 {
             /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
             assignments = <0x00000000 0x00004000>, "iu = (*)",
                           <0x00004000 0x00002000>, "(*)", /* Used by Kernel */
-                          <0x00006000 0x00012000>, "iu = (*)";
+                          <0x00006000 0x00002000>, "iu = (*)";
         };
-        linkram-qm2 {
+        linkram-int-qm2 {
             /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
             assignments = <0x00000000 0x00004000>, "iu = (*)",
                           <0x00004000 0x00002000>, "(*)", /* Used by Kernel */
-                          <0x00006000 0x00012000>, "iu = (*)";
-        };  
+                          <0x00006000 0x00002000>, "iu = (*)";
+        };      
+        linkram-ext-qm1 {
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00008000 0x00010000>, "iu = (*)";
+        };
+        linkram-ext-qm2 {
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00008000 0x00010000>, "iu = (*)";
+        };      
         
         memory-regions-qm1 {
             assignments = <0  12>, "iu = (*)",

diff --git a/device/k2k/global-resource-list-arm-dsp.c b/device/k2k/global-resource-list-arm-dsp.c
index 474fcf542ca3fb81ddf11bd7e9b9550a9003f080..3d634cf74bc089d1c234333365cb4097e467d0a8 100644 (file)
--- a/device/k2k/global-resource-list-arm-dsp.c
+++ b/device/k2k/global-resource-list-arm-dsp.c
@@ -8,7 +8,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x10,
-0x29,
+0x89,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x10,
-0x0c,
+0x6c,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmGlobalResourceList[] = {
 0x1d,
 0x00,
 0x00,
-0x0f,
-0xd4,
+0x10,
+0x34,
 0x00,
 0x00,
 0x00,
@@ -301,6 +301,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -322,8 +326,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
 0x00,
 0x00,
 0x00,
@@ -341,6 +345,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -362,10 +370,98 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
+0x0e,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x0e,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
 0x00,
 0x00,
 0x02,
@@ -4225,4 +4321,36 @@ const char rmGlobalResourceList[] = {
 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/global-resource-list-arm-dsp.dtb b/device/k2k/global-resource-list-arm-dsp.dtb
index e7c29552e170803f3bb097b724e0040f6fed355f..3a707d77910323d7dc638bc1a9987a6c29514ca9 100644 (file)
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
index 7d17d8513ca4e624bbf9933989d74e7e8e831cd4..032a778362e1f625e1b98498b285fdf14e916d5a 100644 (file)
--- a/device/k2k/global-resource-list-arm-dsp.dts
+++ b/device/k2k/global-resource-list-arm-dsp.dts
@@ -25,13 +25,21 @@
         }; 
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
+        linkram-int-qm1 {
             /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+            resource-range = <0x00000000 0x00008000>;
         };
-        linkram-qm2 {
+        linkram-int-qm2 {
             /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+            resource-range = <0x00000000 0x00008000>;
+        };      
+        linkram-ext-qm1 {
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00008000 0x00078000>;
+        };
+        linkram-ext-qm2 {
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00008000 0x00078000>;
         };      
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2k/global-resource-list.c b/device/k2k/global-resource-list.c
index 4d18f8864020f83f1d48bd29e1cb0b7cf0544ac7..83c7d4af9d6fa165c98e55c9be1cc0eef43bf475 100644 (file)
--- a/device/k2k/global-resource-list.c
+++ b/device/k2k/global-resource-list.c
@@ -7,16 +7,16 @@ const char rmGlobalResourceList[] = {
 0xed,
 0x00,
 0x00,
-0x0f,
-0xf7,
+0x10,
+0x57,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x0f,
-0xe8,
+0x10,
+0x48,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmGlobalResourceList[] = {
 0x0f,
 0x00,
 0x00,
-0x0f,
-0xb0,
+0x10,
+0x10,
 0x00,
 0x00,
 0x00,
@@ -265,6 +265,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -286,8 +290,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
 0x00,
 0x00,
 0x00,
@@ -305,6 +309,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -326,12 +334,100 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -4097,4 +4193,36 @@ const char rmGlobalResourceList[] = {
 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/global-resource-list.dtb b/device/k2k/global-resource-list.dtb
index 0e52bf9220a7e6bef9a8244b65aa9099f5db0819..ca10d4b4503f7ac48bd8cb98896cf409586fd813 100644 (file)
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
index cf5d568d27328ac617d46b311d7cde77d783ec29..f421a3a5f61e8ce52431b23ad0948b3767ac0daf 100644 (file)
--- a/device/k2k/global-resource-list.dts
+++ b/device/k2k/global-resource-list.dts
@@ -22,13 +22,21 @@
         }; 
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm1 {
+            /* hw allows max of 32K "internal" descriptors */
+            resource-range = <0x00000000 0x00008000>;
         };
-        linkram-qm2 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm2 {
+            /* hw allows max of 32K "internal" descriptors */
+            resource-range = <0x00000000 0x00008000>;
+        };      
+        linkram-ext-qm1 {
+            /* hw allows max of 480K "external" descriptors */
+            resource-range = <0x00008000 0x00078000>;
+        };
+        linkram-ext-qm2 {
+            /* hw allows max of 480K "external" descriptors */
+            resource-range = <0x00008000 0x00078000>;
         };      
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2k/policy_dsp-only.c b/device/k2k/policy_dsp-only.c
index 8a58a1116f4b2c00c2d479a098c7ecab697b36f4..47d5c36f9169a156a3d4dcebb2ab1b7d7b28584c 100644 (file)
--- a/device/k2k/policy_dsp-only.c
+++ b/device/k2k/policy_dsp-only.c
@@ -8,7 +8,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x14,
-0x7c,
+0xf4,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x14,
-0x60,
+0xd8,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x14,
-0x28,
+0xa0,
 0x00,
 0x00,
 0x00,
@@ -425,6 +425,10 @@ const char rmDspOnlyPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -446,8 +450,8 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
 0x00,
 0x69,
 0x75,
@@ -477,6 +481,10 @@ const char rmDspOnlyPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -498,8 +506,120 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x80,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x07,
+0x80,
 0x00,
 0x69,
 0x75,
@@ -5249,4 +5369,12 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 };

diff --git a/device/k2k/policy_dsp-only.dtb b/device/k2k/policy_dsp-only.dtb
index ffab4477433aed381c8846fd055153caa0a0f57f..16a463c544408ec913b8dc16fc708e0f8a85d971 100644 (file)
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
index 8be6abe90ae6e4ca00882c170a0b49a4273c1e3b..1acc0edaf763e889529d00331a7201be762e0682 100644 (file)
--- a/device/k2k/policy_dsp-only.dts
+++ b/device/k2k/policy_dsp-only.dts
@@ -32,13 +32,21 @@
             assignments = <0 1>, "iu = (*)";
         };
         
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            assignments = <0x00000000 0x00080000>, "iu = (*)";
+        linkram-int-qm1 {
+            /* hw allows max of 32K "internal" descriptors */
+            assignments = <0x00000000 0x00008000>, "iu = (*)";
         };
-        linkram-qm2 {
-            /* hw allows max of 512K descriptors */
-            assignments = <0x00000000 0x00080000>, "iu = (*)";
+        linkram-int-qm2 {
+            /* hw allows max of 32K "internal" descriptors */
+            assignments = <0x00000000 0x00008000>, "iu = (*)";
+        };  
+        linkram-ext-qm1 {
+            /* hw allows max of 480K "external" descriptors */
+            assignments = <0x00008000 0x00078000>, "iu = (*)";
+        };
+        linkram-ext-qm2 {
+            /* hw allows max of 480K "external" descriptors */
+            assignments = <0x00008000 0x00078000>, "iu = (*)";
         };  
         
         memory-regions-qm1 {

diff --git a/device/k2k/policy_dsp_arm.c b/device/k2k/policy_dsp_arm.c
index 58d8fa1a51ac69ca1e980dfa0911227e5f6f455a..0897ed104f61e47e8a080e82c6a8ca1887e38376 100644 (file)
--- a/device/k2k/policy_dsp_arm.c
+++ b/device/k2k/policy_dsp_arm.c
@@ -8,15 +8,15 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x17,
-0x14,
+0x8c,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x16,
-0xf8,
+0x17,
+0x70,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspPlusArmPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x16,
-0xc0,
+0x17,
+0x38,
 0x00,
 0x00,
 0x00,
@@ -409,6 +409,10 @@ const char rmDspPlusArmPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -459,7 +463,7 @@ const char rmDspPlusArmPolicy[] = {
 0x60,
 0x00,
 0x00,
-0x01,
+0x00,
 0x20,
 0x00,
 0x69,
@@ -489,6 +493,10 @@ const char rmDspPlusArmPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x32,
@@ -539,8 +547,119 @@ const char rmDspPlusArmPolicy[] = {
 0x60,
 0x00,
 0x00,
+0x00,
+0x20,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
 0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x01,
+0x00,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
 0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x32,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x80,
+0x00,
+0x00,
+0x01,
+0x00,
 0x00,
 0x69,
 0x75,
@@ -556,6 +675,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -6017,4 +6137,12 @@ const char rmDspPlusArmPolicy[] = {
 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
index 77b5b88181651b1b26fe595115eb5cfc63123d31..678e76c6701a3ba81169c8665d517ca71c3a1133 100644 (file)
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
index 9ce17a0cc9de9b3aa876e7f8720f9093a246456c..e5b7c8aa41bf8909edbaa272f8e08f09c1e5fbaa 100644 (file)
--- a/device/k2k/policy_dsp_arm.dts
+++ b/device/k2k/policy_dsp_arm.dts
@@ -18,6 +18,7 @@
                       "RM_Client7";
        
     qmss {
+        /* QMSS in joint mode affects only -qm1 resource */
         control-qm1 {
             assignments = <0 1>, "iu = (*)";
         };
@@ -31,19 +32,27 @@
         linkram-control-qm2 {
             assignments = <0 1>, "(*)";             /* Used by Kernel */
         };
-        
-        linkram-qm1 {
+
+        linkram-int-qm1 {
             /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
             assignments = <0x00000000 0x00004000>, "iu = (*)",
                           <0x00004000 0x00002000>, "(*)", /* Used by Kernel */
-                          <0x00006000 0x00012000>, "iu = (*)";
+                          <0x00006000 0x00002000>, "iu = (*)";
         };
-        linkram-qm2 {
+        linkram-int-qm2 {
             /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
             assignments = <0x00000000 0x00004000>, "iu = (*)",
                           <0x00004000 0x00002000>, "(*)", /* Used by Kernel */
-                          <0x00006000 0x00012000>, "iu = (*)";
-        };  
+                          <0x00006000 0x00002000>, "iu = (*)";
+        };      
+        linkram-ext-qm1 {
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00008000 0x00010000>, "iu = (*)";
+        };
+        linkram-ext-qm2 {
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00008000 0x00010000>, "iu = (*)";
+        };      
         
         memory-regions-qm1 {
             assignments = <0  12>, "iu = (*)",

diff --git a/device/k2l/global-resource-list-arm-dsp.c b/device/k2l/global-resource-list-arm-dsp.c
index 473764d5bd7c6ce06bff83c8bcc04766d971683f..3cff51940e198bf5b1358e7fe3d48921412fc470 100644 (file)
--- a/device/k2l/global-resource-list-arm-dsp.c
+++ b/device/k2l/global-resource-list-arm-dsp.c
@@ -8,7 +8,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x08,
-0xb5,
+0xe5,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x08,
-0x98,
+0xc8,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x08,
-0x60,
+0x90,
 0x00,
 0x00,
 0x00,
@@ -213,6 +213,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -234,10 +238,54 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
+0x0e,
+0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x07,
+0xc0,
+0x00,
+0x00,
 0x00,
 0x00,
 0x02,
@@ -2257,52 +2305,4 @@ const char rmGlobalResourceList[] = {
 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/global-resource-list-arm-dsp.dtb b/device/k2l/global-resource-list-arm-dsp.dtb
index be55cce07421b38601462df0b7810326d858f157..45896e7778f061dc693590f7ff3ebe1f37927085 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 4a1a65342e66c59e986e6b31578b1abe5b092903..a8eac6992a9872bbb2723f6fa1d4cb7a0a778168 100644 (file)
--- a/device/k2l/global-resource-list-arm-dsp.dts
+++ b/device/k2l/global-resource-list-arm-dsp.dts
@@ -19,9 +19,13 @@
         };
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm1 {
+            /* hw allows max of 16K "internal" descriptors */
+            resource-range = <0x00000000 0x00004000>;
+        };
+        linkram-ext-qm1 {
+            /* hw allows max of 496K "external" descriptors */
+            resource-range = <0x00004000 0x0007C000>;
         };
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2l/global-resource-list.c b/device/k2l/global-resource-list.c
index 4fb60c7e80022098611b5e7b799ac8bc6a253ab4..dab37b89a1caaf0b259e4bf9fa80ed0d9d00d62d 100644 (file)
--- a/device/k2l/global-resource-list.c
+++ b/device/k2l/global-resource-list.c
@@ -8,7 +8,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x08,
-0x83,
+0xb3,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x08,
-0x74,
+0xa4,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x08,
-0x3c,
+0x6c,
 0x00,
 0x00,
 0x00,
@@ -177,6 +177,10 @@ const char rmGlobalResourceList[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -198,12 +202,56 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
 0x08,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x07,
+0xc0,
+0x00,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -2257,52 +2305,4 @@ const char rmGlobalResourceList[] = {
 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/global-resource-list.dtb b/device/k2l/global-resource-list.dtb
index d68d8dd85d782cd7ed2b2ecf724e5b831dcf5f62..4fee545d2dbb87f6ca6c5c31eb335e488ccfbd5d 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 eaddfc959346746be3cbf416bb5ca3d2393a5e39..aa4f79381887156da7b84817ffdfd13eeaf83ae9 100644 (file)
--- a/device/k2l/global-resource-list.dts
+++ b/device/k2l/global-resource-list.dts
@@ -16,9 +16,13 @@
         };
 
         /* QMSS in joint mode affects only -qm1 resource */
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            resource-range = <0x00000000 0x00080000>;
+        linkram-int-qm1 {
+            /* hw allows max of 16K "internal" descriptors */
+            resource-range = <0x00000000 0x00004000>;
+        };
+        linkram-ext-qm1 {
+            /* hw allows max of 496K "external" descriptors */
+            resource-range = <0x00004000 0x0007C000>;
         };
 
         /* QMSS in joint mode affects only -qm1 resource */

diff --git a/device/k2l/policy_dsp-only.c b/device/k2l/policy_dsp-only.c
index 7b147d7e77d2d30cb2993251a35d24e29a3bc5ac..ee3ea1edfdd6122d728eb4ab342a57c6a1d023d8 100644 (file)
--- a/device/k2l/policy_dsp-only.c
+++ b/device/k2l/policy_dsp-only.c
@@ -8,7 +8,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x0b,
-0x1c,
+0x58,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x0b,
-0x00,
+0x3c,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspOnlyPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x0a,
-0xc8,
+0x0b,
+0x04,
 0x00,
 0x00,
 0x00,
@@ -313,6 +313,10 @@ const char rmDspOnlyPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -334,8 +338,64 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x08,
 0x00,
+0x40,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x40,
+0x00,
+0x00,
+0x07,
+0xc0,
 0x00,
 0x69,
 0x75,
@@ -2885,64 +2945,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,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2l/policy_dsp-only.dtb b/device/k2l/policy_dsp-only.dtb
index 6a72c3483683042530dba069d252ea6cf3a8fd41..a0a26b1941bfd643e23a47ffa73a125df0745d86 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 cbf39ef26fbc024f686376c77117fa3d8ac451a0..bf1379133078a7e0191a92495c438c5b67fb5d6d 100644 (file)
--- a/device/k2l/policy_dsp-only.dts
+++ b/device/k2l/policy_dsp-only.dts
@@ -26,9 +26,13 @@
             assignments = <0 1>, "iu = (*)";
         };
         
-        linkram-qm1 {
-            /* hw allows max of 512K descriptors */
-            assignments = <0x00000000 0x00080000>, "iu = (*)";
+        linkram-int-qm1 {
+            /* hw allows max of 16K "internal" descriptors */
+            assignments = <0x00000000 0x00004000>, "iu = (*)";
+        };
+        linkram-ext-qm1 {
+            /* hw allows max of 496K "external" descriptors */
+            assignments = <0x00004000 0x0007C000>, "iu = (*)";
         };
         
         memory-regions-qm1 {

diff --git a/device/k2l/policy_dsp_arm.c b/device/k2l/policy_dsp_arm.c
index b1d70789afcaf34118515e4a56fb0b3891f49217..955edd989d8a6b4cfa49fc18673460ee29d74847 100644 (file)
--- a/device/k2l/policy_dsp_arm.c
+++ b/device/k2l/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0d,
-0x44,
+0x70,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0d,
-0x28,
+0x54,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspPlusArmPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x0c,
-0xf0,
+0x0d,
+0x1c,
 0x00,
 0x00,
 0x00,
@@ -305,6 +305,10 @@ const char rmDspPlusArmPolicy[] = {
 0x61,
 0x6d,
 0x2d,
+0x69,
+0x6e,
+0x74,
+0x2d,
 0x71,
 0x6d,
 0x31,
@@ -316,7 +320,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x2e,
+0x11,
 0x00,
 0x00,
 0x00,
@@ -340,6 +344,45 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x6c,
+0x69,
+0x6e,
+0x6b,
+0x72,
+0x61,
+0x6d,
+0x2d,
+0x65,
+0x78,
+0x74,
+0x2d,
+0x71,
+0x6d,
+0x31,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x1d,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
 0x40,
 0x00,
 0x00,
@@ -355,8 +398,8 @@ const char rmDspPlusArmPolicy[] = {
 0x60,
 0x00,
 0x00,
-0x01,
-0x20,
+0x00,
+0xe0,
 0x00,
 0x69,
 0x75,
@@ -372,6 +415,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -3413,48 +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,
 };

diff --git a/device/k2l/policy_dsp_arm.dtb b/device/k2l/policy_dsp_arm.dtb
index 1ef3e1902311de5f7927c0cefdb1f9594820214a..5a631dde3d88dc3f9571199930023a253c0c3c5d 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 b29d11b8eb73534c8f2495dd66dd26b5c957631a..dca82b495ebb5dbcaf66d7a463e474ea568e11e7 100644 (file)
--- a/device/k2l/policy_dsp_arm.dts
+++ b/device/k2l/policy_dsp_arm.dts
@@ -26,11 +26,14 @@
             assignments = <0 1>, "(*)";             /* Used by Kernel */
         };
         
-        linkram-qm1 {
-            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
-            assignments = <0x00000000 0x00004000>, "iu = (*)",
-                          <0x00004000 0x00002000>, "(*)", /* Used by Kernel */
-                          <0x00006000 0x00012000>, "iu = (*)";
+        linkram-int-qm1 {
+            /* linux provided 0x14000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00000000 0x00004000>, "iu = (*)";
+        };
+        linkram-ext-qm1 {
+            /* linux provided 0x14000 descriptors of linking RAM but uses 0x4000 to 0x6000 */
+            assignments = <0x00004000 0x00002000>, "(*)", /* used by Kernel */
+                          <0x00006000 0x0000E000>, "iu = (*)";
         };
         
         memory-regions-qm1 {

diff --git a/docs/ReleaseNotes_RM.doc b/docs/ReleaseNotes_RM.doc
index 4adce6ccb47ef25ebbfa813a134e5a7f890f94c7..1b1d0374ac50c0947cf6f6c3a5f6b2139c98fa6c 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 784d8ce314b7bf2b9bf771aa7b5012087654facc..6717b60b31d9b574b026efa8133088f1c7e860cc 100644 (file)
Binary files a/docs/ReleaseNotes_RM.pdf and b/docs/ReleaseNotes_RM.pdf differ