sync with linux

diff --git a/device/k2h/global-resource-list-arm-dsp.c b/device/k2h/global-resource-list-arm-dsp.c
index c30f3cbf6e33821b5042f7aea21690583712863a..f596dcc63155d8375e131805a14696326f9935f8 100644 (file)
--- a/device/k2h/global-resource-list-arm-dsp.c
+++ b/device/k2h/global-resource-list-arm-dsp.c
@@ -321,10 +321,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -361,10 +361,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+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 2a16da54b949b900ad718538a494f20215ee7b10..b59c227c657afc22bb3cb0857e263522d5ca4760 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 05ae4cc73f5e11e389be84037ddb9d6ab5e3481f..d32b9807cbaeee524becdab670a81d65d7d28a38 100644 (file)
--- a/device/k2h/global-resource-list-arm-dsp.dts
+++ b/device/k2h/global-resource-list-arm-dsp.dts
@@ -26,10 +26,12 @@
 
         /* QMSS in joint mode affects only -qm1 resource */
         linkram-qm1 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };
         linkram-qm2 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };      
 
         /* 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 28abf11d35bb05e32314c88bef9e061875aa66e7..7d86ac41de27c1049f918e8686ad67e879b2038b 100644 (file)
--- a/device/k2h/global-resource-list.c
+++ b/device/k2h/global-resource-list.c
@@ -285,10 +285,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -325,10 +325,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,

diff --git a/device/k2h/global-resource-list.dtb b/device/k2h/global-resource-list.dtb
index 234b87f18b306b32475ee06ebe1cdfe392879822..e5f2250600380959192447e2bb59e6130055dde6 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 c51c883316a771cfa5f81b4efdf493dc916912ac..f79412550f9583cfff6abc0dee4b906c1d1ac875 100644 (file)
--- a/device/k2h/global-resource-list.dts
+++ b/device/k2h/global-resource-list.dts
@@ -23,10 +23,12 @@
 
         /* QMSS in joint mode affects only -qm1 resource */
         linkram-qm1 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };
         linkram-qm2 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };      
 
         /* 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 c0f5b74e1a23aa5c84244568eaa84ebdf1fd340f..a39a5a550ff5de45e3c13c492d977ddac9f9dc90 100644 (file)
--- a/device/k2h/policy_dsp-only.c
+++ b/device/k2h/policy_dsp-only.c
@@ -445,10 +445,10 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x69,
 0x75,
 0x20,
@@ -497,10 +497,10 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x69,
 0x75,
 0x20,

diff --git a/device/k2h/policy_dsp-only.dtb b/device/k2h/policy_dsp-only.dtb
index c521cc3e4f3cb3f48c635b6704945d96de4fb528..48487e35dd7d575630b1c8da57a04c93890723bc 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 4cef671f0afc1ba361d8eed396a1db65e27e992d..193478d2bba682201a48e5266996c4c48bb24b4a 100644 (file)
--- a/device/k2h/policy_dsp-only.dts
+++ b/device/k2h/policy_dsp-only.dts
@@ -33,10 +33,12 @@
         };
         
         linkram-qm1 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* hw allows max of 512K descriptors */
+            assignments = <0x00000000 0x00080000>, "iu = (*)";
         };
         linkram-qm2 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* hw allows max of 512K descriptors */
