Revert "Updated netcp CPPI resource ranges and Linux usage"

This reverts commit 779f3c6b36e6cecb38ffed24d6df7409e5681daa.

diff --git a/device/k2e/global-resource-list-arm-dsp.c b/device/k2e/global-resource-list-arm-dsp.c
index 752d3f0b4103fbce1db68e574ff8236706923021..bb8834dcca8a07e6d9cf16faadb82657aee759fc 100644 (file)
--- a/device/k2e/global-resource-list-arm-dsp.c
+++ b/device/k2e/global-resource-list-arm-dsp.c
@@ -1256,7 +1256,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x00,
 0x00,
 0x00,

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

diff --git a/device/k2e/global-resource-list-arm-dsp.dts b/device/k2e/global-resource-list-arm-dsp.dts
index e6ef307d39b1bd5b7bafa75ff9058667f4595781..c31a87a529156a9e847ba0f645c03dd4bd3d8037 100644 (file)
--- a/device/k2e/global-resource-list-arm-dsp.dts
+++ b/device/k2e/global-resource-list-arm-dsp.dts
@@ -92,7 +92,7 @@
             resource-range = <0 21>;
         };
         netcp-rx-flow-id {
-            resource-range = <0 91>;
+            resource-range = <0 32>;
         };   
 
         qmss-qm1-rx-ch {

diff --git a/device/k2e/global-resource-list.c b/device/k2e/global-resource-list.c
index 4244543f5931a0ef53f2fcb2f5fa1cb7e4ce9c30..365598986f6a0034ebe459dd411d2556b0ac441e 100644 (file)
--- a/device/k2e/global-resource-list.c
+++ b/device/k2e/global-resource-list.c
@@ -1220,7 +1220,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x00,
 0x00,
 0x00,

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

diff --git a/device/k2e/global-resource-list.dts b/device/k2e/global-resource-list.dts
index 8f7dad8555d2c10534d7e2d0f31f48f4c19f54a2..cfe1c9aef77fdd5ad5abbc8d09ec41e0b2392a78 100644 (file)
--- a/device/k2e/global-resource-list.dts
+++ b/device/k2e/global-resource-list.dts
@@ -89,7 +89,7 @@
             resource-range = <0 21>;
         };
         netcp-rx-flow-id {
-            resource-range = <0 91>;
+            resource-range = <0 32>;
         };   
 
         qmss-qm1-rx-ch {

diff --git a/device/k2e/policy_dsp-only.c b/device/k2e/policy_dsp-only.c
index 3fe8d9c4f6f0f436c305a57cd757872596214c58..5891b16c4c024a445aff92d7f6c41aefa8b6c803 100644 (file)
--- a/device/k2e/policy_dsp-only.c
+++ b/device/k2e/policy_dsp-only.c
@@ -1608,7 +1608,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x69,
 0x75,
 0x20,

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

diff --git a/device/k2e/policy_dsp-only.dts b/device/k2e/policy_dsp-only.dts
index 3e8e5a5e4fc0fb51976861ac6944459eb81cae32..59bd4ed54f5645f1d4912cbea73e5d986236d448 100644 (file)
--- a/device/k2e/policy_dsp-only.dts
+++ b/device/k2e/policy_dsp-only.dts
@@ -97,7 +97,7 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-rx-flow-id {
-            assignments = <0 91>, "iu = (*)";
+            assignments = <0 32>, "iu = (*)";
         };   
 
         qmss-qm1-rx-ch {

diff --git a/device/k2e/policy_dsp_arm.c b/device/k2e/policy_dsp_arm.c
index 6ac688f71162301bfe9915422a5eff1737798436..e678e6ab7d96ba8b54cac72c1dc4439ca774f45e 100644 (file)
--- a/device/k2e/policy_dsp_arm.c
+++ b/device/k2e/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0xc4,
+0xec,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0xa8,
+0xd0,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0a,
-0x70,
+0x98,
 0x00,
 0x00,
 0x00,
@@ -2036,7 +2036,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x1d,
+0x46,
 0x00,
 0x00,
 0x00,
@@ -2048,7 +2048,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x40,
+0x01,
 0x28,
 0x2a,
 0x29,
@@ -2056,11 +2056,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x40,
+0x01,
 0x00,
 0x00,
 0x00,
-0x1b,
+0x07,
 0x69,
 0x75,
 0x20,
@@ -2073,6 +2073,46 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x08,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x09,
+0x00,
+0x00,
+0x00,
+0x15,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x1f,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -2777,44 +2817,4 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
 };

diff --git a/device/k2e/policy_dsp_arm.dtb b/device/k2e/policy_dsp_arm.dtb
index 1ed6086b5f668aaf9dccd13ecb92a9597ed047c1..753491304a37af2d7a329678b6966145047958e6 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 e8312c296d1944b6dbb3ef469585aacbaebcbfab..559ea8e7e74adc89bc7aa8b52576fd34176bb890 100644 (file)
--- a/device/k2e/policy_dsp_arm.dts
+++ b/device/k2e/policy_dsp_arm.dts
@@ -138,8 +138,11 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-rx-flow-id {
-            assignments = <0 64>, "(*)",   /* Used by kernel */
-                          <64 27>, "iu = (*)";
+            assignments = <0  1>, "(*)",  /* Used by kernel - netrx0 */
+                          <1  7>, "iu = (*)",
+                          <8  1>, "(*)",  /* Used by kernel - netrx1 */
+                          <9 21>, "iu = (*)",
+                          <31 1>, "(*)";  /* Used by kernel - parx */
         };   
 
         qmss-qm1-rx-ch {

diff --git a/device/k2l/global-resource-list-arm-dsp.c b/device/k2l/global-resource-list-arm-dsp.c
index 3b70849ebb718f8eef073e06fc5999edee3c95bb..473764d5bd7c6ce06bff83c8bcc04766d971683f 100644 (file)
--- a/device/k2l/global-resource-list-arm-dsp.c
+++ b/device/k2l/global-resource-list-arm-dsp.c
@@ -1476,7 +1476,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -1884,7 +1884,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -1924,7 +1924,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x00,
 0x00,
 0x00,
@@ -1964,7 +1964,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x00,
 0x00,
 0x00,
@@ -2008,7 +2008,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x00,
 0x00,
 0x00,

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

diff --git a/device/k2l/global-resource-list-arm-dsp.dts b/device/k2l/global-resource-list-arm-dsp.dts
index ff1dda12ea10babbb2b08906d6fcf2360c58139a..4a1a65342e66c59e986e6b31578b1abe5b092903 100644 (file)
--- a/device/k2l/global-resource-list-arm-dsp.dts
+++ b/device/k2l/global-resource-list-arm-dsp.dts
@@ -109,7 +109,7 @@
             resource-range = <0 21>;
         };
         netcp-rx-flow-id {
-            resource-range = <0 91>;
+            resource-range = <0 32>;
         };   
 
         qmss-qm1-rx-ch {
@@ -139,17 +139,17 @@
             resource-range = <0 21>;
         };
         netcp-local-rx-flow-id {
-            resource-range = <0 91>;
+            resource-range = <0 32>;
         };           
 
         iqn-rx-ch {
-            resource-range = <0 48>;
+            resource-range = <0 47>;
         };
         iqn-tx-ch {
-            resource-range = <0 48>;
+            resource-range = <0 47>;
         };
         iqn-rx-flow-id {
-            resource-range = <0 48>;
+            resource-range = <0 47>;
         };           
     }; /* cppi */
 

