summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Dowdal2015-07-07 10:00:46 -0500
committerJohn Dowdal2015-07-07 10:00:46 -0500
commit9c43d77179f6ffaecdac16803cb3885b0ecf0ebd (patch)
tree6970828464f3345f4ccb272cd0dc304b9533a960
parent8273ce689ed83aab6c387e94ecfd4f8039c9c393 (diff)
downloadrm-lld-9c43d77179f6ffaecdac16803cb3885b0ecf0ebd.tar.gz
rm-lld-9c43d77179f6ffaecdac16803cb3885b0ecf0ebd.tar.xz
rm-lld-9c43d77179f6ffaecdac16803cb3885b0ecf0ebd.zip
catreq-275: QMSS LLD: Mask out queues (4095, 8191, 12287, 16383)
Diffstat
-rw-r--r--device/k2e/policy_dsp-only.c106
-rw-r--r--device/k2e/policy_dsp-only.dtbbin3532 -> 3580 bytes
-rw-r--r--device/k2e/policy_dsp-only.dts5
-rw-r--r--device/k2e/policy_dsp_arm.c78
-rw-r--r--device/k2e/policy_dsp_arm.dtbbin4164 -> 4196 bytes
-rw-r--r--device/k2e/policy_dsp_arm.dts5
-rw-r--r--device/k2h/policy_dsp-only.c214
-rw-r--r--device/k2h/policy_dsp-only.dtbbin6408 -> 6504 bytes
-rw-r--r--device/k2h/policy_dsp-only.dts12
-rw-r--r--device/k2h/policy_dsp_arm.c178
-rw-r--r--device/k2h/policy_dsp_arm.dtbbin7068 -> 7148 bytes
-rw-r--r--device/k2h/policy_dsp_arm.dts10
-rw-r--r--device/k2k/policy_dsp-only.c214
-rw-r--r--device/k2k/policy_dsp-only.dtbbin6408 -> 6504 bytes
-rw-r--r--device/k2k/policy_dsp-only.dts12
-rw-r--r--device/k2k/policy_dsp_arm.c178
-rw-r--r--device/k2k/policy_dsp_arm.dtbbin7068 -> 7148 bytes
-rw-r--r--device/k2k/policy_dsp_arm.dts10
-rw-r--r--device/k2l/policy_dsp-only.c140
-rw-r--r--device/k2l/policy_dsp-only.dtbbin4580 -> 4628 bytes
-rw-r--r--device/k2l/policy_dsp-only.dts5
-rw-r--r--device/k2l/policy_dsp_arm.c76
-rw-r--r--device/k2l/policy_dsp_arm.dtbbin5168 -> 5200 bytes
-rw-r--r--device/k2l/policy_dsp_arm.dts5
-rw-r--r--docs/ReleaseNotes_RM.docbin133120 -> 133632 bytes
-rw-r--r--docs/ReleaseNotes_RM.pdfbin290350 -> 290291 bytes
26 files changed, 706 insertions, 542 deletions
diff --git a/device/k2e/policy_dsp-only.c b/device/k2e/policy_dsp-only.c
index dde716f..16b7da6 100644
--- a/device/k2e/policy_dsp-only.c
+++ b/device/k2e/policy_dsp-only.c
@@ -8,7 +8,7 @@ const char rmDspOnlyPolicy[] = {
80x00, 80x00,
90x00, 90x00,
100x0d, 100x0d,
110xcc, 110xfc,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
@@ -16,7 +16,7 @@ const char rmDspOnlyPolicy[] = {
160x00, 160x00,
170x00, 170x00,
180x0d, 180x0d,
190xb0, 190xe0,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -40,7 +40,7 @@ const char rmDspOnlyPolicy[] = {
400x00, 400x00,
410x00, 410x00,
420x0d, 420x0d,
430x78, 430xa8,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -1428,7 +1428,7 @@ const char rmDspOnlyPolicy[] = {
14280x00, 14280x00,
14290x00, 14290x00,
14300x00, 14300x00,
14310x11, 14310x42,
14320x00, 14320x00,
14330x00, 14330x00,
14340x00, 14340x00,
@@ -1439,8 +1439,41 @@ const char rmDspOnlyPolicy[] = {
14390x00, 14390x00,
14400x00, 14400x00,
14410x00, 14410x00,
14420x1c, 14420x0b,
14430xff,
14440x69,
14450x75,
14460x20,
14470x3d,
14480x20,
14490x28,
14500x2a,
14510x29,
14520x00,
14530x00,
14540x00,
14550x0f,
14560xff,
14570x00,
14580x00,
14430x00, 14590x00,
14600x01,
14610x75,
14620x20,
14630x3d,
14640x20,
14650x28,
14660x2a,
14670x29,
14680x00,
14690x00,
14700x00,
14710x10,
14720x00,
14730x00,
14740x00,
14750x0f,
14760xff,
14440x69, 14770x69,
14450x75, 14780x75,
14460x20, 14790x20,
@@ -1452,6 +1485,21 @@ const char rmDspOnlyPolicy[] = {
14520x00, 14850x00,
14530x00, 14860x00,
14540x00, 14870x00,
14880x1f,
14890xff,
14900x00,
14910x00,
14920x00,
14930x01,
14940x75,
14950x20,
14960x3d,
14970x20,
14980x28,
14990x2a,
15000x29,
15010x00,
15020x00,
14550x00, 15030x00,
14560x00, 15040x00,
14570x00, 15050x00,
@@ -3537,52 +3585,4 @@ const char rmDspOnlyPolicy[] = {
35370x00, 35850x00,
35380x00, 35860x00,
35390x00, 35870x00,
35400x00,
35410x00,
35420x00,
35430x00,
35440x00,
35450x00,
35460x00,
35470x00,
35480x00,
35490x00,
35500x00,
35510x00,
35520x00,
35530x00,
35540x00,
35550x00,
35560x00,
35570x00,
35580x00,
35590x00,
35600x00,
35610x00,
35620x00,
35630x00,
35640x00,
35650x00,
35660x00,
35670x00,
35680x00,
35690x00,
35700x00,
35710x00,
35720x00,
35730x00,
35740x00,
35750x00,
35760x00,
35770x00,
35780x00,
35790x00,
35800x00,
35810x00,
35820x00,
35830x00,
35840x00,
35850x00,
35860x00,
35870x00,
3588}; 3588};
diff --git a/device/k2e/policy_dsp-only.dtb b/device/k2e/policy_dsp-only.dtb
index 97026ef..47535ca 100644
--- a/device/k2e/policy_dsp-only.dtb
+++ b/device/k2e/policy_dsp-only.dtb
Binary files differ
diff --git a/device/k2e/policy_dsp-only.dts b/device/k2e/policy_dsp-only.dts
index 4d2c47f..7a0c6ed 100644
--- a/device/k2e/policy_dsp-only.dts
+++ b/device/k2e/policy_dsp-only.dts
@@ -85,7 +85,10 @@
85 assignments = <896 21>, "iu = (*)"; 85 assignments = <896 21>, "iu = (*)";
86 }; 86 };
87 GENERAL_PURPOSE_QUEUE-qm1 { 87 GENERAL_PURPOSE_QUEUE-qm1 {
88 assignments = <1024 7168>, "iu = (*)"; 88 assignments = <1024 3071>, "iu = (*)",
89 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
90 <4096 4095>, "iu = (*)",
91 <8191 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
89 }; 92 };
90 93
91 firmware-pdsp { 94 firmware-pdsp {
diff --git a/device/k2e/policy_dsp_arm.c b/device/k2e/policy_dsp_arm.c
index 409c70e..fc66e94 100644
--- a/device/k2e/policy_dsp_arm.c
+++ b/device/k2e/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
80x00, 80x00,
90x00, 90x00,
100x10, 100x10,
110x44, 110x64,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
160x00, 160x00,
170x00, 170x00,
180x10, 180x10,
190x28, 190x48,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -39,8 +39,8 @@ const char rmDspPlusArmPolicy[] = {
390x1c, 390x1c,
400x00, 400x00,
410x00, 410x00,
420x0f, 420x10,
430xf0, 430x10,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -1580,7 +1580,7 @@ const char rmDspPlusArmPolicy[] = {
15800x00, 15800x00,
15810x00, 15810x00,
15820x00, 15820x00,
15830x8f, 15830xb0,
15840x00, 15840x00,
15850x00, 15850x00,
15860x00, 15860x00,
@@ -1620,8 +1620,41 @@ const char rmDspPlusArmPolicy[] = {
16200xe0, 16200xe0,
16210x00, 16210x00,
16220x00, 16220x00,
16230x09, 16230x00,
16240x1f,
16250x69,
16260x75,
16270x20,
16280x3d,
16290x20,
16300x28,
16310x2a,
16320x29,
16330x00,
16340x00,
16350x00,
16360x0f,
16370xff,
16380x00,
16390x00,
16400x00,
16410x01,
16420x75,
16240x20, 16430x20,
16440x3d,
16450x20,
16460x28,
16470x2a,
16480x29,
16490x00,
16500x00,
16510x00,
16520x10,
16530x00,
16540x00,
16550x00,
16560x09,
16570x00,
16250x69, 16580x69,
16260x75, 16590x75,
16270x20, 16600x20,
@@ -1731,7 +1764,6 @@ const char rmDspPlusArmPolicy[] = {
17310x00, 17640x00,
17320x00, 17650x00,
17330x00, 17660x00,
17340x00,
17350x02, 17670x02,
17360x00, 17680x00,
17370x00, 17690x00,
@@ -4193,36 +4225,4 @@ const char rmDspPlusArmPolicy[] = {
41930x00, 42250x00,
41940x00, 42260x00,
41950x00, 42270x00,
41960x00,
41970x00,
41980x00,
41990x00,
42000x00,
42010x00,
42020x00,
42030x00,
42040x00,
42050x00,
42060x00,
42070x00,
42080x00,
42090x00,
42100x00,
42110x00,
42120x00,
42130x00,
42140x00,
42150x00,
42160x00,
42170x00,
42180x00,
42190x00,
42200x00,
42210x00,
42220x00,
42230x00,
42240x00,
42250x00,
42260x00,
42270x00,
4228}; 4228};
diff --git a/device/k2e/policy_dsp_arm.dtb b/device/k2e/policy_dsp_arm.dtb
index 0677c87..1e81536 100644
--- a/device/k2e/policy_dsp_arm.dtb
+++ b/device/k2e/policy_dsp_arm.dtb
Binary files differ
diff --git a/device/k2e/policy_dsp_arm.dts b/device/k2e/policy_dsp_arm.dts
index b2ecb74..a4ba8e2 100644
--- a/device/k2e/policy_dsp_arm.dts
+++ b/device/k2e/policy_dsp_arm.dts
@@ -102,7 +102,9 @@
102 GENERAL_PURPOSE_QUEUE-qm1 { 102 GENERAL_PURPOSE_QUEUE-qm1 {
103 assignments = <1024 2976>, "iu = (*)", 103 assignments = <1024 2976>, "iu = (*)",
104 <4000 64>, "(*)", /* Used by Kernel */ 104 <4000 64>, "(*)", /* Used by Kernel */
105 <4064 2336>, "iu = (*)", 105 <4064 31>, "iu = (*)",
106 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
107 <4096 2304>, "iu = (*)",
106 108
107 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */ 109 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */
108 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 110 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
@@ -115,6 +117,7 @@
115 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 117 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
116 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */ 118 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */
117 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */ 119 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */
120 /* note for q 8191: Queues ending in 0xfff can't be used as return queue (hw reserved) */
118 }; 121 };
119 122
120 firmware-pdsp { 123 firmware-pdsp {
diff --git a/device/k2h/policy_dsp-only.c b/device/k2h/policy_dsp-only.c
index 7ff28e9..8e5936e 100644
--- a/device/k2h/policy_dsp-only.c
+++ b/device/k2h/policy_dsp-only.c
@@ -8,15 +8,15 @@ const char rmDspOnlyPolicy[] = {
80x00, 80x00,
90x00, 90x00,
100x19, 100x19,
110x08, 110x68,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
150x38, 150x38,
160x00, 160x00,
170x00, 170x00,
180x18, 180x19,
190xec, 190x4c,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -39,8 +39,8 @@ const char rmDspOnlyPolicy[] = {
390x1c, 390x1c,
400x00, 400x00,
410x00, 410x00,
420x18, 420x19,
430xb4, 430x14,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -1892,7 +1892,7 @@ const char rmDspOnlyPolicy[] = {
18920x00, 18920x00,
18930x00, 18930x00,
18940x00, 18940x00,
18950x11, 18950x42,
18960x00, 18960x00,
18970x00, 18970x00,
18980x00, 18980x00,
@@ -1903,8 +1903,41 @@ const char rmDspOnlyPolicy[] = {
19030x80, 19030x80,
19040x00, 19040x00,
19050x00, 19050x00,
19060x1c, 19060x0c,
19070x80, 19070x7f,
19080x69,
19090x75,
19100x20,
19110x3d,
19120x20,
19130x28,
19140x2a,
19150x29,
19160x00,
19170x00,
19180x00,
19190x0f,
19200xff,
19210x00,
19220x00,
19230x00,
19240x01,
19250x75,
19260x20,
19270x3d,
19280x20,
19290x28,
19300x2a,
19310x29,
19320x00,
19330x00,
19340x00,
19350x10,
19360x00,
19370x00,
19380x00,
19390x0f,
19400xff,
19080x69, 19410x69,
19090x75, 19420x75,
19100x20, 19430x20,
@@ -1916,6 +1949,21 @@ const char rmDspOnlyPolicy[] = {
19160x00, 19490x00,
19170x00, 19500x00,
19180x00, 19510x00,
19520x1f,
19530xff,
19540x00,
19550x00,
19560x00,
19570x01,
19580x75,
19590x20,
19600x3d,
19610x20,
19620x28,
19630x2a,
19640x29,
19650x00,
19660x00,
19190x00, 19670x00,
19200x00, 19680x00,
19210x00, 19690x00,
@@ -2712,7 +2760,7 @@ const char rmDspOnlyPolicy[] = {
27120x00, 27600x00,
27130x00, 27610x00,
27140x00, 27620x00,
27150x11, 27630x42,
27160x00, 27640x00,
27170x00, 27650x00,
27180x00, 27660x00,
@@ -2723,8 +2771,8 @@ const char rmDspOnlyPolicy[] = {
27230x40, 27710x40,
27240x00, 27720x00,
27250x00, 27730x00,
27260x1c, 27740x0c,
27270xc0, 27750xbf,
27280x69, 27760x69,
27290x75, 27770x75,
27300x20, 27780x20,
@@ -2736,6 +2784,54 @@ const char rmDspOnlyPolicy[] = {
27360x00, 27840x00,
27370x00, 27850x00,
27380x00, 27860x00,
27870x2f,
27880xff,
27890x00,
27900x00,
27910x00,
27920x01,
27930x75,
27940x20,
27950x3d,
27960x20,
27970x28,
27980x2a,
27990x29,
28000x00,
28010x00,
28020x00,
28030x30,
28040x00,
28050x00,
28060x00,
28070x0f,
28080xff,
28090x69,
28100x75,
28110x20,
28120x3d,
28130x20,
28140x28,
28150x2a,
28160x29,
28170x00,
28180x00,
28190x00,
28200x3f,
28210xff,
28220x00,
28230x00,
28240x00,
28250x01,
28260x75,
28270x20,
28280x3d,
28290x20,
28300x28,
28310x2a,
28320x29,
28330x00,
28340x00,
27390x00, 28350x00,
27400x00, 28360x00,
27410x00, 28370x00,
@@ -6433,100 +6529,4 @@ const char rmDspOnlyPolicy[] = {
64330x00, 65290x00,
64340x00, 65300x00,
64350x00, 65310x00,
64360x00,
64370x00,
64380x00,
64390x00,
64400x00,
64410x00,
64420x00,
64430x00,
64440x00,
64450x00,
64460x00,
64470x00,
64480x00,
64490x00,
64500x00,
64510x00,
64520x00,
64530x00,
64540x00,
64550x00,
64560x00,
64570x00,
64580x00,
64590x00,
64600x00,
64610x00,
64620x00,
64630x00,
64640x00,
64650x00,
64660x00,
64670x00,
64680x00,
64690x00,
64700x00,
64710x00,
64720x00,
64730x00,
64740x00,
64750x00,
64760x00,
64770x00,
64780x00,
64790x00,
64800x00,
64810x00,
64820x00,
64830x00,
64840x00,
64850x00,
64860x00,
64870x00,
64880x00,
64890x00,
64900x00,
64910x00,
64920x00,
64930x00,
64940x00,
64950x00,
64960x00,
64970x00,
64980x00,
64990x00,
65000x00,
65010x00,
65020x00,
65030x00,
65040x00,
65050x00,
65060x00,
65070x00,
65080x00,
65090x00,
65100x00,
65110x00,
65120x00,
65130x00,
65140x00,
65150x00,
65160x00,
65170x00,
65180x00,
65190x00,
65200x00,
65210x00,
65220x00,
65230x00,
65240x00,
65250x00,
65260x00,
65270x00,
65280x00,
65290x00,
65300x00,
65310x00,
6532}; 6532};
diff --git a/device/k2h/policy_dsp-only.dtb b/device/k2h/policy_dsp-only.dtb
index 787c4a8..b0cfb7f 100644
--- a/device/k2h/policy_dsp-only.dtb
+++ b/device/k2h/policy_dsp-only.dtb
Binary files differ
diff --git a/device/k2h/policy_dsp-only.dts b/device/k2h/policy_dsp-only.dts
index 016aa33..45e9553 100644
--- a/device/k2h/policy_dsp-only.dts
+++ b/device/k2h/policy_dsp-only.dts
@@ -112,7 +112,10 @@
112 assignments = <884 4>, "iu = (*)"; 112 assignments = <884 4>, "iu = (*)";
113 }; 113 };
114 GENERAL_PURPOSE_QUEUE-qm1 { 114 GENERAL_PURPOSE_QUEUE-qm1 {
115 assignments = <896 7296>, "iu = (*)"; 115 assignments = <896 3199>, "iu = (*)",
116 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
117 <4096 4095>, "iu = (*)",
118 <8191 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
116 }; 119 };
117 LOW_PRIORITY_QUEUE-qm2 { 120 LOW_PRIORITY_QUEUE-qm2 {
118 assignments = <8192 512>, "iu = (*)"; 121 assignments = <8192 512>, "iu = (*)";
@@ -151,8 +154,11 @@
151 assignments = <8992 32>, "iu = (*)"; 154 assignments = <8992 32>, "iu = (*)";
152 }; 155 };
153 GENERAL_PURPOSE_QUEUE-qm2 { 156 GENERAL_PURPOSE_QUEUE-qm2 {
154 assignments = <9024 7360>, "iu = (*)"; 157 assignments = <9024 3263>, "iu = (*)",
155 }; 158 <12287 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
159 <12288 4095>, "iu = (*)",
160 <16383 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
161 };
156 162
157 firmware-pdsp { 163 firmware-pdsp {
158 assignments = <0 8>, "iu = (*)"; 164 assignments = <0 8>, "iu = (*)";
diff --git a/device/k2h/policy_dsp_arm.c b/device/k2h/policy_dsp_arm.c
index 8007b86..29b59b9 100644
--- a/device/k2h/policy_dsp_arm.c
+++ b/device/k2h/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
80x00, 80x00,
90x00, 90x00,
100x1b, 100x1b,
110x9c, 110xec,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
160x00, 160x00,
170x00, 170x00,
180x1b, 180x1b,
190x80, 190xd0,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
400x00, 400x00,
410x00, 410x00,
420x1b, 420x1b,
430x48, 430x98,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -2064,7 +2064,7 @@ const char rmDspPlusArmPolicy[] = {
20640x00, 20640x00,
20650x00, 20650x00,
20660x00, 20660x00,
20670x8f, 20670xb0,
20680x00, 20680x00,
20690x00, 20690x00,
20700x00, 20700x00,
@@ -2104,8 +2104,41 @@ const char rmDspPlusArmPolicy[] = {
21040xe0, 21040xe0,
21050x00, 21050x00,
21060x00, 21060x00,
21070x09, 21070x00,
21080x1f,
21090x69,
21100x75,
21110x20,
21120x3d,
21130x20,
21140x28,
21150x2a,
21160x29,
21170x00,
21180x00,
21190x00,
21200x0f,
21210xff,
21220x00,
21230x00,
21240x00,
21250x01,
21260x75,
21080x20, 21270x20,
21280x3d,
21290x20,
21300x28,
21310x2a,
21320x29,
21330x00,
21340x00,
21350x00,
21360x10,
21370x00,
21380x00,
21390x00,
21400x09,
21410x00,
21090x69, 21420x69,
21100x75, 21430x75,
21110x20, 21440x20,
@@ -2215,7 +2248,6 @@ const char rmDspPlusArmPolicy[] = {
22150x00, 22480x00,
22160x00, 22490x00,
22170x00, 22500x00,
22180x00,
22190x02, 22510x02,
22200x00, 22520x00,
22210x00, 22530x00,
@@ -3020,7 +3052,7 @@ const char rmDspPlusArmPolicy[] = {
30200x00, 30520x00,
30210x00, 30530x00,
30220x00, 30540x00,
30230x11, 30550x42,
30240x00, 30560x00,
30250x00, 30570x00,
30260x00, 30580x00,
@@ -3031,8 +3063,41 @@ const char rmDspPlusArmPolicy[] = {
30310x40, 30630x40,
30320x00, 30640x00,
30330x00, 30650x00,
30340x1c, 30660x0c,
30350xc0, 30670xbf,
30680x69,
30690x75,
30700x20,
30710x3d,
30720x20,
30730x28,
30740x2a,
30750x29,
30760x00,
30770x00,
30780x00,
30790x2f,
30800xff,
30810x00,
30820x00,
30830x00,
30840x01,
30850x75,
30860x20,
30870x3d,
30880x20,
30890x28,
30900x2a,
30910x29,
30920x00,
30930x00,
30940x00,
30950x30,
30960x00,
30970x00,
30980x00,
30990x0f,
31000xff,
30360x69, 31010x69,
30370x75, 31020x75,
30380x20, 31030x20,
@@ -3044,6 +3109,21 @@ const char rmDspPlusArmPolicy[] = {
30440x00, 31090x00,
30450x00, 31100x00,
30460x00, 31110x00,
31120x3f,
31130xff,
31140x00,
31150x00,
31160x00,
31170x01,
31180x75,
31190x20,
31200x3d,
31210x20,
31220x28,
31230x2a,
31240x29,
31250x00,
31260x00,
30470x00, 31270x00,
30480x00, 31280x00,
30490x00, 31290x00,
@@ -7089,84 +7169,4 @@ const char rmDspPlusArmPolicy[] = {
70890x00, 71690x00,
70900x00, 71700x00,
70910x00, 71710x00,
70920x00,
70930x00,
70940x00,
70950x00,
70960x00,
70970x00,
70980x00,
70990x00,
71000x00,
71010x00,
71020x00,
71030x00,
71040x00,
71050x00,
71060x00,
71070x00,
71080x00,
71090x00,
71100x00,
71110x00,
71120x00,
71130x00,
71140x00,
71150x00,
71160x00,
71170x00,
71180x00,
71190x00,
71200x00,
71210x00,
71220x00,
71230x00,
71240x00,
71250x00,
71260x00,
71270x00,
71280x00,
71290x00,
71300x00,
71310x00,
71320x00,
71330x00,
71340x00,
71350x00,
71360x00,
71370x00,
71380x00,
71390x00,
71400x00,
71410x00,
71420x00,
71430x00,
71440x00,
71450x00,
71460x00,
71470x00,
71480x00,
71490x00,
71500x00,
71510x00,
71520x00,
71530x00,
71540x00,
71550x00,
71560x00,
71570x00,
71580x00,
71590x00,
71600x00,
71610x00,
71620x00,
71630x00,
71640x00,
71650x00,
71660x00,
71670x00,
71680x00,
71690x00,
71700x00,
71710x00,
7172}; 7172};
diff --git a/device/k2h/policy_dsp_arm.dtb b/device/k2h/policy_dsp_arm.dtb
index cbf8690..2f1f24c 100644
--- a/device/k2h/policy_dsp_arm.dtb
+++ b/device/k2h/policy_dsp_arm.dtb
Binary files differ
diff --git a/device/k2h/policy_dsp_arm.dts b/device/k2h/policy_dsp_arm.dts
index 9b1efc4..bd94c2b 100644
--- a/device/k2h/policy_dsp_arm.dts
+++ b/device/k2h/policy_dsp_arm.dts
@@ -131,7 +131,9 @@
131 GENERAL_PURPOSE_QUEUE-qm1 { 131 GENERAL_PURPOSE_QUEUE-qm1 {
132 assignments = <896 3104>, "iu = (*)", 132 assignments = <896 3104>, "iu = (*)",
133 <4000 64>, "(*)", /* Used by Kernel */ 133 <4000 64>, "(*)", /* Used by Kernel */
134 <4064 2336>, "iu = (*)", 134 <4064 31>, "iu = (*)",
135 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
136 <4096 2304>, "iu = (*)",
135 137
136 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */ 138 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */
137 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 139 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
@@ -144,6 +146,7 @@
144 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 146 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
145 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */ 147 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */
146 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */ 148 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */
149 /* note for q 8191: Queues ending in 0xfff can't be used as return queue (hw reserved) */
147 }; 150 };
148 LOW_PRIORITY_QUEUE-qm2 { 151 LOW_PRIORITY_QUEUE-qm2 {
149 assignments = <8192 512>, "iu = (*)"; 152 assignments = <8192 512>, "iu = (*)";
@@ -182,7 +185,10 @@
182 assignments = <8992 32>, "iu = (*)"; 185 assignments = <8992 32>, "iu = (*)";
183 }; 186 };
184 GENERAL_PURPOSE_QUEUE-qm2 { 187 GENERAL_PURPOSE_QUEUE-qm2 {
185 assignments = <9024 7360>, "iu = (*)"; 188 assignments = <9024 3263>, "iu = (*)",
189 <12287 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
190 <12288 4095>, "iu = (*)",
191 <16383 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
186 }; 192 };
187 193
188 firmware-pdsp { 194 firmware-pdsp {
diff --git a/device/k2k/policy_dsp-only.c b/device/k2k/policy_dsp-only.c
index 7ff28e9..8e5936e 100644
--- a/device/k2k/policy_dsp-only.c
+++ b/device/k2k/policy_dsp-only.c
@@ -8,15 +8,15 @@ const char rmDspOnlyPolicy[] = {
80x00, 80x00,
90x00, 90x00,
100x19, 100x19,
110x08, 110x68,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
150x38, 150x38,
160x00, 160x00,
170x00, 170x00,
180x18, 180x19,
190xec, 190x4c,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -39,8 +39,8 @@ const char rmDspOnlyPolicy[] = {
390x1c, 390x1c,
400x00, 400x00,
410x00, 410x00,
420x18, 420x19,
430xb4, 430x14,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -1892,7 +1892,7 @@ const char rmDspOnlyPolicy[] = {
18920x00, 18920x00,
18930x00, 18930x00,
18940x00, 18940x00,
18950x11, 18950x42,
18960x00, 18960x00,
18970x00, 18970x00,
18980x00, 18980x00,
@@ -1903,8 +1903,41 @@ const char rmDspOnlyPolicy[] = {
19030x80, 19030x80,
19040x00, 19040x00,
19050x00, 19050x00,
19060x1c, 19060x0c,
19070x80, 19070x7f,
19080x69,
19090x75,
19100x20,
19110x3d,
19120x20,
19130x28,
19140x2a,
19150x29,
19160x00,
19170x00,
19180x00,
19190x0f,
19200xff,
19210x00,
19220x00,
19230x00,
19240x01,
19250x75,
19260x20,
19270x3d,
19280x20,
19290x28,
19300x2a,
19310x29,
19320x00,
19330x00,
19340x00,
19350x10,
19360x00,
19370x00,
19380x00,
19390x0f,
19400xff,
19080x69, 19410x69,
19090x75, 19420x75,
19100x20, 19430x20,
@@ -1916,6 +1949,21 @@ const char rmDspOnlyPolicy[] = {
19160x00, 19490x00,
19170x00, 19500x00,
19180x00, 19510x00,
19520x1f,
19530xff,
19540x00,
19550x00,
19560x00,
19570x01,
19580x75,
19590x20,
19600x3d,
19610x20,
19620x28,
19630x2a,
19640x29,
19650x00,
19660x00,
19190x00, 19670x00,
19200x00, 19680x00,
19210x00, 19690x00,
@@ -2712,7 +2760,7 @@ const char rmDspOnlyPolicy[] = {
27120x00, 27600x00,
27130x00, 27610x00,
27140x00, 27620x00,
27150x11, 27630x42,
27160x00, 27640x00,
27170x00, 27650x00,
27180x00, 27660x00,
@@ -2723,8 +2771,8 @@ const char rmDspOnlyPolicy[] = {
27230x40, 27710x40,
27240x00, 27720x00,
27250x00, 27730x00,
27260x1c, 27740x0c,
27270xc0, 27750xbf,
27280x69, 27760x69,
27290x75, 27770x75,
27300x20, 27780x20,
@@ -2736,6 +2784,54 @@ const char rmDspOnlyPolicy[] = {
27360x00, 27840x00,
27370x00, 27850x00,
27380x00, 27860x00,
27870x2f,
27880xff,
27890x00,
27900x00,
27910x00,
27920x01,
27930x75,
27940x20,
27950x3d,
27960x20,
27970x28,
27980x2a,
27990x29,
28000x00,
28010x00,
28020x00,
28030x30,
28040x00,
28050x00,
28060x00,
28070x0f,
28080xff,
28090x69,
28100x75,
28110x20,
28120x3d,
28130x20,
28140x28,
28150x2a,
28160x29,
28170x00,
28180x00,
28190x00,
28200x3f,
28210xff,
28220x00,
28230x00,
28240x00,
28250x01,
28260x75,
28270x20,
28280x3d,
28290x20,
28300x28,
28310x2a,
28320x29,
28330x00,
28340x00,
27390x00, 28350x00,
27400x00, 28360x00,
27410x00, 28370x00,
@@ -6433,100 +6529,4 @@ const char rmDspOnlyPolicy[] = {
64330x00, 65290x00,
64340x00, 65300x00,
64350x00, 65310x00,
64360x00,
64370x00,
64380x00,
64390x00,
64400x00,
64410x00,
64420x00,
64430x00,
64440x00,
64450x00,
64460x00,
64470x00,
64480x00,
64490x00,
64500x00,
64510x00,
64520x00,
64530x00,
64540x00,
64550x00,
64560x00,
64570x00,
64580x00,
64590x00,
64600x00,
64610x00,
64620x00,
64630x00,
64640x00,
64650x00,
64660x00,
64670x00,
64680x00,
64690x00,
64700x00,
64710x00,
64720x00,
64730x00,
64740x00,
64750x00,
64760x00,
64770x00,
64780x00,
64790x00,
64800x00,
64810x00,
64820x00,
64830x00,
64840x00,
64850x00,
64860x00,
64870x00,
64880x00,
64890x00,
64900x00,
64910x00,
64920x00,
64930x00,
64940x00,
64950x00,
64960x00,
64970x00,
64980x00,
64990x00,
65000x00,
65010x00,
65020x00,
65030x00,
65040x00,
65050x00,
65060x00,
65070x00,
65080x00,
65090x00,
65100x00,
65110x00,
65120x00,
65130x00,
65140x00,
65150x00,
65160x00,
65170x00,
65180x00,
65190x00,
65200x00,
65210x00,
65220x00,
65230x00,
65240x00,
65250x00,
65260x00,
65270x00,
65280x00,
65290x00,
65300x00,
65310x00,
6532}; 6532};
diff --git a/device/k2k/policy_dsp-only.dtb b/device/k2k/policy_dsp-only.dtb
index 787c4a8..b0cfb7f 100644
--- a/device/k2k/policy_dsp-only.dtb
+++ b/device/k2k/policy_dsp-only.dtb
Binary files differ
diff --git a/device/k2k/policy_dsp-only.dts b/device/k2k/policy_dsp-only.dts
index 016aa33..45e9553 100644
--- a/device/k2k/policy_dsp-only.dts
+++ b/device/k2k/policy_dsp-only.dts
@@ -112,7 +112,10 @@
112 assignments = <884 4>, "iu = (*)"; 112 assignments = <884 4>, "iu = (*)";
113 }; 113 };
114 GENERAL_PURPOSE_QUEUE-qm1 { 114 GENERAL_PURPOSE_QUEUE-qm1 {
115 assignments = <896 7296>, "iu = (*)"; 115 assignments = <896 3199>, "iu = (*)",
116 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
117 <4096 4095>, "iu = (*)",
118 <8191 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
116 }; 119 };
117 LOW_PRIORITY_QUEUE-qm2 { 120 LOW_PRIORITY_QUEUE-qm2 {
118 assignments = <8192 512>, "iu = (*)"; 121 assignments = <8192 512>, "iu = (*)";
@@ -151,8 +154,11 @@
151 assignments = <8992 32>, "iu = (*)"; 154 assignments = <8992 32>, "iu = (*)";
152 }; 155 };
153 GENERAL_PURPOSE_QUEUE-qm2 { 156 GENERAL_PURPOSE_QUEUE-qm2 {
154 assignments = <9024 7360>, "iu = (*)"; 157 assignments = <9024 3263>, "iu = (*)",
155 }; 158 <12287 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
159 <12288 4095>, "iu = (*)",
160 <16383 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
161 };
156 162
157 firmware-pdsp { 163 firmware-pdsp {
158 assignments = <0 8>, "iu = (*)"; 164 assignments = <0 8>, "iu = (*)";
diff --git a/device/k2k/policy_dsp_arm.c b/device/k2k/policy_dsp_arm.c
index 8007b86..29b59b9 100644
--- a/device/k2k/policy_dsp_arm.c
+++ b/device/k2k/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
80x00, 80x00,
90x00, 90x00,
100x1b, 100x1b,
110x9c, 110xec,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
160x00, 160x00,
170x00, 170x00,
180x1b, 180x1b,
190x80, 190xd0,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
400x00, 400x00,
410x00, 410x00,
420x1b, 420x1b,
430x48, 430x98,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -2064,7 +2064,7 @@ const char rmDspPlusArmPolicy[] = {
20640x00, 20640x00,
20650x00, 20650x00,
20660x00, 20660x00,
20670x8f, 20670xb0,
20680x00, 20680x00,
20690x00, 20690x00,
20700x00, 20700x00,
@@ -2104,8 +2104,41 @@ const char rmDspPlusArmPolicy[] = {
21040xe0, 21040xe0,
21050x00, 21050x00,
21060x00, 21060x00,
21070x09, 21070x00,
21080x1f,
21090x69,
21100x75,
21110x20,
21120x3d,
21130x20,
21140x28,
21150x2a,
21160x29,
21170x00,
21180x00,
21190x00,
21200x0f,
21210xff,
21220x00,
21230x00,
21240x00,
21250x01,
21260x75,
21080x20, 21270x20,
21280x3d,
21290x20,
21300x28,
21310x2a,
21320x29,
21330x00,
21340x00,
21350x00,
21360x10,
21370x00,
21380x00,
21390x00,
21400x09,
21410x00,
21090x69, 21420x69,
21100x75, 21430x75,
21110x20, 21440x20,
@@ -2215,7 +2248,6 @@ const char rmDspPlusArmPolicy[] = {
22150x00, 22480x00,
22160x00, 22490x00,
22170x00, 22500x00,
22180x00,
22190x02, 22510x02,
22200x00, 22520x00,
22210x00, 22530x00,
@@ -3020,7 +3052,7 @@ const char rmDspPlusArmPolicy[] = {
30200x00, 30520x00,
30210x00, 30530x00,
30220x00, 30540x00,
30230x11, 30550x42,
30240x00, 30560x00,
30250x00, 30570x00,
30260x00, 30580x00,
@@ -3031,8 +3063,41 @@ const char rmDspPlusArmPolicy[] = {
30310x40, 30630x40,
30320x00, 30640x00,
30330x00, 30650x00,
30340x1c, 30660x0c,
30350xc0, 30670xbf,
30680x69,
30690x75,
30700x20,
30710x3d,
30720x20,
30730x28,
30740x2a,
30750x29,
30760x00,
30770x00,
30780x00,
30790x2f,
30800xff,
30810x00,
30820x00,
30830x00,
30840x01,
30850x75,
30860x20,
30870x3d,
30880x20,
30890x28,
30900x2a,
30910x29,
30920x00,
30930x00,
30940x00,
30950x30,
30960x00,
30970x00,
30980x00,
30990x0f,
31000xff,
30360x69, 31010x69,
30370x75, 31020x75,
30380x20, 31030x20,
@@ -3044,6 +3109,21 @@ const char rmDspPlusArmPolicy[] = {
30440x00, 31090x00,
30450x00, 31100x00,
30460x00, 31110x00,
31120x3f,
31130xff,
31140x00,
31150x00,
31160x00,
31170x01,
31180x75,
31190x20,
31200x3d,
31210x20,
31220x28,
31230x2a,
31240x29,
31250x00,
31260x00,
30470x00, 31270x00,
30480x00, 31280x00,
30490x00, 31290x00,
@@ -7089,84 +7169,4 @@ const char rmDspPlusArmPolicy[] = {
70890x00, 71690x00,
70900x00, 71700x00,
70910x00, 71710x00,
70920x00,
70930x00,
70940x00,
70950x00,
70960x00,
70970x00,
70980x00,
70990x00,
71000x00,
71010x00,
71020x00,
71030x00,
71040x00,
71050x00,
71060x00,
71070x00,
71080x00,
71090x00,
71100x00,
71110x00,
71120x00,
71130x00,
71140x00,
71150x00,
71160x00,
71170x00,
71180x00,
71190x00,
71200x00,
71210x00,
71220x00,
71230x00,
71240x00,
71250x00,
71260x00,
71270x00,
71280x00,
71290x00,
71300x00,
71310x00,
71320x00,
71330x00,
71340x00,
71350x00,
71360x00,
71370x00,
71380x00,
71390x00,
71400x00,
71410x00,
71420x00,
71430x00,
71440x00,
71450x00,
71460x00,
71470x00,
71480x00,
71490x00,
71500x00,
71510x00,
71520x00,
71530x00,
71540x00,
71550x00,
71560x00,
71570x00,
71580x00,
71590x00,
71600x00,
71610x00,
71620x00,
71630x00,
71640x00,
71650x00,
71660x00,
71670x00,
71680x00,
71690x00,
71700x00,
71710x00,
7172}; 7172};
diff --git a/device/k2k/policy_dsp_arm.dtb b/device/k2k/policy_dsp_arm.dtb
index cbf8690..2f1f24c 100644
--- a/device/k2k/policy_dsp_arm.dtb
+++ b/device/k2k/policy_dsp_arm.dtb
Binary files differ
diff --git a/device/k2k/policy_dsp_arm.dts b/device/k2k/policy_dsp_arm.dts
index 9b1efc4..bd94c2b 100644
--- a/device/k2k/policy_dsp_arm.dts
+++ b/device/k2k/policy_dsp_arm.dts
@@ -131,7 +131,9 @@
131 GENERAL_PURPOSE_QUEUE-qm1 { 131 GENERAL_PURPOSE_QUEUE-qm1 {
132 assignments = <896 3104>, "iu = (*)", 132 assignments = <896 3104>, "iu = (*)",
133 <4000 64>, "(*)", /* Used by Kernel */ 133 <4000 64>, "(*)", /* Used by Kernel */
134 <4064 2336>, "iu = (*)", 134 <4064 31>, "iu = (*)",
135 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
136 <4096 2304>, "iu = (*)",
135 137
136 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */ 138 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */
137 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 139 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
@@ -144,6 +146,7 @@
144 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 146 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
145 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */ 147 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */
146 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */ 148 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */
149 /* note for q 8191: Queues ending in 0xfff can't be used as return queue (hw reserved) */
147 }; 150 };
148 LOW_PRIORITY_QUEUE-qm2 { 151 LOW_PRIORITY_QUEUE-qm2 {
149 assignments = <8192 512>, "iu = (*)"; 152 assignments = <8192 512>, "iu = (*)";
@@ -182,7 +185,10 @@
182 assignments = <8992 32>, "iu = (*)"; 185 assignments = <8992 32>, "iu = (*)";
183 }; 186 };
184 GENERAL_PURPOSE_QUEUE-qm2 { 187 GENERAL_PURPOSE_QUEUE-qm2 {
185 assignments = <9024 7360>, "iu = (*)"; 188 assignments = <9024 3263>, "iu = (*)",
189 <12287 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
190 <12288 4095>, "iu = (*)",
191 <16383 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
186 }; 192 };
187 193
188 firmware-pdsp { 194 firmware-pdsp {
diff --git a/device/k2l/policy_dsp-only.c b/device/k2l/policy_dsp-only.c
index 819ab42..e3311e1 100644
--- a/device/k2l/policy_dsp-only.c
+++ b/device/k2l/policy_dsp-only.c
@@ -7,8 +7,8 @@ const char rmDspOnlyPolicy[] = {
70xed, 70xed,
80x00, 80x00,
90x00, 90x00,
100x11, 100x12,
110xe4, 110x14,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
@@ -16,7 +16,7 @@ const char rmDspOnlyPolicy[] = {
160x00, 160x00,
170x00, 170x00,
180x11, 180x11,
190xc8, 190xf8,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -40,7 +40,7 @@ const char rmDspOnlyPolicy[] = {
400x00, 400x00,
410x00, 410x00,
420x11, 420x11,
430x90, 430xc0,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -1808,7 +1808,7 @@ const char rmDspOnlyPolicy[] = {
18080x00, 18080x00,
18090x00, 18090x00,
18100x00, 18100x00,
18110x11, 18110x42,
18120x00, 18120x00,
18130x00, 18130x00,
18140x00, 18140x00,
@@ -1819,8 +1819,41 @@ const char rmDspOnlyPolicy[] = {
18190x00, 18190x00,
18200x00, 18200x00,
18210x00, 18210x00,
18220x1c, 18220x0b,
18230xff,
18240x69,
18250x75,
18260x20,
18270x3d,
18280x20,
18290x28,
18300x2a,
18310x29,
18320x00,
18330x00,
18340x00,
18350x0f,
18360xff,
18370x00,
18380x00,
18390x00,
18400x01,
18410x75,
18420x20,
18430x3d,
18440x20,
18450x28,
18460x2a,
18470x29,
18480x00,
18490x00,
18500x00,
18510x10,
18230x00, 18520x00,
18530x00,
18540x00,
18550x0f,
18560xff,
18240x69, 18570x69,
18250x75, 18580x75,
18260x20, 18590x20,
@@ -1832,6 +1865,21 @@ const char rmDspOnlyPolicy[] = {
18320x00, 18650x00,
18330x00, 18660x00,
18340x00, 18670x00,
18680x1f,
18690xff,
18700x00,
18710x00,
18720x00,
18730x01,
18740x75,
18750x20,
18760x3d,
18770x20,
18780x28,
18790x2a,
18800x29,
18810x00,
18820x00,
18350x00, 18830x00,
18360x00, 18840x00,
18370x00, 18850x00,
@@ -4609,4 +4657,84 @@ const char rmDspOnlyPolicy[] = {
46090x00, 46570x00,
46100x00, 46580x00,
46110x00, 46590x00,
46600x00,
46610x00,
46620x00,
46630x00,
46640x00,
46650x00,
46660x00,
46670x00,
46680x00,
46690x00,
46700x00,
46710x00,
46720x00,
46730x00,
46740x00,
46750x00,
46760x00,
46770x00,
46780x00,
46790x00,
46800x00,
46810x00,
46820x00,
46830x00,
46840x00,
46850x00,
46860x00,
46870x00,
46880x00,
46890x00,
46900x00,
46910x00,
46920x00,
46930x00,
46940x00,
46950x00,
46960x00,
46970x00,
46980x00,
46990x00,
47000x00,
47010x00,
47020x00,
47030x00,
47040x00,
47050x00,
47060x00,
47070x00,
47080x00,
47090x00,
47100x00,
47110x00,
47120x00,
47130x00,
47140x00,
47150x00,
47160x00,
47170x00,
47180x00,
47190x00,
47200x00,
47210x00,
47220x00,
47230x00,
47240x00,
47250x00,
47260x00,
47270x00,
47280x00,
47290x00,
47300x00,
47310x00,
47320x00,
47330x00,
47340x00,
47350x00,
47360x00,
47370x00,
47380x00,
47390x00,
4612}; 4740};
diff --git a/device/k2l/policy_dsp-only.dtb b/device/k2l/policy_dsp-only.dtb
index c006a82..60878af 100644
--- a/device/k2l/policy_dsp-only.dtb
+++ b/device/k2l/policy_dsp-only.dtb
Binary files differ
diff --git a/device/k2l/policy_dsp-only.dts b/device/k2l/policy_dsp-only.dts
index bca242a..8d4c251 100644
--- a/device/k2l/policy_dsp-only.dts
+++ b/device/k2l/policy_dsp-only.dts
@@ -103,7 +103,10 @@
103 assignments = <896 21>, "iu = (*)"; 103 assignments = <896 21>, "iu = (*)";
104 }; 104 };
105 GENERAL_PURPOSE_QUEUE-qm1 { 105 GENERAL_PURPOSE_QUEUE-qm1 {
106 assignments = <1024 7168>, "iu = (*)"; 106 assignments = <1024 3071>, "iu = (*)",
107 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
108 <4096 4095>, "iu = (*)",
109 <8191 1>, "u = (*)"; /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
107 }; 110 };
108 111
109 firmware-pdsp { 112 firmware-pdsp {
diff --git a/device/k2l/policy_dsp_arm.c b/device/k2l/policy_dsp_arm.c
index b5c2ecd..4f17ae9 100644
--- a/device/k2l/policy_dsp_arm.c
+++ b/device/k2l/policy_dsp_arm.c
@@ -8,7 +8,7 @@ const char rmDspPlusArmPolicy[] = {
80x00, 80x00,
90x00, 90x00,
100x14, 100x14,
110x30, 110x50,
120x00, 120x00,
130x00, 130x00,
140x00, 140x00,
@@ -16,7 +16,7 @@ const char rmDspPlusArmPolicy[] = {
160x00, 160x00,
170x00, 170x00,
180x14, 180x14,
190x14, 190x34,
200x00, 200x00,
210x00, 210x00,
220x00, 220x00,
@@ -40,7 +40,7 @@ const char rmDspPlusArmPolicy[] = {
400x00, 400x00,
410x00, 410x00,
420x13, 420x13,
430xdc, 430xfc,
440x00, 440x00,
450x00, 450x00,
460x00, 460x00,
@@ -1960,7 +1960,7 @@ const char rmDspPlusArmPolicy[] = {
19600x00, 19600x00,
19610x00, 19610x00,
19620x00, 19620x00,
19630x8f, 19630xb0,
19640x00, 19640x00,
19650x00, 19650x00,
19660x00, 19660x00,
@@ -2000,8 +2000,41 @@ const char rmDspPlusArmPolicy[] = {
20000xe0, 20000xe0,
20010x00, 20010x00,
20020x00, 20020x00,
20030x09, 20030x00,
20040x1f,
20050x69,
20060x75,
20070x20,
20080x3d,
20090x20,
20100x28,
20110x2a,
20120x29,
20130x00,
20140x00,
20150x00,
20160x0f,
20170xff,
20180x00,
20190x00,
20200x00,
20210x01,
20220x75,
20230x20,
20240x3d,
20040x20, 20250x20,
20260x28,
20270x2a,
20280x29,
20290x00,
20300x00,
20310x00,
20320x10,
20330x00,
20340x00,
20350x00,
20360x09,
20370x00,
20050x69, 20380x69,
20060x75, 20390x75,
20070x20, 20400x20,
@@ -2111,7 +2144,6 @@ const char rmDspPlusArmPolicy[] = {
21110x00, 21440x00,
21120x00, 21450x00,
21130x00, 21460x00,
21140x00,
21150x02, 21470x02,
21160x00, 21480x00,
21170x00, 21490x00,
@@ -5217,36 +5249,4 @@ const char rmDspPlusArmPolicy[] = {
52170x00, 52490x00,
52180x00, 52500x00,
52190x00, 52510x00,
52200x00,
52210x00,
52220x00,
52230x00,
52240x00,
52250x00,
52260x00,
52270x00,
52280x00,
52290x00,
52300x00,
52310x00,
52320x00,
52330x00,
52340x00,
52350x00,
52360x00,
52370x00,
52380x00,
52390x00,
52400x00,
52410x00,
52420x00,
52430x00,
52440x00,
52450x00,
52460x00,
52470x00,
52480x00,
52490x00,
52500x00,
52510x00,
5252}; 5252};
diff --git a/device/k2l/policy_dsp_arm.dtb b/device/k2l/policy_dsp_arm.dtb
index 7411503..7097f01 100644
--- a/device/k2l/policy_dsp_arm.dtb
+++ b/device/k2l/policy_dsp_arm.dtb
Binary files differ
diff --git a/device/k2l/policy_dsp_arm.dts b/device/k2l/policy_dsp_arm.dts
index 0e698fc..725c664 100644
--- a/device/k2l/policy_dsp_arm.dts
+++ b/device/k2l/policy_dsp_arm.dts
@@ -120,7 +120,9 @@
120 GENERAL_PURPOSE_QUEUE-qm1 { 120 GENERAL_PURPOSE_QUEUE-qm1 {
121 assignments = <1024 2976>, "iu = (*)", 121 assignments = <1024 2976>, "iu = (*)",
122 <4000 64>, "(*)", /* Used by Kernel */ 122 <4000 64>, "(*)", /* Used by Kernel */
123 <4064 2336>, "iu = (*)", 123 <4064 31>, "iu = (*)",
124 <4095 1>, "u = (*)", /* Queues ending in 0xfff can't be used as return queue (hw reserved) */
125 <4096 2304>, "iu = (*)",
124 126
125 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */ 127 /* 6400-6477 is taken by linux for qostree2, but DSP can transmit via "fastpath" queues */
126 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 128 <6400 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
@@ -133,6 +135,7 @@
133 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */ 135 <8000 72>, "u = (*)", /* qos queues for DSP (fastpath-best-effort, fastpath-hp, 4g-cos#, 3g-cos#, wifi-cos#) use (open by number) not init */
134 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */ 136 <8072 6>, "(*)", /* qos queues for linux (linux-best-effort, linux-cos#, linux-hp) - DSP can't use */
135 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */ 137 <8078 114>, "(*)"; /* unconfigured QoS/Linux queues (qos-inputs-1) */
138 /* note for q 8191: Queues ending in 0xfff can't be used as return queue (hw reserved) */
136 }; 139 };
137 140
138 firmware-pdsp { 141 firmware-pdsp {
diff --git a/docs/ReleaseNotes_RM.doc b/docs/ReleaseNotes_RM.doc
index c2001ce..fb97576 100644
--- a/docs/ReleaseNotes_RM.doc
+++ b/docs/ReleaseNotes_RM.doc
Binary files differ
diff --git a/docs/ReleaseNotes_RM.pdf b/docs/ReleaseNotes_RM.pdf
index 751b6c3..a8d4b9e 100644
--- a/docs/ReleaseNotes_RM.pdf
+++ b/docs/ReleaseNotes_RM.pdf
Binary files differ
generated by cgit v1.2.3 (git 2.39.2)