+            assignments = <0x00000000 0x00080000>, "iu = (*)";
         };  
         
         memory-regions-qm1 {

diff --git a/device/k2h/policy_dsp_arm.c b/device/k2h/policy_dsp_arm.c
index 89404108c09baa7401e35d9269aa4c393e99ef86..a495238076acbc7f9b008f3b309fcceefb69f692 100644 (file)
--- a/device/k2h/policy_dsp_arm.c
+++ b/device/k2h/policy_dsp_arm.c
@@ -7,8 +7,8 @@ const char rmDspPlusArmPolicy[] = {
 0xed,
 0x00,
 0x00,
-0x12,
-0xb8,
+0x13,
+0x0c,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x12,
-0x9c,
+0xf0,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x12,
-0x64,
+0xb8,
 0x00,
 0x00,
 0x00,
@@ -420,7 +420,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x2e,
 0x00,
 0x00,
 0x00,
@@ -429,10 +429,10 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x00,
+0x40,
+0x00,
 0x69,
 0x75,
 0x20,
@@ -444,6 +444,34 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x18,
+0x00,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x58,
+0x00,
+0x00,
+0x01,
+0x28,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -472,7 +500,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x2e,
 0x00,
 0x00,
 0x00,
@@ -481,10 +509,10 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x00,
+0x40,
+0x00,
 0x69,
 0x75,
 0x20,
@@ -496,6 +524,34 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x18,
+0x00,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x58,
+0x00,
+0x00,
+0x01,
+0x28,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -561,7 +617,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x02,
+0x03,
 0x28,
 0x2a,
 0x29,
@@ -569,11 +625,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0e,
+0x0f,
 0x00,
 0x00,
 0x00,
-0x32,
+0x31,
 0x69,
 0x75,
 0x20,
@@ -620,7 +676,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x2e,
 0x00,
 0x00,
 0x00,
@@ -632,7 +688,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x40,
+0x0c,
 0x69,
 0x75,
 0x20,
@@ -645,6 +701,34 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
+0x00,
+0x00,
+0x00,
+0x03,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x0f,
+0x00,
+0x00,
+0x00,
+0x31,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -4865,4 +4949,48 @@ 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/k2h/policy_dsp_arm.dtb b/device/k2h/policy_dsp_arm.dtb
index 4f6a4a6640416c84fc24999bfb85905a4b3035f8..e32ceaa1a830510aee2be117729250c42d07c79d 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 21786e1c569bfcc09b93376bc73c726299cf2311..e798f3eeb070e676096be8f52d1b9c1663bdfb2b 100644 (file)
--- a/device/k2h/policy_dsp_arm.dts
+++ b/device/k2h/policy_dsp_arm.dts
@@ -33,19 +33,27 @@
         };
         
         linkram-qm1 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x5800 */
+            assignments = <0x00000000 0x00004000>, "iu = (*)",
+                          <0x00004000 0x00001800>, "(*)", /* Used by Kernel */
+                          <0x00005800 0x00012800>, "iu = (*)";
         };
         linkram-qm2 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x5800 */
+            assignments = <0x00000000 0x00004000>, "iu = (*)",
+                          <0x00004000 0x00001800>, "(*)", /* Used by Kernel */
+                          <0x00005800 0x00012800>, "iu = (*)";
         };  
         
         memory-regions-qm1 {
             assignments = <0  12>, "iu = (*)",
-                          <12 2>,  "(*)",             /* Used by Kernel */
-                          <14 50>, "iu = (*)";
+                          <12 3>,  "(*)",             /* Used by Kernel */
+                          <15 49>, "iu = (*)";
         };
         memory-regions-qm2 {
-            assignments = <0  64>, "iu = (*)";
+            assignments = <0  12>, "iu = (*)",
+                          <12 3>,  "(*)",             /* Used by Kernel */
+                          <15 49>, "iu = (*)";
         };        
 
         LOW_PRIORITY_QUEUE-qm1 {

diff --git a/device/k2k/global-resource-list-arm-dsp.c b/device/k2k/global-resource-list-arm-dsp.c
index c30f3cbf6e33821b5042f7aea21690583712863a..f596dcc63155d8375e131805a14696326f9935f8 100644 (file)
--- a/device/k2k/global-resource-list-arm-dsp.c
+++ b/device/k2k/global-resource-list-arm-dsp.c
@@ -321,10 +321,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -361,10 +361,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+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 2a16da54b949b900ad718538a494f20215ee7b10..b59c227c657afc22bb3cb0857e263522d5ca4760 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 05ae4cc73f5e11e389be84037ddb9d6ab5e3481f..d32b9807cbaeee524becdab670a81d65d7d28a38 100644 (file)
--- a/device/k2k/global-resource-list-arm-dsp.dts
+++ b/device/k2k/global-resource-list-arm-dsp.dts
@@ -26,10 +26,12 @@
 
         /* QMSS in joint mode affects only -qm1 resource */
         linkram-qm1 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };
         linkram-qm2 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };      
 
         /* 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 28abf11d35bb05e32314c88bef9e061875aa66e7..832019d79ab93702152fd0728e11c30f67695524 100644 (file)
--- a/device/k2k/global-resource-list.c
+++ b/device/k2k/global-resource-list.c
@@ -8,7 +8,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x67,
+0xe3,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x58,
+0xd4,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x0e,
-0x20,
+0x9c,
 0x00,
 0x00,
 0x00,
@@ -285,10 +285,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -325,10 +325,10 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -3576,6 +3576,130 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x72,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x74,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x72,
+0x78,
+0x2d,
+0x66,
+0x6c,
+0x6f,
+0x77,
+0x2d,
+0x69,
+0x64,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x20,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -3713,4 +3837,8 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
+0x00,
+0x00,
+0x00,
+0x00,
 };

diff --git a/device/k2k/global-resource-list.dtb b/device/k2k/global-resource-list.dtb
index 234b87f18b306b32475ee06ebe1cdfe392879822..008671c05a58261d2f8e3241a0ccd829d1ba8bba 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 c51c883316a771cfa5f81b4efdf493dc916912ac..f47c42bdb1c3a0603382a1e2007ea6b416d4b7b1 100644 (file)
--- a/device/k2k/global-resource-list.dts
+++ b/device/k2k/global-resource-list.dts
@@ -23,10 +23,12 @@
 
         /* QMSS in joint mode affects only -qm1 resource */
         linkram-qm1 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };
         linkram-qm2 {
-            resource-range = <0x00000000 0xFFFFFFFF>;
+            /* hw allows max of 512K descriptors */
+            resource-range = <0x00000000 0x00080000>;
         };      
 
         /* QMSS in joint mode affects only -qm1 resource */