diff --git a/device/k2l/global-resource-list.c b/device/k2l/global-resource-list.c
index 9a3a281176e3722b5185551503d5ce2646ff7bda..4fb60c7e80022098611b5e7b799ac8bc6a253ab4 100644 (file)
--- a/device/k2l/global-resource-list.c
+++ b/device/k2l/global-resource-list.c
@@ -1440,7 +1440,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -1848,7 +1848,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x00,
 0x00,
 0x00,
@@ -1888,7 +1888,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x00,
 0x00,
 0x00,
@@ -1928,7 +1928,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x00,
 0x00,
 0x00,
@@ -1972,7 +1972,7 @@ const char rmGlobalResourceList[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x00,
 0x00,
 0x00,

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

diff --git a/device/k2l/global-resource-list.dts b/device/k2l/global-resource-list.dts
index c5a3e680b910c9afca2de5f7ce9bc969d9111122..eaddfc959346746be3cbf416bb5ca3d2393a5e39 100644 (file)
--- a/device/k2l/global-resource-list.dts
+++ b/device/k2l/global-resource-list.dts
@@ -106,7 +106,7 @@
             resource-range = <0 21>;
         };
         netcp-rx-flow-id {
-            resource-range = <0 91>;
+            resource-range = <0 32>;
         };   
 
         qmss-qm1-rx-ch {
@@ -136,17 +136,17 @@
             resource-range = <0 21>;
         };
         netcp-local-rx-flow-id {
-            resource-range = <0 91>;
+            resource-range = <0 32>;
         };           
 
         iqn-rx-ch {
-            resource-range = <0 48>;
+            resource-range = <0 47>;
         };
         iqn-tx-ch {
-            resource-range = <0 48>;
+            resource-range = <0 47>;
         };
         iqn-rx-flow-id {
-            resource-range = <0 48>;
+            resource-range = <0 47>;
         };           
     }; /* cppi */
 

diff --git a/device/k2l/policy_dsp-only.c b/device/k2l/policy_dsp-only.c
index d8e6ec37b093a809db1dd807071cd742791c0337..7b147d7e77d2d30cb2993251a35d24e29a3bc5ac 100644 (file)
--- a/device/k2l/policy_dsp-only.c
+++ b/device/k2l/policy_dsp-only.c
@@ -1888,7 +1888,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x69,
 0x75,
 0x20,
@@ -2404,7 +2404,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x69,
 0x75,
 0x20,
@@ -2456,7 +2456,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x69,
 0x75,
 0x20,
@@ -2508,7 +2508,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x69,
 0x75,
 0x20,
@@ -2564,7 +2564,7 @@ const char rmDspOnlyPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x69,
 0x75,
 0x20,

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

diff --git a/device/k2l/policy_dsp-only.dts b/device/k2l/policy_dsp-only.dts
index e33e6d3ab68c90d4e29393c210fd34261df11267..cbf39ef26fbc024f686376c77117fa3d8ac451a0 100644 (file)
--- a/device/k2l/policy_dsp-only.dts
+++ b/device/k2l/policy_dsp-only.dts
@@ -114,7 +114,7 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-rx-flow-id {
-            assignments = <0 91>, "iu = (*)";
+            assignments = <0 32>, "iu = (*)";
         };   
 
         qmss-qm1-rx-ch {
@@ -144,17 +144,17 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-local-rx-flow-id {
-            assignments = <0 91>, "iu = (*)";
+            assignments = <0 32>, "iu = (*)";
         };           
 
         iqn-rx-ch {
-            assignments = <0 48>, "iu = (*)";
+            assignments = <0 47>, "iu = (*)";
         };
         iqn-tx-ch {
-            assignments = <0 48>, "iu = (*)";
+            assignments = <0 47>, "iu = (*)";
         };
         iqn-rx-flow-id {
-            assignments = <0 48>, "iu = (*)";
+            assignments = <0 47>, "iu = (*)";
         };           
     }; /* cppi */
 

diff --git a/device/k2l/policy_dsp_arm.c b/device/k2l/policy_dsp_arm.c
index cc83ea8f953c04eae4e385b3268c3a5ccec2787c..b1d70789afcaf34118515e4a56fb0b3891f49217 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,
-0x1c,
+0x44,
 0x00,
 0x00,
 0x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0d,
-0x00,
+0x28,
 0x00,
 0x00,
 0x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0c,
-0xc8,
+0xf0,
 0x00,
 0x00,
 0x00,
@@ -2316,7 +2316,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x1d,
+0x46,
 0x00,
 0x00,
 0x00,
@@ -2328,7 +2328,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x20,
+0x01,
 0x28,
 0x2a,
 0x29,
@@ -2336,11 +2336,40 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x01,
+0x00,
+0x00,
+0x00,
+0x07,
+0x69,
+0x75,
 0x20,
+0x3d,
+0x20,
+0x28,
+0x2a,
+0x29,
+0x00,
 0x00,
 0x00,
 0x00,
-0x3b,
+0x08,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
+0x00,
+0x09,
+0x00,
+0x00,
+0x00,
+0x15,
 0x69,
 0x75,
 0x20,
@@ -2353,6 +2382,17 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x1f,
+0x00,
+0x00,
+0x00,
+0x01,
+0x28,
+0x2a,
+0x29,
+0x00,
+0x00,
+0x00,
 0x00,
 0x00,
 0x00,
@@ -2892,7 +2932,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x5b,
+0x20,
 0x69,
 0x75,
 0x20,
@@ -2944,7 +2984,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x69,
 0x75,
 0x20,
@@ -2996,7 +3036,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x69,
 0x75,
 0x20,
@@ -3052,7 +3092,7 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x30,
+0x2f,
 0x69,
 0x75,
 0x20,
@@ -3417,44 +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,
 };

diff --git a/device/k2l/policy_dsp_arm.dtb b/device/k2l/policy_dsp_arm.dtb
index d059dd67467a100b6e175ab88adecc8113d3229f..1ef3e1902311de5f7927c0cefdb1f9594820214a 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 1c8acbf80a486583c0d517d64d07ad935ac7ac61..b29d11b8eb73534c8f2495dd66dd26b5c957631a 100644 (file)
--- a/device/k2l/policy_dsp_arm.dts
+++ b/device/k2l/policy_dsp_arm.dts
@@ -155,8 +155,11 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-rx-flow-id {
-            assignments = <0 32>, "(*)",   /* Used by kernel */
-                          <32 59>, "iu = (*)";
+            assignments = <0  1>, "(*)",  /* Used by kernel - netrx0 */
+                          <1  7>, "iu = (*)",
+                          <8  1>, "(*)",  /* Used by kernel - netrx1 */
+                          <9 21>, "iu = (*)",
+                          <31 1>, "(*)";  /* Used by kernel - parx */
         };   
 
         qmss-qm1-rx-ch {
@@ -189,17 +192,17 @@
             assignments = <0 21>, "iu = (*)";
         };
         netcp-local-rx-flow-id {
-            assignments = <0 91>, "iu = (*)";
+            assignments = <0 32>, "iu = (*)";
         };           
 
         iqn-rx-ch {
-            assignments = <0 48>, "iu = (*)";
+            assignments = <0 47>, "iu = (*)";
         };
         iqn-tx-ch {
-            assignments = <0 48>, "iu = (*)";
+            assignments = <0 47>, "iu = (*)";
         };
         iqn-rx-flow-id {
-            assignments = <0 48>, "iu = (*)";
+            assignments = <0 47>, "iu = (*)";
         };           
     }; /* cppi */