@@ -254,6 +256,16 @@
         bcp-rx-flow-id {
             resource-range = <0 64>;
         };           
+
+        xge-rx-ch {
+            resource-range = <0 16>;
+        };
+        xge-tx-ch {
+            resource-range = <0 8>;
+        };
+        xge-rx-flow-id {
+            resource-range = <0 32>;
+        };           
     }; /* cppi */
 
     pa {

diff --git a/device/k2k/policy_dsp-only.c b/device/k2k/policy_dsp-only.c
index c0f5b74e1a23aa5c84244568eaa84ebdf1fd340f..a39a5a550ff5de45e3c13c492d977ddac9f9dc90 100644 (file)
--- a/device/k2k/policy_dsp-only.c
+++ b/device/k2k/policy_dsp-only.c
@@ -445,10 +445,10 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x69,
 0x75,
 0x20,
@@ -497,10 +497,10 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x08,
+0x00,
+0x00,
 0x69,
 0x75,
 0x20,

diff --git a/device/k2k/policy_dsp-only.dtb b/device/k2k/policy_dsp-only.dtb
index c521cc3e4f3cb3f48c635b6704945d96de4fb528..48487e35dd7d575630b1c8da57a04c93890723bc 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 4cef671f0afc1ba361d8eed396a1db65e27e992d..193478d2bba682201a48e5266996c4c48bb24b4a 100644 (file)
--- a/device/k2k/policy_dsp-only.dts
+++ b/device/k2k/policy_dsp-only.dts
@@ -33,10 +33,12 @@
         };
         
         linkram-qm1 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* hw allows max of 512K descriptors */
+            assignments = <0x00000000 0x00080000>, "iu = (*)";
         };
         linkram-qm2 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* hw allows max of 512K descriptors */
+            assignments = <0x00000000 0x00080000>, "iu = (*)";
         };  
         
         memory-regions-qm1 {

diff --git a/device/k2k/policy_dsp_arm.c b/device/k2k/policy_dsp_arm.c
index 89404108c09baa7401e35d9269aa4c393e99ef86..f3bf88da05ace9389ffa7cc441613013e2ccf64e 100644 (file)
--- a/device/k2k/policy_dsp_arm.c
+++ b/device/k2k/policy_dsp_arm.c
@@ -7,16 +7,16 @@ const char rmDspPlusArmPolicy[] = {
 0xed,
 0x00,
 0x00,
-0x12,
-0xb8,
+0x13,
+0xac,
 0x00,
 0x00,
 0x00,
 0x38,
 0x00,
 0x00,
-0x12,
-0x9c,
+0x13,
+0x90,
 0x00,
 0x00,
 0x00,
@@ -39,8 +39,8 @@ const char rmDspPlusArmPolicy[] = {
 0x1c,
 0x00,
 0x00,
-0x12,
-0x64,
+0x13,
+0x58,
 0x00,
 0x00,
 0x00,
@@ -420,7 +420,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x2e,
 0x00,
 0x00,
 0x00,
@@ -429,10 +429,10 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x00,
+0x40,
+0x00,
 0x69,
 0x75,
 0x20,
@@ -444,6 +444,34 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x18,
+0x00,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x58,
+0x00,
+0x00,
+0x01,
+0x28,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -472,7 +500,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x2e,
 0x00,
 0x00,
 0x00,
@@ -481,10 +509,10 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0xff,
-0xff,
-0xff,
-0xff,
+0x00,
+0x00,
+0x40,
+0x00,
 0x69,
 0x75,
 0x20,
@@ -496,6 +524,34 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x40,
+0x00,
+0x00,
+0x00,
+0x18,
+0x00,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x58,
+0x00,
+0x00,
+0x01,
+0x28,
+0x00,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -561,7 +617,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x02,
+0x03,
 0x28,
 0x2a,
 0x29,
@@ -569,11 +625,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0e,
+0x0f,
 0x00,
 0x00,
 0x00,
-0x32,
+0x31,
 0x69,
 0x75,
 0x20,
@@ -620,7 +676,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x11,
+0x2e,
 0x00,
 0x00,
 0x00,
@@ -632,7 +688,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x40,
+0x0c,
 0x69,
 0x75,
 0x20,
@@ -645,6 +701,34 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
+0x00,
+0x00,
+0x00,
+0x03,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x0f,
+0x00,
+0x00,
+0x00,
+0x31,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -4644,6 +4728,166 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x72,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x10,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x74,
+0x78,
+0x2d,
+0x63,
+0x68,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x08,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
+0x01,
+0x78,
+0x67,
+0x65,
+0x2d,
+0x72,
+0x78,
+0x2d,
+0x66,
+0x6c,
+0x6f,
+0x77,
+0x2d,
+0x69,
+0x64,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x03,
+0x00,
+0x00,
+0x00,
+0x11,
+0x00,
+0x00,
+0x00,
+0x10,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x20,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x00,
+0x02,
+0x00,
+0x00,
+0x00,
 0x02,
 0x00,
 0x00,
@@ -4865,4 +5109,16 @@ const char rmDspPlusArmPolicy[] = {
 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
index 4f6a4a6640416c84fc24999bfb85905a4b3035f8..d3433c83de6e399e97072e6f60c7be7f2ffd8237 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 21786e1c569bfcc09b93376bc73c726299cf2311..38637cfaa44fc733ef53175b49f027cb927b5b1b 100644 (file)
--- a/device/k2k/policy_dsp_arm.dts
+++ b/device/k2k/policy_dsp_arm.dts
@@ -33,19 +33,27 @@
         };
         
         linkram-qm1 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x5800 */
+            assignments = <0x00000000 0x00004000>, "iu = (*)",
+                          <0x00004000 0x00001800>, "(*)", /* Used by Kernel */
+                          <0x00005800 0x00012800>, "iu = (*)";
         };
         linkram-qm2 {
-            assignments = <0x00000000 0xFFFFFFFF>, "iu = (*)";
+            /* linux provided 0x18000 descriptors of linking RAM but uses 0x4000 to 0x5800 */
+            assignments = <0x00000000 0x00004000>, "iu = (*)",
+                          <0x00004000 0x00001800>, "(*)", /* Used by Kernel */
+                          <0x00005800 0x00012800>, "iu = (*)";
         };  
         
         memory-regions-qm1 {
             assignments = <0  12>, "iu = (*)",
-                          <12 2>,  "(*)",             /* Used by Kernel */
-                          <14 50>, "iu = (*)";
+                          <12 3>,  "(*)",             /* Used by Kernel */
+                          <15 49>, "iu = (*)";
         };
         memory-regions-qm2 {
-            assignments = <0  64>, "iu = (*)";
+            assignments = <0  12>, "iu = (*)",
+                          <12 3>,  "(*)",             /* Used by Kernel */
+                          <15 49>, "iu = (*)";
         };        
 
         LOW_PRIORITY_QUEUE-qm1 {
@@ -270,6 +278,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 {