113 files changed, 5967 insertions, 3498 deletions

diff --git a/docs/ReleaseNotes_PA_LLD.doc b/docs/ReleaseNotes_PA_LLD.doc
index ce5c8b4..1f1da76 100644
--- a/docs/ReleaseNotes_PA_LLD.doc
+++ b/docs/ReleaseNotes_PA_LLD.doc
diff --git a/docs/ReleaseNotes_PA_LLD.pdf b/docs/ReleaseNotes_PA_LLD.pdf
index 71a3c57..a0ee851 100644
--- a/docs/ReleaseNotes_PA_LLD.pdf
+++ b/docs/ReleaseNotes_PA_LLD.pdf
diff --git a/fw/classify1_0_bin.c b/fw/classify1_0_bin.c
index f5c214a..8e0e8f7 100644
--- a/fw/classify1_0_bin.c
+++ b/fw/classify1_0_bin.c
@@ -72,7 +72,7 @@
 const uint32_t c1_0[] =  {
      0x21008a00,
      0xbabe0001,
-     0x03000200,
+     0x03000201,
      0x24505084,
      0x108484c4,
      0x10e4e4e5,
@@ -175,8 +175,8 @@ const uint32_t c1_0[] =  {
      0x81801864,
      0x24000504,
      0x81a01864,
-     0x2eff8f82,
-     0x83a0f382,
+     0x2eff9182,
+     0x85a03382,
      0x24000262,
      0x24000242,
      0x24000222,
@@ -208,7 +208,7 @@ const uint32_t c1_0[] =  {
      0x240300f4,
      0x80f4e080,
      0x209e0000,
-     0x2302c09e,
+     0x2302d29e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -222,7 +222,7 @@ const uint32_t c1_0[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100171d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0xc909ff06,
@@ -247,7 +247,7 @@ const uint32_t c1_0[] =  {
      0xc9030503,
      0x2300d79e,
      0x2100b200,
-     0x2301a89e,
+     0x2301b19e,
      0xc9067d13,
      0x1d067d7d,
      0xd1047d04,
@@ -258,15 +258,15 @@ const uint32_t c1_0[] =  {
      0xd1005d0a,
      0x5103de04,
      0x5105de06,
-     0x2301e69e,
+     0x2301ef9e,
      0x2100c500,
      0x240023e4,
      0x2f000184,
      0x2100c500,
-     0x2301ee9e,
+     0x2301f79e,
      0x2100c500,
      0x1d005d5d,
-     0x2301a89e,
+     0x2301b19e,
      0x1d077d7d,
      0x2100cc00,
      0xd7005df1,
@@ -276,14 +276,14 @@ const uint32_t c1_0[] =  {
      0xd105ff00,
      0xd1057d03,
      0xd1047d02,
-     0xd304ff3a,
+     0xd304ff43,
      0xc9057d02,
      0xc90aff05,
      0x5700fcca,
      0x81082c9c,
      0x2eff819c,
      0x21009b00,
-     0x2105a600,
+     0x2105cc00,
      0x2100d100,
      0x1f08fcfc,
      0xc905ff00,
@@ -303,7 +303,7 @@ const uint32_t c1_0[] =  {
      0x10d7d790,
      0x24000442,
      0x6902691c,
-     0xd10319a6,
+     0xd10319af,
      0xc9006805,
      0x812208c8,
      0x11e05959,
@@ -328,13 +328,13 @@ const uint32_t c1_0[] =  {
      0x106a6a44,
      0x24001864,
      0x2f000384,
-     0x51036c94,
+     0x51036c9d,
      0x209e0000,
-     0x69006951,
+     0x6900695a,
      0x81310858,
      0xd1005b03,
      0xc9065d02,
-     0xd1031987,
+     0xd1031990,
      0x8118288a,
      0x51000b05,
      0x91090862,
@@ -386,6 +386,15 @@ const uint32_t c1_0[] =  {
      0xc9016b03,
      0x001a8989,
      0x24000642,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c013c9,
+     0x21014500,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91c213c9,
      0x24001802,
      0xd1055648,
      0x51016c44,
@@ -493,7 +502,7 @@ const uint32_t c1_0[] =  {
      0x2eff8183,
      0x1f12e3e3,
      0x2400cf9e,
-     0x21047e00,
+     0x21049b00,
      0x1f09fcfc,
      0xd106ff00,
      0xc905ff00,
@@ -510,11 +519,11 @@ const uint32_t c1_0[] =  {
      0xc9015604,
      0xc9000216,
      0x01048181,
-     0x2101bf00,
+     0x2101c800,
      0xc9005604,
      0xc9010210,
      0x01148181,
-     0x2101bf00,
+     0x2101c800,
      0xc9020213,
      0x01248181,
      0x9081fe89,
@@ -523,13 +532,13 @@ const uint32_t c1_0[] =  {
      0x5100010e,
      0xc9035603,
      0x2400f081,
-     0x2101cd00,
+     0x2101d600,
      0xc9025603,
      0x2400e081,
-     0x2101cd00,
+     0x2101d600,
      0xc9005603,
      0x2400c081,
-     0x2101cd00,
+     0x2101d600,
      0x2400d081,
      0x9081f489,
      0x51056902,
@@ -555,7 +564,7 @@ const uint32_t c1_0[] =  {
      0x6902c103,
      0x9081e289,
      0x2100e600,
-     0x21017c00,
+     0x21018500,
      0xc905ff00,
      0xd106ff00,
      0x93206896,
@@ -574,7 +583,7 @@ const uint32_t c1_0[] =  {
      0x00c18181,
      0xc9015603,
      0x01048181,
-     0x2101fa00,
+     0x21020300,
      0x01148181,
      0x9081fe89,
      0x2100e600,
@@ -585,11 +594,11 @@ const uint32_t c1_0[] =  {
      0x00c18181,
      0xc9015603,
      0x01048181,
-     0x21020500,
+     0x21020e00,
      0x01148181,
      0x9081fe86,
      0x2400cf9e,
-     0x21047e00,
+     0x21049b00,
      0x1f00fcfc,
      0x91002481,
      0x0101e1e1,
@@ -617,23 +626,23 @@ const uint32_t c1_0[] =  {
      0x5100c90e,
      0x6908c904,
      0x0b036801,
-     0x511e013b,
-     0x511f013a,
+     0x511e0144,
+     0x511f0143,
      0x2e808b96,
      0x0b057601,
-     0x5100013c,
-     0x510401d8,
+     0x51000145,
+     0x510401e1,
      0x1f13fcfc,
      0x2eff8384,
      0x24002104,
      0x2f000384,
      0x21009b00,
-     0xc9015d2b,
+     0xc9015d34,
      0x09032881,
-     0x51008129,
+     0x51008132,
      0x01288181,
      0x90817e8e,
-     0xc9006e26,
+     0xc9006e2f,
      0x816c3585,
      0xc9077d0c,
      0x0089d7c1,
@@ -644,8 +653,8 @@ const uint32_t c1_0[] =  {
      0x2e810185,
      0xc9030503,
      0x2300d79e,
-     0x21024000,
-     0x2301a89e,
+     0x21024900,
+     0x2301b19e,
      0x1d077d7d,
      0xc907ff00,
      0x2eff8384,
@@ -655,7 +664,16 @@ const uint32_t c1_0[] =  {
      0x124e0202,
      0x81090762,
      0x24000744,
-     0x21024e00,
+     0x21026000,
+     0xc90e8e05,
+     0x1d0e8e8e,
+     0x811e07ce,
+     0x91c013ce,
+     0x21025c00,
+     0xc90f8e04,
+     0x1d0f8e8e,
+     0x811e07ce,
+     0x91c213ce,
      0x24000644,
      0x108e8ec5,
      0x104e4e05,
@@ -675,12 +693,12 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x2eff8b96,
      0x108989d7,
-     0x21026800,
+     0x21027a00,
      0x2eff8a96,
      0x108989d7,
      0x24001059,
-     0x2402819e,
-     0x21066b00,
+     0x2402939e,
+     0x21069100,
      0x24000104,
      0x240018c4,
      0x2f000184,
@@ -697,7 +715,7 @@ const uint32_t c1_0[] =  {
      0x61100304,
      0x1f005d5d,
      0x240002de,
-     0x21029300,
+     0x2102a500,
      0x2eff8f8e,
      0x2f01878e,
      0x2f020f8e,
@@ -705,7 +723,7 @@ const uint32_t c1_0[] =  {
      0x4896d704,
      0x24002837,
      0x240002de,
-     0x21029300,
+     0x2102a500,
      0x09010300,
      0x01000000,
      0x90001580,
@@ -724,7 +742,7 @@ const uint32_t c1_0[] =  {
      0xc9015604,
      0xc9000207,
      0xc9030206,
-     0x21029200,
+     0x2102a400,
      0xc9005604,
      0xc9010203,
      0xc9040202,
@@ -755,18 +773,18 @@ const uint32_t c1_0[] =  {
      0x24001864,
      0x24000644,
      0x2f000384,
-     0x2102a200,
+     0x2102b400,
      0x5103de04,
-     0x5705de4d,
+     0x5705de44,
      0x0b0337de,
-     0x2101a100,
+     0x2101aa00,
      0x24502084,
      0x24001864,
      0x24000644,
      0x2f000384,
      0x2100cf00,
      0x24002104,
-     0x2102b500,
+     0x2102c700,
      0x1f047d7d,
      0x24002004,
      0x24000824,
@@ -781,7 +799,7 @@ const uint32_t c1_0[] =  {
      0x24000205,
      0x2f010185,
      0x0101e3e3,
-     0x2102c100,
+     0x2102d300,
      0x2eff9183,
      0x1d006363,
      0x24000564,
@@ -796,11 +814,11 @@ const uint32_t c1_0[] =  {
      0x2eff818a,
      0x8108398a,
      0x2eff9088,
-     0x2405bfc8,
-     0x24062788,
-     0x240638c9,
-     0x24064bcf,
-     0x240667d0,
+     0x2405e5c8,
+     0x24064d88,
+     0x24065ec9,
+     0x240671cf,
+     0x24068dd0,
      0x24002200,
      0x8f00d508,
      0x91001760,
@@ -812,11 +830,11 @@ const uint32_t c1_0[] =  {
      0x71406a04,
      0x240004e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x91007981,
      0x59206a03,
      0x1c6ae2e2,
-     0x2102ed00,
+     0x2102ff00,
      0x05206a4a,
      0x1c4ae1e1,
      0x2eff918d,
@@ -831,13 +849,13 @@ const uint32_t c1_0[] =  {
      0x2f010185,
      0x09066a80,
      0x8480318d,
-     0x21031800,
+     0x21032a00,
      0x2400006b,
      0x106a6a4b,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21031800,
+     0x21032a00,
      0x240000da,
      0x10898980,
      0x24000d04,
@@ -848,21 +866,21 @@ const uint32_t c1_0[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x2400005a,
      0x5101670a,
      0x5102670a,
-     0x53066727,
-     0x510c6781,
-     0x5309674a,
-     0x5105671f,
-     0x5307673f,
+     0x53066732,
+     0x510c678c,
+     0x53096755,
+     0x51056728,
+     0x5307674a,
      0x240002e6,
      0x2f008186,
-     0x21031800,
-     0x21053c00,
-     0x2102e200,
-     0x69062915,
+     0x21032a00,
+     0x21056200,
+     0x2102f400,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -872,6 +890,15 @@ const uint32_t c1_0[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21033d00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -880,23 +907,23 @@ const uint32_t c1_0[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x23059e9e,
+     0x2305c49e,
      0x2f000384,
      0x2100d100,
      0x240021e4,
      0x2f000184,
      0x2100d100,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -981,7 +1008,9 @@ const uint32_t c1_0[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21031800,
+     0xc9076a02,
+     0x81c03394,
+     0x21032a00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -991,22 +1020,22 @@ const uint32_t c1_0[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x240018c4,
      0x2f000384,
-     0x21042b00,
+     0x21044800,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1019,26 +1048,26 @@ const uint32_t c1_0[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21031800,
+     0x21032a00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21031800,
+     0x21032a00,
      0x69036a0d,
      0x59188004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80818e,
      0x1d035d5d,
      0xc9006e05,
@@ -1046,12 +1075,12 @@ const uint32_t c1_0[] =  {
      0x1d045d5d,
      0xc9016e02,
      0x1f045d5d,
-     0x21031800,
+     0x21032a00,
      0x69066a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -1061,13 +1090,13 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2103d700,
-     0x21031800,
+     0x2103f400,
+     0x21032a00,
      0x69076a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -1077,14 +1106,14 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2103e700,
-     0x21031800,
+     0x21040400,
+     0x21032a00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1104,14 +1133,14 @@ const uint32_t c1_0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2103f900,
-     0x21031800,
+     0x21041600,
+     0x21032a00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -1127,16 +1156,16 @@ const uint32_t c1_0[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x21041a00,
+     0x21043700,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21041400,
-     0x21031800,
+     0x21043100,
+     0x21032a00,
      0x240002e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1146,7 +1175,7 @@ const uint32_t c1_0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21031800,
+     0x21032a00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -1173,8 +1202,8 @@ const uint32_t c1_0[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21031800,
-     0x21031800,
+     0x21032a00,
+     0x21032a00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -1183,12 +1212,12 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21031800,
+     0x21032a00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x1f027d7d,
      0x2e80838a,
      0x106a6a24,
@@ -1219,7 +1248,7 @@ const uint32_t c1_0[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21031800,
+     0x21032a00,
      0x10d7d790,
      0x24000442,
      0x69026619,
@@ -1233,7 +1262,7 @@ const uint32_t c1_0[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21048d00,
+     0x2104aa00,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -1245,9 +1274,9 @@ const uint32_t c1_0[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036997,
+     0x510369a0,
      0x209e0000,
-     0x69006654,
+     0x6900665d,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -1275,7 +1304,7 @@ const uint32_t c1_0[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x2104bc00,
+     0x2104d900,
      0xd1010106,
      0x111f5900,
      0x51030002,
@@ -1288,17 +1317,26 @@ const uint32_t c1_0[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x2104cd00,
+     0x2104ea00,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x2104cd00,
+     0x2104ea00,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2104f300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
@@ -1409,7 +1447,7 @@ const uint32_t c1_0[] =  {
      0x209e0000,
      0x24000ce6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x2e80818a,
      0x2eff818d,
      0x240034c0,
@@ -1418,7 +1456,7 @@ const uint32_t c1_0[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x91007981,
      0x69406a0b,
      0x2700e160,
@@ -1427,14 +1465,14 @@ const uint32_t c1_0[] =  {
      0x69206005,
      0x240004e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x01206060,
      0x1060606a,
      0x2f00800a,
      0x61406a04,
      0x240004e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x2400016b,
      0x106a6a4b,
      0x24000004,
@@ -1446,11 +1484,11 @@ const uint32_t c1_0[] =  {
      0x51004a18,
      0x240003e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x61206a04,
      0x05206a60,
      0x1e60e1e1,
-     0x21056600,
+     0x21058c00,
      0x1e6ae2e2,
      0x2e808f8e,
      0xd1077d0a,
@@ -1462,11 +1500,11 @@ const uint32_t c1_0[] =  {
      0x104b4b25,
      0x24000105,
      0x2f010185,
-     0x21031800,
+     0x21032a00,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1490,7 +1528,7 @@ const uint32_t c1_0[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21056100,
+     0x21058700,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1507,7 +1545,7 @@ const uint32_t c1_0[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21056100,
+     0x21058700,
      0xc9077d07,
      0x13082424,
      0x1f047d7d,
@@ -1531,13 +1569,13 @@ const uint32_t c1_0[] =  {
      0x59204b06,
      0x51016b03,
      0x1c4be2e2,
-     0x2105bd00,
+     0x2105e300,
      0x1e4be2e2,
-     0x2105bd00,
+     0x2105e300,
      0x05204b4b,
      0x51016b03,
      0x1c4be1e1,
-     0x2105bd00,
+     0x2105e300,
      0x1e4be1e1,
      0x81007981,
      0x2100d100,
@@ -1580,11 +1618,11 @@ const uint32_t c1_0[] =  {
      0x111f0101,
      0x68013003,
      0x1f15fcfc,
-     0x21062400,
+     0x21064a00,
      0x019010c1,
      0x80c13991,
      0x81811961,
-     0x21062400,
+     0x21064a00,
      0x1f071919,
      0x10d0d0ce,
      0x0108c4c4,
@@ -1661,7 +1699,7 @@ const uint32_t c1_0[] =  {
      0x01029696,
      0x240002c4,
      0x2f000384,
-     0x2105d500,
+     0x2105fb00,
      0x1f07d9d9,
      0x1f0efcfc,
      0x2e80838e,
@@ -1702,13 +1740,13 @@ const uint32_t c1_0[] =  {
      0x24000403,
      0x209e0000,
      0x2400b837,
-     0x21066200,
+     0x21068800,
      0x2400b037,
      0x240002de,
      0x24001003,
      0x209e0000,
      0x24002837,
-     0x21066200,
+     0x21068800,
      0x1f0ffcfc,
      0x13283737,
      0x240002de,
@@ -1727,7 +1765,7 @@ const uint32_t c1_0[] =  {
      0x1f031d1d,
      0x10cecec7,
      0x108e8e87,
-     0x21067d00,
+     0x2106a300,
      0x1f021d1d,
      0x11ffcec7,
      0x11ff8e87,
@@ -1747,7 +1785,7 @@ const uint32_t c1_0[] =  {
      0x1f031d1d,
      0x10cecec7,
      0x108e8e87,
-     0x21069100,
+     0x2106b700,
      0x1f021d1d,
      0x11ffcec7,
      0x11ff8e87,
diff --git a/fw/classify1_1_bin.c b/fw/classify1_1_bin.c
index 25ad624..77f0d26 100644
--- a/fw/classify1_1_bin.c
+++ b/fw/classify1_1_bin.c
@@ -73,8 +73,8 @@
 const uint32_t c1_1[] =  {
      0x21000300,
      0xbabe0001,
-     0x03000200,
-     0x2301b29e,
+     0x03000201,
+     0x2301bb9e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -84,7 +84,7 @@ const uint32_t c1_1[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100171d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0xc901ff0f,
@@ -118,7 +118,7 @@ const uint32_t c1_1[] =  {
      0xc9030503,
      0x2300529e,
      0x21003000,
-     0x2301229e,
+     0x23012b9e,
      0xc9067d10,
      0x1d067d7d,
      0xd1047d04,
@@ -128,13 +128,13 @@ const uint32_t c1_1[] =  {
      0x1d047d7d,
      0xd1005d07,
      0x5103de03,
-     0x23014b9e,
+     0x2301549e,
      0x21004000,
      0x240023e4,
      0x2f000184,
      0x21004000,
      0x1d005d5d,
-     0x2301229e,
+     0x23012b9e,
      0x1d077d7d,
      0x21004700,
      0xd7005df4,
@@ -144,14 +144,14 @@ const uint32_t c1_1[] =  {
      0xd105ff00,
      0xd1057d03,
      0xd1047d02,
-     0xd304ff0a,
+     0xd304ff13,
      0xc9057d02,
      0xc90aff05,
      0x5700fcc4,
      0x81082c9c,
      0x2eff819c,
      0x21001000,
-     0x21049f00,
+     0x2104bc00,
      0x21004c00,
      0x1f08fcfc,
      0xc905ff00,
@@ -171,7 +171,7 @@ const uint32_t c1_1[] =  {
      0x10d7d790,
      0x24000442,
      0x6902691c,
-     0xd10319a5,
+     0xd10319ae,
      0xc9006805,
      0x812208c8,
      0x11e05959,
@@ -196,13 +196,13 @@ const uint32_t c1_1[] =  {
      0x106a6a44,
      0x24001864,
      0x2f000384,
-     0x51036c93,
+     0x51036c9c,
      0x209e0000,
-     0x69006950,
+     0x69006959,
      0x81310858,
      0xd1005b03,
      0xc9065d02,
-     0xd1031986,
+     0xd103198f,
      0x8118288a,
      0x51000b05,
      0x91090862,
@@ -253,6 +253,15 @@ const uint32_t c1_1[] =  {
      0xc9016b03,
      0x001a8989,
      0x24000642,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c013c9,
+     0x2100bf00,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91c213c9,
      0x24001802,
      0xd1055648,
      0x51016c44,
@@ -360,7 +369,7 @@ const uint32_t c1_1[] =  {
      0x2eff8183,
      0x1f12e3e3,
      0x24004a9e,
-     0x21037800,
+     0x21038c00,
      0x1f09fcfc,
      0xd106ff00,
      0xc905ff00,
@@ -369,13 +378,13 @@ const uint32_t c1_1[] =  {
      0x5100010e,
      0xc9035603,
      0x2400f081,
-     0x21013200,
+     0x21013b00,
      0xc9025603,
      0x2400e081,
-     0x21013200,
+     0x21013b00,
      0xc9005603,
      0x2400c081,
-     0x21013200,
+     0x21013b00,
      0x2400d081,
      0x9081f489,
      0x51056902,
@@ -401,7 +410,7 @@ const uint32_t c1_1[] =  {
      0x6902c103,
      0x9081e289,
      0x21006100,
-     0x2100f600,
+     0x2100ff00,
      0xc905ff00,
      0xd106ff00,
      0x93206896,
@@ -445,7 +454,7 @@ const uint32_t c1_1[] =  {
      0x61100304,
      0x1f005d5d,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x2eff8f8e,
      0x2f01878e,
      0x2f020f8e,
@@ -453,7 +462,7 @@ const uint32_t c1_1[] =  {
      0x4896d704,
      0x24002837,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x09010300,
      0x01800000,
      0x90001580,
@@ -487,17 +496,17 @@ const uint32_t c1_1[] =  {
      0x24001864,
      0x24000644,
      0x2f000384,
-     0x21019500,
+     0x21019e00,
      0x5103de03,
      0x0b0337de,
-     0x21011b00,
+     0x21012400,
      0x24502084,
      0x24001864,
      0x24000644,
      0x2f000384,
      0x21004a00,
      0x24002104,
-     0x2101a700,
+     0x2101b000,
      0x1f047d7d,
      0x24002004,
      0x24000824,
@@ -512,7 +521,7 @@ const uint32_t c1_1[] =  {
      0x24000205,
      0x2f010185,
      0x0101e3e3,
-     0x2101b300,
+     0x2101bc00,
      0x2eff9183,
      0x1d006363,
      0x24000564,
@@ -527,19 +536,19 @@ const uint32_t c1_1[] =  {
      0x2eff818a,
      0x8108398a,
      0x2eff9088,
-     0x2404b889,
-     0x240546ca,
-     0x2405d08a,
-     0x2405dccb,
-     0x2405e88b,
-     0x2405f4cc,
-     0x2406008c,
-     0x240625cd,
-     0x2406338d,
-     0x24063cce,
-     0x24066b8e,
-     0x24064e8f,
-     0x240667d0,
+     0x2404d589,
+     0x24056cca,
+     0x2405ff8a,
+     0x24060bcb,
+     0x2406178b,
+     0x240623cc,
+     0x24062f8c,
+     0x240654cd,
+     0x2406628d,
+     0x24066bce,
+     0x24069a8e,
+     0x24067d8f,
+     0x240696d0,
      0x24002200,
      0x8f80d508,
      0x91001760,
@@ -551,11 +560,11 @@ const uint32_t c1_1[] =  {
      0x71406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x59206a03,
      0x1c6ae2e2,
-     0x2101e700,
+     0x2101f000,
      0x05206a4a,
      0x1c4ae1e1,
      0x2eff918d,
@@ -570,13 +579,13 @@ const uint32_t c1_1[] =  {
      0x2f010185,
      0x09066a80,
      0x8480318d,
-     0x21021200,
+     0x21021b00,
      0x2400006b,
      0x106a6a4b,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x240000da,
      0x10898980,
      0x24000d04,
@@ -587,21 +596,21 @@ const uint32_t c1_1[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400005a,
      0x5101670a,
      0x5102670a,
-     0x53066727,
-     0x510c6781,
-     0x5309674a,
-     0x5105671f,
-     0x5307673f,
+     0x53066732,
+     0x510c678c,
+     0x53096755,
+     0x51056728,
+     0x5307674a,
      0x240002e6,
      0x2f008186,
-     0x21021200,
-     0x21043500,
-     0x2101dc00,
-     0x69062915,
+     0x21021b00,
+     0x21045200,
+     0x2101e500,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -611,6 +620,15 @@ const uint32_t c1_1[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21022e00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -619,23 +637,23 @@ const uint32_t c1_1[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x2304979e,
+     0x2304b49e,
      0x2f000384,
      0x21004c00,
      0x240021e4,
      0x2f000184,
      0x21004c00,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -720,7 +738,9 @@ const uint32_t c1_1[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21021200,
+     0xc9076a02,
+     0x81c03394,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -730,22 +750,22 @@ const uint32_t c1_1[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240018c4,
      0x2f000384,
-     0x21032500,
+     0x21033900,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -758,26 +778,26 @@ const uint32_t c1_1[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21021200,
+     0x21021b00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21021200,
+     0x21021b00,
      0x69036a0d,
      0x59188004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80818e,
      0x1d035d5d,
      0xc9006e05,
@@ -785,12 +805,12 @@ const uint32_t c1_1[] =  {
      0x1d045d5d,
      0xc9016e02,
      0x1f045d5d,
-     0x21021200,
+     0x21021b00,
      0x69066a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -800,13 +820,13 @@ const uint32_t c1_1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102d100,
-     0x21021200,
+     0x2102e500,
+     0x21021b00,
      0x69076a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -816,14 +836,14 @@ const uint32_t c1_1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102e100,
-     0x21021200,
+     0x2102f500,
+     0x21021b00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -843,14 +863,14 @@ const uint32_t c1_1[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2102f300,
-     0x21021200,
+     0x21030700,
+     0x21021b00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -866,16 +886,16 @@ const uint32_t c1_1[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x21031400,
+     0x21032800,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21030e00,
-     0x21021200,
+     0x21032200,
+     0x21021b00,
      0x240002e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -885,7 +905,7 @@ const uint32_t c1_1[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -912,8 +932,8 @@ const uint32_t c1_1[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21021200,
-     0x21021200,
+     0x21021b00,
+     0x21021b00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -922,12 +942,12 @@ const uint32_t c1_1[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21021200,
+     0x21021b00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x1f027d7d,
      0x2e80838a,
      0x106a6a24,
@@ -958,7 +978,7 @@ const uint32_t c1_1[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21021200,
+     0x21021b00,
      0x10d7d790,
      0x24000442,
      0x69026619,
@@ -972,7 +992,7 @@ const uint32_t c1_1[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21038700,
+     0x21039b00,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -984,9 +1004,9 @@ const uint32_t c1_1[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036996,
+     0x5103699f,
      0x209e0000,
-     0x69006653,
+     0x6900665c,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -1014,7 +1034,7 @@ const uint32_t c1_1[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x2103b500,
+     0x2103c900,
      0xd1010105,
      0x11073900,
      0x51000003,
@@ -1026,17 +1046,26 @@ const uint32_t c1_1[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x2103c600,
+     0x2103da00,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x2103c600,
+     0x2103da00,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2103e300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
@@ -1147,7 +1176,7 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x24000ce6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x2eff818d,
      0x240034c0,
@@ -1156,7 +1185,7 @@ const uint32_t c1_1[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x69406a0b,
      0x2700e160,
@@ -1165,14 +1194,14 @@ const uint32_t c1_1[] =  {
      0x69206005,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x01206060,
      0x1060606a,
      0x2f00800a,
      0x61406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400016b,
      0x106a6a4b,
      0x24000004,
@@ -1184,11 +1213,11 @@ const uint32_t c1_1[] =  {
      0x51004a18,
      0x240003e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x61206a04,
      0x05206a60,
      0x1e60e1e1,
-     0x21045f00,
+     0x21047c00,
      0x1e6ae2e2,
      0x2e808f8e,
      0xd1077d0a,
@@ -1200,11 +1229,11 @@ const uint32_t c1_1[] =  {
      0x104b4b25,
      0x24000105,
      0x2f010185,
-     0x21021200,
+     0x21021b00,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1228,7 +1257,7 @@ const uint32_t c1_1[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1245,7 +1274,7 @@ const uint32_t c1_1[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0xc9077d07,
      0x13082424,
      0x1f047d7d,
@@ -1269,13 +1298,13 @@ const uint32_t c1_1[] =  {
      0x59204b06,
      0x51016b03,
      0x1c4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x1e4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x05204b4b,
      0x51016b03,
      0x1c4be1e1,
-     0x2104b600,
+     0x2104d300,
      0x1e4be1e1,
      0x81007981,
      0x21004c00,
@@ -1301,7 +1330,7 @@ const uint32_t c1_1[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2104d200,
+     0x2104ef00,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1340,7 +1369,7 @@ const uint32_t c1_1[] =  {
      0x2700ea01,
      0x69200103,
      0x1f025656,
-     0x2104f900,
+     0x21051600,
      0x61e06a03,
      0x49ef6a02,
      0x1f035656,
@@ -1356,11 +1385,11 @@ const uint32_t c1_1[] =  {
      0x1f031d1d,
      0x209e0000,
      0x24002837,
-     0x21050700,
+     0x21052400,
      0x2400c837,
      0x240002de,
      0x209e0000,
-     0xd104562c,
+     0xd1045635,
      0x2e808986,
      0x11f066e0,
      0x6f40e0fa,
@@ -1380,7 +1409,7 @@ const uint32_t c1_1[] =  {
      0x6e484bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21052d00,
+     0x21054a00,
      0xcf0afc9c,
      0x586e4e0d,
      0x2700f07a,
@@ -1394,11 +1423,20 @@ const uint32_t c1_1[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21052d00,
+     0x21054a00,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x21055600,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1406,34 +1444,34 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207acd,
+     0x5f207ac4,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21054300,
+     0x21056900,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
      0x05014e4e,
      0x8100bb8e,
-     0xcf055677,
+     0xcf05566e,
      0x240004de,
      0x209e0000,
-     0xd1055643,
+     0xd105564c,
      0x2e808386,
      0x11f06600,
-     0x6f6000bd,
+     0x6f6000b4,
      0x2eff8384,
      0x24000004,
      0x240008c4,
      0x2f000384,
      0x2e808f8e,
      0x2f020f8e,
-     0xd1005b4a,
-     0xc9037d49,
-     0xd1045637,
+     0xd1005b53,
+     0xc9037d52,
+     0xd1045640,
      0x2eff8380,
      0x10272760,
      0x01689680,
@@ -1443,12 +1481,12 @@ const uint32_t c1_1[] =  {
      0x51006004,
      0x512b6003,
      0x513c6002,
-     0x21056400,
+     0x21058a00,
      0x90800680,
      0x01014081,
      0x09038181,
      0x00818080,
-     0x21055700,
+     0x21057d00,
      0x90800600,
      0x1f0afcfc,
      0x10f1f1e1,
@@ -1464,8 +1502,8 @@ const uint32_t c1_1[] =  {
      0x6e604bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21058100,
-     0xc90afc28,
+     0x2105a700,
+     0xc90afc31,
      0x586e4e0d,
      0x2700f07a,
      0x51207a0b,
@@ -1478,11 +1516,20 @@ const uint32_t c1_1[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21058100,
+     0x2105a700,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x2105b300,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1490,13 +1537,13 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207a79,
+     0x5f207a67,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21059700,
+     0x2105c600,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
@@ -1527,7 +1574,7 @@ const uint32_t c1_1[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2105b400,
+     0x2105e300,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1561,7 +1608,7 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x2e808086,
      0x09034680,
-     0x4fff8034,
+     0x4fff8022,
      0x010880c4,
      0x00c49696,
      0x2f000384,
@@ -1578,7 +1625,7 @@ const uint32_t c1_1[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff8023,
+     0x4fff8011,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1602,7 +1649,7 @@ const uint32_t c1_1[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff800b,
+     0x4dff80f9,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1721,7 +1768,7 @@ const uint32_t c1_1[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x21067600,
+     0x2106a500,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
diff --git a/fw/classify1_2_bin.c b/fw/classify1_2_bin.c
index ab6d7b6..d32d9ab 100644
--- a/fw/classify1_2_bin.c
+++ b/fw/classify1_2_bin.c
@@ -74,8 +74,8 @@
 const uint32_t c1_2[] =  {
      0x21000300,
      0xbabe0001,
-     0x03000200,
-     0x2301b29e,
+     0x03000201,
+     0x2301bb9e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -85,7 +85,7 @@ const uint32_t c1_2[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100171d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0xc901ff0f,
@@ -119,7 +119,7 @@ const uint32_t c1_2[] =  {
      0xc9030503,
      0x2300529e,
      0x21003000,
-     0x2301229e,
+     0x23012b9e,
      0xc9067d10,
      0x1d067d7d,
      0xd1047d04,
@@ -129,13 +129,13 @@ const uint32_t c1_2[] =  {
      0x1d047d7d,
      0xd1005d07,
      0x5103de03,
-     0x23014b9e,
+     0x2301549e,
      0x21004000,
      0x240023e4,
      0x2f000184,
      0x21004000,
      0x1d005d5d,
-     0x2301229e,
+     0x23012b9e,
      0x1d077d7d,
      0x21004700,
      0xd7005df4,
@@ -145,14 +145,14 @@ const uint32_t c1_2[] =  {
      0xd105ff00,
      0xd1057d03,
      0xd1047d02,
-     0xd304ff0a,
+     0xd304ff13,
      0xc9057d02,
      0xc90aff05,
      0x5700fcc4,
      0x81082c9c,
      0x2eff819c,
      0x21001000,
-     0x21049f00,
+     0x2104bc00,
      0x21004c00,
      0x1f08fcfc,
      0xc905ff00,
@@ -172,7 +172,7 @@ const uint32_t c1_2[] =  {
      0x10d7d790,
      0x24000442,
      0x6902691c,
-     0xd10319a5,
+     0xd10319ae,
      0xc9006805,
      0x812208c8,
      0x11e05959,
@@ -197,13 +197,13 @@ const uint32_t c1_2[] =  {
      0x106a6a44,
      0x24001864,
      0x2f000384,
-     0x51036c93,
+     0x51036c9c,
      0x209e0000,
-     0x69006950,
+     0x69006959,
      0x81310858,
      0xd1005b03,
      0xc9065d02,
-     0xd1031986,
+     0xd103198f,
      0x8118288a,
      0x51000b05,
      0x91090862,
@@ -254,6 +254,15 @@ const uint32_t c1_2[] =  {
      0xc9016b03,
      0x001a8989,
      0x24000642,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c013c9,
+     0x2100bf00,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91c213c9,
      0x24001802,
      0xd1055648,
      0x51016c44,
@@ -361,7 +370,7 @@ const uint32_t c1_2[] =  {
      0x2eff8183,
      0x1f12e3e3,
      0x24004a9e,
-     0x21037800,
+     0x21038c00,
      0x1f09fcfc,
      0xd106ff00,
      0xc905ff00,
@@ -370,13 +379,13 @@ const uint32_t c1_2[] =  {
      0x5100010e,
      0xc9035603,
      0x2400f081,
-     0x21013200,
+     0x21013b00,
      0xc9025603,
      0x2400e081,
-     0x21013200,
+     0x21013b00,
      0xc9005603,
      0x2400c081,
-     0x21013200,
+     0x21013b00,
      0x2400d081,
      0x9081f489,
      0x51056902,
@@ -402,7 +411,7 @@ const uint32_t c1_2[] =  {
      0x6902c103,
      0x9081e289,
      0x21006100,
-     0x2100f600,
+     0x2100ff00,
      0xc905ff00,
      0xd106ff00,
      0x93206896,
@@ -446,7 +455,7 @@ const uint32_t c1_2[] =  {
      0x61100304,
      0x1f005d5d,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x2eff8f8e,
      0x2f01878e,
      0x2f020f8e,
@@ -454,7 +463,7 @@ const uint32_t c1_2[] =  {
      0x4896d704,
      0x24002837,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x09010300,
      0x01800000,
      0x90001580,
@@ -488,17 +497,17 @@ const uint32_t c1_2[] =  {
      0x24001864,
      0x24000644,
      0x2f000384,
-     0x21019500,
+     0x21019e00,
      0x5103de03,
      0x0b0337de,
-     0x21011b00,
+     0x21012400,
      0x24502084,
      0x24001864,
      0x24000644,
      0x2f000384,
      0x21004a00,
      0x24002104,
-     0x2101a700,
+     0x2101b000,
      0x1f047d7d,
      0x24002004,
      0x24000824,
@@ -513,7 +522,7 @@ const uint32_t c1_2[] =  {
      0x24000205,
      0x2f010185,
      0x0101e3e3,
-     0x2101b300,
+     0x2101bc00,
      0x2eff9183,
      0x1d006363,
      0x24000564,
@@ -528,19 +537,19 @@ const uint32_t c1_2[] =  {
      0x2eff818a,
      0x8108398a,
      0x2eff9088,
-     0x2404b889,
-     0x240546ca,
-     0x2405d08a,
-     0x2405dccb,
-     0x2405e88b,
-     0x2405f4cc,
-     0x2406008c,
-     0x240625cd,
-     0x2406338d,
-     0x24063cce,
-     0x24066b8e,
-     0x24064e8f,
-     0x240667d0,
+     0x2404d589,
+     0x24056cca,
+     0x2405ff8a,
+     0x24060bcb,
+     0x2406178b,
+     0x240623cc,
+     0x24062f8c,
+     0x240654cd,
+     0x2406628d,
+     0x24066bce,
+     0x24069a8e,
+     0x24067d8f,
+     0x240696d0,
      0x24002200,
      0x8f80d508,
      0x91001760,
@@ -552,11 +561,11 @@ const uint32_t c1_2[] =  {
      0x71406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x59206a03,
      0x1c6ae2e2,
-     0x2101e700,
+     0x2101f000,
      0x05206a4a,
      0x1c4ae1e1,
      0x2eff918d,
@@ -571,13 +580,13 @@ const uint32_t c1_2[] =  {
      0x2f010185,
      0x09066a80,
      0x8480318d,
-     0x21021200,
+     0x21021b00,
      0x2400006b,
      0x106a6a4b,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x240000da,
      0x10898980,
      0x24000d04,
@@ -588,21 +597,21 @@ const uint32_t c1_2[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400005a,
      0x5101670a,
      0x5102670a,
-     0x53066727,
-     0x510c6781,
-     0x5309674a,
-     0x5105671f,
-     0x5307673f,
+     0x53066732,
+     0x510c678c,
+     0x53096755,
+     0x51056728,
+     0x5307674a,
      0x240002e6,
      0x2f008186,
-     0x21021200,
-     0x21043500,
-     0x2101dc00,
-     0x69062915,
+     0x21021b00,
+     0x21045200,
+     0x2101e500,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -612,6 +621,15 @@ const uint32_t c1_2[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21022e00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -620,23 +638,23 @@ const uint32_t c1_2[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x2304979e,
+     0x2304b49e,
      0x2f000384,
      0x21004c00,
      0x240021e4,
      0x2f000184,
      0x21004c00,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -721,7 +739,9 @@ const uint32_t c1_2[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21021200,
+     0xc9076a02,
+     0x81c03394,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -731,22 +751,22 @@ const uint32_t c1_2[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240018c4,
      0x2f000384,
-     0x21032500,
+     0x21033900,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -759,26 +779,26 @@ const uint32_t c1_2[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21021200,
+     0x21021b00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21021200,
+     0x21021b00,
      0x69036a0d,
      0x59188004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80818e,
      0x1d035d5d,
      0xc9006e05,
@@ -786,12 +806,12 @@ const uint32_t c1_2[] =  {
      0x1d045d5d,
      0xc9016e02,
      0x1f045d5d,
-     0x21021200,
+     0x21021b00,
      0x69066a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -801,13 +821,13 @@ const uint32_t c1_2[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102d100,
-     0x21021200,
+     0x2102e500,
+     0x21021b00,
      0x69076a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -817,14 +837,14 @@ const uint32_t c1_2[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102e100,
-     0x21021200,
+     0x2102f500,
+     0x21021b00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -844,14 +864,14 @@ const uint32_t c1_2[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2102f300,
-     0x21021200,
+     0x21030700,
+     0x21021b00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -867,16 +887,16 @@ const uint32_t c1_2[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x21031400,
+     0x21032800,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21030e00,
-     0x21021200,
+     0x21032200,
+     0x21021b00,
      0x240002e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -886,7 +906,7 @@ const uint32_t c1_2[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -913,8 +933,8 @@ const uint32_t c1_2[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21021200,
-     0x21021200,
+     0x21021b00,
+     0x21021b00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -923,12 +943,12 @@ const uint32_t c1_2[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21021200,
+     0x21021b00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x1f027d7d,
      0x2e80838a,
      0x106a6a24,
@@ -959,7 +979,7 @@ const uint32_t c1_2[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21021200,
+     0x21021b00,
      0x10d7d790,
      0x24000442,
      0x69026619,
@@ -973,7 +993,7 @@ const uint32_t c1_2[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21038700,
+     0x21039b00,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -985,9 +1005,9 @@ const uint32_t c1_2[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036996,
+     0x5103699f,
      0x209e0000,
-     0x69006653,
+     0x6900665c,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -1015,7 +1035,7 @@ const uint32_t c1_2[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x2103b500,
+     0x2103c900,
      0xd1010105,
      0x11073900,
      0x51000003,
@@ -1027,17 +1047,26 @@ const uint32_t c1_2[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x2103c600,
+     0x2103da00,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x2103c600,
+     0x2103da00,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2103e300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
@@ -1148,7 +1177,7 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x24000ce6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x2eff818d,
      0x240034c0,
@@ -1157,7 +1186,7 @@ const uint32_t c1_2[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x69406a0b,
      0x2700e160,
@@ -1166,14 +1195,14 @@ const uint32_t c1_2[] =  {
      0x69206005,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x01206060,
      0x1060606a,
      0x2f00800a,
      0x61406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400016b,
      0x106a6a4b,
      0x24000004,
@@ -1185,11 +1214,11 @@ const uint32_t c1_2[] =  {
      0x51004a18,
      0x240003e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x61206a04,
      0x05206a60,
      0x1e60e1e1,
-     0x21045f00,
+     0x21047c00,
      0x1e6ae2e2,
      0x2e808f8e,
      0xd1077d0a,
@@ -1201,11 +1230,11 @@ const uint32_t c1_2[] =  {
      0x104b4b25,
      0x24000105,
      0x2f010185,
-     0x21021200,
+     0x21021b00,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1229,7 +1258,7 @@ const uint32_t c1_2[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1246,7 +1275,7 @@ const uint32_t c1_2[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0xc9077d07,
      0x13082424,
      0x1f047d7d,
@@ -1270,13 +1299,13 @@ const uint32_t c1_2[] =  {
      0x59204b06,
      0x51016b03,
      0x1c4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x1e4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x05204b4b,
      0x51016b03,
      0x1c4be1e1,
-     0x2104b600,
+     0x2104d300,
      0x1e4be1e1,
      0x81007981,
      0x21004c00,
@@ -1302,7 +1331,7 @@ const uint32_t c1_2[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2104d200,
+     0x2104ef00,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1341,7 +1370,7 @@ const uint32_t c1_2[] =  {
      0x2700ea01,
      0x69200103,
      0x1f025656,
-     0x2104f900,
+     0x21051600,
      0x61e06a03,
      0x49ef6a02,
      0x1f035656,
@@ -1357,11 +1386,11 @@ const uint32_t c1_2[] =  {
      0x1f031d1d,
      0x209e0000,
      0x24002837,
-     0x21050700,
+     0x21052400,
      0x2400c837,
      0x240002de,
      0x209e0000,
-     0xd104562c,
+     0xd1045635,
      0x2e808986,
      0x11f066e0,
      0x6f40e0fa,
@@ -1381,7 +1410,7 @@ const uint32_t c1_2[] =  {
      0x6e484bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21052d00,
+     0x21054a00,
      0xcf0afc9c,
      0x586e4e0d,
      0x2700f07a,
@@ -1395,11 +1424,20 @@ const uint32_t c1_2[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21052d00,
+     0x21054a00,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x21055600,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1407,34 +1445,34 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207acd,
+     0x5f207ac4,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21054300,
+     0x21056900,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
      0x05014e4e,
      0x8100bb8e,
-     0xcf055677,
+     0xcf05566e,
      0x240004de,
      0x209e0000,
-     0xd1055643,
+     0xd105564c,
      0x2e808386,
      0x11f06600,
-     0x6f6000bd,
+     0x6f6000b4,
      0x2eff8384,
      0x24000004,
      0x240008c4,
      0x2f000384,
      0x2e808f8e,
      0x2f020f8e,
-     0xd1005b4a,
-     0xc9037d49,
-     0xd1045637,
+     0xd1005b53,
+     0xc9037d52,
+     0xd1045640,
      0x2eff8380,
      0x10272760,
      0x01689680,
@@ -1444,12 +1482,12 @@ const uint32_t c1_2[] =  {
      0x51006004,
      0x512b6003,
      0x513c6002,
-     0x21056400,
+     0x21058a00,
      0x90800680,
      0x01014081,
      0x09038181,
      0x00818080,
-     0x21055700,
+     0x21057d00,
      0x90800600,
      0x1f0afcfc,
      0x10f1f1e1,
@@ -1465,8 +1503,8 @@ const uint32_t c1_2[] =  {
      0x6e604bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21058100,
-     0xc90afc28,
+     0x2105a700,
+     0xc90afc31,
      0x586e4e0d,
      0x2700f07a,
      0x51207a0b,
@@ -1479,11 +1517,20 @@ const uint32_t c1_2[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21058100,
+     0x2105a700,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x2105b300,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1491,13 +1538,13 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207a79,
+     0x5f207a67,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21059700,
+     0x2105c600,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
@@ -1528,7 +1575,7 @@ const uint32_t c1_2[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2105b400,
+     0x2105e300,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1562,7 +1609,7 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x2e808086,
      0x09034680,
-     0x4fff8034,
+     0x4fff8022,
      0x010880c4,
      0x00c49696,
      0x2f000384,
@@ -1579,7 +1626,7 @@ const uint32_t c1_2[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff8023,
+     0x4fff8011,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1603,7 +1650,7 @@ const uint32_t c1_2[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff800b,
+     0x4dff80f9,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1722,7 +1769,7 @@ const uint32_t c1_2[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x21067600,
+     0x2106a500,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
diff --git a/fw/classify2_bin.c b/fw/classify2_bin.c
index d71301b..6a733f6 100644
--- a/fw/classify2_bin.c
+++ b/fw/classify2_bin.c
@@ -74,7 +74,7 @@
 const uint32_t c2[] =  {
      0x21000300,
      0xbabe0002,
-     0x03000200,
+     0x03000201,
      0x2300e99e,
      0x2eff8582,
      0x8104a482,
@@ -85,7 +85,7 @@ const uint32_t c2[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100175d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0x5100fc03,
@@ -163,12 +163,12 @@ const uint32_t c2[] =  {
      0x2eff8183,
      0x1f1ce3e3,
      0x2400109e,
-     0x21034700,
+     0x21035200,
      0x2e818786,
      0x2eff8183,
      0x1f1ce3e3,
      0x2400109e,
-     0x21034700,
+     0x21035200,
      0x2e818786,
      0xc90ed908,
      0x11073737,
@@ -192,13 +192,13 @@ const uint32_t c2[] =  {
      0x1f1ce3e3,
      0x6900c103,
      0x9081e086,
-     0x21034700,
+     0x21035200,
      0x6901c103,
      0x9081e186,
-     0x21034700,
+     0x21035200,
      0x6902c103,
      0x9081e286,
-     0x21034700,
+     0x21035200,
      0x11073737,
      0x13583737,
      0x21008200,
@@ -209,7 +209,7 @@ const uint32_t c2[] =  {
      0x2eff8183,
      0x1f1ce3e3,
      0x2400109e,
-     0x21034700,
+     0x21035200,
      0x24000ce6,
      0x2f008186,
      0x2101f700,
@@ -565,17 +565,17 @@ const uint32_t c2[] =  {
      0x2400005a,
      0x5103670a,
      0x5104670a,
-     0x53066712,
-     0x510c6781,
-     0x53096735,
-     0x5105671f,
-     0x5307672a,
+     0x5306671d,
+     0x510c678c,
+     0x53096740,
+     0x51056728,
+     0x53076735,
      0x240002e6,
      0x2f008186,
      0x2101f700,
      0x21008d00,
      0x2100cc00,
-     0x69062915,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -585,6 +585,15 @@ const uint32_t c2[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21020a00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -599,7 +608,7 @@ const uint32_t c2[] =  {
      0x240021e4,
      0x2f000184,
      0x21001000,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
      0x2101f700,
@@ -609,7 +618,7 @@ const uint32_t c2[] =  {
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -694,6 +703,8 @@ const uint32_t c2[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
+     0xc9076a02,
+     0x81c03394,
      0x2101f700,
      0x240000e6,
      0x2f008186,
@@ -707,7 +718,7 @@ const uint32_t c2[] =  {
      0x2101f700,
      0x240018c4,
      0x2f000384,
-     0x2102f500,
+     0x21030000,
      0x240014c4,
      0x2f000384,
      0x69016a17,
@@ -796,7 +807,7 @@ const uint32_t c2[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2102c300,
+     0x2102ce00,
      0x2101f700,
      0x69096a1c,
      0x2400b0c0,
@@ -819,12 +830,12 @@ const uint32_t c2[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x2102e400,
+     0x2102ef00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2102de00,
+     0x2102e900,
      0x2101f700,
      0x240002e6,
      0x1f007a7a,
@@ -924,7 +935,7 @@ const uint32_t c2[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21035600,
+     0x21036100,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -936,9 +947,9 @@ const uint32_t c2[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036996,
+     0x5103699f,
      0x209e0000,
-     0x69006653,
+     0x6900665c,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -966,7 +977,7 @@ const uint32_t c2[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x21038400,
+     0x21038f00,
      0xd1010105,
      0x11073900,
      0x51000003,
@@ -978,17 +989,26 @@ const uint32_t c2[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x21039500,
+     0x2103a000,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x21039500,
+     0x2103a000,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2103a900,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
diff --git a/fw/pam_bin.c b/fw/pam_bin.c
index ec88ddf..2d09bc8 100644
--- a/fw/pam_bin.c
+++ b/fw/pam_bin.c
@@ -74,7 +74,7 @@
 const uint32_t m[] =  {
      0x21000300,
      0xbabe0003,
-     0x03000200,
+     0x03000201,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -84,7 +84,7 @@ const uint32_t m[] =  {
      0x9100171d,
      0x11017d7d,
      0x2400005d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -117,7 +117,7 @@ const uint32_t m[] =  {
      0x01042f2f,
      0x111f2f2f,
      0x808e004f,
-     0x2304e89e,
+     0x2305069e,
      0x104e4e5d,
      0x91001acf,
      0x502f0f07,
@@ -126,7 +126,7 @@ const uint32_t m[] =  {
      0x01042f2f,
      0x111f2f2f,
      0x81001a4f,
-     0x2304e89e,
+     0x2305069e,
      0xcf04ffdb,
      0x91002481,
      0x0101e1e1,
@@ -166,12 +166,12 @@ const uint32_t m[] =  {
      0x51010125,
      0x51050102,
      0x21005f00,
-     0x21037900,
+     0x21038200,
      0x51040102,
      0x21006200,
-     0x21037800,
+     0x21038100,
      0x51060144,
-     0x510701ef,
+     0x510701f8,
      0x2eff8384,
      0x24002104,
      0x2f000384,
@@ -299,9 +299,9 @@ const uint32_t m[] =  {
      0x69074204,
      0x11701542,
      0x51004202,
-     0x2302ac9e,
-     0xd1023588,
-     0x2303079e,
+     0x2302b59e,
+     0xd1023591,
+     0x2303109e,
      0xc9013509,
      0x593c9408,
      0x24001084,
@@ -311,15 +311,15 @@ const uint32_t m[] =  {
      0x2f000184,
      0x01013d3d,
      0x24003c94,
-     0xd1077d1b,
-     0xd102351b,
-     0xc904351a,
-     0xc9017d19,
+     0xd1077d24,
+     0xd1023524,
+     0xc9043523,
+     0xc9017d22,
      0x11701501,
      0x0b010181,
      0x01008181,
      0x90817e8e,
-     0xc9006e14,
+     0xc9006e1d,
      0x1f077d7d,
      0x2eff8384,
      0xd1016e07,
@@ -328,7 +328,16 @@ const uint32_t m[] =  {
      0x124e0202,
      0x81090762,
      0x24000744,
-     0x21010500,
+     0x21010e00,
+     0xc90e8e05,
+     0x1d0e8e8e,
+     0x811e07ce,
+     0x91c013ce,
+     0x21010a00,
+     0xc90f8e04,
+     0x1d0f8e8e,
+     0x811e07ce,
+     0x91c213ce,
      0x24000644,
      0x108e8ec5,
      0x104e4e05,
@@ -343,14 +352,14 @@ const uint32_t m[] =  {
      0x10d4d4d0,
      0x10949490,
      0xc9007d03,
-     0x2304e89e,
-     0x21011a00,
+     0x2305069e,
+     0x21012300,
      0x91001acf,
      0x01040f00,
      0x111f0000,
      0x68002f03,
      0x1f15fcfc,
-     0x21011a00,
+     0x21012300,
      0x01100fc0,
      0x80c03a90,
      0x81011a60,
@@ -363,14 +372,14 @@ const uint32_t m[] =  {
      0x1f0ec0c0,
      0x80801c80,
      0xd1007d03,
-     0x2304e89e,
-     0x21012e00,
+     0x2305069e,
+     0x21013700,
      0x91001acf,
      0x01040f00,
      0x111f0000,
      0x68002f03,
      0x1f15fcfc,
-     0x21012e00,
+     0x21013700,
      0x01100fc0,
      0x80c03a90,
      0x81011a60,
@@ -412,15 +421,15 @@ const uint32_t m[] =  {
      0x21001200,
      0x24000104,
      0x240004c4,
-     0x66c40314,
+     0x66c4030b,
      0x04c40303,
      0x2f000184,
      0x00c41d1d,
      0x111f7601,
-     0x550001fd,
+     0x550001f4,
      0x5103010c,
      0x6902010c,
-     0x5d0275fa,
+     0x5d0275f1,
      0x24000276,
      0xc90f9603,
      0x24000476,
@@ -430,7 +439,7 @@ const uint32_t m[] =  {
      0x80c33996,
      0x01017575,
      0x21005600,
-     0x21035e00,
+     0x21036700,
      0xd1063506,
      0x1f023535,
      0x1f013535,
@@ -451,7 +460,7 @@ const uint32_t m[] =  {
      0x11f06600,
      0x51400003,
      0x51600095,
-     0x2101e300,
+     0x2101ec00,
      0x108686cf,
      0x110f660e,
      0x09020e0e,
@@ -466,7 +475,7 @@ const uint32_t m[] =  {
      0x040ecfe1,
      0x48e0e103,
      0x0490e1d0,
-     0x21018c00,
+     0x21019500,
      0x1f0d8787,
      0x000ed086,
      0x24000088,
@@ -481,7 +490,7 @@ const uint32_t m[] =  {
      0x104242c4,
      0x51022403,
      0x008682e5,
-     0x21019b00,
+     0x2101a400,
      0x008682c5,
      0x2f000384,
      0x51017508,
@@ -489,7 +498,7 @@ const uint32_t m[] =  {
      0x104343c4,
      0x51022403,
      0x008683e5,
-     0x2101a300,
+     0x2101ac00,
      0x008683c5,
      0x2f000384,
      0x2eff8384,
@@ -553,7 +562,7 @@ const uint32_t m[] =  {
      0x102e2ec4,
      0x2f000184,
      0x2e808986,
-     0x21018400,
+     0x21018d00,
      0x2100e600,
      0x51007511,
      0x24004304,
@@ -561,7 +570,7 @@ const uint32_t m[] =  {
      0x104242c4,
      0x51022403,
      0x00cf82e5,
-     0x2101eb00,
+     0x2101f400,
      0x00cf82c5,
      0x2f000384,
      0x51017508,
@@ -569,12 +578,12 @@ const uint32_t m[] =  {
      0x104343c4,
      0x51022403,
      0x00cf83e5,
-     0x2101f300,
+     0x2101fc00,
      0x00cf83c5,
      0x2f000384,
      0x102e2e82,
      0x2400e69e,
-     0x21033a00,
+     0x21034300,
      0x24000081,
      0x6f0155b9,
      0x24704480,
@@ -598,7 +607,7 @@ const uint32_t m[] =  {
      0x240000c4,
      0x10e0e0e5,
      0x2f000384,
-     0x2101b100,
+     0x2101ba00,
      0x11f84e4e,
      0x0128c7cf,
      0x2400280e,
@@ -610,7 +619,7 @@ const uint32_t m[] =  {
      0x51007104,
      0x512b7103,
      0x513c7102,
-     0x21022300,
+     0x21022c00,
      0x2f000184,
      0x2e808086,
      0x593f4606,
@@ -618,7 +627,7 @@ const uint32_t m[] =  {
      0x010146c4,
      0x0903c4c4,
      0x00c40e0e,
-     0x21021600,
+     0x21021f00,
      0x01080ee0,
      0x04e0ced0,
      0x70e0ce84,
@@ -635,7 +644,7 @@ const uint32_t m[] =  {
      0x01042ec4,
      0x0528cec5,
      0x2f000384,
-     0x21023800,
+     0x21024100,
      0x24002c27,
      0x0528cec7,
      0x2f008386,
@@ -651,7 +660,7 @@ const uint32_t m[] =  {
      0x104242c4,
      0x51022403,
      0x008182e5,
-     0x21024500,
+     0x21024e00,
      0x008182c5,
      0x2f000384,
      0x51017508,
@@ -659,7 +668,7 @@ const uint32_t m[] =  {
      0x104343c4,
      0x51022403,
      0x008183e5,
-     0x21024d00,
+     0x21025600,
      0x008183c5,
      0x2f000384,
      0x24003304,
@@ -726,7 +735,7 @@ const uint32_t m[] =  {
      0x2f008386,
      0x100e0ec4,
      0x2f000184,
-     0x21023800,
+     0x21024100,
      0x2100e600,
      0x24000081,
      0x6f0155cd,
@@ -752,10 +761,10 @@ const uint32_t m[] =  {
      0x240000c4,
      0x10e0e0e5,
      0x2f000384,
-     0x21025e00,
+     0x21026700,
      0x2f000184,
      0x000e2e2e,
-     0x2101e300,
+     0x2101ec00,
      0x24000c04,
      0x2f000384,
      0x2eff8192,
@@ -793,23 +802,23 @@ const uint32_t m[] =  {
      0x240002c4,
      0x2f000384,
      0x00c48282,
-     0x2102bd00,
+     0x2102c600,
      0x688ec605,
      0x240002c4,
      0x2f000384,
      0x00c48282,
-     0x2102bd00,
+     0x2102c600,
      0x68cfc605,
      0x2e808186,
      0x0b024612,
      0x1f017272,
-     0x2102f800,
+     0x21030100,
      0x688fc606,
      0x2e808186,
      0x0b04c612,
      0x0b021212,
      0x1f017272,
-     0x2102f800,
+     0x21030100,
      0x68d0c60a,
      0x2e808386,
      0x240004c4,
@@ -819,7 +828,7 @@ const uint32_t m[] =  {
      0x0b046703,
      0x570403ef,
      0x570603f3,
-     0x2102f800,
+     0x21030100,
      0x5690c6f7,
      0x68d1c60a,
      0x2e808386,
@@ -830,12 +839,12 @@ const uint32_t m[] =  {
      0x56c287e5,
      0x240057c2,
      0x56c287e8,
-     0x2102f800,
+     0x21030100,
      0x5691c6f7,
      0xc9006905,
      0xc9007203,
      0x10323252,
-     0x21030000,
+     0x21030900,
      0xd1016904,
      0xc9017203,
      0x10121252,
@@ -932,7 +941,7 @@ const uint32_t m[] =  {
      0x01010303,
      0x01202323,
      0x0120e0e0,
-     0x21034100,
+     0x21034a00,
      0x209e0000,
      0x24000d04,
      0x2f000184,
@@ -960,15 +969,15 @@ const uint32_t m[] =  {
      0x2f000184,
      0x1f1ffcfc,
      0x21001200,
-     0x21050500,
+     0x21052300,
      0x2400129e,
      0xc9075602,
-     0x21070a00,
+     0x21073300,
      0xd1055603,
      0xd1065604,
      0x21006400,
-     0xd3007d4b,
-     0x2104b200,
+     0xd3007d54,
+     0x2104c400,
      0x24000104,
      0x240018c4,
      0x2f000184,
@@ -987,7 +996,7 @@ const uint32_t m[] =  {
      0x01048c8c,
      0x68006c03,
      0x490a4c02,
-     0x21039500,
+     0x21039e00,
      0x21006400,
      0x51004c0e,
      0x908c2186,
@@ -1004,7 +1013,7 @@ const uint32_t m[] =  {
      0x51136665,
      0x21006400,
      0x24000067,
-     0x2103a600,
+     0x2103af00,
      0x908c2187,
      0xc9065403,
      0x0496d7d7,
@@ -1042,7 +1051,7 @@ const uint32_t m[] =  {
      0x24000d04,
      0x2f000384,
      0x09034737,
-     0x21070a00,
+     0x21073300,
      0xc9026705,
      0x91090762,
      0x110f0202,
@@ -1064,7 +1073,7 @@ const uint32_t m[] =  {
      0xc9046704,
      0x4e9688b7,
      0x04889688,
-     0x2103e200,
+     0x2103eb00,
      0x00968888,
      0x014088c0,
      0xd106ff00,
@@ -1079,7 +1088,7 @@ const uint32_t m[] =  {
      0x69006104,
      0x0b032e2e,
      0x24000641,
-     0x2103f200,
+     0x2103fb00,
      0x0b030e2e,
      0x24000441,
      0x09012e4e,
@@ -1101,7 +1110,7 @@ const uint32_t m[] =  {
      0x24006004,
      0x044181c4,
      0x2f000384,
-     0x21039500,
+     0x21039e00,
      0x908c6187,
      0x01088c8c,
      0x05014c4c,
@@ -1113,7 +1122,7 @@ const uint32_t m[] =  {
      0x69002704,
      0x0b032e2e,
      0x24000641,
-     0x21041400,
+     0x21041d00,
      0x0b030e2e,
      0x24000441,
      0x09012e4e,
@@ -1128,13 +1137,13 @@ const uint32_t m[] =  {
      0x24000874,
      0x10888895,
      0x10484855,
-     0x21039500,
+     0x21039e00,
      0x908c2187,
      0x01048c8c,
      0x05014c4c,
      0xd1006703,
      0x00964747,
-     0x21042800,
+     0x21043100,
      0x0407d747,
      0x014047c0,
      0xd106ff00,
@@ -1152,7 +1161,7 @@ const uint32_t m[] =  {
      0x01202720,
      0xc907ff00,
      0x8e20c70e,
-     0x21039500,
+     0x21039e00,
      0x05044600,
      0x9e8cc107,
      0x01048cc0,
@@ -1166,7 +1175,7 @@ const uint32_t m[] =  {
      0x107878c4,
      0x2f000384,
      0x107878cd,
-     0x21045f00,
+     0x21046800,
      0x00964747,
      0x4e47cd4d,
      0x24000004,
@@ -1181,16 +1190,16 @@ const uint32_t m[] =  {
      0x04cd7500,
      0x70270003,
      0x04277575,
-     0x21045700,
+     0x21046000,
      0x04007575,
      0x0027cdcd,
      0x04270d0d,
-     0x21039500,
+     0x21039e00,
      0xd1006705,
      0x10272700,
      0x9ec0c10e,
      0x2f00be0e,
-     0x21039500,
+     0x21039e00,
      0x240004c5,
      0x24200085,
      0x24003704,
@@ -1215,11 +1224,11 @@ const uint32_t m[] =  {
      0x00279696,
      0x04789696,
      0x10272778,
-     0x21039500,
+     0x21039e00,
      0x60cd7502,
      0x00277575,
      0x00270d0d,
-     0x21039500,
+     0x21039e00,
      0x05014c4c,
      0x6f00cd18,
      0x109696cd,
@@ -1227,7 +1236,7 @@ const uint32_t m[] =  {
      0x24000104,
      0x109696c4,
      0x2f000384,
-     0x21039500,
+     0x21039e00,
      0x05014c4c,
      0x4ed7cd10,
      0x24000004,
@@ -1237,21 +1246,21 @@ const uint32_t m[] =  {
      0x24000104,
      0x04d789c4,
      0x2f000384,
-     0x21039500,
+     0x21039e00,
      0x05014c4c,
      0x108686d0,
      0x10d7d790,
-     0x2304e89e,
-     0x21039500,
+     0x2305069e,
+     0x21039e00,
      0x09032637,
-     0x21070a00,
+     0x21073300,
      0x908ca187,
      0x010c8c8c,
      0x05014c4c,
      0x91090660,
      0x10670000,
      0x550000fb,
-     0x69004714,
+     0x6900471d,
      0xc907ff00,
      0x81182789,
      0xc9065403,
@@ -1264,6 +1273,15 @@ const uint32_t m[] =  {
      0x0081d7d7,
      0x05047400,
      0x8f20c716,
+     0xc90ec805,
+     0x1d0ec8c8,
+     0x811e0788,
+     0x91c01388,
+     0x2104ba00,
+     0xc90fc804,
+     0x1d0fc8c8,
+     0x811e0788,
+     0x91c21388,
      0x24f020e4,
      0x102d2d64,
      0x24000644,
@@ -1320,6 +1338,18 @@ const uint32_t m[] =  {
      0x24000104,
      0x106b6bc4,
      0x2f000384,
+     0x24001084,
+     0x2f000184,
+     0xc907ff00,
+     0xc90e8b05,
+     0x1d0e8b8b,
+     0x811e07cb,
+     0x91c013cb,
+     0x2104fe00,
+     0xc90f8b04,
+     0x1d0f8b8b,
+     0x811e07cb,
+     0x91c213cb,
      0x2eff8384,
      0x2400f024,
      0x24002004,
@@ -1338,24 +1368,24 @@ const uint32_t m[] =  {
      0x90c77d88,
      0xd10ec603,
      0x0101e9e9,
-     0x2104f400,
+     0x21051200,
      0x0090e9e9,
      0x0300e8e8,
      0x80c77d88,
-     0x21050000,
+     0x21051e00,
      0x048ad081,
      0x090281c7,
      0x0087c7c7,
      0x90c73d88,
      0xd10ec603,
      0x0101e8e8,
-     0x2104ff00,
+     0x21051d00,
      0x0090e8e8,
      0x80c73d88,
      0xd10fc604,
      0x10c6c6d0,
      0x110f7070,
-     0x2104ea00,
+     0x21050800,
      0x209e0000,
      0x240000da,
      0x10898980,
@@ -1367,24 +1397,24 @@ const uint32_t m[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2400005a,
      0x5103670d,
      0x5104670d,
-     0x510667fd,
-     0x510c6784,
-     0x530a67d7,
-     0x5308675f,
-     0x530b6792,
-     0x530967b1,
-     0x5105671f,
-     0x53076752,
+     0x53066708,
+     0x510c678f,
+     0x530a67e2,
+     0x5308676a,
+     0x530b679d,
+     0x530967bc,
+     0x51056728,
+     0x5307675d,
      0x240002e6,
      0x2f008186,
-     0x21052000,
-     0x21072c00,
-     0x21073100,
-     0x69062915,
+     0x21053e00,
+     0x21075e00,
+     0x21076300,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -1394,6 +1424,15 @@ const uint32_t m[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21055100,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -1402,23 +1441,23 @@ const uint32_t m[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x2307349e,
+     0x2307669e,
      0x2f000384,
      0x21001200,
      0x240021e4,
      0x2f000184,
      0x21001200,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -1503,7 +1542,9 @@ const uint32_t m[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21052000,
+     0xc9076a02,
+     0x81c03394,
+     0x21053e00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -1513,22 +1554,22 @@ const uint32_t m[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x240018c4,
      0x2f000384,
-     0x21060600,
+     0x21062f00,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1541,27 +1582,27 @@ const uint32_t m[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21052000,
+     0x21053e00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21052000,
+     0x21053e00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1581,14 +1622,14 @@ const uint32_t m[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2105d400,
-     0x21052000,
+     0x2105fd00,
+     0x21053e00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -1604,16 +1645,16 @@ const uint32_t m[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x2105f500,
+     0x21061e00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2105ef00,
-     0x21052000,
+     0x21061800,
+     0x21053e00,
      0x240002e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1623,7 +1664,7 @@ const uint32_t m[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -1650,14 +1691,14 @@ const uint32_t m[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21052000,
+     0x21053e00,
      0xc9016a06,
      0x240037e4,
      0x240008c4,
      0x240004c5,
      0x24080085,
      0x2f000384,
-     0xcd006aef,
+     0xcd006ae4,
      0x69008a0c,
      0x240f0083,
      0x8083e286,
@@ -1669,7 +1710,7 @@ const uint32_t m[] =  {
      0x0140e2e2,
      0x6ee1e2fe,
      0x9083e286,
-     0x21052000,
+     0x21053e00,
      0x91b0338b,
      0x608acb2c,
      0x24000004,
@@ -1679,7 +1720,7 @@ const uint32_t m[] =  {
      0x51008b04,
      0x24000800,
      0x09038bd0,
-     0x21064900,
+     0x21067200,
      0x24000400,
      0x2e80818e,
      0x2f000184,
@@ -1697,12 +1738,12 @@ const uint32_t m[] =  {
      0x0b018181,
      0x0081d08f,
      0x24000400,
-     0x21064900,
+     0x21067200,
      0x1081818f,
-     0x21064900,
+     0x21067200,
      0x090220c0,
      0x00c08f8f,
-     0x21064900,
+     0x21067200,
      0xc830ee04,
      0x8e8fdd12,
      0x1c30eeee,
@@ -1714,8 +1755,8 @@ const uint32_t m[] =  {
      0x00008f8f,
      0x6ed08fe4,
      0x24000400,
-     0x21064c00,
-     0x21052000,
+     0x21067500,
+     0x21053e00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -1724,17 +1765,17 @@ const uint32_t m[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21052000,
+     0x21053e00,
      0x240054c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x71206a04,
      0x24000ee6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2eff8f8e,
      0x09066ac2,
      0x69004a14,
@@ -1756,12 +1797,12 @@ const uint32_t m[] =  {
      0x09036060,
      0x2e80bf8e,
      0x82c2f68e,
-     0x21052000,
+     0x21053e00,
      0x69014a05,
      0x82c2f68e,
      0x0120c2c2,
      0x82c2f68e,
-     0x21052000,
+     0x21053e00,
      0x69024a0c,
      0x24000004,
      0x240014c4,
@@ -1773,21 +1814,21 @@ const uint32_t m[] =  {
      0x24660085,
      0x00c2e5e5,
      0x2f000384,
-     0x21052000,
+     0x21053e00,
      0x24000fe6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x240014c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x91b0338b,
      0x70cb8a04,
      0x240014e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0xc9006a08,
      0x24040082,
      0x240800c2,
@@ -1801,19 +1842,19 @@ const uint32_t m[] =  {
      0x2f000384,
      0x240004c4,
      0x24040082,
-     0x55008a5f,
+     0x55008a54,
      0x2e80818e,
      0x0901cec2,
      0x0082c2c2,
      0x80c200ce,
      0x05018a8a,
      0x2f000384,
-     0x2106c100,
+     0x2106ea00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80838a,
      0x106a6a24,
      0x10ebebe5,
@@ -1843,18 +1884,18 @@ const uint32_t m[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21052000,
+     0x21053e00,
      0x240090c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x91ac338b,
      0x606b6a04,
      0x240013e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x09066a81,
      0x69804b02,
      0x09018181,
@@ -1873,7 +1914,7 @@ const uint32_t m[] =  {
      0x4f2040fb,
      0x2e80bf0e,
      0x8e81e10e,
-     0x21052000,
+     0x21053e00,
      0x0b033700,
      0x11073737,
      0x111f7676,
@@ -1894,6 +1935,15 @@ const uint32_t m[] =  {
      0xc9016e03,
      0xd106ff00,
      0x8118278f,
+     0xc90e8e05,
+     0x1d0e8e8e,
+     0x811e07ce,
+     0x91c013ce,
+     0x21075000,
+     0xc90f8e04,
+     0x1d0f8e8e,
+     0x811e07ce,
+     0x91c213ce,
      0x2eff8384,
      0x2400f024,
      0x24002204,
@@ -1906,16 +1956,16 @@ const uint32_t m[] =  {
      0xc904ff00,
      0x24000804,
      0x2f000384,
-     0x570800e9,
-     0x21071100,
+     0x570800e0,
+     0x21073a00,
      0x2e80838a,
      0xc9022a04,
      0x240000e1,
      0xe1342181,
-     0x21052000,
+     0x21053e00,
      0x24000ce6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x209e0000 };
 
 const int mSize = sizeof(m);
diff --git a/fw/v0/classify1.p b/fw/v0/classify1.p
index aada809..301516e 100644
--- a/fw/v0/classify1.p
+++ b/fw/v0/classify1.p
@@ -745,7 +745,24 @@ l_stdHeldPktForward1_dscp_priority:
             mov  r2.b2,  PA_DEST_CDMA

             

 l_stdHeldPktForward1_no_priority:

-        

+

+l_stdHeldPktForward1_queue_bounce:

+        // Check for Queue Bounce operation

+l_stdHeldPktForward1_queue_bounce_ddr:

+        qbbc l_stdHeldPktForward1_queue_bounce_msmc, s_matchForward.queue.t_pa_forward_queue_bounce_ddr

+            clr s_matchForward.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_matchForward.queue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_matchForward.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_stdHeldPktForward1_queue_bounce_end

+

+l_stdHeldPktForward1_queue_bounce_msmc:

+        qbbc l_stdHeldPktForward1_queue_bounce_end, s_matchForward.queue.t_pa_forward_queue_bounce_msmc

+            clr s_matchForward.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_matchForward.queue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_matchForward.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_stdHeldPktForward1_queue_bounce_end:

         // Note CRC verification is only required by the SCTP header

         // The destination must be host and there should be neither multi-route nor command set

         mov    r2.b0,   (SIZE(s_pktCxt) + 7) & 0xf8 

@@ -1701,6 +1718,23 @@ l_c1Parse6_copy:
       jmp  l_c1Parse6_send

     

 l_c1Parse6_host:

+l_c1Parse6_host_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1Parse6_host_queue_bounce_ddr:

+        qbbc l_c1Parse6_host_queue_bounce_msmc, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1Parse6_host_queue_bounce_end

+

+l_c1Parse6_host_queue_bounce_msmc:

+        qbbc l_c1Parse6_host_queue_bounce_end, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_c1Parse6_host_queue_bounce_end:

+

       // Packet Capture activity

       mov  s_cdeCmdPkt.threadId,     PA_DEST_CDMA

       mov  s_cdeCmdPkt.destQueue,    s_paPktCapScr.destQueue

diff --git a/fw/v0/classify1_0.bib b/fw/v0/classify1_0.bib
index 77ce38d..76b0f5a 100644
--- a/fw/v0/classify1_0.bib
+++ b/fw/v0/classify1_0.bib
diff --git a/fw/v0/classify1_0_bin.c b/fw/v0/classify1_0_bin.c
index f5c214a..8e0e8f7 100644
--- a/fw/v0/classify1_0_bin.c
+++ b/fw/v0/classify1_0_bin.c
@@ -72,7 +72,7 @@
 const uint32_t c1_0[] =  {
      0x21008a00,
      0xbabe0001,
-     0x03000200,
+     0x03000201,
      0x24505084,
      0x108484c4,
      0x10e4e4e5,
@@ -175,8 +175,8 @@ const uint32_t c1_0[] =  {
      0x81801864,
      0x24000504,
      0x81a01864,
-     0x2eff8f82,
-     0x83a0f382,
+     0x2eff9182,
+     0x85a03382,
      0x24000262,
      0x24000242,
      0x24000222,
@@ -208,7 +208,7 @@ const uint32_t c1_0[] =  {
      0x240300f4,
      0x80f4e080,
      0x209e0000,
-     0x2302c09e,
+     0x2302d29e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -222,7 +222,7 @@ const uint32_t c1_0[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100171d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0xc909ff06,
@@ -247,7 +247,7 @@ const uint32_t c1_0[] =  {
      0xc9030503,
      0x2300d79e,
      0x2100b200,
-     0x2301a89e,
+     0x2301b19e,
      0xc9067d13,
      0x1d067d7d,
      0xd1047d04,
@@ -258,15 +258,15 @@ const uint32_t c1_0[] =  {
      0xd1005d0a,
      0x5103de04,
      0x5105de06,
-     0x2301e69e,
+     0x2301ef9e,
      0x2100c500,
      0x240023e4,
      0x2f000184,
      0x2100c500,
-     0x2301ee9e,
+     0x2301f79e,
      0x2100c500,
      0x1d005d5d,
-     0x2301a89e,
+     0x2301b19e,
      0x1d077d7d,
      0x2100cc00,
      0xd7005df1,
@@ -276,14 +276,14 @@ const uint32_t c1_0[] =  {
      0xd105ff00,
      0xd1057d03,
      0xd1047d02,
-     0xd304ff3a,
+     0xd304ff43,
      0xc9057d02,
      0xc90aff05,
      0x5700fcca,
      0x81082c9c,
      0x2eff819c,
      0x21009b00,
-     0x2105a600,
+     0x2105cc00,
      0x2100d100,
      0x1f08fcfc,
      0xc905ff00,
@@ -303,7 +303,7 @@ const uint32_t c1_0[] =  {
      0x10d7d790,
      0x24000442,
      0x6902691c,
-     0xd10319a6,
+     0xd10319af,
      0xc9006805,
      0x812208c8,
      0x11e05959,
@@ -328,13 +328,13 @@ const uint32_t c1_0[] =  {
      0x106a6a44,
      0x24001864,
      0x2f000384,
-     0x51036c94,
+     0x51036c9d,
      0x209e0000,
-     0x69006951,
+     0x6900695a,
      0x81310858,
      0xd1005b03,
      0xc9065d02,
-     0xd1031987,
+     0xd1031990,
      0x8118288a,
      0x51000b05,
      0x91090862,
@@ -386,6 +386,15 @@ const uint32_t c1_0[] =  {
      0xc9016b03,
      0x001a8989,
      0x24000642,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c013c9,
+     0x21014500,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91c213c9,
      0x24001802,
      0xd1055648,
      0x51016c44,
@@ -493,7 +502,7 @@ const uint32_t c1_0[] =  {
      0x2eff8183,
      0x1f12e3e3,
      0x2400cf9e,
-     0x21047e00,
+     0x21049b00,
      0x1f09fcfc,
      0xd106ff00,
      0xc905ff00,
@@ -510,11 +519,11 @@ const uint32_t c1_0[] =  {
      0xc9015604,
      0xc9000216,
      0x01048181,
-     0x2101bf00,
+     0x2101c800,
      0xc9005604,
      0xc9010210,
      0x01148181,
-     0x2101bf00,
+     0x2101c800,
      0xc9020213,
      0x01248181,
      0x9081fe89,
@@ -523,13 +532,13 @@ const uint32_t c1_0[] =  {
      0x5100010e,
      0xc9035603,
      0x2400f081,
-     0x2101cd00,
+     0x2101d600,
      0xc9025603,
      0x2400e081,
-     0x2101cd00,
+     0x2101d600,
      0xc9005603,
      0x2400c081,
-     0x2101cd00,
+     0x2101d600,
      0x2400d081,
      0x9081f489,
      0x51056902,
@@ -555,7 +564,7 @@ const uint32_t c1_0[] =  {
      0x6902c103,
      0x9081e289,
      0x2100e600,
-     0x21017c00,
+     0x21018500,
      0xc905ff00,
      0xd106ff00,
      0x93206896,
@@ -574,7 +583,7 @@ const uint32_t c1_0[] =  {
      0x00c18181,
      0xc9015603,
      0x01048181,
-     0x2101fa00,
+     0x21020300,
      0x01148181,
      0x9081fe89,
      0x2100e600,
@@ -585,11 +594,11 @@ const uint32_t c1_0[] =  {
      0x00c18181,
      0xc9015603,
      0x01048181,
-     0x21020500,
+     0x21020e00,
      0x01148181,
      0x9081fe86,
      0x2400cf9e,
-     0x21047e00,
+     0x21049b00,
      0x1f00fcfc,
      0x91002481,
      0x0101e1e1,
@@ -617,23 +626,23 @@ const uint32_t c1_0[] =  {
      0x5100c90e,
      0x6908c904,
      0x0b036801,
-     0x511e013b,
-     0x511f013a,
+     0x511e0144,
+     0x511f0143,
      0x2e808b96,
      0x0b057601,
-     0x5100013c,
-     0x510401d8,
+     0x51000145,
+     0x510401e1,
      0x1f13fcfc,
      0x2eff8384,
      0x24002104,
      0x2f000384,
      0x21009b00,
-     0xc9015d2b,
+     0xc9015d34,
      0x09032881,
-     0x51008129,
+     0x51008132,
      0x01288181,
      0x90817e8e,
-     0xc9006e26,
+     0xc9006e2f,
      0x816c3585,
      0xc9077d0c,
      0x0089d7c1,
@@ -644,8 +653,8 @@ const uint32_t c1_0[] =  {
      0x2e810185,
      0xc9030503,
      0x2300d79e,
-     0x21024000,
-     0x2301a89e,
+     0x21024900,
+     0x2301b19e,
      0x1d077d7d,
      0xc907ff00,
      0x2eff8384,
@@ -655,7 +664,16 @@ const uint32_t c1_0[] =  {
      0x124e0202,
      0x81090762,
      0x24000744,
-     0x21024e00,
+     0x21026000,
+     0xc90e8e05,
+     0x1d0e8e8e,
+     0x811e07ce,
+     0x91c013ce,
+     0x21025c00,
+     0xc90f8e04,
+     0x1d0f8e8e,
+     0x811e07ce,
+     0x91c213ce,
      0x24000644,
      0x108e8ec5,
      0x104e4e05,
@@ -675,12 +693,12 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x2eff8b96,
      0x108989d7,
-     0x21026800,
+     0x21027a00,
      0x2eff8a96,
      0x108989d7,
      0x24001059,
-     0x2402819e,
-     0x21066b00,
+     0x2402939e,
+     0x21069100,
      0x24000104,
      0x240018c4,
      0x2f000184,
@@ -697,7 +715,7 @@ const uint32_t c1_0[] =  {
      0x61100304,
      0x1f005d5d,
      0x240002de,
-     0x21029300,
+     0x2102a500,
      0x2eff8f8e,
      0x2f01878e,
      0x2f020f8e,
@@ -705,7 +723,7 @@ const uint32_t c1_0[] =  {
      0x4896d704,
      0x24002837,
      0x240002de,
-     0x21029300,
+     0x2102a500,
      0x09010300,
      0x01000000,
      0x90001580,
@@ -724,7 +742,7 @@ const uint32_t c1_0[] =  {
      0xc9015604,
      0xc9000207,
      0xc9030206,
-     0x21029200,
+     0x2102a400,
      0xc9005604,
      0xc9010203,
      0xc9040202,
@@ -755,18 +773,18 @@ const uint32_t c1_0[] =  {
      0x24001864,
      0x24000644,
      0x2f000384,
-     0x2102a200,
+     0x2102b400,
      0x5103de04,
-     0x5705de4d,
+     0x5705de44,
      0x0b0337de,
-     0x2101a100,
+     0x2101aa00,
      0x24502084,
      0x24001864,
      0x24000644,
      0x2f000384,
      0x2100cf00,
      0x24002104,
-     0x2102b500,
+     0x2102c700,
      0x1f047d7d,
      0x24002004,
      0x24000824,
@@ -781,7 +799,7 @@ const uint32_t c1_0[] =  {
      0x24000205,
      0x2f010185,
      0x0101e3e3,
-     0x2102c100,
+     0x2102d300,
      0x2eff9183,
      0x1d006363,
      0x24000564,
@@ -796,11 +814,11 @@ const uint32_t c1_0[] =  {
      0x2eff818a,
      0x8108398a,
      0x2eff9088,
-     0x2405bfc8,
-     0x24062788,
-     0x240638c9,
-     0x24064bcf,
-     0x240667d0,
+     0x2405e5c8,
+     0x24064d88,
+     0x24065ec9,
+     0x240671cf,
+     0x24068dd0,
      0x24002200,
      0x8f00d508,
      0x91001760,
@@ -812,11 +830,11 @@ const uint32_t c1_0[] =  {
      0x71406a04,
      0x240004e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x91007981,
      0x59206a03,
      0x1c6ae2e2,
-     0x2102ed00,
+     0x2102ff00,
      0x05206a4a,
      0x1c4ae1e1,
      0x2eff918d,
@@ -831,13 +849,13 @@ const uint32_t c1_0[] =  {
      0x2f010185,
      0x09066a80,
      0x8480318d,
-     0x21031800,
+     0x21032a00,
      0x2400006b,
      0x106a6a4b,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21031800,
+     0x21032a00,
      0x240000da,
      0x10898980,
      0x24000d04,
@@ -848,21 +866,21 @@ const uint32_t c1_0[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x2400005a,
      0x5101670a,
      0x5102670a,
-     0x53066727,
-     0x510c6781,
-     0x5309674a,
-     0x5105671f,
-     0x5307673f,
+     0x53066732,
+     0x510c678c,
+     0x53096755,
+     0x51056728,
+     0x5307674a,
      0x240002e6,
      0x2f008186,
-     0x21031800,
-     0x21053c00,
-     0x2102e200,
-     0x69062915,
+     0x21032a00,
+     0x21056200,
+     0x2102f400,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -872,6 +890,15 @@ const uint32_t c1_0[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21033d00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -880,23 +907,23 @@ const uint32_t c1_0[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x23059e9e,
+     0x2305c49e,
      0x2f000384,
      0x2100d100,
      0x240021e4,
      0x2f000184,
      0x2100d100,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -981,7 +1008,9 @@ const uint32_t c1_0[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21031800,
+     0xc9076a02,
+     0x81c03394,
+     0x21032a00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -991,22 +1020,22 @@ const uint32_t c1_0[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x240018c4,
      0x2f000384,
-     0x21042b00,
+     0x21044800,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1019,26 +1048,26 @@ const uint32_t c1_0[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21031800,
+     0x21032a00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21031800,
+     0x21032a00,
      0x69036a0d,
      0x59188004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80818e,
      0x1d035d5d,
      0xc9006e05,
@@ -1046,12 +1075,12 @@ const uint32_t c1_0[] =  {
      0x1d045d5d,
      0xc9016e02,
      0x1f045d5d,
-     0x21031800,
+     0x21032a00,
      0x69066a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -1061,13 +1090,13 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2103d700,
-     0x21031800,
+     0x2103f400,
+     0x21032a00,
      0x69076a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -1077,14 +1106,14 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2103e700,
-     0x21031800,
+     0x21040400,
+     0x21032a00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1104,14 +1133,14 @@ const uint32_t c1_0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2103f900,
-     0x21031800,
+     0x21041600,
+     0x21032a00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -1127,16 +1156,16 @@ const uint32_t c1_0[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x21041a00,
+     0x21043700,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21041400,
-     0x21031800,
+     0x21043100,
+     0x21032a00,
      0x240002e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1146,7 +1175,7 @@ const uint32_t c1_0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21031800,
+     0x21032a00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -1173,8 +1202,8 @@ const uint32_t c1_0[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21031800,
-     0x21031800,
+     0x21032a00,
+     0x21032a00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -1183,12 +1212,12 @@ const uint32_t c1_0[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21031800,
+     0x21032a00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x1f027d7d,
      0x2e80838a,
      0x106a6a24,
@@ -1219,7 +1248,7 @@ const uint32_t c1_0[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21031800,
+     0x21032a00,
      0x10d7d790,
      0x24000442,
      0x69026619,
@@ -1233,7 +1262,7 @@ const uint32_t c1_0[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21048d00,
+     0x2104aa00,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -1245,9 +1274,9 @@ const uint32_t c1_0[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036997,
+     0x510369a0,
      0x209e0000,
-     0x69006654,
+     0x6900665d,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -1275,7 +1304,7 @@ const uint32_t c1_0[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x2104bc00,
+     0x2104d900,
      0xd1010106,
      0x111f5900,
      0x51030002,
@@ -1288,17 +1317,26 @@ const uint32_t c1_0[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x2104cd00,
+     0x2104ea00,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x2104cd00,
+     0x2104ea00,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2104f300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
@@ -1409,7 +1447,7 @@ const uint32_t c1_0[] =  {
      0x209e0000,
      0x24000ce6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x2e80818a,
      0x2eff818d,
      0x240034c0,
@@ -1418,7 +1456,7 @@ const uint32_t c1_0[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x91007981,
      0x69406a0b,
      0x2700e160,
@@ -1427,14 +1465,14 @@ const uint32_t c1_0[] =  {
      0x69206005,
      0x240004e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x01206060,
      0x1060606a,
      0x2f00800a,
      0x61406a04,
      0x240004e6,
      0x2f008186,
-     0x21031800,
+     0x21032a00,
      0x2400016b,
      0x106a6a4b,
      0x24000004,
@@ -1446,11 +1484,11 @@ const uint32_t c1_0[] =  {
      0x51004a18,
      0x240003e6,
      0x1f007a7a,
-     0x21031800,
+     0x21032a00,
      0x61206a04,
      0x05206a60,
      0x1e60e1e1,
-     0x21056600,
+     0x21058c00,
      0x1e6ae2e2,
      0x2e808f8e,
      0xd1077d0a,
@@ -1462,11 +1500,11 @@ const uint32_t c1_0[] =  {
      0x104b4b25,
      0x24000105,
      0x2f010185,
-     0x21031800,
+     0x21032a00,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21031800,
+     0x21032a00,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1490,7 +1528,7 @@ const uint32_t c1_0[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21056100,
+     0x21058700,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1507,7 +1545,7 @@ const uint32_t c1_0[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21056100,
+     0x21058700,
      0xc9077d07,
      0x13082424,
      0x1f047d7d,
@@ -1531,13 +1569,13 @@ const uint32_t c1_0[] =  {
      0x59204b06,
      0x51016b03,
      0x1c4be2e2,
-     0x2105bd00,
+     0x2105e300,
      0x1e4be2e2,
-     0x2105bd00,
+     0x2105e300,
      0x05204b4b,
      0x51016b03,
      0x1c4be1e1,
-     0x2105bd00,
+     0x2105e300,
      0x1e4be1e1,
      0x81007981,
      0x2100d100,
@@ -1580,11 +1618,11 @@ const uint32_t c1_0[] =  {
      0x111f0101,
      0x68013003,
      0x1f15fcfc,
-     0x21062400,
+     0x21064a00,
      0x019010c1,
      0x80c13991,
      0x81811961,
-     0x21062400,
+     0x21064a00,
      0x1f071919,
      0x10d0d0ce,
      0x0108c4c4,
@@ -1661,7 +1699,7 @@ const uint32_t c1_0[] =  {
      0x01029696,
      0x240002c4,
      0x2f000384,
-     0x2105d500,
+     0x2105fb00,
      0x1f07d9d9,
      0x1f0efcfc,
      0x2e80838e,
@@ -1702,13 +1740,13 @@ const uint32_t c1_0[] =  {
      0x24000403,
      0x209e0000,
      0x2400b837,
-     0x21066200,
+     0x21068800,
      0x2400b037,
      0x240002de,
      0x24001003,
      0x209e0000,
      0x24002837,
-     0x21066200,
+     0x21068800,
      0x1f0ffcfc,
      0x13283737,
      0x240002de,
@@ -1727,7 +1765,7 @@ const uint32_t c1_0[] =  {
      0x1f031d1d,
      0x10cecec7,
      0x108e8e87,
-     0x21067d00,
+     0x2106a300,
      0x1f021d1d,
      0x11ffcec7,
      0x11ff8e87,
@@ -1747,7 +1785,7 @@ const uint32_t c1_0[] =  {
      0x1f031d1d,
      0x10cecec7,
      0x108e8e87,
-     0x21069100,
+     0x2106b700,
      0x1f021d1d,
      0x11ffcec7,
      0x11ff8e87,
diff --git a/fw/v0/classify1_1.bib b/fw/v0/classify1_1.bib
index 7a9264d..827defc 100644
--- a/fw/v0/classify1_1.bib
+++ b/fw/v0/classify1_1.bib
diff --git a/fw/v0/classify1_1_bin.c b/fw/v0/classify1_1_bin.c
index 25ad624..77f0d26 100644
--- a/fw/v0/classify1_1_bin.c
+++ b/fw/v0/classify1_1_bin.c
@@ -73,8 +73,8 @@
 const uint32_t c1_1[] =  {
      0x21000300,
      0xbabe0001,
-     0x03000200,
-     0x2301b29e,
+     0x03000201,
+     0x2301bb9e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -84,7 +84,7 @@ const uint32_t c1_1[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100171d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0xc901ff0f,
@@ -118,7 +118,7 @@ const uint32_t c1_1[] =  {
      0xc9030503,
      0x2300529e,
      0x21003000,
-     0x2301229e,
+     0x23012b9e,
      0xc9067d10,
      0x1d067d7d,
      0xd1047d04,
@@ -128,13 +128,13 @@ const uint32_t c1_1[] =  {
      0x1d047d7d,
      0xd1005d07,
      0x5103de03,
-     0x23014b9e,
+     0x2301549e,
      0x21004000,
      0x240023e4,
      0x2f000184,
      0x21004000,
      0x1d005d5d,
-     0x2301229e,
+     0x23012b9e,
      0x1d077d7d,
      0x21004700,
      0xd7005df4,
@@ -144,14 +144,14 @@ const uint32_t c1_1[] =  {
      0xd105ff00,
      0xd1057d03,
      0xd1047d02,
-     0xd304ff0a,
+     0xd304ff13,
      0xc9057d02,
      0xc90aff05,
      0x5700fcc4,
      0x81082c9c,
      0x2eff819c,
      0x21001000,
-     0x21049f00,
+     0x2104bc00,
      0x21004c00,
      0x1f08fcfc,
      0xc905ff00,
@@ -171,7 +171,7 @@ const uint32_t c1_1[] =  {
      0x10d7d790,
      0x24000442,
      0x6902691c,
-     0xd10319a5,
+     0xd10319ae,
      0xc9006805,
      0x812208c8,
      0x11e05959,
@@ -196,13 +196,13 @@ const uint32_t c1_1[] =  {
      0x106a6a44,
      0x24001864,
      0x2f000384,
-     0x51036c93,
+     0x51036c9c,
      0x209e0000,
-     0x69006950,
+     0x69006959,
      0x81310858,
      0xd1005b03,
      0xc9065d02,
-     0xd1031986,
+     0xd103198f,
      0x8118288a,
      0x51000b05,
      0x91090862,
@@ -253,6 +253,15 @@ const uint32_t c1_1[] =  {
      0xc9016b03,
      0x001a8989,
      0x24000642,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c013c9,
+     0x2100bf00,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91c213c9,
      0x24001802,
      0xd1055648,
      0x51016c44,
@@ -360,7 +369,7 @@ const uint32_t c1_1[] =  {
      0x2eff8183,
      0x1f12e3e3,
      0x24004a9e,
-     0x21037800,
+     0x21038c00,
      0x1f09fcfc,
      0xd106ff00,
      0xc905ff00,
@@ -369,13 +378,13 @@ const uint32_t c1_1[] =  {
      0x5100010e,
      0xc9035603,
      0x2400f081,
-     0x21013200,
+     0x21013b00,
      0xc9025603,
      0x2400e081,
-     0x21013200,
+     0x21013b00,
      0xc9005603,
      0x2400c081,
-     0x21013200,
+     0x21013b00,
      0x2400d081,
      0x9081f489,
      0x51056902,
@@ -401,7 +410,7 @@ const uint32_t c1_1[] =  {
      0x6902c103,
      0x9081e289,
      0x21006100,
-     0x2100f600,
+     0x2100ff00,
      0xc905ff00,
      0xd106ff00,
      0x93206896,
@@ -445,7 +454,7 @@ const uint32_t c1_1[] =  {
      0x61100304,
      0x1f005d5d,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x2eff8f8e,
      0x2f01878e,
      0x2f020f8e,
@@ -453,7 +462,7 @@ const uint32_t c1_1[] =  {
      0x4896d704,
      0x24002837,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x09010300,
      0x01800000,
      0x90001580,
@@ -487,17 +496,17 @@ const uint32_t c1_1[] =  {
      0x24001864,
      0x24000644,
      0x2f000384,
-     0x21019500,
+     0x21019e00,
      0x5103de03,
      0x0b0337de,
-     0x21011b00,
+     0x21012400,
      0x24502084,
      0x24001864,
      0x24000644,
      0x2f000384,
      0x21004a00,
      0x24002104,
-     0x2101a700,
+     0x2101b000,
      0x1f047d7d,
      0x24002004,
      0x24000824,
@@ -512,7 +521,7 @@ const uint32_t c1_1[] =  {
      0x24000205,
      0x2f010185,
      0x0101e3e3,
-     0x2101b300,
+     0x2101bc00,
      0x2eff9183,
      0x1d006363,
      0x24000564,
@@ -527,19 +536,19 @@ const uint32_t c1_1[] =  {
      0x2eff818a,
      0x8108398a,
      0x2eff9088,
-     0x2404b889,
-     0x240546ca,
-     0x2405d08a,
-     0x2405dccb,
-     0x2405e88b,
-     0x2405f4cc,
-     0x2406008c,
-     0x240625cd,
-     0x2406338d,
-     0x24063cce,
-     0x24066b8e,
-     0x24064e8f,
-     0x240667d0,
+     0x2404d589,
+     0x24056cca,
+     0x2405ff8a,
+     0x24060bcb,
+     0x2406178b,
+     0x240623cc,
+     0x24062f8c,
+     0x240654cd,
+     0x2406628d,
+     0x24066bce,
+     0x24069a8e,
+     0x24067d8f,
+     0x240696d0,
      0x24002200,
      0x8f80d508,
      0x91001760,
@@ -551,11 +560,11 @@ const uint32_t c1_1[] =  {
      0x71406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x59206a03,
      0x1c6ae2e2,
-     0x2101e700,
+     0x2101f000,
      0x05206a4a,
      0x1c4ae1e1,
      0x2eff918d,
@@ -570,13 +579,13 @@ const uint32_t c1_1[] =  {
      0x2f010185,
      0x09066a80,
      0x8480318d,
-     0x21021200,
+     0x21021b00,
      0x2400006b,
      0x106a6a4b,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x240000da,
      0x10898980,
      0x24000d04,
@@ -587,21 +596,21 @@ const uint32_t c1_1[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400005a,
      0x5101670a,
      0x5102670a,
-     0x53066727,
-     0x510c6781,
-     0x5309674a,
-     0x5105671f,
-     0x5307673f,
+     0x53066732,
+     0x510c678c,
+     0x53096755,
+     0x51056728,
+     0x5307674a,
      0x240002e6,
      0x2f008186,
-     0x21021200,
-     0x21043500,
-     0x2101dc00,
-     0x69062915,
+     0x21021b00,
+     0x21045200,
+     0x2101e500,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -611,6 +620,15 @@ const uint32_t c1_1[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21022e00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -619,23 +637,23 @@ const uint32_t c1_1[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x2304979e,
+     0x2304b49e,
      0x2f000384,
      0x21004c00,
      0x240021e4,
      0x2f000184,
      0x21004c00,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -720,7 +738,9 @@ const uint32_t c1_1[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21021200,
+     0xc9076a02,
+     0x81c03394,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -730,22 +750,22 @@ const uint32_t c1_1[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240018c4,
      0x2f000384,
-     0x21032500,
+     0x21033900,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -758,26 +778,26 @@ const uint32_t c1_1[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21021200,
+     0x21021b00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21021200,
+     0x21021b00,
      0x69036a0d,
      0x59188004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80818e,
      0x1d035d5d,
      0xc9006e05,
@@ -785,12 +805,12 @@ const uint32_t c1_1[] =  {
      0x1d045d5d,
      0xc9016e02,
      0x1f045d5d,
-     0x21021200,
+     0x21021b00,
      0x69066a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -800,13 +820,13 @@ const uint32_t c1_1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102d100,
-     0x21021200,
+     0x2102e500,
+     0x21021b00,
      0x69076a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -816,14 +836,14 @@ const uint32_t c1_1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102e100,
-     0x21021200,
+     0x2102f500,
+     0x21021b00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -843,14 +863,14 @@ const uint32_t c1_1[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2102f300,
-     0x21021200,
+     0x21030700,
+     0x21021b00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -866,16 +886,16 @@ const uint32_t c1_1[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x21031400,
+     0x21032800,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21030e00,
-     0x21021200,
+     0x21032200,
+     0x21021b00,
      0x240002e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -885,7 +905,7 @@ const uint32_t c1_1[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -912,8 +932,8 @@ const uint32_t c1_1[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21021200,
-     0x21021200,
+     0x21021b00,
+     0x21021b00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -922,12 +942,12 @@ const uint32_t c1_1[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21021200,
+     0x21021b00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x1f027d7d,
      0x2e80838a,
      0x106a6a24,
@@ -958,7 +978,7 @@ const uint32_t c1_1[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21021200,
+     0x21021b00,
      0x10d7d790,
      0x24000442,
      0x69026619,
@@ -972,7 +992,7 @@ const uint32_t c1_1[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21038700,
+     0x21039b00,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -984,9 +1004,9 @@ const uint32_t c1_1[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036996,
+     0x5103699f,
      0x209e0000,
-     0x69006653,
+     0x6900665c,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -1014,7 +1034,7 @@ const uint32_t c1_1[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x2103b500,
+     0x2103c900,
      0xd1010105,
      0x11073900,
      0x51000003,
@@ -1026,17 +1046,26 @@ const uint32_t c1_1[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x2103c600,
+     0x2103da00,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x2103c600,
+     0x2103da00,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2103e300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
@@ -1147,7 +1176,7 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x24000ce6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x2eff818d,
      0x240034c0,
@@ -1156,7 +1185,7 @@ const uint32_t c1_1[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x69406a0b,
      0x2700e160,
@@ -1165,14 +1194,14 @@ const uint32_t c1_1[] =  {
      0x69206005,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x01206060,
      0x1060606a,
      0x2f00800a,
      0x61406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400016b,
      0x106a6a4b,
      0x24000004,
@@ -1184,11 +1213,11 @@ const uint32_t c1_1[] =  {
      0x51004a18,
      0x240003e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x61206a04,
      0x05206a60,
      0x1e60e1e1,
-     0x21045f00,
+     0x21047c00,
      0x1e6ae2e2,
      0x2e808f8e,
      0xd1077d0a,
@@ -1200,11 +1229,11 @@ const uint32_t c1_1[] =  {
      0x104b4b25,
      0x24000105,
      0x2f010185,
-     0x21021200,
+     0x21021b00,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1228,7 +1257,7 @@ const uint32_t c1_1[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1245,7 +1274,7 @@ const uint32_t c1_1[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0xc9077d07,
      0x13082424,
      0x1f047d7d,
@@ -1269,13 +1298,13 @@ const uint32_t c1_1[] =  {
      0x59204b06,
      0x51016b03,
      0x1c4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x1e4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x05204b4b,
      0x51016b03,
      0x1c4be1e1,
-     0x2104b600,
+     0x2104d300,
      0x1e4be1e1,
      0x81007981,
      0x21004c00,
@@ -1301,7 +1330,7 @@ const uint32_t c1_1[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2104d200,
+     0x2104ef00,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1340,7 +1369,7 @@ const uint32_t c1_1[] =  {
      0x2700ea01,
      0x69200103,
      0x1f025656,
-     0x2104f900,
+     0x21051600,
      0x61e06a03,
      0x49ef6a02,
      0x1f035656,
@@ -1356,11 +1385,11 @@ const uint32_t c1_1[] =  {
      0x1f031d1d,
      0x209e0000,
      0x24002837,
-     0x21050700,
+     0x21052400,
      0x2400c837,
      0x240002de,
      0x209e0000,
-     0xd104562c,
+     0xd1045635,
      0x2e808986,
      0x11f066e0,
      0x6f40e0fa,
@@ -1380,7 +1409,7 @@ const uint32_t c1_1[] =  {
      0x6e484bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21052d00,
+     0x21054a00,
      0xcf0afc9c,
      0x586e4e0d,
      0x2700f07a,
@@ -1394,11 +1423,20 @@ const uint32_t c1_1[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21052d00,
+     0x21054a00,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x21055600,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1406,34 +1444,34 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207acd,
+     0x5f207ac4,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21054300,
+     0x21056900,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
      0x05014e4e,
      0x8100bb8e,
-     0xcf055677,
+     0xcf05566e,
      0x240004de,
      0x209e0000,
-     0xd1055643,
+     0xd105564c,
      0x2e808386,
      0x11f06600,
-     0x6f6000bd,
+     0x6f6000b4,
      0x2eff8384,
      0x24000004,
      0x240008c4,
      0x2f000384,
      0x2e808f8e,
      0x2f020f8e,
-     0xd1005b4a,
-     0xc9037d49,
-     0xd1045637,
+     0xd1005b53,
+     0xc9037d52,
+     0xd1045640,
      0x2eff8380,
      0x10272760,
      0x01689680,
@@ -1443,12 +1481,12 @@ const uint32_t c1_1[] =  {
      0x51006004,
      0x512b6003,
      0x513c6002,
-     0x21056400,
+     0x21058a00,
      0x90800680,
      0x01014081,
      0x09038181,
      0x00818080,
-     0x21055700,
+     0x21057d00,
      0x90800600,
      0x1f0afcfc,
      0x10f1f1e1,
@@ -1464,8 +1502,8 @@ const uint32_t c1_1[] =  {
      0x6e604bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21058100,
-     0xc90afc28,
+     0x2105a700,
+     0xc90afc31,
      0x586e4e0d,
      0x2700f07a,
      0x51207a0b,
@@ -1478,11 +1516,20 @@ const uint32_t c1_1[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21058100,
+     0x2105a700,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x2105b300,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1490,13 +1537,13 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207a79,
+     0x5f207a67,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21059700,
+     0x2105c600,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
@@ -1527,7 +1574,7 @@ const uint32_t c1_1[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2105b400,
+     0x2105e300,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1561,7 +1608,7 @@ const uint32_t c1_1[] =  {
      0x209e0000,
      0x2e808086,
      0x09034680,
-     0x4fff8034,
+     0x4fff8022,
      0x010880c4,
      0x00c49696,
      0x2f000384,
@@ -1578,7 +1625,7 @@ const uint32_t c1_1[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff8023,
+     0x4fff8011,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1602,7 +1649,7 @@ const uint32_t c1_1[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff800b,
+     0x4dff80f9,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1721,7 +1768,7 @@ const uint32_t c1_1[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x21067600,
+     0x2106a500,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
diff --git a/fw/v0/classify1_2.bib b/fw/v0/classify1_2.bib
index fe543c4..4b5a87c 100644
--- a/fw/v0/classify1_2.bib
+++ b/fw/v0/classify1_2.bib
diff --git a/fw/v0/classify1_2_bin.c b/fw/v0/classify1_2_bin.c
index ab6d7b6..d32d9ab 100644
--- a/fw/v0/classify1_2_bin.c
+++ b/fw/v0/classify1_2_bin.c
@@ -74,8 +74,8 @@
 const uint32_t c1_2[] =  {
      0x21000300,
      0xbabe0001,
-     0x03000200,
-     0x2301b29e,
+     0x03000201,
+     0x2301bb9e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -85,7 +85,7 @@ const uint32_t c1_2[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100171d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0xc901ff0f,
@@ -119,7 +119,7 @@ const uint32_t c1_2[] =  {
      0xc9030503,
      0x2300529e,
      0x21003000,
-     0x2301229e,
+     0x23012b9e,
      0xc9067d10,
      0x1d067d7d,
      0xd1047d04,
@@ -129,13 +129,13 @@ const uint32_t c1_2[] =  {
      0x1d047d7d,
      0xd1005d07,
      0x5103de03,
-     0x23014b9e,
+     0x2301549e,
      0x21004000,
      0x240023e4,
      0x2f000184,
      0x21004000,
      0x1d005d5d,
-     0x2301229e,
+     0x23012b9e,
      0x1d077d7d,
      0x21004700,
      0xd7005df4,
@@ -145,14 +145,14 @@ const uint32_t c1_2[] =  {
      0xd105ff00,
      0xd1057d03,
      0xd1047d02,
-     0xd304ff0a,
+     0xd304ff13,
      0xc9057d02,
      0xc90aff05,
      0x5700fcc4,
      0x81082c9c,
      0x2eff819c,
      0x21001000,
-     0x21049f00,
+     0x2104bc00,
      0x21004c00,
      0x1f08fcfc,
      0xc905ff00,
@@ -172,7 +172,7 @@ const uint32_t c1_2[] =  {
      0x10d7d790,
      0x24000442,
      0x6902691c,
-     0xd10319a5,
+     0xd10319ae,
      0xc9006805,
      0x812208c8,
      0x11e05959,
@@ -197,13 +197,13 @@ const uint32_t c1_2[] =  {
      0x106a6a44,
      0x24001864,
      0x2f000384,
-     0x51036c93,
+     0x51036c9c,
      0x209e0000,
-     0x69006950,
+     0x69006959,
      0x81310858,
      0xd1005b03,
      0xc9065d02,
-     0xd1031986,
+     0xd103198f,
      0x8118288a,
      0x51000b05,
      0x91090862,
@@ -254,6 +254,15 @@ const uint32_t c1_2[] =  {
      0xc9016b03,
      0x001a8989,
      0x24000642,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c013c9,
+     0x2100bf00,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91c213c9,
      0x24001802,
      0xd1055648,
      0x51016c44,
@@ -361,7 +370,7 @@ const uint32_t c1_2[] =  {
      0x2eff8183,
      0x1f12e3e3,
      0x24004a9e,
-     0x21037800,
+     0x21038c00,
      0x1f09fcfc,
      0xd106ff00,
      0xc905ff00,
@@ -370,13 +379,13 @@ const uint32_t c1_2[] =  {
      0x5100010e,
      0xc9035603,
      0x2400f081,
-     0x21013200,
+     0x21013b00,
      0xc9025603,
      0x2400e081,
-     0x21013200,
+     0x21013b00,
      0xc9005603,
      0x2400c081,
-     0x21013200,
+     0x21013b00,
      0x2400d081,
      0x9081f489,
      0x51056902,
@@ -402,7 +411,7 @@ const uint32_t c1_2[] =  {
      0x6902c103,
      0x9081e289,
      0x21006100,
-     0x2100f600,
+     0x2100ff00,
      0xc905ff00,
      0xd106ff00,
      0x93206896,
@@ -446,7 +455,7 @@ const uint32_t c1_2[] =  {
      0x61100304,
      0x1f005d5d,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x2eff8f8e,
      0x2f01878e,
      0x2f020f8e,
@@ -454,7 +463,7 @@ const uint32_t c1_2[] =  {
      0x4896d704,
      0x24002837,
      0x240002de,
-     0x21018600,
+     0x21018f00,
      0x09010300,
      0x01800000,
      0x90001580,
@@ -488,17 +497,17 @@ const uint32_t c1_2[] =  {
      0x24001864,
      0x24000644,
      0x2f000384,
-     0x21019500,
+     0x21019e00,
      0x5103de03,
      0x0b0337de,
-     0x21011b00,
+     0x21012400,
      0x24502084,
      0x24001864,
      0x24000644,
      0x2f000384,
      0x21004a00,
      0x24002104,
-     0x2101a700,
+     0x2101b000,
      0x1f047d7d,
      0x24002004,
      0x24000824,
@@ -513,7 +522,7 @@ const uint32_t c1_2[] =  {
      0x24000205,
      0x2f010185,
      0x0101e3e3,
-     0x2101b300,
+     0x2101bc00,
      0x2eff9183,
      0x1d006363,
      0x24000564,
@@ -528,19 +537,19 @@ const uint32_t c1_2[] =  {
      0x2eff818a,
      0x8108398a,
      0x2eff9088,
-     0x2404b889,
-     0x240546ca,
-     0x2405d08a,
-     0x2405dccb,
-     0x2405e88b,
-     0x2405f4cc,
-     0x2406008c,
-     0x240625cd,
-     0x2406338d,
-     0x24063cce,
-     0x24066b8e,
-     0x24064e8f,
-     0x240667d0,
+     0x2404d589,
+     0x24056cca,
+     0x2405ff8a,
+     0x24060bcb,
+     0x2406178b,
+     0x240623cc,
+     0x24062f8c,
+     0x240654cd,
+     0x2406628d,
+     0x24066bce,
+     0x24069a8e,
+     0x24067d8f,
+     0x240696d0,
      0x24002200,
      0x8f80d508,
      0x91001760,
@@ -552,11 +561,11 @@ const uint32_t c1_2[] =  {
      0x71406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x59206a03,
      0x1c6ae2e2,
-     0x2101e700,
+     0x2101f000,
      0x05206a4a,
      0x1c4ae1e1,
      0x2eff918d,
@@ -571,13 +580,13 @@ const uint32_t c1_2[] =  {
      0x2f010185,
      0x09066a80,
      0x8480318d,
-     0x21021200,
+     0x21021b00,
      0x2400006b,
      0x106a6a4b,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x240000da,
      0x10898980,
      0x24000d04,
@@ -588,21 +597,21 @@ const uint32_t c1_2[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400005a,
      0x5101670a,
      0x5102670a,
-     0x53066727,
-     0x510c6781,
-     0x5309674a,
-     0x5105671f,
-     0x5307673f,
+     0x53066732,
+     0x510c678c,
+     0x53096755,
+     0x51056728,
+     0x5307674a,
      0x240002e6,
      0x2f008186,
-     0x21021200,
-     0x21043500,
-     0x2101dc00,
-     0x69062915,
+     0x21021b00,
+     0x21045200,
+     0x2101e500,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -612,6 +621,15 @@ const uint32_t c1_2[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21022e00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -620,23 +638,23 @@ const uint32_t c1_2[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x2304979e,
+     0x2304b49e,
      0x2f000384,
      0x21004c00,
      0x240021e4,
      0x2f000184,
      0x21004c00,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -721,7 +739,9 @@ const uint32_t c1_2[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21021200,
+     0xc9076a02,
+     0x81c03394,
+     0x21021b00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -731,22 +751,22 @@ const uint32_t c1_2[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x240018c4,
      0x2f000384,
-     0x21032500,
+     0x21033900,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -759,26 +779,26 @@ const uint32_t c1_2[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21021200,
+     0x21021b00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21021200,
+     0x21021b00,
      0x69036a0d,
      0x59188004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80818e,
      0x1d035d5d,
      0xc9006e05,
@@ -786,12 +806,12 @@ const uint32_t c1_2[] =  {
      0x1d045d5d,
      0xc9016e02,
      0x1f045d5d,
-     0x21021200,
+     0x21021b00,
      0x69066a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -801,13 +821,13 @@ const uint32_t c1_2[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102d100,
-     0x21021200,
+     0x2102e500,
+     0x21021b00,
      0x69076a10,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x51006e09,
      0x09036f82,
@@ -817,14 +837,14 @@ const uint32_t c1_2[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102e100,
-     0x21021200,
+     0x2102f500,
+     0x21021b00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -844,14 +864,14 @@ const uint32_t c1_2[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2102f300,
-     0x21021200,
+     0x21030700,
+     0x21021b00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -867,16 +887,16 @@ const uint32_t c1_2[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x21031400,
+     0x21032800,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21030e00,
-     0x21021200,
+     0x21032200,
+     0x21021b00,
      0x240002e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -886,7 +906,7 @@ const uint32_t c1_2[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -913,8 +933,8 @@ const uint32_t c1_2[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21021200,
-     0x21021200,
+     0x21021b00,
+     0x21021b00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -923,12 +943,12 @@ const uint32_t c1_2[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21021200,
+     0x21021b00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x1f027d7d,
      0x2e80838a,
      0x106a6a24,
@@ -959,7 +979,7 @@ const uint32_t c1_2[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21021200,
+     0x21021b00,
      0x10d7d790,
      0x24000442,
      0x69026619,
@@ -973,7 +993,7 @@ const uint32_t c1_2[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21038700,
+     0x21039b00,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -985,9 +1005,9 @@ const uint32_t c1_2[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036996,
+     0x5103699f,
      0x209e0000,
-     0x69006653,
+     0x6900665c,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -1015,7 +1035,7 @@ const uint32_t c1_2[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x2103b500,
+     0x2103c900,
      0xd1010105,
      0x11073900,
      0x51000003,
@@ -1027,17 +1047,26 @@ const uint32_t c1_2[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x2103c600,
+     0x2103da00,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x2103c600,
+     0x2103da00,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2103e300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
@@ -1148,7 +1177,7 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x24000ce6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2e80818a,
      0x2eff818d,
      0x240034c0,
@@ -1157,7 +1186,7 @@ const uint32_t c1_2[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x91007981,
      0x69406a0b,
      0x2700e160,
@@ -1166,14 +1195,14 @@ const uint32_t c1_2[] =  {
      0x69206005,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x01206060,
      0x1060606a,
      0x2f00800a,
      0x61406a04,
      0x240004e6,
      0x2f008186,
-     0x21021200,
+     0x21021b00,
      0x2400016b,
      0x106a6a4b,
      0x24000004,
@@ -1185,11 +1214,11 @@ const uint32_t c1_2[] =  {
      0x51004a18,
      0x240003e6,
      0x1f007a7a,
-     0x21021200,
+     0x21021b00,
      0x61206a04,
      0x05206a60,
      0x1e60e1e1,
-     0x21045f00,
+     0x21047c00,
      0x1e6ae2e2,
      0x2e808f8e,
      0xd1077d0a,
@@ -1201,11 +1230,11 @@ const uint32_t c1_2[] =  {
      0x104b4b25,
      0x24000105,
      0x2f010185,
-     0x21021200,
+     0x21021b00,
      0x8108398b,
      0x850c398d,
      0x1f057d7d,
-     0x21021200,
+     0x21021b00,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1229,7 +1258,7 @@ const uint32_t c1_2[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0x2e80878e,
      0x2f01878e,
      0x240010c4,
@@ -1246,7 +1275,7 @@ const uint32_t c1_2[] =  {
      0x10cece8b,
      0x240004c4,
      0x2f000384,
-     0x21045a00,
+     0x21047700,
      0xc9077d07,
      0x13082424,
      0x1f047d7d,
@@ -1270,13 +1299,13 @@ const uint32_t c1_2[] =  {
      0x59204b06,
      0x51016b03,
      0x1c4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x1e4be2e2,
-     0x2104b600,
+     0x2104d300,
      0x05204b4b,
      0x51016b03,
      0x1c4be1e1,
-     0x2104b600,
+     0x2104d300,
      0x1e4be1e1,
      0x81007981,
      0x21004c00,
@@ -1302,7 +1331,7 @@ const uint32_t c1_2[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2104d200,
+     0x2104ef00,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1341,7 +1370,7 @@ const uint32_t c1_2[] =  {
      0x2700ea01,
      0x69200103,
      0x1f025656,
-     0x2104f900,
+     0x21051600,
      0x61e06a03,
      0x49ef6a02,
      0x1f035656,
@@ -1357,11 +1386,11 @@ const uint32_t c1_2[] =  {
      0x1f031d1d,
      0x209e0000,
      0x24002837,
-     0x21050700,
+     0x21052400,
      0x2400c837,
      0x240002de,
      0x209e0000,
-     0xd104562c,
+     0xd1045635,
      0x2e808986,
      0x11f066e0,
      0x6f40e0fa,
@@ -1381,7 +1410,7 @@ const uint32_t c1_2[] =  {
      0x6e484bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21052d00,
+     0x21054a00,
      0xcf0afc9c,
      0x586e4e0d,
      0x2700f07a,
@@ -1395,11 +1424,20 @@ const uint32_t c1_2[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21052d00,
+     0x21054a00,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x21055600,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1407,34 +1445,34 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207acd,
+     0x5f207ac4,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21054300,
+     0x21056900,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
      0x05014e4e,
      0x8100bb8e,
-     0xcf055677,
+     0xcf05566e,
      0x240004de,
      0x209e0000,
-     0xd1055643,
+     0xd105564c,
      0x2e808386,
      0x11f06600,
-     0x6f6000bd,
+     0x6f6000b4,
      0x2eff8384,
      0x24000004,
      0x240008c4,
      0x2f000384,
      0x2e808f8e,
      0x2f020f8e,
-     0xd1005b4a,
-     0xc9037d49,
-     0xd1045637,
+     0xd1005b53,
+     0xc9037d52,
+     0xd1045640,
      0x2eff8380,
      0x10272760,
      0x01689680,
@@ -1444,12 +1482,12 @@ const uint32_t c1_2[] =  {
      0x51006004,
      0x512b6003,
      0x513c6002,
-     0x21056400,
+     0x21058a00,
      0x90800680,
      0x01014081,
      0x09038181,
      0x00818080,
-     0x21055700,
+     0x21057d00,
      0x90800600,
      0x1f0afcfc,
      0x10f1f1e1,
@@ -1465,8 +1503,8 @@ const uint32_t c1_2[] =  {
      0x6e604bf9,
      0x01016b6b,
      0x808e1a0b,
-     0x21058100,
-     0xc90afc28,
+     0x2105a700,
+     0xc90afc31,
      0x586e4e0d,
      0x2700f07a,
      0x51207a0b,
@@ -1479,11 +1517,20 @@ const uint32_t c1_2[] =  {
      0x2400016b,
      0x09047a8e,
      0x808eba8b,
-     0x21058100,
+     0x2105a700,
      0x2400ff7a,
      0x2400015a,
      0x1f045656,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c0138f,
+     0x2105b300,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91c2138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1491,13 +1538,13 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x1d045656,
      0x51ff7a0d,
-     0x5f207a79,
+     0x5f207a67,
      0x09047a81,
      0x90813a8b,
      0x705a6b04,
      0x045a6b6b,
      0x80813a8b,
-     0x21059700,
+     0x2105c600,
      0x9100bb8e,
      0x1c7af0f0,
      0x51004e02,
@@ -1528,7 +1575,7 @@ const uint32_t c1_2[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x2105b400,
+     0x2105e300,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
@@ -1562,7 +1609,7 @@ const uint32_t c1_2[] =  {
      0x209e0000,
      0x2e808086,
      0x09034680,
-     0x4fff8034,
+     0x4fff8022,
      0x010880c4,
      0x00c49696,
      0x2f000384,
@@ -1579,7 +1626,7 @@ const uint32_t c1_2[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff8023,
+     0x4fff8011,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1603,7 +1650,7 @@ const uint32_t c1_2[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff800b,
+     0x4dff80f9,
      0x010880c4,
      0x2f000384,
      0x00c49696,
@@ -1722,7 +1769,7 @@ const uint32_t c1_2[] =  {
      0x0b0697c9,
      0x1107c9c9,
      0x113f1789,
-     0x21067600,
+     0x2106a500,
      0x240003c9,
      0x103a3a89,
      0x1d099797,
diff --git a/fw/v0/classify2.bib b/fw/v0/classify2.bib
index 16cb2a6..8bdd652 100644
--- a/fw/v0/classify2.bib
+++ b/fw/v0/classify2.bib
diff --git a/fw/v0/classify2_bin.c b/fw/v0/classify2_bin.c
index d71301b..6a733f6 100644
--- a/fw/v0/classify2_bin.c
+++ b/fw/v0/classify2_bin.c
@@ -74,7 +74,7 @@
 const uint32_t c2[] =  {
      0x21000300,
      0xbabe0002,
-     0x03000200,
+     0x03000201,
      0x2300e99e,
      0x2eff8582,
      0x8104a482,
@@ -85,7 +85,7 @@ const uint32_t c2[] =  {
      0x2eff819d,
      0x2eff819c,
      0x9100175d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0x5100fc03,
@@ -163,12 +163,12 @@ const uint32_t c2[] =  {
      0x2eff8183,
      0x1f1ce3e3,
      0x2400109e,
-     0x21034700,
+     0x21035200,
      0x2e818786,
      0x2eff8183,
      0x1f1ce3e3,
      0x2400109e,
-     0x21034700,
+     0x21035200,
      0x2e818786,
      0xc90ed908,
      0x11073737,
@@ -192,13 +192,13 @@ const uint32_t c2[] =  {
      0x1f1ce3e3,
      0x6900c103,
      0x9081e086,
-     0x21034700,
+     0x21035200,
      0x6901c103,
      0x9081e186,
-     0x21034700,
+     0x21035200,
      0x6902c103,
      0x9081e286,
-     0x21034700,
+     0x21035200,
      0x11073737,
      0x13583737,
      0x21008200,
@@ -209,7 +209,7 @@ const uint32_t c2[] =  {
      0x2eff8183,
      0x1f1ce3e3,
      0x2400109e,
-     0x21034700,
+     0x21035200,
      0x24000ce6,
      0x2f008186,
      0x2101f700,
@@ -565,17 +565,17 @@ const uint32_t c2[] =  {
      0x2400005a,
      0x5103670a,
      0x5104670a,
-     0x53066712,
-     0x510c6781,
-     0x53096735,
-     0x5105671f,
-     0x5307672a,
+     0x5306671d,
+     0x510c678c,
+     0x53096740,
+     0x51056728,
+     0x53076735,
      0x240002e6,
      0x2f008186,
      0x2101f700,
      0x21008d00,
      0x2100cc00,
-     0x69062915,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -585,6 +585,15 @@ const uint32_t c2[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21020a00,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -599,7 +608,7 @@ const uint32_t c2[] =  {
      0x240021e4,
      0x2f000184,
      0x21001000,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
      0x2101f700,
@@ -609,7 +618,7 @@ const uint32_t c2[] =  {
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -694,6 +703,8 @@ const uint32_t c2[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
+     0xc9076a02,
+     0x81c03394,
      0x2101f700,
      0x240000e6,
      0x2f008186,
@@ -707,7 +718,7 @@ const uint32_t c2[] =  {
      0x2101f700,
      0x240018c4,
      0x2f000384,
-     0x2102f500,
+     0x21030000,
      0x240014c4,
      0x2f000384,
      0x69016a17,
@@ -796,7 +807,7 @@ const uint32_t c2[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2102c300,
+     0x2102ce00,
      0x2101f700,
      0x69096a1c,
      0x2400b0c0,
@@ -819,12 +830,12 @@ const uint32_t c2[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x2102e400,
+     0x2102ef00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2102de00,
+     0x2102e900,
      0x2101f700,
      0x240002e6,
      0x1f007a7a,
@@ -924,7 +935,7 @@ const uint32_t c2[] =  {
      0x11e08181,
      0x51014703,
      0x240016c1,
-     0x21035600,
+     0x21036100,
      0x24000dc1,
      0x12c18181,
      0x812c07c1,
@@ -936,9 +947,9 @@ const uint32_t c2[] =  {
      0x24001864,
      0x10676744,
      0x2f000384,
-     0x51036996,
+     0x5103699f,
      0x209e0000,
-     0x69006653,
+     0x6900665c,
      0x81182787,
      0x51000805,
      0x91090762,
@@ -966,7 +977,7 @@ const uint32_t c2[] =  {
      0x11c03900,
      0x51000003,
      0x107b7b21,
-     0x21038400,
+     0x21038f00,
      0xd1010105,
      0x11073900,
      0x51000003,
@@ -978,17 +989,26 @@ const uint32_t c2[] =  {
      0x00214646,
      0x00018686,
      0x24000642,
-     0x21039500,
+     0x2103a000,
      0x00228686,
      0xc9016809,
      0x00224646,
-     0x21039500,
+     0x2103a000,
      0xc9026803,
      0x007b8686,
      0x24000642,
      0xc9016803,
      0x001a8686,
      0x24000642,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c013c6,
+     0x2103a900,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91c213c6,
      0x51016954,
      0x51046953,
      0x69026908,
diff --git a/fw/v0/ks2_pa_pdsp0_classify1.bin b/fw/v0/ks2_pa_pdsp0_classify1.bin
index 3caa355..d97ae52 100644
--- a/fw/v0/ks2_pa_pdsp0_classify1.bin
+++ b/fw/v0/ks2_pa_pdsp0_classify1.bin
diff --git a/fw/v0/ks2_pa_pdsp1_classify1.bin b/fw/v0/ks2_pa_pdsp1_classify1.bin
index 6c3f0c6..dd5f742 100644
--- a/fw/v0/ks2_pa_pdsp1_classify1.bin
+++ b/fw/v0/ks2_pa_pdsp1_classify1.bin
diff --git a/fw/v0/ks2_pa_pdsp2_classify1.bin b/fw/v0/ks2_pa_pdsp2_classify1.bin
index 2a66aff..790032f 100644
--- a/fw/v0/ks2_pa_pdsp2_classify1.bin
+++ b/fw/v0/ks2_pa_pdsp2_classify1.bin
diff --git a/fw/v0/ks2_pa_pdsp3_classify2.bin b/fw/v0/ks2_pa_pdsp3_classify2.bin
index f384073..fb8629b 100644
--- a/fw/v0/ks2_pa_pdsp3_classify2.bin
+++ b/fw/v0/ks2_pa_pdsp3_classify2.bin
diff --git a/fw/v0/ks2_pa_pdsp4_pam.bin b/fw/v0/ks2_pa_pdsp4_pam.bin
index 8d92ee4..51bd4df 100644
--- a/fw/v0/ks2_pa_pdsp4_pam.bin
+++ b/fw/v0/ks2_pa_pdsp4_pam.bin
diff --git a/fw/v0/ks2_pa_pdsp5_pam.bin b/fw/v0/ks2_pa_pdsp5_pam.bin
index 2042462..27b0851 100644
--- a/fw/v0/ks2_pa_pdsp5_pam.bin
+++ b/fw/v0/ks2_pa_pdsp5_pam.bin
diff --git a/fw/v0/meminit.p b/fw/v0/meminit.p
index 71decf3..5f7fc7a 100644
--- a/fw/v0/meminit.p
+++ b/fw/v0/meminit.p
@@ -263,10 +263,10 @@ commonInit_1:
   sbco  &r4.b0,  PAMEM_CONST_PDSP_ALL_INFO, OFFSET_ID_PDSP5, 1

 

   // Initialize global configuration parameters

-  zero &s_paMaxHdrCountInit, 32

+  zero &s_paMaxHdrCountInit, 36

   

   // Initialize the total block to zero (replace individual initialization 

-  sbco s_paMaxHdrCountInit,               PAMEM_CONST_CUSTOM, OFFSET_MAX_HDR, 32

+  sbco s_paMaxHdrCountInit,               PAMEM_CONST_CUSTOM, OFFSET_MAX_HDR, 36

   

   // Initialize the max counts

   mov  s_paMaxHdrCountInit.vlanMaxCount,  2

@@ -298,6 +298,8 @@ commonInit_1:
   // Initialize the IPSEC NAT-T configuration

   //sbco s_paIpsecNatTDetInit,              PAMEM_CONST_CUSTOM, OFFSET_IPSEC_NAT_T_CFG,  SIZE(s_paIpsecNatTDetInit)

   

+  // Initialize the Queue Bounce configuration

+

   // Initialize the User-defined statistics related memory blocks

   // Initialize the User Statistics Link buffer  (512 * 2 bytes)

   mov    r20,    OFFSET_USR_STATS_CB

diff --git a/fw/v0/pacfgcmn.p b/fw/v0/pacfgcmn.p
index d913fbb..2966da8 100644
--- a/fw/v0/pacfgcmn.p
+++ b/fw/v0/pacfgcmn.p
@@ -274,6 +274,24 @@ f_cfgReply:
 

 l_cfgReply0:

 

+l_cfgReply0_queue_bounce:

+        // Check for Queue Bounce operation

+l_cfgReply0_queue_bounce_ddr:

+        qbbc l_cfgReply0_queue_bounce_msmc, s_paCmd1.replyQueue.t_pa_forward_queue_bounce_ddr

+            clr s_paCmd1.replyQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_paCmd1.replyQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paCmd1.replyQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_cfgReply0_queue_bounce_end

+

+l_cfgReply0_queue_bounce_msmc:

+        qbbc l_cfgReply0_queue_bounce_end, s_paCmd1.replyQueue.t_pa_forward_queue_bounce_msmc

+            clr s_paCmd1.replyQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_paCmd1.replyQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paCmd1.replyQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_cfgReply0_queue_bounce_end:

+

    mov  s_cdeCmdPkt.psInfoSize,  0

    mov  s_cdeCmdPkt.threadId,    s_paCmd1.replyDest

    mov  s_cdeCmdPkt.destQueue,   s_paCmd1.replyQueue

@@ -341,7 +359,7 @@ l_cfgReply1:
 // *   R17:            | pktCtrl

 // *   R18:            | pktCtrl (MacPaddingCfg)

 // *   R19:            | Events BitMap

-// *   R20:          |

+// *   R20:            | queueBounce

 // *   R21:          |

 // *   R22:     |     

 // *   R23:     |  Packet context - pktScope   

@@ -380,7 +398,7 @@ l_paComConfigPa0:
    xout XID_CDECTRL,           s_cdeCmdWd,    SIZE(s_cdeCmdWd)

    

    // Input configurations for command set, usr stats, queue divert, and packet control

-   xin  XID_CDEDATA,  s_paComCmdSetCfg,  SIZE(s_paComCmdSetCfg) + SIZE(s_paComUsrStats) + SIZE(s_paComQueueDivert) + SIZE(s_paComPktCtrl)

+   xin  XID_CDEDATA,  s_paComCmdSetCfg,  SIZE(s_paComCmdSetCfg) + SIZE(s_paComUsrStats) + SIZE(s_paComQueueDivert) + SIZE(s_paComPktCtrl)+ SIZE(s_paComQueueBounce)

 

 

    qbbc  l_paComConfigPa1,   s_paCmdCfgA.validFlag.t_paCmdConfigValidMaxCount

@@ -548,6 +566,11 @@ l_paComConfigPa6_mbox45_post:
             sbbo r1, r2, FIRMWARE_CMD_PKT_CTRL_CFG_OFFSET, 4             

          

 l_paComConfigPa7:

+   qbbc  l_paComConfigPa8, s_paCmdCfgA.validFlag.t_paCmdConfigValidQueueBounce

+   // Configure queue bounce

+       sbco s_paComQueueBounce,  PAMEM_CONST_CUSTOM,  OFFSET_QUEUE_BOUNCE_CFG,     SIZE(s_paComQueueBounce)

+

+l_paComConfigPa8:

    jmp f_cfgReply

 

     .leave cdeScope

@@ -2006,6 +2029,24 @@ l_paMultiFwd5:
     sbco  s_paSr0.swInfo0,  cCdeOutPkt,  OFFSET(s_pktDescr.swinfo0),  SIZE(s_pktDescr.swinfo0)

 

 l_paMultiFwd6:

+l_paMultiFwd6_queue_bounce:

+        // Check for Queue Bounce operation

+l_paMultiFwd6_queue_bounce_ddr:

+        qbbc l_paMultiFwd6_queue_bounce_msmc, s_paSr0.queue.t_pa_forward_queue_bounce_ddr

+            clr s_paSr0.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_paSr0.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paSr0.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_paMultiFwd6_queue_bounce_end

+

+l_paMultiFwd6_queue_bounce_msmc:

+        qbbc l_paMultiFwd6_queue_bounce_end, s_paSr0.queue.t_pa_forward_queue_bounce_msmc

+            clr s_paSr0.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_paSr0.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paSr0.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_paMultiFwd6_queue_bounce_end:

+

   zero &s_cdeCmdPkt,            SIZE(s_cdeCmdPkt)

   mov  s_cdeCmdPkt.optionsFlag, CDE_FLG_SET_THREADID | CDE_FLG_SET_FLOWID | CDE_FLG_SET_PSINFO | CDE_FLG_SET_DESTQUEUE

   mov  s_cdeCmdPkt.operation,   CDE_CMD_PACKET_COPY

@@ -2251,6 +2292,24 @@ l_curPktForward1_dscp_priority:
             mov  r2.b2,  PA_DEST_CDMA    

 l_curPktForward1_no_priority:

 

+l_curPktForward1_queue_bounce:

+        // Check for Queue Bounce operation

+l_curPktForward1_queue_bounce_ddr:

+        qbbc l_curPktForward1_queue_bounce_msmc, s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_curPktForward1_queue_bounce_end

+

+l_curPktForward1_queue_bounce_msmc:

+        qbbc l_curPktForward1_queue_bounce_end, s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_curPktForward1_queue_bounce_end:

+

         // Check whether command set is enabled, which precedes the multi-route option

         qbeq l_curPktForward8,  s_curFwdRxCmdHdr.cmd, PA_RX_CMD_CMDSET

         qbeq l_curPktForward8,  s_curFwdRxCmdHdr.cmd, PA_RX_CMD_CMDSET_USR_STATS

diff --git a/fw/v0/pam.bib b/fw/v0/pam.bib
index 994a93f..f1a6b60 100644
--- a/fw/v0/pam.bib
+++ b/fw/v0/pam.bib
diff --git a/fw/v0/pam.p b/fw/v0/pam.p
index 6c57586..545e52c 100644
--- a/fw/v0/pam.p
+++ b/fw/v0/pam.p
@@ -1117,6 +1117,23 @@ l_nextRoute_copy:
          jmp  l_nextRoute_eth_dest_copy_send

        

 l_nextRoute_eth_dest_copy_host:

+l_nextRoute_eth_dest_copy_host_queue_bounce:

+        // Check for Queue Bounce operation

+l_nextRoute_eth_dest_copy_host_queue_bounce_ddr:

+        qbbc l_nextRoute_eth_dest_copy_host_queue_bounce_msmc, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_nextRoute_eth_dest_copy_host_queue_bounce_end

+

+l_nextRoute_eth_dest_copy_host_queue_bounce_msmc:

+        qbbc l_nextRoute_eth_dest_copy_host_queue_bounce_end, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_nextRoute_eth_dest_copy_host_queue_bounce_end:

+

          // Packet Capture activity

          mov  s_cdeCmdPkt.threadId,     PA_DEST_CDMA

          mov  s_cdeCmdPkt.destQueue,    s_paPktCapScr.destQueue

@@ -3554,6 +3571,23 @@ l_rxVerifyPktErr_1_2:
             sbco  s_pktCxt,  cCdeOutPkt,  SIZE(s_pktDescr),  b0

         

 l_rxVerifyPktErr_1_3:

+l_rxVerifyPktErr_1_3_queue_bounce:

+        // Check for Queue Bounce operation

+l_rxVerifyPktErr_1_3_queue_bounce_ddr:

+        qbbc l_rxVerifyPktErr_1_3_queue_bounce_msmc, s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_ddr

+            clr s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_rxCmdVerifyPktErr.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_rxCmdVerifyPktErr.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_rxVerifyPktErr_1_3_queue_bounce_end

+

+l_rxVerifyPktErr_1_3_queue_bounce_msmc:

+        qbbc l_rxVerifyPktErr_1_3_queue_bounce_end, s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_msmc

+            clr s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_rxCmdVerifyPktErr.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_rxCmdVerifyPktErr.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_rxVerifyPktErr_1_3_queue_bounce_end:

+

             // Send the packet on its way

             ldi  r4,  CDE_CMD_PACKET_ADVANCE | ((CDE_FLG_SET_THREADID | CDE_FLG_SET_PSINFO | CDE_FLG_SET_FLOWID | CDE_FLG_SET_DESTQUEUE) << 8) 

             mov  s_cdeCmdPkt.psInfoSize,   s_rxCmdCxt.psInfoSize

@@ -3780,6 +3814,28 @@ l_paRxPayloadSplit2:
     mov  s_cdeCmdWd.byteCount,  s_rxSplitCxt.hdrSize

     xout XID_CDECTRL,           s_cdeCmdWd,        SIZE(s_cdeCmdWd)

     

+l_paRxPayloadSplit2_queue_bounce:

+    // Move to the end of the packet

+    mov     s_cdeCmd.v0.w0, CDE_CMD_ADVANCE_TO_END

+    xout    XID_CDECTRL, s_cdeCmd, 4              // Send the command

+

+    // Check for Queue Bounce operation

+    wbs s_flags.info.tStatus_CDEOutPacket

+l_paRxPayloadSplit2_queue_bounce_ddr:

+    qbbc l_paRxPayloadSplit2_queue_bounce_msmc, s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_ddr

+        clr s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_ddr

+        sbco s_rxSplitCxt.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_rxSplitCxt.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+        jmp  l_paRxPayloadSplit2_queue_bounce_end

+

+l_paRxPayloadSplit2_queue_bounce_msmc:

+    qbbc l_paRxPayloadSplit2_queue_bounce_end, s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_msmc

+        clr s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_msmc

+        sbco s_rxSplitCxt.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_rxSplitCxt.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+        // pass through

+l_paRxPayloadSplit2_queue_bounce_end:

+

     // Forward the packet out

     zero &s_cdeCmdPkt,            SIZE(s_cdeCmdPkt)

     mov  s_cdeCmdPkt.optionsFlag, CDE_FLG_SET_THREADID | CDE_FLG_SET_FLOWID | CDE_FLG_SET_PSINFO | CDE_FLG_SET_DESTQUEUE

diff --git a/fw/v0/pam_bin.c b/fw/v0/pam_bin.c
index ec88ddf..2d09bc8 100644
--- a/fw/v0/pam_bin.c
+++ b/fw/v0/pam_bin.c
@@ -74,7 +74,7 @@
 const uint32_t m[] =  {
      0x21000300,
      0xbabe0003,
-     0x03000200,
+     0x03000201,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -84,7 +84,7 @@ const uint32_t m[] =  {
      0x9100171d,
      0x11017d7d,
      0x2400005d,
-     0x24020082,
+     0x24020182,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -117,7 +117,7 @@ const uint32_t m[] =  {
      0x01042f2f,
      0x111f2f2f,
      0x808e004f,
-     0x2304e89e,
+     0x2305069e,
      0x104e4e5d,
      0x91001acf,
      0x502f0f07,
@@ -126,7 +126,7 @@ const uint32_t m[] =  {
      0x01042f2f,
      0x111f2f2f,
      0x81001a4f,
-     0x2304e89e,
+     0x2305069e,
      0xcf04ffdb,
      0x91002481,
      0x0101e1e1,
@@ -166,12 +166,12 @@ const uint32_t m[] =  {
      0x51010125,
      0x51050102,
      0x21005f00,
-     0x21037900,
+     0x21038200,
      0x51040102,
      0x21006200,
-     0x21037800,
+     0x21038100,
      0x51060144,
-     0x510701ef,
+     0x510701f8,
      0x2eff8384,
      0x24002104,
      0x2f000384,
@@ -299,9 +299,9 @@ const uint32_t m[] =  {
      0x69074204,
      0x11701542,
      0x51004202,
-     0x2302ac9e,
-     0xd1023588,
-     0x2303079e,
+     0x2302b59e,
+     0xd1023591,
+     0x2303109e,
      0xc9013509,
      0x593c9408,
      0x24001084,
@@ -311,15 +311,15 @@ const uint32_t m[] =  {
      0x2f000184,
      0x01013d3d,
      0x24003c94,
-     0xd1077d1b,
-     0xd102351b,
-     0xc904351a,
-     0xc9017d19,
+     0xd1077d24,
+     0xd1023524,
+     0xc9043523,
+     0xc9017d22,
      0x11701501,
      0x0b010181,
      0x01008181,
      0x90817e8e,
-     0xc9006e14,
+     0xc9006e1d,
      0x1f077d7d,
      0x2eff8384,
      0xd1016e07,
@@ -328,7 +328,16 @@ const uint32_t m[] =  {
      0x124e0202,
      0x81090762,
      0x24000744,
-     0x21010500,
+     0x21010e00,
+     0xc90e8e05,
+     0x1d0e8e8e,
+     0x811e07ce,
+     0x91c013ce,
+     0x21010a00,
+     0xc90f8e04,
+     0x1d0f8e8e,
+     0x811e07ce,
+     0x91c213ce,
      0x24000644,
      0x108e8ec5,
      0x104e4e05,
@@ -343,14 +352,14 @@ const uint32_t m[] =  {
      0x10d4d4d0,
      0x10949490,
      0xc9007d03,
-     0x2304e89e,
-     0x21011a00,
+     0x2305069e,
+     0x21012300,
      0x91001acf,
      0x01040f00,
      0x111f0000,
      0x68002f03,
      0x1f15fcfc,
-     0x21011a00,
+     0x21012300,
      0x01100fc0,
      0x80c03a90,
      0x81011a60,
@@ -363,14 +372,14 @@ const uint32_t m[] =  {
      0x1f0ec0c0,
      0x80801c80,
      0xd1007d03,
-     0x2304e89e,
-     0x21012e00,
+     0x2305069e,
+     0x21013700,
      0x91001acf,
      0x01040f00,
      0x111f0000,
      0x68002f03,
      0x1f15fcfc,
-     0x21012e00,
+     0x21013700,
      0x01100fc0,
      0x80c03a90,
      0x81011a60,
@@ -412,15 +421,15 @@ const uint32_t m[] =  {
      0x21001200,
      0x24000104,
      0x240004c4,
-     0x66c40314,
+     0x66c4030b,
      0x04c40303,
      0x2f000184,
      0x00c41d1d,
      0x111f7601,
-     0x550001fd,
+     0x550001f4,
      0x5103010c,
      0x6902010c,
-     0x5d0275fa,
+     0x5d0275f1,
      0x24000276,
      0xc90f9603,
      0x24000476,
@@ -430,7 +439,7 @@ const uint32_t m[] =  {
      0x80c33996,
      0x01017575,
      0x21005600,
-     0x21035e00,
+     0x21036700,
      0xd1063506,
      0x1f023535,
      0x1f013535,
@@ -451,7 +460,7 @@ const uint32_t m[] =  {
      0x11f06600,
      0x51400003,
      0x51600095,
-     0x2101e300,
+     0x2101ec00,
      0x108686cf,
      0x110f660e,
      0x09020e0e,
@@ -466,7 +475,7 @@ const uint32_t m[] =  {
      0x040ecfe1,
      0x48e0e103,
      0x0490e1d0,
-     0x21018c00,
+     0x21019500,
      0x1f0d8787,
      0x000ed086,
      0x24000088,
@@ -481,7 +490,7 @@ const uint32_t m[] =  {
      0x104242c4,
      0x51022403,
      0x008682e5,
-     0x21019b00,
+     0x2101a400,
      0x008682c5,
      0x2f000384,
      0x51017508,
@@ -489,7 +498,7 @@ const uint32_t m[] =  {
      0x104343c4,
      0x51022403,
      0x008683e5,
-     0x2101a300,
+     0x2101ac00,
      0x008683c5,
      0x2f000384,
      0x2eff8384,
@@ -553,7 +562,7 @@ const uint32_t m[] =  {
      0x102e2ec4,
      0x2f000184,
      0x2e808986,
-     0x21018400,
+     0x21018d00,
      0x2100e600,
      0x51007511,
      0x24004304,
@@ -561,7 +570,7 @@ const uint32_t m[] =  {
      0x104242c4,
      0x51022403,
      0x00cf82e5,
-     0x2101eb00,
+     0x2101f400,
      0x00cf82c5,
      0x2f000384,
      0x51017508,
@@ -569,12 +578,12 @@ const uint32_t m[] =  {
      0x104343c4,
      0x51022403,
      0x00cf83e5,
-     0x2101f300,
+     0x2101fc00,
      0x00cf83c5,
      0x2f000384,
      0x102e2e82,
      0x2400e69e,
-     0x21033a00,
+     0x21034300,
      0x24000081,
      0x6f0155b9,
      0x24704480,
@@ -598,7 +607,7 @@ const uint32_t m[] =  {
      0x240000c4,
      0x10e0e0e5,
      0x2f000384,
-     0x2101b100,
+     0x2101ba00,
      0x11f84e4e,
      0x0128c7cf,
      0x2400280e,
@@ -610,7 +619,7 @@ const uint32_t m[] =  {
      0x51007104,
      0x512b7103,
      0x513c7102,
-     0x21022300,
+     0x21022c00,
      0x2f000184,
      0x2e808086,
      0x593f4606,
@@ -618,7 +627,7 @@ const uint32_t m[] =  {
      0x010146c4,
      0x0903c4c4,
      0x00c40e0e,
-     0x21021600,
+     0x21021f00,
      0x01080ee0,
      0x04e0ced0,
      0x70e0ce84,
@@ -635,7 +644,7 @@ const uint32_t m[] =  {
      0x01042ec4,
      0x0528cec5,
      0x2f000384,
-     0x21023800,
+     0x21024100,
      0x24002c27,
      0x0528cec7,
      0x2f008386,
@@ -651,7 +660,7 @@ const uint32_t m[] =  {
      0x104242c4,
      0x51022403,
      0x008182e5,
-     0x21024500,
+     0x21024e00,
      0x008182c5,
      0x2f000384,
      0x51017508,
@@ -659,7 +668,7 @@ const uint32_t m[] =  {
      0x104343c4,
      0x51022403,
      0x008183e5,
-     0x21024d00,
+     0x21025600,
      0x008183c5,
      0x2f000384,
      0x24003304,
@@ -726,7 +735,7 @@ const uint32_t m[] =  {
      0x2f008386,
      0x100e0ec4,
      0x2f000184,
-     0x21023800,
+     0x21024100,
      0x2100e600,
      0x24000081,
      0x6f0155cd,
@@ -752,10 +761,10 @@ const uint32_t m[] =  {
      0x240000c4,
      0x10e0e0e5,
      0x2f000384,
-     0x21025e00,
+     0x21026700,
      0x2f000184,
      0x000e2e2e,
-     0x2101e300,
+     0x2101ec00,
      0x24000c04,
      0x2f000384,
      0x2eff8192,
@@ -793,23 +802,23 @@ const uint32_t m[] =  {
      0x240002c4,
      0x2f000384,
      0x00c48282,
-     0x2102bd00,
+     0x2102c600,
      0x688ec605,
      0x240002c4,
      0x2f000384,
      0x00c48282,
-     0x2102bd00,
+     0x2102c600,
      0x68cfc605,
      0x2e808186,
      0x0b024612,
      0x1f017272,
-     0x2102f800,
+     0x21030100,
      0x688fc606,
      0x2e808186,
      0x0b04c612,
      0x0b021212,
      0x1f017272,
-     0x2102f800,
+     0x21030100,
      0x68d0c60a,
      0x2e808386,
      0x240004c4,
@@ -819,7 +828,7 @@ const uint32_t m[] =  {
      0x0b046703,
      0x570403ef,
      0x570603f3,
-     0x2102f800,
+     0x21030100,
      0x5690c6f7,
      0x68d1c60a,
      0x2e808386,
@@ -830,12 +839,12 @@ const uint32_t m[] =  {
      0x56c287e5,
      0x240057c2,
      0x56c287e8,
-     0x2102f800,
+     0x21030100,
      0x5691c6f7,
      0xc9006905,
      0xc9007203,
      0x10323252,
-     0x21030000,
+     0x21030900,
      0xd1016904,
      0xc9017203,
      0x10121252,
@@ -932,7 +941,7 @@ const uint32_t m[] =  {
      0x01010303,
      0x01202323,
      0x0120e0e0,
-     0x21034100,
+     0x21034a00,
      0x209e0000,
      0x24000d04,
      0x2f000184,
@@ -960,15 +969,15 @@ const uint32_t m[] =  {
      0x2f000184,
      0x1f1ffcfc,
      0x21001200,
-     0x21050500,
+     0x21052300,
      0x2400129e,
      0xc9075602,
-     0x21070a00,
+     0x21073300,
      0xd1055603,
      0xd1065604,
      0x21006400,
-     0xd3007d4b,
-     0x2104b200,
+     0xd3007d54,
+     0x2104c400,
      0x24000104,
      0x240018c4,
      0x2f000184,
@@ -987,7 +996,7 @@ const uint32_t m[] =  {
      0x01048c8c,
      0x68006c03,
      0x490a4c02,
-     0x21039500,
+     0x21039e00,
      0x21006400,
      0x51004c0e,
      0x908c2186,
@@ -1004,7 +1013,7 @@ const uint32_t m[] =  {
      0x51136665,
      0x21006400,
      0x24000067,
-     0x2103a600,
+     0x2103af00,
      0x908c2187,
      0xc9065403,
      0x0496d7d7,
@@ -1042,7 +1051,7 @@ const uint32_t m[] =  {
      0x24000d04,
      0x2f000384,
      0x09034737,
-     0x21070a00,
+     0x21073300,
      0xc9026705,
      0x91090762,
      0x110f0202,
@@ -1064,7 +1073,7 @@ const uint32_t m[] =  {
      0xc9046704,
      0x4e9688b7,
      0x04889688,
-     0x2103e200,
+     0x2103eb00,
      0x00968888,
      0x014088c0,
      0xd106ff00,
@@ -1079,7 +1088,7 @@ const uint32_t m[] =  {
      0x69006104,
      0x0b032e2e,
      0x24000641,
-     0x2103f200,
+     0x2103fb00,
      0x0b030e2e,
      0x24000441,
      0x09012e4e,
@@ -1101,7 +1110,7 @@ const uint32_t m[] =  {
      0x24006004,
      0x044181c4,
      0x2f000384,
-     0x21039500,
+     0x21039e00,
      0x908c6187,
      0x01088c8c,
      0x05014c4c,
@@ -1113,7 +1122,7 @@ const uint32_t m[] =  {
      0x69002704,
      0x0b032e2e,
      0x24000641,
-     0x21041400,
+     0x21041d00,
      0x0b030e2e,
      0x24000441,
      0x09012e4e,
@@ -1128,13 +1137,13 @@ const uint32_t m[] =  {
      0x24000874,
      0x10888895,
      0x10484855,
-     0x21039500,
+     0x21039e00,
      0x908c2187,
      0x01048c8c,
      0x05014c4c,
      0xd1006703,
      0x00964747,
-     0x21042800,
+     0x21043100,
      0x0407d747,
      0x014047c0,
      0xd106ff00,
@@ -1152,7 +1161,7 @@ const uint32_t m[] =  {
      0x01202720,
      0xc907ff00,
      0x8e20c70e,
-     0x21039500,
+     0x21039e00,
      0x05044600,
      0x9e8cc107,
      0x01048cc0,
@@ -1166,7 +1175,7 @@ const uint32_t m[] =  {
      0x107878c4,
      0x2f000384,
      0x107878cd,
-     0x21045f00,
+     0x21046800,
      0x00964747,
      0x4e47cd4d,
      0x24000004,
@@ -1181,16 +1190,16 @@ const uint32_t m[] =  {
      0x04cd7500,
      0x70270003,
      0x04277575,
-     0x21045700,
+     0x21046000,
      0x04007575,
      0x0027cdcd,
      0x04270d0d,
-     0x21039500,
+     0x21039e00,
      0xd1006705,
      0x10272700,
      0x9ec0c10e,
      0x2f00be0e,
-     0x21039500,
+     0x21039e00,
      0x240004c5,
      0x24200085,
      0x24003704,
@@ -1215,11 +1224,11 @@ const uint32_t m[] =  {
      0x00279696,
      0x04789696,
      0x10272778,
-     0x21039500,
+     0x21039e00,
      0x60cd7502,
      0x00277575,
      0x00270d0d,
-     0x21039500,
+     0x21039e00,
      0x05014c4c,
      0x6f00cd18,
      0x109696cd,
@@ -1227,7 +1236,7 @@ const uint32_t m[] =  {
      0x24000104,
      0x109696c4,
      0x2f000384,
-     0x21039500,
+     0x21039e00,
      0x05014c4c,
      0x4ed7cd10,
      0x24000004,
@@ -1237,21 +1246,21 @@ const uint32_t m[] =  {
      0x24000104,
      0x04d789c4,
      0x2f000384,
-     0x21039500,
+     0x21039e00,
      0x05014c4c,
      0x108686d0,
      0x10d7d790,
-     0x2304e89e,
-     0x21039500,
+     0x2305069e,
+     0x21039e00,
      0x09032637,
-     0x21070a00,
+     0x21073300,
      0x908ca187,
      0x010c8c8c,
      0x05014c4c,
      0x91090660,
      0x10670000,
      0x550000fb,
-     0x69004714,
+     0x6900471d,
      0xc907ff00,
      0x81182789,
      0xc9065403,
@@ -1264,6 +1273,15 @@ const uint32_t m[] =  {
      0x0081d7d7,
      0x05047400,
      0x8f20c716,
+     0xc90ec805,
+     0x1d0ec8c8,
+     0x811e0788,
+     0x91c01388,
+     0x2104ba00,
+     0xc90fc804,
+     0x1d0fc8c8,
+     0x811e0788,
+     0x91c21388,
      0x24f020e4,
      0x102d2d64,
      0x24000644,
@@ -1320,6 +1338,18 @@ const uint32_t m[] =  {
      0x24000104,
      0x106b6bc4,
      0x2f000384,
+     0x24001084,
+     0x2f000184,
+     0xc907ff00,
+     0xc90e8b05,
+     0x1d0e8b8b,
+     0x811e07cb,
+     0x91c013cb,
+     0x2104fe00,
+     0xc90f8b04,
+     0x1d0f8b8b,
+     0x811e07cb,
+     0x91c213cb,
      0x2eff8384,
      0x2400f024,
      0x24002004,
@@ -1338,24 +1368,24 @@ const uint32_t m[] =  {
      0x90c77d88,
      0xd10ec603,
      0x0101e9e9,
-     0x2104f400,
+     0x21051200,
      0x0090e9e9,
      0x0300e8e8,
      0x80c77d88,
-     0x21050000,
+     0x21051e00,
      0x048ad081,
      0x090281c7,
      0x0087c7c7,
      0x90c73d88,
      0xd10ec603,
      0x0101e8e8,
-     0x2104ff00,
+     0x21051d00,
      0x0090e8e8,
      0x80c73d88,
      0xd10fc604,
      0x10c6c6d0,
      0x110f7070,
-     0x2104ea00,
+     0x21050800,
      0x209e0000,
      0x240000da,
      0x10898980,
@@ -1367,24 +1397,24 @@ const uint32_t m[] =  {
      0x51ce4704,
      0x240001e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2400005a,
      0x5103670d,
      0x5104670d,
-     0x510667fd,
-     0x510c6784,
-     0x530a67d7,
-     0x5308675f,
-     0x530b6792,
-     0x530967b1,
-     0x5105671f,
-     0x53076752,
+     0x53066708,
+     0x510c678f,
+     0x530a67e2,
+     0x5308676a,
+     0x530b679d,
+     0x530967bc,
+     0x51056728,
+     0x5307675d,
      0x240002e6,
      0x2f008186,
-     0x21052000,
-     0x21072c00,
-     0x21073100,
-     0x69062915,
+     0x21053e00,
+     0x21075e00,
+     0x21076300,
+     0x6906291e,
      0x91082481,
      0x0101e1e1,
      0x81082481,
@@ -1394,6 +1424,15 @@ const uint32_t m[] =  {
      0x24000424,
      0x10e6e6e5,
      0x2f000384,
+     0xc90ec905,
+     0x1d0ec9c9,
+     0x811e0789,
+     0x91c01389,
+     0x21055100,
+     0xc90fc904,
+     0x1d0fc9c9,
+     0x811e0789,
+     0x91c21389,
      0x24000064,
      0x10292944,
      0x10c9c9c5,
@@ -1402,23 +1441,23 @@ const uint32_t m[] =  {
      0x2400f024,
      0x91001761,
      0x59030002,
-     0x2307349e,
+     0x2307669e,
      0x2f000384,
      0x21001200,
      0x240021e4,
      0x2f000184,
      0x21001200,
-     0x59388004,
+     0x593c8004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x240000e6,
      0x2f008186,
      0x2e80878a,
      0x24000004,
      0x240020c4,
      0x2f000384,
-     0x2e808b8e,
+     0x2e808d8e,
      0xc9006a02,
      0x81a0338b,
      0xc9016a05,
@@ -1503,7 +1542,9 @@ const uint32_t m[] =  {
      0xe10c2281,
      0x240050e2,
      0xe10c2281,
-     0x21052000,
+     0xc9076a02,
+     0x81c03394,
+     0x21053e00,
      0x240000e6,
      0x2f008186,
      0x2e80838a,
@@ -1513,22 +1554,22 @@ const uint32_t m[] =  {
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x240018c4,
      0x2f000384,
-     0x21060600,
+     0x21062f00,
      0x240014c4,
      0x2f000384,
      0x69016a17,
      0x593c8004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e80838e,
      0x71046e04,
      0x240011e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1541,27 +1582,27 @@ const uint32_t m[] =  {
      0x8281f38e,
      0x240020c4,
      0x2f000384,
-     0x21052000,
+     0x21053e00,
      0x69026a0e,
      0x59248004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e80878e,
      0x71106e04,
      0x240012e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x09046e81,
      0x01008181,
      0x8081fa8e,
-     0x21052000,
+     0x21053e00,
      0x69086a1b,
      0x24004cc0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1581,14 +1622,14 @@ const uint32_t m[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2105d400,
-     0x21052000,
+     0x2105fd00,
+     0x21053e00,
      0x69096a1c,
      0x2400b0c0,
      0x58c08004,
      0x240010e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x2e808d8e,
      0x240200c2,
      0x51006e13,
@@ -1604,16 +1645,16 @@ const uint32_t m[] =  {
      0x8082fe91,
      0x01108282,
      0x05014e4e,
-     0x2105f500,
+     0x21061e00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2105ef00,
-     0x21052000,
+     0x21061800,
+     0x21053e00,
      0x240002e6,
      0x1f007a7a,
-     0x21052000,
+     0x21053e00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1623,7 +1664,7 @@ const uint32_t m[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
@@ -1650,14 +1691,14 @@ const uint32_t m[] =  {
      0x10e2e2e5,
      0x2f000384,
      0x9083e286,
-     0x21052000,
+     0x21053e00,
      0xc9016a06,
      0x240037e4,
      0x240008c4,
      0x240004c5,
      0x24080085,
      0x2f000384,
-     0xcd006aef,
+     0xcd006ae4,
      0x69008a0c,
      0x240f0083,
      0x8083e286,
@@ -1669,7 +1710,7 @@ const uint32_t m[] =  {
      0x0140e2e2,
      0x6ee1e2fe,
      0x9083e286,
-     0x21052000,
+     0x21053e00,
      0x91b0338b,
      0x608acb2c,
      0x24000004,
@@ -1679,7 +1720,7 @@ const uint32_t m[] =  {
      0x51008b04,
      0x24000800,
      0x09038bd0,
-     0x21064900,
+     0x21067200,
      0x24000400,
      0x2e80818e,
      0x2f000184,
@@ -1697,12 +1738,12 @@ const uint32_t m[] =  {
      0x0b018181,
      0x0081d08f,
      0x24000400,
-     0x21064900,
+     0x21067200,
      0x1081818f,
-     0x21064900,
+     0x21067200,
      0x090220c0,
      0x00c08f8f,
-     0x21064900,
+     0x21067200,
      0xc830ee04,
      0x8e8fdd12,
      0x1c30eeee,
@@ -1714,8 +1755,8 @@ const uint32_t m[] =  {
      0x00008f8f,
      0x6ed08fe4,
      0x24000400,
-     0x21064c00,
-     0x21052000,
+     0x21067500,
+     0x21053e00,
      0x24000004,
      0x240010c4,
      0x2f000384,
@@ -1724,17 +1765,17 @@ const uint32_t m[] =  {
      0x2f000384,
      0x9100b78e,
      0x2f00858e,
-     0x21052000,
+     0x21053e00,
      0x240054c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x71206a04,
      0x24000ee6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2eff8f8e,
      0x09066ac2,
      0x69004a14,
@@ -1756,12 +1797,12 @@ const uint32_t m[] =  {
      0x09036060,
      0x2e80bf8e,
      0x82c2f68e,
-     0x21052000,
+     0x21053e00,
      0x69014a05,
      0x82c2f68e,
      0x0120c2c2,
      0x82c2f68e,
-     0x21052000,
+     0x21053e00,
      0x69024a0c,
      0x24000004,
      0x240014c4,
@@ -1773,21 +1814,21 @@ const uint32_t m[] =  {
      0x24660085,
      0x00c2e5e5,
      0x2f000384,
-     0x21052000,
+     0x21053e00,
      0x24000fe6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x240014c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x91b0338b,
      0x70cb8a04,
      0x240014e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0xc9006a08,
      0x24040082,
      0x240800c2,
@@ -1801,19 +1842,19 @@ const uint32_t m[] =  {
      0x2f000384,
      0x240004c4,
      0x24040082,
-     0x55008a5f,
+     0x55008a54,
      0x2e80818e,
      0x0901cec2,
      0x0082c2c2,
      0x80c200ce,
      0x05018a8a,
      0x2f000384,
-     0x2106c100,
+     0x2106ea00,
      0x240058c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80838a,
      0x106a6a24,
      0x10ebebe5,
@@ -1843,18 +1884,18 @@ const uint32_t m[] =  {
      0x01040101,
      0x01012424,
      0x671024fc,
-     0x21052000,
+     0x21053e00,
      0x240090c0,
      0x58c08004,
      0x240010e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x2e80818a,
      0x91ac338b,
      0x606b6a04,
      0x240013e6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x09066a81,
      0x69804b02,
      0x09018181,
@@ -1873,7 +1914,7 @@ const uint32_t m[] =  {
      0x4f2040fb,
      0x2e80bf0e,
      0x8e81e10e,
-     0x21052000,
+     0x21053e00,
      0x0b033700,
      0x11073737,
      0x111f7676,
@@ -1894,6 +1935,15 @@ const uint32_t m[] =  {
      0xc9016e03,
      0xd106ff00,
      0x8118278f,
+     0xc90e8e05,
+     0x1d0e8e8e,
+     0x811e07ce,
+     0x91c013ce,
+     0x21075000,
+     0xc90f8e04,
+     0x1d0f8e8e,
+     0x811e07ce,
+     0x91c213ce,
      0x2eff8384,
      0x2400f024,
      0x24002204,
@@ -1906,16 +1956,16 @@ const uint32_t m[] =  {
      0xc904ff00,
      0x24000804,
      0x2f000384,
-     0x570800e9,
-     0x21071100,
+     0x570800e0,
+     0x21073a00,
      0x2e80838a,
      0xc9022a04,
      0x240000e1,
      0xe1342181,
-     0x21052000,
+     0x21053e00,
      0x24000ce6,
      0x2f008186,
-     0x21052000,
+     0x21053e00,
      0x209e0000 };
 
 const int mSize = sizeof(m);
diff --git a/fw/v0/parse1.p b/fw/v0/parse1.p
index 73007be..fac0bba 100644
--- a/fw/v0/parse1.p
+++ b/fw/v0/parse1.p
@@ -968,6 +968,23 @@ l_c1IpReassm_pass1_4:
   mov   s_pktCxt4.fragCnt,  1

   set   s_pktCxt.flag.t_flag_2nd_pass  

   wbs   s_flags.info.tStatus_CDEOutPacket

+

+l_c1IpReassm_pass1_4_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1IpReassm_pass1_4_queue_bounce_ddr:

+        qbbc l_c1IpReassm_pass1_4_queue_bounce_msmc, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+            clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1IpReassm_pass1_4_queue_bounce_end

+

+l_c1IpReassm_pass1_4_queue_bounce_msmc:

+        qbbc l_c1IpReassm_pass1_4_queue_bounce_end, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+            clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_c1IpReassm_pass1_4_queue_bounce_end:

   sbco  s_ipReassmCxt.queue,  cCdeOutPkt,  OFFSET(s_pktDescr.destQ),    SIZE(s_pktDescr.destQ)

   sbco  s_ipReassmCxt.flowId, cCdeOutPkt,  OFFSET(s_pktDescr.flowIdx),  SIZE(s_pktDescr.flowIdx)

   mov   s_param.action,     SUBS_ACTION_FWPKT

@@ -1455,6 +1472,24 @@ l_c1Ipv6ExtReasm_pass1_5:
     mov   s_pktCxt4.fragCnt,  1

     set   s_pktCxt.flag.t_flag_2nd_pass  

     wbs   s_flags.info.tStatus_CDEOutPacket

+

+l_c1Ipv6ExtReasm_pass1_5_queue_bounce:

+    // Check for Queue Bounce operation

+l_c1Ipv6ExtReasm_pass1_5_queue_bounce_ddr:

+    qbbc l_c1Ipv6ExtReasm_pass1_5_queue_bounce_msmc, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+        clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+        sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+        jmp  l_c1Ipv6ExtReasm_pass1_5_queue_bounce_end

+

+l_c1Ipv6ExtReasm_pass1_5_queue_bounce_msmc:

+    qbbc l_c1Ipv6ExtReasm_pass1_5_queue_bounce_end, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+        clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+        sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+         // pass through

+l_c1Ipv6ExtReasm_pass1_5_queue_bounce_end:

+

     sbco  s_ipReassmCxt.queue,  cCdeOutPkt,  OFFSET(s_pktDescr.destQ),    SIZE(s_pktDescr.destQ)

     sbco  s_ipReassmCxt.flowId, cCdeOutPkt,  OFFSET(s_pktDescr.flowIdx),  SIZE(s_pktDescr.flowIdx)

     mov   s_param.action,     SUBS_ACTION_FWPKT

diff --git a/fw/v0/parsescope.h b/fw/v0/parsescope.h
index 09b4f46..6679d8a 100644
--- a/fw/v0/parsescope.h
+++ b/fw/v0/parsescope.h
@@ -311,6 +311,7 @@
         .assign struct_paQueueDivertCfg,        r16,    r16,    s_paComQueueDivert           // Must follow psComUsrStats

         .assign struct_paPktCtrlCfg,            r17,    r19,    s_paComPktCtrl               // Must follow paQueueDivert 

         .assign struct_paMacPaddingCfg,         r18,    r18,    s_paComMacPadding            // Must align with s_paComPktCtrl 

+        .assign struct_paQueueDivertCfg,        r20,    r20,    s_paComQueueBounce           // Must follow paComPktCtrl

         .assign struct_paSystemConfig,          r10,    r10,    s_paCmdSysCfg                // Must follow paCmd1

         .assign struct_paComEroute,             r11,    r11,    s_paComEroute                // Must follow paCmdSysCfg

         .assign struct_paFwdPlace,              r14,    r17,    s_paComErouteFwd

diff --git a/fw/v0/pdsp_mem.h b/fw/v0/pdsp_mem.h
index b579c88..43766a2 100644
--- a/fw/v0/pdsp_mem.h
+++ b/fw/v0/pdsp_mem.h
@@ -162,6 +162,7 @@
 //                  |  Queue Diversion Config   4 bytes        |                                  OFFSET_QUEUE_DIVERT_CFG

 //                  |  IPSEC NAT-T Config       4 bytes        |                                  OFFSET_IPSEC_NAT_T_CFG

 //                  |  MAC Padding Config       4 bytes        |                                  OFFSET_MAC_PADDING_CFG

+//                  |  Queue Bounce Config      4 bytes        |                                  OFFSET_QUEUE_BOUNCE_CFG

 //                  |                                          |

 //     0x4:6200     |  Configurable Exception Routing          |      c20 - all pdsps  EROUTE     

 //                  |     32 entries of size 16 bytes          |

@@ -312,6 +313,8 @@
 #define OFFSET_QUEUE_DIVERT_CFG         OFFSET_USR_STATS_CFG + 4

 #define OFFSET_IPSEC_NAT_T_CFG          OFFSET_QUEUE_DIVERT_CFG + 4

 #define OFFSET_MAC_PADDING_CFG          OFFSET_IPSEC_NAT_T_CFG + 4

+#define OFFSET_QUEUE_BOUNCE_CFG         OFFSET_MAC_PADDING_CFG + 4

+

 

 // Custom Configuration

 #define PAMEM_CONST_CUSTOM2             c26

diff --git a/fw/v0/pdsp_pa.h b/fw/v0/pdsp_pa.h
index 5cfb932..7cb2e2f 100644
--- a/fw/v0/pdsp_pa.h
+++ b/fw/v0/pdsp_pa.h
@@ -193,6 +193,10 @@
 #define PA_FORWARD_TYPE_ETH      3

 #define PA_FORWARD_TYPE_SRIO     4

 #define PA_FORWARD_TYPE_DISCARD  5

+
+#define PA_FOWARD_QUEUE_MASK     0x3FFF
+#define t_pa_forward_queue_bounce_ddr       t14
+#define t_pa_forward_queue_bounce_msmc      t15
 

 // Placeholder structure for PA forward

 .struct struct_paFwdPlace

@@ -950,6 +954,11 @@
     .u16 rxPaddingErrCntIndex  // Specify the user statistics index of Rx MAC padding error counter

     .u16 txPaddingCntIndex     // Specify the user statistics index of Tx MAC padding counter

 .ends

+
+.struct struct_paQueueBounceCfg

+    .u16 ddrQueue      //   Bounce queue where PASS will deliver the host-routed packet with DDR bit set

+    .u16 msmcQueue     //   Bounce queue where PASS will deliver the host-routed packet with MSMC bit set

+.ends

 

 #define t_pa_pkt_verify_proto_pppoe         t0

 #define t_pa_pkt_verify_proto_ip            t1

@@ -984,7 +993,7 @@
     //  Configure User-defined Statistics

     //  Configure Queue Diversion

     //  Configure Packet Verification 

-    //  Configure events

+    //  Configure Queue Bounce

 .ends

 

 #define t_paCmdConfigValidMaxCount      t0

@@ -994,7 +1003,8 @@
 #define t_paCmdConfigValidUsrStats      t4

 #define t_paCmdConfigValidQueueDivert   t5

 #define t_paCmdConfigValidPktCtrl       t6

-#define t_paCmdConfigValidEvents        t7

+#define t_paCmdConfigValidQueueBounce   t7

+

 

 // Command sizes. The assembler can't do all the SIZE(x)+SIZE(y)+... because of line size limitations

 // Command size in 32 bit words is:  struct_paCommand:         4

@@ -1006,10 +1016,11 @@
 //                                   struct_paUsrStatsCfg:     1

 //                                   struct_paQueueDivertCfg:  1

 //                                   struct_paPktCtrlCfg:      3

+//                                   struct_paQueueBounceCfg:  1

 //

 // 

-//                                               Total:       14   words = 56 bytes

-#define PA_CONFIG_COMMAND_SIZE_CONFIG_PA              56  

+//                                               Total:       15   words = 60 bytes

+#define PA_CONFIG_COMMAND_SIZE_CONFIG_PA              60

 #define PA_CONFIG_COMMAND_SIZE_THROUGH_IN_IP_REASM    32  // Byte up to and including struct_paIpReassmCfg for inner IP

 

 

diff --git a/fw/v0/pdsp_ver.h b/fw/v0/pdsp_ver.h
index ad7c056..cf02075 100644
--- a/fw/v0/pdsp_ver.h
+++ b/fw/v0/pdsp_ver.h
@@ -62,9 +62,9 @@
 #ifndef _PDSP_VER_GEN1_H

 #define _PDSP_VER_GEN1_H  1

 

-#define PASS_VERSION_STR  "03.00.02.00"

+#define PASS_VERSION_STR  "03.00.02.01"

 

 // Common PDSP version number

-#define PASS_VERSION      0x03000200

+#define PASS_VERSION      0x03000201

 

 #endif 

diff --git a/fw/v1/classify1.p b/fw/v1/classify1.p
index 621c003..0195435 100644
--- a/fw/v1/classify1.p
+++ b/fw/v1/classify1.p
@@ -472,7 +472,7 @@ l_mainLoop5:
             call f_c1FirewallRescore
 l_mainLoop5_0:        
         #endif
-        qbbs f_c1Parse,  s_flags.info.tStatus_CDENewPacket
+        qbbs l_mainLoop9,  s_flags.info.tStatus_CDENewPacket
             // jmp fci_mainLoop7
 
         // if (  (pendingConfig == TRUE) && (Lut1Busy == FALSE) ) then complete modify
@@ -489,8 +489,9 @@ l_mainLoop8:
     // Relative jump was out of range
     jmp f_paComLut1CompleteModify      // no return
 
-
-    //jmp f_mainLoop
+l_mainLoop9:

+    // Relative jump was out of range
+    jmp f_c1Parse
    
    .leave  lut1Scope
    .leave  pktScope
@@ -850,8 +851,25 @@ l_c1ForwardHeldFirewallPktNoMatch_1:
         // Send the packet on its way
         // Free the packet Ext Info
         mov  s_pktExtDescr.threadId, THREADID_CDMA0
-        xout XID_PINFO_DST, s_pktExtDescr, SIZE(s_pktExtDescr)   
+        xout XID_PINFO_DST, s_pktExtDescr, SIZE(s_pktExtDescr)
             
+l_c1ForwardHeldFirewallPktNoMatch_1_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1ForwardHeldFirewallPktNoMatch_1_queue_bounce_ddr:

+        qbbc l_c1ForwardHeldFirewallPktNoMatch_1_queue_bounce_msmc, s_paAclCfg.destQueue.t_pa_forward_queue_bounce_ddr

+            clr s_paAclCfg.destQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_paAclCfg.destQueue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paAclCfg.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1ForwardHeldFirewallPktNoMatch_1_queue_bounce_end

+

+l_c1ForwardHeldFirewallPktNoMatch_1_queue_bounce_msmc:

+        qbbc l_c1ForwardHeldFirewallPktNoMatch_1_queue_bounce_end, s_paAclCfg.destQueue.t_pa_forward_queue_bounce_msmc

+            clr s_paAclCfg.destQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_paAclCfg.destQueue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paAclCfg.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_c1ForwardHeldFirewallPktNoMatch_1_queue_bounce_end:

         //   CDE workaround: do not use CDE_FLG_SET_DESTQUEUE 
         //ldi  r4,  CDE_CMD_HPKT_RELEASE | ((CDE_FLG_SET_FLOWID | CDE_FLG_SET_DESTQUEUE | CDE_FLG_SET_PSINFO) << 8)
         ldi  r4,  CDE_CMD_HPKT_RELEASE | ((CDE_FLG_SET_FLOWID | CDE_FLG_SET_PSINFO) << 8) 
@@ -927,7 +945,25 @@ l_c1ForwardFirewallPktNoMatch_2:
         // Host Routing
         // Send the packet on its way
         // Free the packet Ext Info
-        mov  s_pktExtDescr.threadId, THREADID_CDMA0
+        mov  s_pktExtDescr.threadId, THREADID_CDMA0

+

+l_c1ForwardFirewallPktNoMatch_2_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1ForwardFirewallPktNoMatch_2_queue_bounce_ddr:

+        qbbc l_c1ForwardFirewallPktNoMatch_2_queue_bounce_msmc, s_paAclCfg.destQueue.t_pa_forward_queue_bounce_ddr

+            clr s_paAclCfg.destQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_paAclCfg.destQueue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paAclCfg.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1ForwardFirewallPktNoMatch_2_queue_bounce_end

+

+l_c1ForwardFirewallPktNoMatch_2_queue_bounce_msmc:

+        qbbc l_c1ForwardFirewallPktNoMatch_2_queue_bounce_end, s_paAclCfg.destQueue.t_pa_forward_queue_bounce_msmc

+            clr s_paAclCfg.destQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_paAclCfg.destQueue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paAclCfg.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_c1ForwardFirewallPktNoMatch_2_queue_bounce_end:

             
         //   CDE workaround: do not use CDE_FLG_SET_DESTQUEUE
         //ldi  r4,  CDE_CMD_PACKET_ADVANCE | ((CDE_FLG_SET_FLOWID | CDE_FLG_SET_DESTQUEUE | CDE_FLG_SET_PSINFO) << 8) 
@@ -1337,6 +1373,24 @@ l_stdHeldPktForward1_dscp_priority:
             mov  r2.b2,  THREADID_CDMA0
             
 l_stdHeldPktForward1_no_priority:
+

+l_stdHeldPktForward1_queue_bounce:

+        // Check for Queue Bounce operation

+l_stdHeldPktForward1_queue_bounce_ddr:

+        qbbc l_stdHeldPktForward1_queue_bounce_msmc, s_matchForward.queue.t_pa_forward_queue_bounce_ddr

+            clr s_matchForward.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_matchForward.queue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_matchForward.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_stdHeldPktForward1_queue_bounce_end

+

+l_stdHeldPktForward1_queue_bounce_msmc:

+        qbbc l_stdHeldPktForward1_queue_bounce_end, s_matchForward.queue.t_pa_forward_queue_bounce_msmc

+            clr s_matchForward.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_matchForward.queue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_matchForward.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_stdHeldPktForward1_queue_bounce_end:

         // Note CRC verification is only required by the SCTP header
         // The destination must be host and there should be neither multi-route nor command set
         mov    r2.b0,   SIZE(s_pktCxt) + 8 
@@ -2061,7 +2115,25 @@ l_c1CurPktForward1_no_priority:
         qbeq   l_c1CurPktForward1_1, r1.b0, 0
             sbco   r1.b0,   cCdeOutPkt,  SIZE(s_pktDescr)+OFFSET(s_pktCxt5.l3offset2), 1
             
-l_c1CurPktForward1_1:
+l_c1CurPktForward1_1:

+l_c1CurPktForward1_1_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1CurPktForward1_1_queue_bounce_ddr:

+        qbbc l_c1CurPktForward1_1_queue_bounce_msmc, s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1CurPktForward1_1_queue_bounce_end

+

+l_c1CurPktForward1_1_queue_bounce_msmc:

+        qbbc l_c1CurPktForward1_1_queue_bounce_end, s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_c1CurPktForward1_1_queue_bounce_end:

+
         // Check whether command set is enabled, which precedes the multi-route option
         qbeq l_c1CurPktForward8,  s_curFwdRxCmdHdr.cmd, PA_RX_CMD_CMDSET
         qbeq l_c1CurPktForward8,  s_curFwdRxCmdHdr.cmd, PA_RX_CMD_CMDSET_USR_STATS
@@ -2922,6 +2994,23 @@ l_c1Parse6_copy:
       jmp  l_c1Parse6_copy_send
     
 l_c1Parse6_copy_host:
+l_c1Parse6_copy_host_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1Parse6_copy_host_queue_bounce_ddr:

+        qbbc l_c1Parse6_copy_host_queue_bounce_msmc, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1Parse6_copy_host_queue_bounce_end

+

+l_c1Parse6_copy_host_queue_bounce_msmc:

+        qbbc l_c1Parse6_copy_host_queue_bounce_end, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_c1Parse6_copy_host_queue_bounce_end:

+

       // Packet Capture activity
       mov  s_pktExtDescr.threadId,   PA_DEST_CDMA
       mov  s_cdeCmdPkt.destQueue,    s_paPktCapScr.destQueue
diff --git a/fw/v1/classify3.p b/fw/v1/classify3.p
index 7ab2c16..8452f9a 100644
--- a/fw/v1/classify3.p
+++ b/fw/v1/classify3.p
@@ -495,6 +495,23 @@ l_c1ForwardHeldFCPktNoMatch_2:
         mov  s_pktExtDescr.threadId, THREADID_CDMA0
         xout XID_PINFO_DST, s_pktExtDescr, SIZE(s_pktExtDescr)   
             
+l_c1ForwardHeldFCPktNoMatch_2_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1ForwardHeldFCPktNoMatch_2_queue_bounce_ddr:

+        qbbc l_c1ForwardHeldFCPktNoMatch_2_queue_bounce_msmc, s_matchForward.queue.t_pa_forward_queue_bounce_ddr

+            clr s_matchForward.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_matchForward.queue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_matchForward.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1ForwardHeldFCPktNoMatch_2_queue_bounce_end

+

+l_c1ForwardHeldFCPktNoMatch_2_queue_bounce_msmc:

+        qbbc l_c1ForwardHeldFCPktNoMatch_2_queue_bounce_end, s_matchForward.queue.t_pa_forward_queue_bounce_msmc

+            clr s_matchForward.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_matchForward.queue,  cCdeHeldPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_matchForward.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_c1ForwardHeldFCPktNoMatch_2_queue_bounce_end:

         // CDE workaround: Do not use CDE_FLG_SET_DESTQUEUE
         //ldi  r4,  CDE_CMD_HPKT_RELEASE | ((CDE_FLG_SET_FLOWID | CDE_FLG_SET_DESTQUEUE | CDE_FLG_SET_PSINFO) << 8) 
         ldi  r4,  CDE_CMD_HPKT_RELEASE | ((CDE_FLG_SET_FLOWID | CDE_FLG_SET_PSINFO) << 8) 
@@ -646,6 +663,23 @@ f_c1CurPktForward:
             sbco r2.b0, cCdeOutPkt, OFFSET(s_pktDescr.psFlags_errorFlags), 1
             
 l_c1CurPktForward1_0:
+l_c1CurPktForward1_0_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1CurPktForward1_0_queue_bounce_ddr:

+        qbbc l_c1CurPktForward1_0_queue_bounce_msmc, s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1CurPktForward1_0_queue_bounce_end

+

+l_c1CurPktForward1_0_queue_bounce_msmc:

+        qbbc l_c1CurPktForward1_0_queue_bounce_end, s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_c1CurPktForward1_0_queue_bounce_end:

         // Send the packet on its way
         // Free the packet Ext Info
         mov     s_pktExtDescr.threadId, THREADID_CDMA0
diff --git a/fw/v1/efp.p b/fw/v1/efp.p
index 92fbb80..8234091 100644
--- a/fw/v1/efp.p
+++ b/fw/v1/efp.p
@@ -175,6 +175,24 @@ l_efPktForward1_0:
         
 l_efPktForward1_1:        
         
+l_efPktForward1_1_queue_bounce:

+        // Check for Queue Bounce operation

+l_efPktForward1_1_queue_bounce_ddr:

+        qbbc l_efPktForward1_1_queue_bounce_msmc, s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_efPktForward1_1_queue_bounce_end

+

+l_efPktForward1_1_queue_bounce_msmc:

+        qbbc l_efPktForward1_1_queue_bounce_end, s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_efPktForward1_1_queue_bounce_end:

+

         // Send the packet on its way
         //   Free the packet Ext Info
         xout    XID_PINFO_DST, s_pktExtDescr, SIZE(s_pktExtDescr)   
diff --git a/fw/v1/eg0_pdsp0.bib b/fw/v1/eg0_pdsp0.bib
index 09c3d57..ec10364 100644
--- a/fw/v1/eg0_pdsp0.bib
+++ b/fw/v1/eg0_pdsp0.bib
diff --git a/fw/v1/eg0_pdsp1.bib b/fw/v1/eg0_pdsp1.bib
index 27d7e31..bf79ac7 100644
--- a/fw/v1/eg0_pdsp1.bib
+++ b/fw/v1/eg0_pdsp1.bib
diff --git a/fw/v1/eg0_pdsp2.bib b/fw/v1/eg0_pdsp2.bib
index 35af1c8..cba1647 100644
--- a/fw/v1/eg0_pdsp2.bib
+++ b/fw/v1/eg0_pdsp2.bib
diff --git a/fw/v1/eg1_pdsp0.bib b/fw/v1/eg1_pdsp0.bib
index 681dd31..809cf52 100644
--- a/fw/v1/eg1_pdsp0.bib
+++ b/fw/v1/eg1_pdsp0.bib
diff --git a/fw/v1/eg2_pdsp0.bib b/fw/v1/eg2_pdsp0.bib
index b4b02c7..f2d40a3 100644
--- a/fw/v1/eg2_pdsp0.bib
+++ b/fw/v1/eg2_pdsp0.bib
diff --git a/fw/v1/in0_pdsp0.bib b/fw/v1/in0_pdsp0.bib
index 78b4aea..cda847e 100644
--- a/fw/v1/in0_pdsp0.bib
+++ b/fw/v1/in0_pdsp0.bib
diff --git a/fw/v1/in0_pdsp1.bib b/fw/v1/in0_pdsp1.bib
index e7a6c7a..3b524eb 100644
--- a/fw/v1/in0_pdsp1.bib
+++ b/fw/v1/in0_pdsp1.bib
diff --git a/fw/v1/in1_pdsp0.bib b/fw/v1/in1_pdsp0.bib
index 412c0e1..bbf7d6e 100644
--- a/fw/v1/in1_pdsp0.bib
+++ b/fw/v1/in1_pdsp0.bib
diff --git a/fw/v1/in1_pdsp1.bib b/fw/v1/in1_pdsp1.bib
index ce37934..2b66b78 100644
--- a/fw/v1/in1_pdsp1.bib
+++ b/fw/v1/in1_pdsp1.bib
diff --git a/fw/v1/in2_pdsp0.bib b/fw/v1/in2_pdsp0.bib
index ef456e2..41230e6 100644
--- a/fw/v1/in2_pdsp0.bib
+++ b/fw/v1/in2_pdsp0.bib
diff --git a/fw/v1/in3_pdsp0.bib b/fw/v1/in3_pdsp0.bib
index f7354c5..455ca6c 100644
--- a/fw/v1/in3_pdsp0.bib
+++ b/fw/v1/in3_pdsp0.bib
diff --git a/fw/v1/in4_pdsp0.bib b/fw/v1/in4_pdsp0.bib
index fe5aebc..b823ac3 100644
--- a/fw/v1/in4_pdsp0.bib
+++ b/fw/v1/in4_pdsp0.bib
diff --git a/fw/v1/in4_pdsp1.bib b/fw/v1/in4_pdsp1.bib
index e512c7c..34229c3 100644
--- a/fw/v1/in4_pdsp1.bib
+++ b/fw/v1/in4_pdsp1.bib
diff --git a/fw/v1/ks2_pa_eg0_pdsp0.bin b/fw/v1/ks2_pa_eg0_pdsp0.bin
index 20388ff..4585a64 100644
--- a/fw/v1/ks2_pa_eg0_pdsp0.bin
+++ b/fw/v1/ks2_pa_eg0_pdsp0.bin
diff --git a/fw/v1/ks2_pa_eg0_pdsp1.bin b/fw/v1/ks2_pa_eg0_pdsp1.bin
index 65a610d..1f0519c 100644
--- a/fw/v1/ks2_pa_eg0_pdsp1.bin
+++ b/fw/v1/ks2_pa_eg0_pdsp1.bin
diff --git a/fw/v1/ks2_pa_eg0_pdsp2.bin b/fw/v1/ks2_pa_eg0_pdsp2.bin
index 56564a8..04b27a7 100644
--- a/fw/v1/ks2_pa_eg0_pdsp2.bin
+++ b/fw/v1/ks2_pa_eg0_pdsp2.bin
diff --git a/fw/v1/ks2_pa_eg1_pdsp0.bin b/fw/v1/ks2_pa_eg1_pdsp0.bin
index d07483e..5cf624c 100644
--- a/fw/v1/ks2_pa_eg1_pdsp0.bin
+++ b/fw/v1/ks2_pa_eg1_pdsp0.bin
diff --git a/fw/v1/ks2_pa_eg2_pdsp0.bin b/fw/v1/ks2_pa_eg2_pdsp0.bin
index 873d7f6..9079d91 100644
--- a/fw/v1/ks2_pa_eg2_pdsp0.bin
+++ b/fw/v1/ks2_pa_eg2_pdsp0.bin
diff --git a/fw/v1/ks2_pa_in0_pdsp0.bin b/fw/v1/ks2_pa_in0_pdsp0.bin
index cfd9af2..f07fab7 100644
--- a/fw/v1/ks2_pa_in0_pdsp0.bin
+++ b/fw/v1/ks2_pa_in0_pdsp0.bin
diff --git a/fw/v1/ks2_pa_in0_pdsp1.bin b/fw/v1/ks2_pa_in0_pdsp1.bin
index 9a0c831..03343b5 100644
--- a/fw/v1/ks2_pa_in0_pdsp1.bin
+++ b/fw/v1/ks2_pa_in0_pdsp1.bin
diff --git a/fw/v1/ks2_pa_in1_pdsp0.bin b/fw/v1/ks2_pa_in1_pdsp0.bin
index 7b92dac..11d7a8e 100644
--- a/fw/v1/ks2_pa_in1_pdsp0.bin
+++ b/fw/v1/ks2_pa_in1_pdsp0.bin
diff --git a/fw/v1/ks2_pa_in1_pdsp1.bin b/fw/v1/ks2_pa_in1_pdsp1.bin
index 51324ac..a3bd62d 100644
--- a/fw/v1/ks2_pa_in1_pdsp1.bin
+++ b/fw/v1/ks2_pa_in1_pdsp1.bin
diff --git a/fw/v1/ks2_pa_in2_pdsp0.bin b/fw/v1/ks2_pa_in2_pdsp0.bin
index 2bd7400..6d53f99 100644
--- a/fw/v1/ks2_pa_in2_pdsp0.bin
+++ b/fw/v1/ks2_pa_in2_pdsp0.bin
diff --git a/fw/v1/ks2_pa_in3_pdsp0.bin b/fw/v1/ks2_pa_in3_pdsp0.bin
index c2fe6d1..3eb4b5d 100644
--- a/fw/v1/ks2_pa_in3_pdsp0.bin
+++ b/fw/v1/ks2_pa_in3_pdsp0.bin
diff --git a/fw/v1/ks2_pa_in4_pdsp0.bin b/fw/v1/ks2_pa_in4_pdsp0.bin
index 581d9b6..710c602 100644
--- a/fw/v1/ks2_pa_in4_pdsp0.bin
+++ b/fw/v1/ks2_pa_in4_pdsp0.bin
diff --git a/fw/v1/ks2_pa_in4_pdsp1.bin b/fw/v1/ks2_pa_in4_pdsp1.bin
index fb112ef..147f4db 100644
--- a/fw/v1/ks2_pa_in4_pdsp1.bin
+++ b/fw/v1/ks2_pa_in4_pdsp1.bin
diff --git a/fw/v1/ks2_pa_post_pdsp0.bin b/fw/v1/ks2_pa_post_pdsp0.bin
index 7f6dd0b..7c115e4 100644
--- a/fw/v1/ks2_pa_post_pdsp0.bin
+++ b/fw/v1/ks2_pa_post_pdsp0.bin
diff --git a/fw/v1/ks2_pa_post_pdsp1.bin b/fw/v1/ks2_pa_post_pdsp1.bin
index bb8fe3b..92d1a9c 100644
--- a/fw/v1/ks2_pa_post_pdsp1.bin
+++ b/fw/v1/ks2_pa_post_pdsp1.bin
diff --git a/fw/v1/meminit.p b/fw/v1/meminit.p
index 2906088..460a5d6 100644
--- a/fw/v1/meminit.p
+++ b/fw/v1/meminit.p
@@ -124,10 +124,10 @@ commonInit_0:
   qbne  commonInit_0, r5,           r1
   
   // Initialize global configuration parameters
-  zero &s_paMaxHdrCountInit, 40
+  zero &s_paMaxHdrCountInit, 44
   
   // Initialize the total block to zero (replace individual initialization 
-  sbco s_paMaxHdrCountInit,               PAMEM_CONST_CUSTOM, OFFSET_MAX_HDR, 40
+  sbco s_paMaxHdrCountInit,               PAMEM_CONST_CUSTOM, OFFSET_MAX_HDR, 44
   
   // Initialize the max counts
   mov  s_paMaxHdrCountInit.vlanMaxCount,  2
@@ -166,7 +166,10 @@ commonInit_0:
   // Initialize the inner ACL configuration
   mov  s_paInAclInit.action,     PA_FORWARD_TYPE_PA
   sbco s_paInAclInit,            PAMEM_CONST_CUSTOM, OFFSET_IN_IP_ACL_CFG, SIZE(s_paInAclInit)
-  
+

+  // Initialize the Queue Bounce configuration

+  // No default value is required, clear to zero

+

   ret
   
 #endif
diff --git a/fw/v1/pa2_eg0_pdsp0_bin.c b/fw/v1/pa2_eg0_pdsp0_bin.c
index 31014d2..39c379e 100644
--- a/fw/v1/pa2_eg0_pdsp0_bin.c
+++ b/fw/v1/pa2_eg0_pdsp0_bin.c
@@ -74,9 +74,9 @@
 const uint32_t eg0_pdsp0[] =  {
      0x21000300,
      0xbabe0600,
-     0x03000201,
-     0x2300d89e,
-     0x24020182,
+     0x03000202,
+     0x2300ea9e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -117,11 +117,11 @@ const uint32_t eg0_pdsp0[] =  {
      0x21002b00,
      0x21002c00,
      0xd1057d02,
-     0xd104ff47,
+     0xd104ff59,
      0xcf057de2,
      0xc910ff02,
      0x21001000,
-     0x21035600,
+     0x21037300,
      0x0905c481,
      0x92812088,
      0x10c8c89f,
@@ -156,6 +156,15 @@ const uint32_t eg0_pdsp0[] =  {
      0x81090862,
      0x2400002e,
      0x2f04898e,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x21005d00,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x246023e4,
      0x24001864,
      0x811208c9,
@@ -164,17 +173,26 @@ const uint32_t eg0_pdsp0[] =  {
      0x209e0000,
      0x09047ac0,
      0x90c0f486,
-     0x2400b39e,
-     0x21005e00,
+     0x2400c59e,
+     0x21006700,
      0x10d7d794,
      0x83206796,
-     0x6900660e,
+     0x69006617,
      0x81182787,
      0x51000805,
      0x91090762,
      0x110f0202,
      0x12080202,
      0x81090762,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21007900,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2400002e,
      0x246020e4,
      0x24001864,
@@ -203,7 +221,7 @@ const uint32_t eg0_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x2100b300,
+     0x2100c500,
      0x2480009f,
      0x2e808b96,
      0x0b057601,
@@ -213,14 +231,14 @@ const uint32_t eg0_pdsp0[] =  {
      0x24004024,
      0x24000064,
      0x1f047d7d,
-     0x2100b700,
+     0x2100c900,
      0xc90eb607,
      0x24000f2e,
      0x24002004,
      0x24004024,
      0x24000064,
      0x1f047d7d,
-     0x2100b300,
+     0x2100c500,
      0xcf0fb6f4,
      0x24000d04,
      0x2f000384,
@@ -235,10 +253,10 @@ const uint32_t eg0_pdsp0[] =  {
      0x2f018786,
      0x2f020786,
      0x2f028786,
-     0x2100a700,
+     0x2100b900,
      0x70167c03,
      0x24000ade,
-     0x2100ad00,
+     0x2100bf00,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -279,15 +297,15 @@ const uint32_t eg0_pdsp0[] =  {
      0x1f047d7d,
      0x510ade07,
      0x5103de02,
-     0x21005a00,
+     0x21006300,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x2100b300,
+     0x2100c500,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x2100b300,
+     0x2100c500,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -306,26 +324,26 @@ const uint32_t eg0_pdsp0[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x240408c8,
-     0x24040888,
-     0x240408c9,
-     0x24035b89,
-     0x240385ca,
-     0x2403a08a,
-     0x2403accb,
-     0x2403b78b,
-     0x2403c9cc,
-     0x2403d48c,
-     0x240408cd,
-     0x2404088d,
-     0x240408ce,
-     0x2404088e,
-     0x240408cf,
-     0x2404088f,
-     0x240408d0,
-     0x2403ed90,
-     0x2403f6d1,
-     0x2403fe91,
+     0x240425c8,
+     0x24042588,
+     0x240425c9,
+     0x24037889,
+     0x2403a2ca,
+     0x2403bd8a,
+     0x2403c9cb,
+     0x2403d48b,
+     0x2403e6cc,
+     0x2403f18c,
+     0x240425cd,
+     0x2404258d,
+     0x240425ce,
+     0x2404258e,
+     0x240425cf,
+     0x2404258f,
+     0x240425d0,
+     0x24040a90,
+     0x240413d1,
+     0x24041b91,
      0x8500f588,
      0x24505084,
      0x108484c4,
@@ -384,7 +402,7 @@ const uint32_t eg0_pdsp0[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21018b00,
+     0x21019d00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -407,10 +425,10 @@ const uint32_t eg0_pdsp0[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x21018b00,
+     0x21019d00,
      0x81242e84,
      0x1f057d7d,
-     0x21018b00,
+     0x21019d00,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -420,15 +438,15 @@ const uint32_t eg0_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21018b00,
+     0x21019d00,
      0x51006602,
-     0x21018b00,
+     0x21019d00,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21018b00,
+     0x21019d00,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -453,20 +471,20 @@ const uint32_t eg0_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x5306277d,
-     0x510c27f3,
-     0x530a277f,
-     0x5308277b,
-     0x530b277b,
-     0x5309277b,
-     0x51052737,
+     0x53062788,
+     0x510c27fe,
+     0x530a278a,
+     0x53082786,
+     0x530b2786,
+     0x53092786,
+     0x51052740,
      0x24000286,
      0x2f0080c6,
-     0x21018b00,
-     0x21030200,
-     0x21013200,
-     0x2102ff00,
-     0x2102ff00,
+     0x21019d00,
+     0x21031f00,
+     0x21014400,
+     0x21031c00,
+     0x21031c00,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -486,11 +504,11 @@ const uint32_t eg0_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x2101b400,
+     0x2101cf00,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x2101a600,
+     0x2101b800,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -499,7 +517,16 @@ const uint32_t eg0_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x2101b400,
+     0x2101cf00,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x2101c700,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -514,10 +541,10 @@ const uint32_t eg0_pdsp0[] =  {
      0x2f04898e,
      0x2f000384,
      0x21001000,
-     0x59388004,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21018b00,
+     0x21019d00,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -614,7 +641,7 @@ const uint32_t eg0_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -643,10 +670,12 @@ const uint32_t eg0_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -696,7 +725,7 @@ const uint32_t eg0_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21018b00,
+     0x21019d00,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -706,20 +735,20 @@ const uint32_t eg0_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21018b00,
+     0x21019d00,
      0x240018c4,
      0x2f000384,
-     0x2102f000,
+     0x21030d00,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2102ed00,
+     0x21030a00,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21018b00,
+     0x21019d00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -730,10 +759,10 @@ const uint32_t eg0_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21018b00,
+     0x21019d00,
      0x69066a0e,
      0x59148002,
-     0x2102ed00,
+     0x21030a00,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -743,11 +772,11 @@ const uint32_t eg0_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21029800,
-     0x21018b00,
+     0x2102b500,
+     0x21019d00,
      0x69076a0e,
      0x59148002,
-     0x2102ed00,
+     0x21030a00,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -757,12 +786,12 @@ const uint32_t eg0_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2102a600,
-     0x21018b00,
+     0x2102c300,
+     0x21019d00,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2102ed00,
+     0x21030a00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -782,12 +811,12 @@ const uint32_t eg0_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2102b500,
-     0x21018b00,
+     0x2102d200,
+     0x21019d00,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2102ed00,
+     0x21030a00,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -803,27 +832,27 @@ const uint32_t eg0_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x2102d400,
+     0x2102f100,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2102ce00,
-     0x21018b00,
+     0x2102eb00,
+     0x21019d00,
      0x690a6a08,
      0x590c8002,
-     0x2102ed00,
+     0x21030a00,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21018b00,
+     0x21019d00,
      0x240002d9,
      0x1f047b7b,
-     0x21018b00,
+     0x21019d00,
      0x240010d9,
      0x1f047b7b,
-     0x21018b00,
+     0x21019d00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -833,15 +862,15 @@ const uint32_t eg0_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21018b00,
-     0x21018b00,
-     0x21018b00,
-     0x21018b00,
-     0x21018b00,
-     0x21018b00,
+     0x21019d00,
+     0x21019d00,
+     0x21019d00,
+     0x21019d00,
+     0x21019d00,
+     0x21019d00,
      0x24000c86,
      0x2f0080c6,
-     0x21018b00,
+     0x21019d00,
      0x2e80838a,
      0x2eff818d,
      0x108b8bcd,
@@ -850,7 +879,7 @@ const uint32_t eg0_pdsp0[] =  {
      0x58c08004,
      0x24001000,
      0xc9037b3c,
-     0x21034100,
+     0x21035e00,
      0x91200e61,
      0x240100c0,
      0x68c0ca12,
@@ -858,7 +887,7 @@ const uint32_t eg0_pdsp0[] =  {
      0x69202104,
      0x24000400,
      0xc9037b34,
-     0x21034100,
+     0x21035e00,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -866,15 +895,15 @@ const uint32_t eg0_pdsp0[] =  {
      0x69200304,
      0x24000400,
      0xc9037b2c,
-     0x21034100,
+     0x21035e00,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x21032800,
+     0x21034500,
      0x60c0ca04,
      0x24000400,
      0xc9037b24,
-     0x21034100,
+     0x21035e00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -883,7 +912,7 @@ const uint32_t eg0_pdsp0[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x21034900,
+     0x21036600,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -901,18 +930,18 @@ const uint32_t eg0_pdsp0[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x21018b00,
+     0x21019d00,
      0x83242e84,
      0x1f057d7d,
-     0x21018b00,
+     0x21019d00,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21018b00,
+     0x21019d00,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x21018b00,
+     0x21019d00,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -925,7 +954,7 @@ const uint32_t eg0_pdsp0[] =  {
      0x2e808786,
      0x240010c4,
      0x2f000384,
-     0x21032c00,
+     0x21034900,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
diff --git a/fw/v1/pa2_eg0_pdsp1_bin.c b/fw/v1/pa2_eg0_pdsp1_bin.c
index a54d24c..64c0872 100644
--- a/fw/v1/pa2_eg0_pdsp1_bin.c
+++ b/fw/v1/pa2_eg0_pdsp1_bin.c
@@ -72,15 +72,15 @@
 /* This file is generated by the PDSP assembler.                       */
 
 const uint32_t eg0_pdsp1[] =  {
-     0x21017600,
+     0x21017f00,
      0xbabe0601,
-     0x03000201,
+     0x03000202,
      0xc907ff00,
      0x911007c0,
      0x1f0f8080,
      0x811007c0,
      0x10d7d794,
-     0x69006613,
+     0x6900661c,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -91,6 +91,15 @@ const uint32_t eg0_pdsp1[] =  {
      0x111f0800,
      0x81110760,
      0x2400002e,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21001c00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2f04898e,
      0x24e020e4,
      0x24001864,
@@ -103,9 +112,9 @@ const uint32_t eg0_pdsp1[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21002400,
+     0x21002d00,
      0x2400012e,
-     0x21002400,
+     0x21002d00,
      0x6905020b,
      0x1046462e,
      0x81186787,
@@ -161,15 +170,15 @@ const uint32_t eg0_pdsp1[] =  {
      0x09047ac0,
      0x90c0fa86,
      0x2e85098e,
-     0x2401839e,
+     0x24018c9e,
      0x21000300,
      0x2400057a,
-     0x21005600,
+     0x21005f00,
      0x24000d04,
      0x2f000184,
      0xd104b603,
      0x2eff858b,
-     0x21007100,
+     0x21007a00,
      0x09057980,
      0x090479c0,
      0x00c0809c,
@@ -184,7 +193,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f000184,
      0x10787817,
      0x04c4cece,
-     0x21007400,
+     0x21007d00,
      0x24000004,
      0x101717c4,
      0x2f000384,
@@ -193,7 +202,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x51400004,
      0x5160003d,
      0x2400017a,
-     0x21005600,
+     0x21005f00,
      0x2eff8384,
      0x110f6682,
      0x090282c4,
@@ -204,12 +213,12 @@ const uint32_t eg0_pdsp1[] =  {
      0x10808780,
      0x51008003,
      0x2400027a,
-     0x21005600,
+     0x21005f00,
      0xc90ccb05,
      0x110f6600,
      0x51050003,
      0x2400047a,
-     0x21005600,
+     0x21005f00,
      0xc909cb03,
      0x51006802,
      0x05016868,
@@ -251,7 +260,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x24000004,
      0x105b5bc4,
      0x2f000384,
-     0x21011800,
+     0x21012100,
      0x10272773,
      0x10c7c7d4,
      0x00c717d7,
@@ -313,7 +322,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x51007304,
      0x512b7303,
      0x513c7302,
-     0x2100fc00,
+     0x21010500,
      0x2e808086,
      0x593f4609,
      0x1000003b,
@@ -323,18 +332,18 @@ const uint32_t eg0_pdsp1[] =  {
      0x00c45b5b,
      0x00c40000,
      0x2f000184,
-     0x2100ed00,
+     0x2100f600,
      0xc90dcb04,
      0x692c7303,
      0x2400027a,
-     0x21005600,
+     0x21005f00,
      0xc90ccb04,
      0x51280003,
      0x2400047a,
-     0x21005600,
+     0x21005f00,
      0x692c7303,
      0x2400285b,
-     0x21011700,
+     0x21012000,
      0x1073737b,
      0x1000005b,
      0xc904cb0e,
@@ -355,7 +364,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x51117304,
      0x51067328,
      0x51887314,
-     0x21015800,
+     0x21016100,
      0x2e808386,
      0xc905cb02,
      0x10cdcdc6,
@@ -373,7 +382,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x24005304,
      0x2f000384,
      0x2f008386,
-     0x21015800,
+     0x21016100,
      0x2e808386,
      0xc905cb02,
      0x10cdcdc6,
@@ -392,13 +401,13 @@ const uint32_t eg0_pdsp1[] =  {
      0x24005304,
      0x2f000384,
      0x2f008386,
-     0x21015800,
+     0x21016100,
      0x2e808986,
      0xc90bcb05,
      0x11074900,
      0x51000003,
      0x2400067a,
-     0x21005600,
+     0x21005f00,
      0xc905cb02,
      0x10cdcdc6,
      0xc906cb02,
@@ -431,7 +440,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x21018300,
+     0x21018c00,
      0x49ff8409,
      0x69014408,
      0x09058480,
@@ -440,13 +449,13 @@ const uint32_t eg0_pdsp1[] =  {
      0x9510fb86,
      0x849cec86,
      0x240000e5,
-     0x21017200,
+     0x21017b00,
      0x240003e5,
      0x81043b85,
      0x2eff8184,
      0x81003b84,
-     0x21019100,
-     0x2307ff9e,
+     0x21019a00,
+     0x2308259e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -454,7 +463,7 @@ const uint32_t eg0_pdsp1[] =  {
      0xc900ff00,
      0xd100ff00,
      0x2eff819d,
-     0x24020182,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -486,11 +495,11 @@ const uint32_t eg0_pdsp1[] =  {
      0xc90fca04,
      0x24001004,
      0x2f000384,
-     0x2101b600,
+     0x2101bf00,
      0x008f8994,
      0x6900c903,
      0x24801e9f,
-     0x2101b200,
+     0x2101bb00,
      0x24000804,
      0x2f000184,
      0x242031e4,
@@ -503,13 +512,13 @@ const uint32_t eg0_pdsp1[] =  {
      0x5102014e,
      0x5101012f,
      0x51060161,
-     0x53070128,
+     0x53070131,
      0x51050105,
      0x51040103,
      0x1f060e0e,
-     0x2101b600,
-     0x21057200,
-     0x21005d00,
+     0x2101bf00,
+     0x21058400,
+     0x21006600,
      0xd106ff00,
      0x9110e78a,
      0x2eff8384,
@@ -519,17 +528,17 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f04898e,
      0x8110078a,
      0x2f000384,
-     0x21018300,
+     0x21018c00,
      0x2eff8384,
      0x24002004,
      0x24004024,
      0x2f04898e,
      0x2f000384,
-     0x21018300,
+     0x21018c00,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2101b600,
+     0x2101bf00,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -543,11 +552,11 @@ const uint32_t eg0_pdsp1[] =  {
      0x80e2b186,
      0x01017575,
      0xcf0635d2,
-     0x21024b00,
+     0x21025400,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2101b600,
+     0x2101bf00,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -573,11 +582,11 @@ const uint32_t eg0_pdsp1[] =  {
      0x10878785,
      0x2f000384,
      0x1f073535,
-     0x2101a800,
+     0x2101b100,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2101b600,
+     0x2101bf00,
      0x2e808986,
      0x24000104,
      0x0b0446c4,
@@ -594,11 +603,11 @@ const uint32_t eg0_pdsp1[] =  {
      0x8ec3d106,
      0x01015555,
      0xcf06359f,
-     0x21024b00,
+     0x21025400,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2101b600,
+     0x2101bf00,
      0x2e808396,
      0x111f7600,
      0x6f0000b5,
@@ -609,7 +618,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x66c45eb0,
      0x04c45e5e,
      0x2f000384,
-     0x2101a800,
+     0x2101b100,
      0x2e808786,
      0x24000cc4,
      0xc907ff00,
@@ -633,7 +642,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x81206787,
      0x240010c4,
      0x1f053535,
-     0x21023f00,
+     0x21024800,
      0x91090762,
      0x110f0202,
      0x11c06922,
@@ -658,18 +667,18 @@ const uint32_t eg0_pdsp1[] =  {
      0x00c47e7e,
      0xc9046603,
      0x1f063535,
-     0x2101a800,
+     0x2101b100,
      0x24000082,
      0xc9027d06,
      0x11077342,
      0x69024204,
      0x111f1542,
      0x51004202,
-     0x2304ba9e,
+     0x2304cc9e,
      0xd1037d04,
-     0xd1047d71,
-     0xd10235c2,
-     0x2305169e,
+     0xd1047d7a,
+     0xd10235cb,
+     0x2305289e,
      0x2e85098e,
      0xc901350a,
      0x593c9409,
@@ -681,21 +690,30 @@ const uint32_t eg0_pdsp1[] =  {
      0x24003cce,
      0x01013d3d,
      0x24003c94,
-     0xd1077d22,
-     0xd1023522,
-     0xc9043521,
-     0xc9017d20,
+     0xd1077d2b,
+     0xd102352b,
+     0xc904352a,
+     0xc9017d29,
      0x111f6981,
      0x09038181,
      0x01008181,
      0x90817c86,
-     0xc900661b,
+     0xc9006624,
      0x1f077d7d,
      0x2eff8384,
      0xd1016604,
      0x81110726,
      0x2400022e,
-     0x21027400,
+     0x21028600,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21028200,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2400002e,
      0x108686c5,
      0x10464605,
@@ -714,7 +732,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x1f000e0e,
      0xc904ff00,
      0x2e808f86,
-     0x21019f00,
+     0x2101a800,
      0x1d077d7d,
      0x2f05098e,
      0xc900350c,
@@ -725,7 +743,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x21029100,
+     0x2102a300,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -742,7 +760,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x2102a200,
+     0x2102b400,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -754,7 +772,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x1d0f8080,
      0x1f0c8080,
      0x811007c0,
-     0x2102af00,
+     0x2102c100,
      0xd1073504,
      0x911007c0,
      0x1f0f8080,
@@ -779,7 +797,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x8110e78a,
      0x2f000384,
      0x2f04898e,
-     0x21018300,
+     0x21018c00,
      0x2e85098e,
      0x1d047d7d,
      0xd1077d0a,
@@ -798,7 +816,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x240443e4,
      0x109696c4,
      0x2f000384,
-     0x21025700,
+     0x21026000,
      0x111f7601,
      0x24000104,
      0x240004c4,
@@ -806,32 +824,32 @@ const uint32_t eg0_pdsp1[] =  {
      0x24000004,
      0x69040102,
      0x240008c4,
-     0x64c45ee8,
+     0x64c45edf,
      0x04c45e5e,
      0x2f000184,
      0x00c47e7e,
      0x51030106,
      0x51040107,
      0x511f010d,
-     0x550001c3,
+     0x550001ba,
      0x6902012b,
-     0x21030700,
+     0x21031900,
      0x1f037d7d,
-     0x2101a800,
+     0x2101b100,
      0x71ff9604,
      0x24801e9f,
      0x1f060e0e,
-     0x2101b600,
+     0x2101bf00,
      0x1f047d7d,
      0x81387196,
-     0x2101a800,
+     0x2101b100,
      0x24001004,
      0x2f000384,
      0x2e85098e,
      0x24004304,
      0x58ce9603,
      0x109696c4,
-     0x2102f900,
+     0x21030b00,
      0x048f96c4,
      0x10565624,
      0x10f2f2e5,
@@ -846,8 +864,8 @@ const uint32_t eg0_pdsp1[] =  {
      0x24004024,
      0x2f000384,
      0x2f04898e,
-     0x21018300,
-     0x5d0275a1,
+     0x21018c00,
+     0x5d027598,
      0x24000276,
      0xc90f9603,
      0x24000476,
@@ -856,12 +874,12 @@ const uint32_t eg0_pdsp1[] =  {
      0x01f8c3c3,
      0x80c33196,
      0x01017575,
-     0x2101a800,
+     0x2101b100,
      0x1f023535,
      0x1f013535,
      0xd1063504,
      0x81f03196,
-     0x2101a800,
+     0x2101b100,
      0x91f03196,
      0x2eff8b97,
      0x109696d7,
@@ -878,7 +896,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x11f06600,
      0x51400003,
      0x516000c3,
-     0x2103bf00,
+     0x2103d100,
      0x108686d8,
      0x110f6617,
      0x09021717,
@@ -901,7 +919,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x0417d8e1,
      0x48e0e103,
      0x0499e1d9,
-     0x21033f00,
+     0x21035100,
      0x1f0d8787,
      0x0017d986,
      0x24000088,
@@ -914,7 +932,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x104242c4,
      0x51022403,
      0x008682e5,
-     0x21034c00,
+     0x21035e00,
      0x008682c5,
      0x2f000384,
      0x51017508,
@@ -922,7 +940,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x104343c4,
      0x51022403,
      0x008683e5,
-     0x21035400,
+     0x21036600,
      0x008683c5,
      0x2f000384,
      0x2eff8384,
@@ -943,7 +961,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f000184,
      0x24000004,
      0x04d19a9a,
-     0x21037600,
+     0x21038800,
      0x24000104,
      0x109a9ac4,
      0x2f000184,
@@ -963,7 +981,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x60919a04,
      0x04919a9a,
      0x2400008f,
-     0x21038200,
+     0x21039400,
      0x009af2f0,
      0x00da9ae0,
      0x6091e002,
@@ -1028,16 +1046,16 @@ const uint32_t eg0_pdsp1[] =  {
      0x103737c4,
      0x2f000184,
      0x2e808986,
-     0x21033600,
+     0x21034800,
      0x105b5b0e,
-     0x21025700,
+     0x21026000,
      0x51007511,
      0x24004304,
      0x10626224,
      0x104242c4,
      0x51022403,
      0x00d882e5,
-     0x2103c700,
+     0x2103d900,
      0x00d882c5,
      0x2f000384,
      0x51017508,
@@ -1045,12 +1063,12 @@ const uint32_t eg0_pdsp1[] =  {
      0x104343c4,
      0x51022403,
      0x00d883e5,
-     0x2103cf00,
+     0x2103e100,
      0x00d883c5,
      0x2f000384,
      0x10373782,
-     0x2402569e,
-     0x21054600,
+     0x24025f9e,
+     0x21055800,
      0x6f015598,
      0x24104480,
      0x24fff8c0,
@@ -1071,7 +1089,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x240000c4,
      0x10e0e0e5,
      0x2f000384,
-     0x21036b00,
+     0x21037d00,
      0x11f85757,
      0x0128c7d8,
      0x24002817,
@@ -1085,7 +1103,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x51007b04,
      0x512b7b03,
      0x513c7b02,
-     0x2103fe00,
+     0x21041000,
      0x2f000184,
      0x2e808086,
      0x593f4606,
@@ -1093,7 +1111,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x010146c4,
      0x0903c4c4,
      0x00c41717,
-     0x2103f100,
+     0x21040300,
      0x010817e0,
      0x04e0d7d9,
      0x70e0d7b7,
@@ -1118,7 +1136,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x010437c4,
      0x0528d7c5,
      0x2f000384,
-     0x21041b00,
+     0x21042d00,
      0x24002c27,
      0x0528d7c7,
      0x2f008386,
@@ -1144,7 +1162,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x104242c4,
      0x51022403,
      0x008182e5,
-     0x21043200,
+     0x21044400,
      0x008182c5,
      0x2f000384,
      0x51017508,
@@ -1152,7 +1170,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x104343c4,
      0x51022403,
      0x008183e5,
-     0x21043a00,
+     0x21044c00,
      0x008183c5,
      0x2f000384,
      0x10d9d9da,
@@ -1165,7 +1183,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f000184,
      0x24000004,
      0x04d19a9a,
-     0x21045400,
+     0x21046600,
      0x24000104,
      0x109a9ac4,
      0x2f000184,
@@ -1185,7 +1203,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x60919a04,
      0x04919a9a,
      0x2400008f,
-     0x21046000,
+     0x21047200,
      0x009af2f0,
      0x00da9ae0,
      0x6091e002,
@@ -1254,9 +1272,9 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f008386,
      0x101717c4,
      0x2f000184,
-     0x21041b00,
+     0x21042d00,
      0x105b5b0e,
-     0x21025700,
+     0x21026000,
      0x6f0155a8,
      0x24104480,
      0x24fff8c0,
@@ -1278,10 +1296,10 @@ const uint32_t eg0_pdsp1[] =  {
      0x240000c4,
      0x10e0e0e5,
      0x2f000384,
-     0x21044900,
+     0x21045b00,
      0x2f000184,
      0x00173737,
-     0x2103bf00,
+     0x2103d100,
      0x24000c04,
      0x2f000384,
      0x2eff8192,
@@ -1320,23 +1338,23 @@ const uint32_t eg0_pdsp1[] =  {
      0x240002c4,
      0x2f000384,
      0x00c48282,
-     0x2104cc00,
+     0x2104de00,
      0x688ec605,
      0x240002c4,
      0x2f000384,
      0x00c48282,
-     0x2104cc00,
+     0x2104de00,
      0x68cfc605,
      0x2e808186,
      0x0b024612,
      0x1f017272,
-     0x21050700,
+     0x21051900,
      0x688fc606,
      0x2e808186,
      0x0b04c612,
      0x0b021212,
      0x1f017272,
-     0x21050700,
+     0x21051900,
      0x68d0c60a,
      0x2e808386,
      0x240004c4,
@@ -1346,7 +1364,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x0b046703,
      0x570403ef,
      0x570603f3,
-     0x21050700,
+     0x21051900,
      0x5690c6f7,
      0x68d1c60a,
      0x2e808386,
@@ -1357,12 +1375,12 @@ const uint32_t eg0_pdsp1[] =  {
      0x56c287e5,
      0x240057c2,
      0x56c287e8,
-     0x21050700,
+     0x21051900,
      0x5691c6f7,
      0xc9006905,
      0xc9007203,
      0x10323252,
-     0x21050f00,
+     0x21052100,
      0xd1016904,
      0xc9017203,
      0x10121252,
@@ -1391,7 +1409,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x21052a00,
+     0x21053c00,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -1402,7 +1420,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x58820604,
      0x24801e9f,
      0x1f060e0e,
-     0x2101b600,
+     0x2101bf00,
      0x24000004,
      0x048206c4,
      0x00c48282,
@@ -1413,7 +1431,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x21054000,
+     0x21055200,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -1432,7 +1450,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x58828604,
      0x24801e9f,
      0x1f060e0e,
-     0x2101b600,
+     0x2101bf00,
      0x24000004,
      0x048286c4,
      0x00c48282,
@@ -1457,7 +1475,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x01010303,
      0x01202323,
      0x0120e0e0,
-     0x21054b00,
+     0x21055d00,
      0x24000083,
      0xc9071d02,
      0x2400ff23,
@@ -1466,7 +1484,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x00839494,
      0x2f05098e,
      0x209e0000,
-     0x21057300,
+     0x21058500,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -1476,15 +1494,15 @@ const uint32_t eg0_pdsp1[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x2105ab00,
+     0x2105bd00,
      0x51006602,
-     0x2105ab00,
+     0x2105bd00,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x2105ab00,
+     0x2105bd00,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -1509,20 +1527,20 @@ const uint32_t eg0_pdsp1[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x5306277d,
-     0x510c27f3,
-     0x530a277f,
-     0x5308277b,
-     0x530b277b,
-     0x5309277b,
-     0x51052737,
+     0x53062788,
+     0x510c27fe,
+     0x530a278a,
+     0x53082786,
+     0x530b2786,
+     0x53092786,
+     0x51052740,
      0x24000286,
      0x2f0080c6,
-     0x2105ab00,
-     0x2107fc00,
-     0x2107fc00,
-     0x2107f500,
-     0x2107fc00,
+     0x2105bd00,
+     0x21082200,
+     0x21082200,
+     0x21081b00,
+     0x21082200,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -1542,11 +1560,11 @@ const uint32_t eg0_pdsp1[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x2105d400,
+     0x2105ef00,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x2105c600,
+     0x2105d800,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -1555,7 +1573,16 @@ const uint32_t eg0_pdsp1[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x2105d400,
+     0x2105ef00,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x2105e700,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -1563,17 +1590,17 @@ const uint32_t eg0_pdsp1[] =  {
      0x9110078a,
      0x8110078a,
      0x2f000384,
-     0x21018300,
+     0x21018c00,
      0x9110078a,
      0x1f0fcaca,
      0x8110078a,
      0x2f04898e,
      0x2f000384,
-     0x21018300,
-     0x59388004,
+     0x21018c00,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x2105ab00,
+     0x2105bd00,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1670,7 +1697,7 @@ const uint32_t eg0_pdsp1[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1699,10 +1726,12 @@ const uint32_t eg0_pdsp1[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1752,7 +1781,7 @@ const uint32_t eg0_pdsp1[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x2105ab00,
+     0x2105bd00,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1762,20 +1791,20 @@ const uint32_t eg0_pdsp1[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x2105ab00,
+     0x2105bd00,
      0x240018c4,
      0x2f000384,
-     0x21071000,
+     0x21072d00,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x21070d00,
+     0x21072a00,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x2105ab00,
+     0x2105bd00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1786,10 +1815,10 @@ const uint32_t eg0_pdsp1[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x2105ab00,
+     0x2105bd00,
      0x69066a0e,
      0x59148002,
-     0x21070d00,
+     0x21072a00,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1799,11 +1828,11 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2106b800,
-     0x2105ab00,
+     0x2106d500,
+     0x2105bd00,
      0x69076a0e,
      0x59148002,
-     0x21070d00,
+     0x21072a00,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1813,12 +1842,12 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2106c600,
-     0x2105ab00,
+     0x2106e300,
+     0x2105bd00,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x21070d00,
+     0x21072a00,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1838,12 +1867,12 @@ const uint32_t eg0_pdsp1[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2106d500,
-     0x2105ab00,
+     0x2106f200,
+     0x2105bd00,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x21070d00,
+     0x21072a00,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1859,27 +1888,27 @@ const uint32_t eg0_pdsp1[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x2106f400,
+     0x21071100,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2106ee00,
-     0x2105ab00,
+     0x21070b00,
+     0x2105bd00,
      0x690a6a08,
      0x590c8002,
-     0x21070d00,
+     0x21072a00,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x2105ab00,
+     0x2105bd00,
      0x240002d9,
      0x1f047b7b,
-     0x2105ab00,
+     0x2105bd00,
      0x240010d9,
      0x1f047b7b,
-     0x2105ab00,
+     0x2105bd00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1889,12 +1918,12 @@ const uint32_t eg0_pdsp1[] =  {
      0x01010101,
      0x0110c1c1,
      0x670b01fa,
-     0x2105ab00,
-     0x2105ab00,
-     0x2105ab00,
-     0x2105ab00,
-     0x2105ab00,
-     0x2105ab00,
+     0x2105bd00,
+     0x2105bd00,
+     0x2105bd00,
+     0x2105bd00,
+     0x2105bd00,
+     0x2105bd00,
      0xc907ff00,
      0x911007ca,
      0x1f0f8a8a,
@@ -1910,7 +1939,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x11c00101,
      0x51014703,
      0x24001641,
-     0x21073000,
+     0x21074d00,
      0x24000d41,
      0x12410101,
      0x812607c1,
@@ -1923,9 +1952,9 @@ const uint32_t eg0_pdsp1[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x510369af,
+     0x510369b8,
      0x209e0000,
-     0x69006658,
+     0x69006661,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -1956,7 +1985,7 @@ const uint32_t eg0_pdsp1[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21076200,
+     0x21077f00,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -1968,11 +1997,11 @@ const uint32_t eg0_pdsp1[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x21077400,
+     0x21079100,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x21077400,
+     0x21079100,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -1980,6 +2009,15 @@ const uint32_t eg0_pdsp1[] =  {
      0xc9016803,
      0x003a8686,
      0x24000042,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21079a00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x81340758,
      0x2400002e,
      0x51016964,
@@ -2017,9 +2055,9 @@ const uint32_t eg0_pdsp1[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21079e00,
+     0x2107c400,
      0x2400012e,
-     0x21079e00,
+     0x2107c400,
      0x69050214,
      0x1046462e,
      0x81186787,
@@ -2115,10 +2153,10 @@ const uint32_t eg0_pdsp1[] =  {
      0x24ff00c2,
      0x240000e1,
      0xe1742281,
-     0x2105ab00,
+     0x2105bd00,
      0x24000c86,
      0x2f0080c6,
-     0x2105ab00,
+     0x2105bd00,
      0x2eff8384,
      0x81007b84,
      0x248100c8,
diff --git a/fw/v1/pa2_eg0_pdsp2_bin.c b/fw/v1/pa2_eg0_pdsp2_bin.c
index bf48ca0..21539ed 100644
--- a/fw/v1/pa2_eg0_pdsp2_bin.c
+++ b/fw/v1/pa2_eg0_pdsp2_bin.c
@@ -72,15 +72,15 @@
 /* This file is generated by the PDSP assembler.                       */
 
 const uint32_t eg0_pdsp2[] =  {
-     0x21028f00,
+     0x21029800,
      0xbabe0602,
-     0x03000201,
+     0x03000202,
      0xc907ff00,
      0x911007c0,
      0x1d0f8080,
      0x811007c0,
      0x10d7d794,
-     0x69006613,
+     0x6900661c,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -91,6 +91,15 @@ const uint32_t eg0_pdsp2[] =  {
      0x111f0800,
      0x81110760,
      0x2400002e,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21001c00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2f04898e,
      0x24e020e4,
      0x24001864,
@@ -103,9 +112,9 @@ const uint32_t eg0_pdsp2[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21002400,
+     0x21002d00,
      0x2400012e,
-     0x21002400,
+     0x21002d00,
      0x6905020b,
      0x1046462e,
      0x81186787,
@@ -160,10 +169,10 @@ const uint32_t eg0_pdsp2[] =  {
      0x09047ac0,
      0x90c0fa86,
      0x2e85098e,
-     0x24029c9e,
+     0x2402a59e,
      0x21000300,
      0x2400057a,
-     0x21005500,
+     0x21005e00,
      0x24000d04,
      0x2f000384,
      0xcb05b6c6,
@@ -184,12 +193,12 @@ const uint32_t eg0_pdsp2[] =  {
      0xc902cb06,
      0xd108cb03,
      0x2400002e,
-     0x21007700,
+     0x21008000,
      0x2400012e,
-     0x21007700,
+     0x21008000,
      0xd106b603,
      0x2400122e,
-     0x21007700,
+     0x21008000,
      0x2400112e,
      0x109595ce,
      0x1d0db6b6,
@@ -197,7 +206,7 @@ const uint32_t eg0_pdsp2[] =  {
      0xd1013304,
      0x10dadac2,
      0x045bdac3,
-     0x21008000,
+     0x21008900,
      0x109a9ac2,
      0x045b9ac3,
      0x24000004,
@@ -217,12 +226,12 @@ const uint32_t eg0_pdsp2[] =  {
      0x51400004,
      0x51600022,
      0x2400017a,
-     0x21005500,
+     0x21005e00,
      0x10484853,
      0x110f6600,
      0x09020022,
      0x0b024679,
-     0x23022f9e,
+     0x2302389e,
      0xc9003306,
      0x2eff8384,
      0x24005104,
@@ -248,13 +257,13 @@ const uint32_t eg0_pdsp2[] =  {
      0x009ce5e5,
      0x0124e5e5,
      0x2f000384,
-     0x2100c600,
+     0x2100cf00,
      0x10272753,
      0x0b04c679,
      0x113f7979,
      0x1f053333,
      0x24002822,
-     0x23022f9e,
+     0x2302389e,
      0x10c2c2c7,
      0x24003304,
      0x24000424,
@@ -273,13 +282,13 @@ const uint32_t eg0_pdsp2[] =  {
      0x00221717,
      0x00225858,
      0x0022cece,
-     0x21012600,
+     0x21012f00,
      0x2e808586,
      0x11f06600,
      0x51400004,
      0x51600026,
      0x2400017a,
-     0x21005500,
+     0x21005e00,
      0xc9003312,
      0xc90ecb02,
      0x57006888,
@@ -288,12 +297,12 @@ const uint32_t eg0_pdsp2[] =  {
      0x10808780,
      0x51008003,
      0x2400027a,
-     0x21005500,
+     0x21005e00,
      0xc90ccb05,
      0x110f6600,
      0x51050003,
      0x2400047a,
-     0x21005500,
+     0x21005e00,
      0xc906cb03,
      0x51006802,
      0x05016868,
@@ -301,7 +310,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x110f6600,
      0x09020022,
      0x0b024679,
-     0x23022f9e,
+     0x2302389e,
      0x0022c286,
      0xc9003306,
      0x2eff8384,
@@ -314,7 +323,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x24000004,
      0x105b5bc4,
      0x2f000184,
-     0x21012600,
+     0x21012f00,
      0xc9003308,
      0xc90ecb02,
      0x57000765,
@@ -332,7 +341,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x51005304,
      0x512b5303,
      0x513c5302,
-     0x21010d00,
+     0x21011600,
      0x2f000184,
      0x2e808086,
      0x593f4606,
@@ -340,24 +349,24 @@ const uint32_t eg0_pdsp2[] =  {
      0x010146c4,
      0x0903c4c4,
      0x00c42222,
-     0x21010000,
+     0x21010900,
      0xc90dcb04,
      0x692c5303,
      0x2400027a,
-     0x21005500,
+     0x21005e00,
      0xc90ccb04,
      0x51282203,
      0x2400047a,
-     0x21005500,
+     0x21005e00,
      0x10c4c401,
-     0x23022f9e,
+     0x2302389e,
      0x24000004,
      0x100101c4,
      0x69282205,
      0x10c2c2c7,
      0x2f008386,
      0x2f000384,
-     0x21012600,
+     0x21012f00,
      0x2f008006,
      0x2f000384,
      0x24004304,
@@ -372,7 +381,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x24000004,
      0x100202c4,
      0x2f000384,
-     0x21014b00,
+     0x21015400,
      0xd103cb09,
      0x24003304,
      0x24000424,
@@ -381,7 +390,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000384,
      0x05040224,
      0x2f000184,
-     0x21014700,
+     0x21015000,
      0x24003304,
      0x24000424,
      0x24000085,
@@ -413,14 +422,14 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000184,
      0x48d1c302,
      0x1f033333,
-     0x2101ef00,
+     0x2101f800,
      0x2480119f,
      0x2e808986,
      0x11f06600,
      0x51400004,
      0x51600046,
      0x2400017a,
-     0x21005500,
+     0x21005e00,
      0xc9003303,
      0x108787d5,
      0x108686d4,
@@ -449,7 +458,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000184,
      0x24000004,
      0x04d18282,
-     0x21018700,
+     0x21019000,
      0x51009404,
      0x24000104,
      0x108282c4,
@@ -468,7 +477,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x60918204,
      0x04918282,
      0x2400008f,
-     0x21019300,
+     0x21019c00,
      0x0082f2f0,
      0x00c282e0,
      0x6091e002,
@@ -487,7 +496,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x24001104,
      0x2f000184,
      0x00c39494,
-     0x2101ef00,
+     0x2101f800,
      0xc9003303,
      0x240000d5,
      0x0128c7d4,
@@ -504,7 +513,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f008006,
      0x043b5bc4,
      0x2f000184,
-     0x2101b600,
+     0x2101bf00,
      0x24002c27,
      0x2f008386,
      0x24000004,
@@ -529,7 +538,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000184,
      0x24000004,
      0x04d18282,
-     0x2101d700,
+     0x2101e000,
      0x51009404,
      0x24000104,
      0x108282c4,
@@ -548,7 +557,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x60918204,
      0x04918282,
      0x2400008f,
-     0x2101e300,
+     0x2101ec00,
      0x0082f2f0,
      0x00c282e0,
      0x6091e002,
@@ -613,43 +622,43 @@ const uint32_t eg0_pdsp2[] =  {
      0x045bd4e1,
      0x4ce0e15c,
      0x1f013333,
-     0x21007700,
+     0x21008000,
      0x1073730e,
      0x24002004,
      0x2400e024,
      0x2f000384,
      0x2f04898e,
-     0x21029c00,
+     0x2102a500,
      0xc907ff00,
      0x83206796,
      0xd106b603,
      0x2400122e,
-     0x21022a00,
+     0x21023300,
      0x2400112e,
      0x2f04898e,
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x21029c00,
+     0x2102a500,
      0x10535321,
      0xd102cb02,
-     0x21025900,
+     0x21026200,
      0x692c5303,
      0x2400027a,
-     0x21005500,
+     0x21005e00,
      0xd103cb16,
      0x24003221,
      0xd1053303,
      0x24003248,
-     0x21023e00,
+     0x21024700,
      0x51282203,
      0x24003266,
-     0x21023e00,
+     0x21024700,
      0x24003227,
      0x01082c02,
      0x49014c03,
      0x24000113,
-     0x21024600,
+     0x21024f00,
      0x01024213,
      0x05014c00,
      0x10001313,
@@ -658,14 +667,14 @@ const uint32_t eg0_pdsp2[] =  {
      0x0102c2c2,
      0x0002c2c2,
      0x000cc2c2,
-     0x21025900,
+     0x21026200,
      0x24003321,
      0xd1053303,
      0x24003348,
-     0x21025300,
+     0x21025c00,
      0x51282203,
      0x24003366,
-     0x21025300,
+     0x21025c00,
      0x24003327,
      0x010c2c02,
      0x000c0202,
@@ -682,7 +691,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x10c4c484,
      0x51282203,
      0x04012225,
-     0x21026400,
+     0x21026d00,
      0x24000625,
      0x1d0db6b6,
      0x512c5319,
@@ -697,7 +706,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x0480c0c0,
      0x4e80c0ff,
      0x0045c084,
-     0x21027e00,
+     0x21028700,
      0x010845e0,
      0x70e08b0b,
      0x1f0db6b6,
@@ -721,13 +730,13 @@ const uint32_t eg0_pdsp2[] =  {
      0x9710fb86,
      0x869ced86,
      0x240000e5,
-     0x21028b00,
+     0x21029400,
      0x240003e5,
      0x81043b85,
      0x2eff8184,
      0x81003b84,
-     0x2102aa00,
-     0x2307599e,
+     0x2102b300,
+     0x23077f9e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -735,7 +744,7 @@ const uint32_t eg0_pdsp2[] =  {
      0xc900ff00,
      0xd100ff00,
      0x2eff819d,
-     0x24020182,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -766,11 +775,11 @@ const uint32_t eg0_pdsp2[] =  {
      0xc90fca04,
      0x24001004,
      0x2f000384,
-     0x2102ce00,
+     0x2102d700,
      0x008f8994,
      0x6900c903,
      0x24801e9f,
-     0x2102ca00,
+     0x2102d300,
      0x24000804,
      0x2f000184,
      0x242031e4,
@@ -783,13 +792,13 @@ const uint32_t eg0_pdsp2[] =  {
      0x51020170,
      0x51010151,
      0x51060182,
-     0x5307014c,
+     0x53070155,
      0x51050105,
      0x51040103,
      0x1f060e0e,
-     0x2102ce00,
-     0x2104c900,
-     0x21005c00,
+     0x2102d700,
+     0x2104db00,
+     0x21006500,
      0xd106ff00,
      0x9110e78a,
      0x2eff8384,
@@ -802,7 +811,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f04898e,
      0x8110078a,
      0x2f000384,
-     0x21029c00,
+     0x2102a500,
      0xc90eca1b,
      0x1d0ecaca,
      0x8110078a,
@@ -829,21 +838,21 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f00878a,
      0x2f000384,
      0x2f04898e,
-     0x21029c00,
+     0x2102a500,
      0x2f04898e,
      0x8110078a,
      0x2f000384,
-     0x21029c00,
+     0x2102a500,
      0x2eff8384,
      0x24002004,
      0x24004024,
      0x2f04898e,
      0x2f000384,
-     0x21029c00,
+     0x2102a500,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2102ce00,
+     0x2102d700,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -857,11 +866,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x80e2b186,
      0x01017575,
      0xcf0635b0,
-     0x21038300,
+     0x21038c00,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2102ce00,
+     0x2102d700,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -887,11 +896,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x10878785,
      0x2f000384,
      0x1f073535,
-     0x2102c000,
+     0x2102c900,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2102ce00,
+     0x2102d700,
      0x2e808986,
      0x24000104,
      0x0b0446c4,
@@ -907,11 +916,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x8ec3d106,
      0x01015555,
      0xcf06357e,
-     0x21038300,
+     0x21038c00,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x2102ce00,
+     0x2102d700,
      0x2e808396,
      0x111f7600,
      0x6f0000b6,
@@ -922,7 +931,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x66c45eb1,
      0x04c45e5e,
      0x2f000384,
-     0x2102c000,
+     0x2102c900,
      0x2e808786,
      0x24000cc4,
      0xc907ff00,
@@ -946,7 +955,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x81206787,
      0x240010c4,
      0x1f053535,
-     0x21037800,
+     0x21038100,
      0x91090762,
      0x110f0202,
      0x11c06922,
@@ -970,11 +979,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000184,
      0xc9046603,
      0x1f063535,
-     0x2102c000,
+     0x2102c900,
      0x24000082,
      0xd1037d03,
-     0xd1047d7b,
-     0x23046d9e,
+     0xd1047d84,
+     0x23047f9e,
      0x2e85098e,
      0xc901350a,
      0x593c9409,
@@ -986,21 +995,30 @@ const uint32_t eg0_pdsp2[] =  {
      0x24003cce,
      0x01013d3d,
      0x24003c94,
-     0xd1077d1e,
-     0xd102351e,
-     0xc904351d,
-     0xc9017d1c,
+     0xd1077d27,
+     0xd1023527,
+     0xc9043526,
+     0xc9017d25,
      0x111f6981,
      0x09038181,
      0x01008181,
      0x90817c86,
-     0xc9006617,
+     0xc9006620,
      0x1f077d7d,
      0x2eff8384,
      0xd1016604,
      0x81110726,
      0x2400022e,
-     0x2103a500,
+     0x2103b700,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2103b300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2400002e,
      0x108686c5,
      0x10464605,
@@ -1015,7 +1033,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x1f000e0e,
      0xc904ff00,
      0x2e808f86,
-     0x2102b700,
+     0x2102c000,
      0x1d077d7d,
      0x2f05098e,
      0xc900350c,
@@ -1026,7 +1044,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x2103be00,
+     0x2103d000,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -1043,7 +1061,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x2103cf00,
+     0x2103e100,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -1095,7 +1113,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x10565605,
      0x2f000384,
      0x2f04898e,
-     0x21029c00,
+     0x2102a500,
      0x2e85098e,
      0x1d047d7d,
      0xd1077d0a,
@@ -1114,18 +1132,18 @@ const uint32_t eg0_pdsp2[] =  {
      0x240443e4,
      0x109696c4,
      0x2f000384,
-     0x21038800,
+     0x21039100,
      0x111f7601,
      0x24000104,
      0x240004c4,
-     0x64c45eea,
+     0x64c45ee1,
      0x04c45e5e,
      0x2f000184,
      0x51030105,
      0x51040137,
      0x511f013d,
-     0x550001a4,
-     0x2102c000,
+     0x5500019b,
+     0x2102c900,
      0xc90cca26,
      0x91082380,
      0x24ffffc0,
@@ -1134,7 +1152,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x60808104,
      0x04808181,
      0x00818080,
-     0x21042800,
+     0x21043a00,
      0x240000e1,
      0x0901e1e2,
      0x30e20002,
@@ -1176,21 +1194,21 @@ const uint32_t eg0_pdsp2[] =  {
      0x1d0f8181,
      0x811007c1,
      0x2e85098e,
-     0x2102fa00,
+     0x21030300,
      0x71ff9604,
      0x24801e9f,
      0x1f060e0e,
-     0x2102ce00,
+     0x2102d700,
      0x1f047d7d,
      0x81387196,
-     0x2102c000,
+     0x2102c900,
      0x24001004,
      0x2f000384,
      0x2e85098e,
      0x24004304,
      0x58ce9603,
      0x109696c4,
-     0x21046000,
+     0x21047200,
      0x048f96c4,
      0x10565624,
      0x10f2f2e5,
@@ -1201,10 +1219,10 @@ const uint32_t eg0_pdsp2[] =  {
      0x24002004,
      0x24004024,
      0x9110e78a,
-     0x2102db00,
+     0x2102e400,
      0x2f000384,
      0x2f04898e,
-     0x21029c00,
+     0x2102a500,
      0x69008203,
      0x24000c04,
      0x2f000384,
@@ -1222,7 +1240,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x21048100,
+     0x21049300,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -1233,7 +1251,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x58820604,
      0x24801e9f,
      0x1f060e0e,
-     0x2102ce00,
+     0x2102d700,
      0x24000004,
      0x048206c4,
      0x00c48282,
@@ -1244,7 +1262,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x21049700,
+     0x2104a900,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -1263,7 +1281,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x58828604,
      0x24801e9f,
      0x1f060e0e,
-     0x2102ce00,
+     0x2102d700,
      0x24000004,
      0x048286c4,
      0x00c48282,
@@ -1288,7 +1306,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x01010303,
      0x01202323,
      0x0120e0e0,
-     0x2104a200,
+     0x2104b400,
      0x24000083,
      0xc9071d02,
      0x2400ff23,
@@ -1297,7 +1315,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x00839494,
      0x2f05098e,
      0x209e0000,
-     0x2104ca00,
+     0x2104dc00,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -1307,15 +1325,15 @@ const uint32_t eg0_pdsp2[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21050200,
+     0x21051400,
      0x51006602,
-     0x21050200,
+     0x21051400,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21050200,
+     0x21051400,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -1340,20 +1358,20 @@ const uint32_t eg0_pdsp2[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062781,
-     0x510c27f7,
-     0x530a2783,
-     0x5308277f,
-     0x530b277f,
-     0x5309277f,
-     0x5105273b,
+     0x5306278c,
+     0x530c2702,
+     0x530a278e,
+     0x5308278a,
+     0x530b278a,
+     0x5309278a,
+     0x51052744,
      0x24000286,
      0x2f0080c6,
-     0x21050200,
-     0x21075600,
-     0x21075600,
-     0x21074f00,
-     0x21075600,
+     0x21051400,
+     0x21077c00,
+     0x21077c00,
+     0x21077500,
+     0x21077c00,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -1373,11 +1391,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21052c00,
+     0x21054700,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21051d00,
+     0x21052f00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -1386,7 +1404,16 @@ const uint32_t eg0_pdsp2[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21052c00,
+     0x21054700,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21053e00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -1395,7 +1422,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x1d0fcaca,
      0x8110078a,
      0x2f000384,
-     0x21029c00,
+     0x2102a500,
      0x9110078a,
      0x1d0fcaca,
      0xc9060e03,
@@ -1404,11 +1431,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x8110078a,
      0x2f04898e,
      0x2f000384,
-     0x21029c00,
-     0x59388004,
+     0x2102a500,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21050200,
+     0x21051400,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1505,7 +1532,7 @@ const uint32_t eg0_pdsp2[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1534,10 +1561,12 @@ const uint32_t eg0_pdsp2[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1587,7 +1616,7 @@ const uint32_t eg0_pdsp2[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21050200,
+     0x21051400,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1597,20 +1626,20 @@ const uint32_t eg0_pdsp2[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21050200,
+     0x21051400,
      0x240018c4,
      0x2f000384,
-     0x21066b00,
+     0x21068800,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x21066800,
+     0x21068500,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21050200,
+     0x21051400,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1621,10 +1650,10 @@ const uint32_t eg0_pdsp2[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21050200,
+     0x21051400,
      0x69066a0e,
      0x59148002,
-     0x21066800,
+     0x21068500,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1634,11 +1663,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21061300,
-     0x21050200,
+     0x21063000,
+     0x21051400,
      0x69076a0e,
      0x59148002,
-     0x21066800,
+     0x21068500,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1648,12 +1677,12 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21062100,
-     0x21050200,
+     0x21063e00,
+     0x21051400,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x21066800,
+     0x21068500,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1673,12 +1702,12 @@ const uint32_t eg0_pdsp2[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21063000,
-     0x21050200,
+     0x21064d00,
+     0x21051400,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x21066800,
+     0x21068500,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1694,27 +1723,27 @@ const uint32_t eg0_pdsp2[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21064f00,
+     0x21066c00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21064900,
-     0x21050200,
+     0x21066600,
+     0x21051400,
      0x690a6a08,
      0x590c8002,
-     0x21066800,
+     0x21068500,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21050200,
+     0x21051400,
      0x240002d9,
      0x1f047b7b,
-     0x21050200,
+     0x21051400,
      0x240010d9,
      0x1f047b7b,
-     0x21050200,
+     0x21051400,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1724,12 +1753,12 @@ const uint32_t eg0_pdsp2[] =  {
      0x01010101,
      0x0110c1c1,
      0x670b01fa,
-     0x21050200,
-     0x21050200,
-     0x21050200,
-     0x21050200,
-     0x21050200,
-     0x21050200,
+     0x21051400,
+     0x21051400,
+     0x21051400,
+     0x21051400,
+     0x21051400,
+     0x21051400,
      0xc907ff00,
      0x911007ca,
      0x1d0f8a8a,
@@ -1745,7 +1774,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x11c00101,
      0x51014703,
      0x24001641,
-     0x21068b00,
+     0x2106a800,
      0x24000d41,
      0x12410101,
      0x812607c1,
@@ -1758,9 +1787,9 @@ const uint32_t eg0_pdsp2[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x510369ae,
+     0x510369b7,
      0x209e0000,
-     0x69006658,
+     0x69006661,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -1791,7 +1820,7 @@ const uint32_t eg0_pdsp2[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2106bd00,
+     0x2106da00,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -1803,11 +1832,11 @@ const uint32_t eg0_pdsp2[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x2106cf00,
+     0x2106ec00,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x2106cf00,
+     0x2106ec00,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -1815,6 +1844,15 @@ const uint32_t eg0_pdsp2[] =  {
      0xc9016803,
      0x003a8686,
      0x24000042,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2106f500,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x81340758,
      0x2400002e,
      0x51016963,
@@ -1852,9 +1890,9 @@ const uint32_t eg0_pdsp2[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x2106f900,
+     0x21071f00,
      0x2400012e,
-     0x2106f900,
+     0x21071f00,
      0x69050214,
      0x1046462e,
      0x81186787,
@@ -1949,10 +1987,10 @@ const uint32_t eg0_pdsp2[] =  {
      0x24ff00c2,
      0x240000e1,
      0xe1742281,
-     0x21050200,
+     0x21051400,
      0x24000c86,
      0x2f0080c6,
-     0x21050200,
+     0x21051400,
      0x2eff8384,
      0x81007b84,
      0x240102c0,
diff --git a/fw/v1/pa2_eg1_pdsp0_bin.c b/fw/v1/pa2_eg1_pdsp0_bin.c
index b31f855..e8a00dd 100644
--- a/fw/v1/pa2_eg1_pdsp0_bin.c
+++ b/fw/v1/pa2_eg1_pdsp0_bin.c
@@ -72,15 +72,15 @@
 /* This file is generated by the PDSP assembler.                       */
 
 const uint32_t eg1_pdsp0[] =  {
-     0x2100f800,
+     0x21010100,
      0xbabe0700,
-     0x03000201,
+     0x03000202,
      0xc907ff00,
      0x911007c0,
      0x1d0f8080,
      0x811007c0,
      0x10d7d794,
-     0x69006613,
+     0x6900661c,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -91,6 +91,15 @@ const uint32_t eg1_pdsp0[] =  {
      0x111f0800,
      0x81110760,
      0x2400002e,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21001c00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2f04898e,
      0x24e020e4,
      0x24001864,
@@ -103,9 +112,9 @@ const uint32_t eg1_pdsp0[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21002400,
+     0x21002d00,
      0x2400012e,
-     0x21002400,
+     0x21002d00,
      0x6905020b,
      0x1046462e,
      0x81186787,
@@ -160,10 +169,10 @@ const uint32_t eg1_pdsp0[] =  {
      0x09047ac0,
      0x90c0fa86,
      0x2e85098e,
-     0x2401059e,
+     0x24010e9e,
      0x21000300,
      0x2400057a,
-     0x21005500,
+     0x21005e00,
      0x24000d04,
      0x2f000384,
      0xc906b686,
@@ -176,7 +185,7 @@ const uint32_t eg1_pdsp0[] =  {
      0xd100cb04,
      0x24001133,
      0x24000853,
-     0x21006c00,
+     0x21007500,
      0x24003333,
      0x010c2c53,
      0x000c5353,
@@ -185,7 +194,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x51400004,
      0x51600010,
      0x2400017a,
-     0x21005500,
+     0x21005e00,
      0x045b86d4,
      0x0053d4d4,
      0xd101cb1f,
@@ -198,7 +207,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f000384,
      0x24000088,
      0x2f008586,
-     0x21009300,
+     0x21009c00,
      0x01045353,
      0x11f85353,
      0x1f007373,
@@ -209,7 +218,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x59283b04,
      0x10333327,
      0x2f008386,
-     0x21009300,
+     0x21009c00,
      0x2f008386,
      0x24000004,
      0x103b3bc4,
@@ -218,7 +227,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f008006,
      0x043b5bc4,
      0x2f000384,
-     0x21009600,
+     0x21009f00,
      0x24000004,
      0x105b5bc4,
      0x2f000384,
@@ -242,10 +251,10 @@ const uint32_t eg1_pdsp0[] =  {
      0x005b9a9a,
      0xc9007311,
      0x01109a9a,
-     0x2100b900,
+     0x2100c200,
      0x0053dada,
      0x10dada9a,
-     0x2100b900,
+     0x2100c200,
      0x11f80b0b,
      0x00539a9a,
      0x708b9a09,
@@ -253,7 +262,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x005b9a9a,
      0xc9007306,
      0x01089a9a,
-     0x2100b900,
+     0x2100c200,
      0x24000104,
      0x105353c4,
      0x2f000184,
@@ -287,11 +296,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x24002064,
      0xd103cb03,
      0x2400002e,
-     0x2100d900,
+     0x2100e200,
      0x2400012e,
      0x2f000384,
      0x2f04898e,
-     0x21010500,
+     0x21010e00,
      0x24003304,
      0x24000424,
      0x10ccccc5,
@@ -307,20 +316,20 @@ const uint32_t eg1_pdsp0[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x21010500,
+     0x21010e00,
      0x49ff8407,
      0x69034406,
      0x0905849c,
      0x9310fb86,
      0x829cec86,
      0x240000e5,
-     0x2100f400,
+     0x2100fd00,
      0x240003e5,
      0x81043b85,
      0x2eff8184,
      0x81003b84,
-     0x21011300,
-     0x2305959e,
+     0x21011c00,
+     0x2305bb9e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -328,7 +337,7 @@ const uint32_t eg1_pdsp0[] =  {
      0xc900ff00,
      0xd100ff00,
      0x2eff819d,
-     0x24020182,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -359,11 +368,11 @@ const uint32_t eg1_pdsp0[] =  {
      0xc90fca04,
      0x24001004,
      0x2f000384,
-     0x21013700,
+     0x21014000,
      0x008f8994,
      0x6900c903,
      0x24801e9f,
-     0x21013300,
+     0x21013c00,
      0x24000804,
      0x2f000184,
      0x242031e4,
@@ -376,13 +385,13 @@ const uint32_t eg1_pdsp0[] =  {
      0x51020170,
      0x51010151,
      0x51060182,
-     0x5307014c,
+     0x53070155,
      0x51050105,
      0x51040103,
      0x1f060e0e,
-     0x21013700,
-     0x21030500,
-     0x21005c00,
+     0x21014000,
+     0x21031700,
+     0x21006500,
      0xd106ff00,
      0x9110e78a,
      0x2eff8384,
@@ -395,7 +404,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f04898e,
      0x8110078a,
      0x2f000384,
-     0x21010500,
+     0x21010e00,
      0xc90eca1b,
      0x1d0ecaca,
      0x8110078a,
@@ -422,21 +431,21 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f00878a,
      0x2f000384,
      0x2f04898e,
-     0x21010500,
+     0x21010e00,
      0x2f04898e,
      0x8110078a,
      0x2f000384,
-     0x21010500,
+     0x21010e00,
      0x2eff8384,
      0x24002004,
      0x24004024,
      0x2f04898e,
      0x2f000384,
-     0x21010500,
+     0x21010e00,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21013700,
+     0x21014000,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -450,11 +459,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x80e2b186,
      0x01017575,
      0xcf0635b0,
-     0x2101ec00,
+     0x2101f500,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21013700,
+     0x21014000,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -480,11 +489,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x10878785,
      0x2f000384,
      0x1f073535,
-     0x21012900,
+     0x21013200,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21013700,
+     0x21014000,
      0x2e808986,
      0x24000104,
      0x0b0446c4,
@@ -500,11 +509,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x8ec3d106,
      0x01015555,
      0xcf06357e,
-     0x2101ec00,
+     0x2101f500,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21013700,
+     0x21014000,
      0x2e808396,
      0x111f7600,
      0x6f0000b6,
@@ -515,7 +524,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x66c45eb1,
      0x04c45e5e,
      0x2f000384,
-     0x21012900,
+     0x21013200,
      0x2e808786,
      0x24000cc4,
      0xc907ff00,
@@ -539,7 +548,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x81206787,
      0x240010c4,
      0x1f053535,
-     0x2101e100,
+     0x2101ea00,
      0x91090762,
      0x110f0202,
      0x11c06922,
@@ -563,11 +572,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f000184,
      0xc9046603,
      0x1f063535,
-     0x21012900,
+     0x21013200,
      0x24000082,
      0xd1037d03,
-     0xd1047d7b,
-     0x2302a99e,
+     0xd1047d84,
+     0x2302bb9e,
      0x2e85098e,
      0xc901350a,
      0x593c9409,
@@ -579,21 +588,30 @@ const uint32_t eg1_pdsp0[] =  {
      0x24003cce,
      0x01013d3d,
      0x24003c94,
-     0xd1077d1e,
-     0xd102351e,
-     0xc904351d,
-     0xc9017d1c,
+     0xd1077d27,
+     0xd1023527,
+     0xc9043526,
+     0xc9017d25,
      0x111f6981,
      0x09038181,
      0x01008181,
      0x90817c86,
-     0xc9006617,
+     0xc9006620,
      0x1f077d7d,
      0x2eff8384,
      0xd1016604,
      0x81110726,
      0x2400022e,
-     0x21020e00,
+     0x21022000,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21021c00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2400002e,
      0x108686c5,
      0x10464605,
@@ -608,7 +626,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x1f000e0e,
      0xc904ff00,
      0x2e808f86,
-     0x21012000,
+     0x21012900,
      0x1d077d7d,
      0x2f05098e,
      0xc900350c,
@@ -619,7 +637,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x21022700,
+     0x21023900,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -636,7 +654,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x21023800,
+     0x21024a00,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -688,7 +706,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x10565605,
      0x2f000384,
      0x2f04898e,
-     0x21010500,
+     0x21010e00,
      0x2e85098e,
      0x1d047d7d,
      0xd1077d0a,
@@ -707,7 +725,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x240443e4,
      0x109696c4,
      0x2f000384,
-     0x2101f100,
+     0x2101fa00,
      0x111f7601,
      0x24000104,
      0x240004c4,
@@ -715,30 +733,30 @@ const uint32_t eg1_pdsp0[] =  {
      0x24000004,
      0x69040102,
      0x240008c4,
-     0x64c45ee6,
+     0x64c45edd,
      0x04c45e5e,
      0x2f000184,
      0x51030105,
      0x51040106,
      0x511f010c,
-     0x550001a0,
-     0x21012900,
+     0x55000197,
+     0x21013200,
      0x1f037d7d,
-     0x21012900,
+     0x21013200,
      0x71ff9604,
      0x24801e9f,
      0x1f060e0e,
-     0x21013700,
+     0x21014000,
      0x1f047d7d,
      0x81387196,
-     0x21012900,
+     0x21013200,
      0x24001004,
      0x2f000384,
      0x2e85098e,
      0x24004304,
      0x58ce9603,
      0x109696c4,
-     0x21029c00,
+     0x2102ae00,
      0x048f96c4,
      0x10565624,
      0x10f2f2e5,
@@ -749,10 +767,10 @@ const uint32_t eg1_pdsp0[] =  {
      0x24002004,
      0x24004024,
      0x9110e78a,
-     0x21014400,
+     0x21014d00,
      0x2f000384,
      0x2f04898e,
-     0x21010500,
+     0x21010e00,
      0x69008203,
      0x24000c04,
      0x2f000384,
@@ -770,7 +788,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x2102bd00,
+     0x2102cf00,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -781,7 +799,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x58820604,
      0x24801e9f,
      0x1f060e0e,
-     0x21013700,
+     0x21014000,
      0x24000004,
      0x048206c4,
      0x00c48282,
@@ -792,7 +810,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x2102d300,
+     0x2102e500,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -811,7 +829,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x58828604,
      0x24801e9f,
      0x1f060e0e,
-     0x21013700,
+     0x21014000,
      0x24000004,
      0x048286c4,
      0x00c48282,
@@ -836,7 +854,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x01010303,
      0x01202323,
      0x0120e0e0,
-     0x2102de00,
+     0x2102f000,
      0x24000083,
      0xc9071d02,
      0x2400ff23,
@@ -845,7 +863,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x00839494,
      0x2f05098e,
      0x209e0000,
-     0x21030600,
+     0x21031800,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -855,15 +873,15 @@ const uint32_t eg1_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21033e00,
+     0x21035000,
      0x51006602,
-     0x21033e00,
+     0x21035000,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21033e00,
+     0x21035000,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -888,20 +906,20 @@ const uint32_t eg1_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062781,
-     0x510c27f7,
-     0x530a2783,
-     0x5308277f,
-     0x530b277f,
-     0x5309277f,
-     0x5105273b,
+     0x5306278c,
+     0x530c2702,
+     0x530a278e,
+     0x5308278a,
+     0x530b278a,
+     0x5309278a,
+     0x51052744,
      0x24000286,
      0x2f0080c6,
-     0x21033e00,
-     0x21059200,
-     0x21059200,
-     0x21058b00,
-     0x21059200,
+     0x21035000,
+     0x2105b800,
+     0x2105b800,
+     0x2105b100,
+     0x2105b800,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -921,11 +939,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21036800,
+     0x21038300,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21035900,
+     0x21036b00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -934,7 +952,16 @@ const uint32_t eg1_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21036800,
+     0x21038300,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21037a00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -943,7 +970,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x1d0fcaca,
      0x8110078a,
      0x2f000384,
-     0x21010500,
+     0x21010e00,
      0x9110078a,
      0x1d0fcaca,
      0xc9060e03,
@@ -952,11 +979,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x8110078a,
      0x2f04898e,
      0x2f000384,
-     0x21010500,
-     0x59388004,
+     0x21010e00,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21033e00,
+     0x21035000,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1053,7 +1080,7 @@ const uint32_t eg1_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1082,10 +1109,12 @@ const uint32_t eg1_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1135,7 +1164,7 @@ const uint32_t eg1_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21033e00,
+     0x21035000,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1145,20 +1174,20 @@ const uint32_t eg1_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21033e00,
+     0x21035000,
      0x240018c4,
      0x2f000384,
-     0x2104a700,
+     0x2104c400,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2104a400,
+     0x2104c100,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21033e00,
+     0x21035000,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1169,10 +1198,10 @@ const uint32_t eg1_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21033e00,
+     0x21035000,
      0x69066a0e,
      0x59148002,
-     0x2104a400,
+     0x2104c100,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1182,11 +1211,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21044f00,
-     0x21033e00,
+     0x21046c00,
+     0x21035000,
      0x69076a0e,
      0x59148002,
-     0x2104a400,
+     0x2104c100,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1196,12 +1225,12 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21045d00,
-     0x21033e00,
+     0x21047a00,
+     0x21035000,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2104a400,
+     0x2104c100,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1221,12 +1250,12 @@ const uint32_t eg1_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21046c00,
-     0x21033e00,
+     0x21048900,
+     0x21035000,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2104a400,
+     0x2104c100,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1242,27 +1271,27 @@ const uint32_t eg1_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21048b00,
+     0x2104a800,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21048500,
-     0x21033e00,
+     0x2104a200,
+     0x21035000,
      0x690a6a08,
      0x590c8002,
-     0x2104a400,
+     0x2104c100,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21033e00,
+     0x21035000,
      0x240002d9,
      0x1f047b7b,
-     0x21033e00,
+     0x21035000,
      0x240010d9,
      0x1f047b7b,
-     0x21033e00,
+     0x21035000,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1272,12 +1301,12 @@ const uint32_t eg1_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x670b01fa,
-     0x21033e00,
-     0x21033e00,
-     0x21033e00,
-     0x21033e00,
-     0x21033e00,
-     0x21033e00,
+     0x21035000,
+     0x21035000,
+     0x21035000,
+     0x21035000,
+     0x21035000,
+     0x21035000,
      0xc907ff00,
      0x911007ca,
      0x1d0f8a8a,
@@ -1293,7 +1322,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x11c00101,
      0x51014703,
      0x24001641,
-     0x2104c700,
+     0x2104e400,
      0x24000d41,
      0x12410101,
      0x812607c1,
@@ -1306,9 +1335,9 @@ const uint32_t eg1_pdsp0[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x510369ae,
+     0x510369b7,
      0x209e0000,
-     0x69006658,
+     0x69006661,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -1339,7 +1368,7 @@ const uint32_t eg1_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2104f900,
+     0x21051600,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -1351,11 +1380,11 @@ const uint32_t eg1_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x21050b00,
+     0x21052800,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x21050b00,
+     0x21052800,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -1363,6 +1392,15 @@ const uint32_t eg1_pdsp0[] =  {
      0xc9016803,
      0x003a8686,
      0x24000042,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21053100,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x81340758,
      0x2400002e,
      0x51016963,
@@ -1400,9 +1438,9 @@ const uint32_t eg1_pdsp0[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21053500,
+     0x21055b00,
      0x2400012e,
-     0x21053500,
+     0x21055b00,
      0x69050214,
      0x1046462e,
      0x81186787,
@@ -1497,10 +1535,10 @@ const uint32_t eg1_pdsp0[] =  {
      0x24ff00c2,
      0x240000e1,
      0xe1742281,
-     0x21033e00,
+     0x21035000,
      0x24000c86,
      0x2f0080c6,
-     0x21033e00,
+     0x21035000,
      0x2eff8384,
      0x81007b84,
      0x209e0000 };
diff --git a/fw/v1/pa2_eg2_pdsp0_bin.c b/fw/v1/pa2_eg2_pdsp0_bin.c
index 1c0f8e3..4746f0a 100644
--- a/fw/v1/pa2_eg2_pdsp0_bin.c
+++ b/fw/v1/pa2_eg2_pdsp0_bin.c
@@ -72,15 +72,15 @@
 /* This file is generated by the PDSP assembler.                       */
 
 const uint32_t eg2_pdsp0[] =  {
-     0x2101ef00,
+     0x2101f800,
      0xbabe0800,
-     0x03000201,
+     0x03000202,
      0xc907ff00,
      0x911007c0,
      0x1d0f8080,
      0x811007c0,
      0x10d7d794,
-     0x69006613,
+     0x6900661c,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -91,6 +91,15 @@ const uint32_t eg2_pdsp0[] =  {
      0x111f0800,
      0x81110760,
      0x2400002e,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21001c00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2f04898e,
      0x24e020e4,
      0x24001864,
@@ -103,9 +112,9 @@ const uint32_t eg2_pdsp0[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21002400,
+     0x21002d00,
      0x2400012e,
-     0x21002400,
+     0x21002d00,
      0x6905020b,
      0x1046462e,
      0x81186787,
@@ -160,13 +169,13 @@ const uint32_t eg2_pdsp0[] =  {
      0x09047ac0,
      0x90c0fa86,
      0x2e85098e,
-     0x2401fc9e,
+     0x2402059e,
      0x21000300,
      0x2400057a,
-     0x21005500,
+     0x21005e00,
      0xd107b603,
      0x2400077a,
-     0x21005500,
+     0x21005e00,
      0xc90eb606,
      0x24000104,
      0x0510c9c4,
@@ -196,7 +205,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x109595ce,
      0xd1015303,
      0x10dada93,
-     0x21007f00,
+     0x21008800,
      0x109a9a93,
      0x1f045353,
      0x045b93c3,
@@ -239,7 +248,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x002bd7d7,
      0x002bcece,
      0x1d045353,
-     0x2100fc00,
+     0x21010500,
      0x010c3721,
      0x24000001,
      0x24000004,
@@ -262,7 +271,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000384,
      0x01042121,
      0x2e808586,
-     0x2100c700,
+     0x2100d000,
      0xc904cb08,
      0x24003304,
      0x24000424,
@@ -288,7 +297,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000384,
      0x01042121,
      0x2e808586,
-     0x2100e100,
+     0x2100ea00,
      0xc903cb08,
      0x24003304,
      0x24000424,
@@ -332,14 +341,14 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000184,
      0x48d1c302,
      0x1f035353,
-     0x21019f00,
+     0x2101a800,
      0x2480119f,
      0x2e808986,
      0x11f06600,
      0x51400004,
      0x51600047,
      0x2400017a,
-     0x21005500,
+     0x21005e00,
      0xc9005303,
      0x108787d5,
      0x108686d4,
@@ -369,7 +378,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000184,
      0x24000004,
      0x04d18282,
-     0x21013700,
+     0x21014000,
      0x51009404,
      0x24000104,
      0x108282c4,
@@ -388,7 +397,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x60918204,
      0x04918282,
      0x2400008f,
-     0x21014300,
+     0x21014c00,
      0x0082f2f0,
      0x00c282e0,
      0x6091e002,
@@ -407,7 +416,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x24001104,
      0x2f000184,
      0x00c39494,
-     0x21019f00,
+     0x2101a800,
      0xc9005304,
      0x240000d5,
      0x0128c7d4,
@@ -425,7 +434,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f008006,
      0x043b5bc4,
      0x2f000184,
-     0x21016700,
+     0x21017000,
      0x24002c27,
      0x2f008386,
      0x24000004,
@@ -450,7 +459,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000184,
      0x24000004,
      0x04d18282,
-     0x21018700,
+     0x21019000,
      0x24000104,
      0x108282c4,
      0x2f000184,
@@ -468,7 +477,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x60918204,
      0x04918282,
      0x2400008f,
-     0x21019300,
+     0x21019c00,
      0x0082f2f0,
      0x00c282e0,
      0x6091e002,
@@ -517,7 +526,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x81206786,
      0x24000864,
      0x8108072d,
-     0x2101ca00,
+     0x2101d300,
      0x91090760,
      0x110f0000,
      0x11c04d20,
@@ -548,26 +557,26 @@ const uint32_t eg2_pdsp0[] =  {
      0x045bd4e1,
      0x4ce0e19e,
      0x1f015353,
-     0x21007800,
+     0x21008100,
      0x1073730e,
      0x2400e024,
      0x24002004,
      0x2f000384,
      0x2f04898e,
-     0x2101fc00,
+     0x21020500,
      0x49ff8407,
      0x69044406,
      0x0906849c,
      0x9710fb86,
      0x869cec86,
      0x240000e5,
-     0x2101eb00,
+     0x2101f400,
      0x240003e5,
      0x81043b85,
      0x2eff8184,
      0x81003b84,
-     0x21020a00,
-     0x23068c9e,
+     0x21021300,
+     0x2306b29e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -575,7 +584,7 @@ const uint32_t eg2_pdsp0[] =  {
      0xc900ff00,
      0xd100ff00,
      0x2eff819d,
-     0x24020182,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -606,11 +615,11 @@ const uint32_t eg2_pdsp0[] =  {
      0xc90fca04,
      0x24001004,
      0x2f000384,
-     0x21022e00,
+     0x21023700,
      0x008f8994,
      0x6900c903,
      0x24801e9f,
-     0x21022a00,
+     0x21023300,
      0x24000804,
      0x2f000184,
      0x242031e4,
@@ -623,13 +632,13 @@ const uint32_t eg2_pdsp0[] =  {
      0x51020170,
      0x51010151,
      0x51060182,
-     0x5307014c,
+     0x53070155,
      0x51050105,
      0x51040103,
      0x1f060e0e,
-     0x21022e00,
-     0x2103fc00,
-     0x21005c00,
+     0x21023700,
+     0x21040e00,
+     0x21006500,
      0xd106ff00,
      0x9110e78a,
      0x2eff8384,
@@ -642,7 +651,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f04898e,
      0x8110078a,
      0x2f000384,
-     0x2101fc00,
+     0x21020500,
      0xc90eca1b,
      0x1d0ecaca,
      0x8110078a,
@@ -669,21 +678,21 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f00878a,
      0x2f000384,
      0x2f04898e,
-     0x2101fc00,
+     0x21020500,
      0x2f04898e,
      0x8110078a,
      0x2f000384,
-     0x2101fc00,
+     0x21020500,
      0x2eff8384,
      0x24002004,
      0x24004024,
      0x2f04898e,
      0x2f000384,
-     0x2101fc00,
+     0x21020500,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21022e00,
+     0x21023700,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -697,11 +706,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x80e2b186,
      0x01017575,
      0xcf0635b0,
-     0x2102e300,
+     0x2102ec00,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21022e00,
+     0x21023700,
      0x2e808586,
      0x24000104,
      0x24000cc4,
@@ -727,11 +736,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x10878785,
      0x2f000384,
      0x1f073535,
-     0x21022000,
+     0x21022900,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21022e00,
+     0x21023700,
      0x2e808986,
      0x24000104,
      0x0b0446c4,
@@ -747,11 +756,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x8ec3d106,
      0x01015555,
      0xcf06357e,
-     0x2102e300,
+     0x2102ec00,
      0x24801e9f,
      0x2e85098e,
      0x1f060e0e,
-     0x21022e00,
+     0x21023700,
      0x2e808396,
      0x111f7600,
      0x6f0000b6,
@@ -762,7 +771,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x66c45eb1,
      0x04c45e5e,
      0x2f000384,
-     0x21022000,
+     0x21022900,
      0x2e808786,
      0x24000cc4,
      0xc907ff00,
@@ -786,7 +795,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x81206787,
      0x240010c4,
      0x1f053535,
-     0x2102d800,
+     0x2102e100,
      0x91090762,
      0x110f0202,
      0x11c06922,
@@ -810,11 +819,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000184,
      0xc9046603,
      0x1f063535,
-     0x21022000,
+     0x21022900,
      0x24000082,
      0xd1037d03,
-     0xd1047d7b,
-     0x2303a09e,
+     0xd1047d84,
+     0x2303b29e,
      0x2e85098e,
      0xc901350a,
      0x593c9409,
@@ -826,21 +835,30 @@ const uint32_t eg2_pdsp0[] =  {
      0x24003cce,
      0x01013d3d,
      0x24003c94,
-     0xd1077d1e,
-     0xd102351e,
-     0xc904351d,
-     0xc9017d1c,
+     0xd1077d27,
+     0xd1023527,
+     0xc9043526,
+     0xc9017d25,
      0x111f6981,
      0x09038181,
      0x01008181,
      0x90817c86,
-     0xc9006617,
+     0xc9006620,
      0x1f077d7d,
      0x2eff8384,
      0xd1016604,
      0x81110726,
      0x2400022e,
-     0x21030500,
+     0x21031700,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21031300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2400002e,
      0x108686c5,
      0x10464605,
@@ -855,7 +873,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x1f000e0e,
      0xc904ff00,
      0x2e808f86,
-     0x21021700,
+     0x21022000,
      0x1d077d7d,
      0x2f05098e,
      0xc900350c,
@@ -866,7 +884,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x21031e00,
+     0x21033000,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -883,7 +901,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x111f0000,
      0x68002f03,
      0x2480159f,
-     0x21032f00,
+     0x21034100,
      0x01100fc0,
      0x80c03990,
      0x81011960,
@@ -935,7 +953,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x10565605,
      0x2f000384,
      0x2f04898e,
-     0x2101fc00,
+     0x21020500,
      0x2e85098e,
      0x1d047d7d,
      0xd1077d0a,
@@ -954,7 +972,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x240443e4,
      0x109696c4,
      0x2f000384,
-     0x2102e800,
+     0x2102f100,
      0x111f7601,
      0x24000104,
      0x240004c4,
@@ -962,30 +980,30 @@ const uint32_t eg2_pdsp0[] =  {
      0x24000004,
      0x69040102,
      0x240008c4,
-     0x64c45ee6,
+     0x64c45edd,
      0x04c45e5e,
      0x2f000184,
      0x51030105,
      0x51040106,
      0x511f010c,
-     0x550001a0,
-     0x21022000,
+     0x55000197,
+     0x21022900,
      0x1f037d7d,
-     0x21022000,
+     0x21022900,
      0x71ff9604,
      0x24801e9f,
      0x1f060e0e,
-     0x21022e00,
+     0x21023700,
      0x1f047d7d,
      0x81387196,
-     0x21022000,
+     0x21022900,
      0x24001004,
      0x2f000384,
      0x2e85098e,
      0x24004304,
      0x58ce9603,
      0x109696c4,
-     0x21039300,
+     0x2103a500,
      0x048f96c4,
      0x10565624,
      0x10f2f2e5,
@@ -996,10 +1014,10 @@ const uint32_t eg2_pdsp0[] =  {
      0x24002004,
      0x24004024,
      0x9110e78a,
-     0x21023b00,
+     0x21024400,
      0x2f000384,
      0x2f04898e,
-     0x2101fc00,
+     0x21020500,
      0x69008203,
      0x24000c04,
      0x2f000384,
@@ -1017,7 +1035,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x2103b400,
+     0x2103c600,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -1028,7 +1046,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x58820604,
      0x24801e9f,
      0x1f060e0e,
-     0x21022e00,
+     0x21023700,
      0x24000004,
      0x048206c4,
      0x00c48282,
@@ -1039,7 +1057,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x048fc7c4,
      0x00cfc8c5,
      0x0300c5c5,
-     0x2103ca00,
+     0x2103dc00,
      0x10c7c7c4,
      0x10c8c8c5,
      0x10878785,
@@ -1058,7 +1076,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x58828604,
      0x24801e9f,
      0x1f060e0e,
-     0x21022e00,
+     0x21023700,
      0x24000004,
      0x048286c4,
      0x00c48282,
@@ -1083,7 +1101,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x01010303,
      0x01202323,
      0x0120e0e0,
-     0x2103d500,
+     0x2103e700,
      0x24000083,
      0xc9071d02,
      0x2400ff23,
@@ -1092,7 +1110,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x00839494,
      0x2f05098e,
      0x209e0000,
-     0x2103fd00,
+     0x21040f00,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -1102,15 +1120,15 @@ const uint32_t eg2_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21043500,
+     0x21044700,
      0x51006602,
-     0x21043500,
+     0x21044700,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21043500,
+     0x21044700,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -1135,20 +1153,20 @@ const uint32_t eg2_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062781,
-     0x510c27f7,
-     0x530a2783,
-     0x5308277f,
-     0x530b277f,
-     0x5309277f,
-     0x5105273b,
+     0x5306278c,
+     0x530c2702,
+     0x530a278e,
+     0x5308278a,
+     0x530b278a,
+     0x5309278a,
+     0x51052744,
      0x24000286,
      0x2f0080c6,
-     0x21043500,
-     0x21068900,
-     0x21068900,
-     0x21068200,
-     0x21068900,
+     0x21044700,
+     0x2106af00,
+     0x2106af00,
+     0x2106a800,
+     0x2106af00,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -1168,11 +1186,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21045f00,
+     0x21047a00,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21045000,
+     0x21046200,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -1181,7 +1199,16 @@ const uint32_t eg2_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21045f00,
+     0x21047a00,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21047100,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -1190,7 +1217,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x1d0fcaca,
      0x8110078a,
      0x2f000384,
-     0x2101fc00,
+     0x21020500,
      0x9110078a,
      0x1d0fcaca,
      0xc9060e03,
@@ -1199,11 +1226,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x8110078a,
      0x2f04898e,
      0x2f000384,
-     0x2101fc00,
-     0x59388004,
+     0x21020500,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21043500,
+     0x21044700,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1300,7 +1327,7 @@ const uint32_t eg2_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1329,10 +1356,12 @@ const uint32_t eg2_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1382,7 +1411,7 @@ const uint32_t eg2_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21043500,
+     0x21044700,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1392,20 +1421,20 @@ const uint32_t eg2_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21043500,
+     0x21044700,
      0x240018c4,
      0x2f000384,
-     0x21059e00,
+     0x2105bb00,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x21059b00,
+     0x2105b800,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21043500,
+     0x21044700,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1416,10 +1445,10 @@ const uint32_t eg2_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21043500,
+     0x21044700,
      0x69066a0e,
      0x59148002,
-     0x21059b00,
+     0x2105b800,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1429,11 +1458,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21054600,
-     0x21043500,
+     0x21056300,
+     0x21044700,
      0x69076a0e,
      0x59148002,
-     0x21059b00,
+     0x2105b800,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1443,12 +1472,12 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21055400,
-     0x21043500,
+     0x21057100,
+     0x21044700,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x21059b00,
+     0x2105b800,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1468,12 +1497,12 @@ const uint32_t eg2_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21056300,
-     0x21043500,
+     0x21058000,
+     0x21044700,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x21059b00,
+     0x2105b800,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1489,27 +1518,27 @@ const uint32_t eg2_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21058200,
+     0x21059f00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21057c00,
-     0x21043500,
+     0x21059900,
+     0x21044700,
      0x690a6a08,
      0x590c8002,
-     0x21059b00,
+     0x2105b800,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21043500,
+     0x21044700,
      0x240002d9,
      0x1f047b7b,
-     0x21043500,
+     0x21044700,
      0x240010d9,
      0x1f047b7b,
-     0x21043500,
+     0x21044700,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1519,12 +1548,12 @@ const uint32_t eg2_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x670b01fa,
-     0x21043500,
-     0x21043500,
-     0x21043500,
-     0x21043500,
-     0x21043500,
-     0x21043500,
+     0x21044700,
+     0x21044700,
+     0x21044700,
+     0x21044700,
+     0x21044700,
+     0x21044700,
      0xc907ff00,
      0x911007ca,
      0x1d0f8a8a,
@@ -1540,7 +1569,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x11c00101,
      0x51014703,
      0x24001641,
-     0x2105be00,
+     0x2105db00,
      0x24000d41,
      0x12410101,
      0x812607c1,
@@ -1553,9 +1582,9 @@ const uint32_t eg2_pdsp0[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x510369ae,
+     0x510369b7,
      0x209e0000,
-     0x69006658,
+     0x69006661,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -1586,7 +1615,7 @@ const uint32_t eg2_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2105f000,
+     0x21060d00,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -1598,11 +1627,11 @@ const uint32_t eg2_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x21060200,
+     0x21061f00,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x21060200,
+     0x21061f00,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -1610,6 +1639,15 @@ const uint32_t eg2_pdsp0[] =  {
      0xc9016803,
      0x003a8686,
      0x24000042,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21062800,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x81340758,
      0x2400002e,
      0x51016963,
@@ -1647,9 +1685,9 @@ const uint32_t eg2_pdsp0[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21062c00,
+     0x21065200,
      0x2400012e,
-     0x21062c00,
+     0x21065200,
      0x69050214,
      0x1046462e,
      0x81186787,
@@ -1744,10 +1782,10 @@ const uint32_t eg2_pdsp0[] =  {
      0x24ff00c2,
      0x240000e1,
      0xe1742281,
-     0x21043500,
+     0x21044700,
      0x24000c86,
      0x2f0080c6,
-     0x21043500,
+     0x21044700,
      0x2eff8384,
      0x81007b84,
      0x209e0000 };
diff --git a/fw/v1/pa2_in0_pdsp0_bin.c b/fw/v1/pa2_in0_pdsp0_bin.c
index 91fe0e9..1d26c4d 100644
--- a/fw/v1/pa2_in0_pdsp0_bin.c
+++ b/fw/v1/pa2_in0_pdsp0_bin.c
@@ -74,7 +74,7 @@
 const uint32_t in0_pdsp0[] =  {
      0x21002c00,
      0xbabe0000,
-     0x03000201,
+     0x03000202,
      0x2effa780,
      0x8900f380,
      0x8950f380,
@@ -102,8 +102,8 @@ const uint32_t in0_pdsp0[] =  {
      0x80e5f488,
      0x0110e5e5,
      0x6ee1e5fe,
-     0x2eff9382,
-     0x85a07382,
+     0x2eff9582,
+     0x85a0b382,
      0x24000262,
      0x24000242,
      0x24000222,
@@ -116,8 +116,8 @@ const uint32_t in0_pdsp0[] =  {
      0x2400026a,
      0x81c4338a,
      0x209e0000,
-     0x23037c9e,
-     0x24020182,
+     0x2303989e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -137,7 +137,7 @@ const uint32_t in0_pdsp0[] =  {
      0x0101e0e0,
      0x0300e1e1,
      0x81f07380,
-     0x2300819e,
+     0x2300829e,
      0xc901ff09,
      0x91042481,
      0x69026107,
@@ -172,9 +172,9 @@ const uint32_t in0_pdsp0[] =  {
      0xd106ff00,
      0x93202896,
      0xc9000403,
-     0x2300939e,
+     0x2300949e,
      0x21006700,
-     0x2302449e,
+     0x2302579e,
      0x1d067d7d,
      0xc9017d04,
      0x93402e8e,
@@ -196,11 +196,12 @@ const uint32_t in0_pdsp0[] =  {
      0x21007a00,
      0x21007b00,
      0xd1057d02,
-     0xd304fff4,
+     0xd104ff05,
      0xcf057dbd,
      0xc910ff02,
      0x21003a00,
-     0x21061e00,
+     0x21064500,
+     0x21028300,
      0x91083083,
      0x01018383,
      0x91d0b380,
@@ -236,7 +237,7 @@ const uint32_t in0_pdsp0[] =  {
      0x10d7d794,
      0x24000f42,
      0x69026926,
-     0xd10bb6e4,
+     0xd10bb6ed,
      0xc9006805,
      0x81230848,
      0x11c01717,
@@ -249,7 +250,7 @@ const uint32_t in0_pdsp0[] =  {
      0x11c01717,
      0x51014a03,
      0x13161717,
-     0x2100b300,
+     0x2100b400,
      0x130d1717,
      0x812608d7,
      0x69004a04,
@@ -271,14 +272,14 @@ const uint32_t in0_pdsp0[] =  {
      0x244023e4,
      0x24001864,
      0x2f000384,
-     0x51036cc8,
+     0x51036cd1,
      0x209e0000,
-     0x6900695c,
+     0x69006965,
      0x51003802,
      0x81340858,
      0xd101b603,
      0xc9065d02,
-     0xd10bb6ba,
+     0xd10bb6c3,
      0x8118288a,
      0x51000b08,
      0x91090862,
@@ -309,7 +310,7 @@ const uint32_t in0_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2100f400,
+     0x2100f500,
      0xd1010106,
      0x113f1700,
      0x51030002,
@@ -322,11 +323,11 @@ const uint32_t in0_pdsp0[] =  {
      0x00214949,
      0x00018989,
      0x24000042,
-     0x21010600,
+     0x21010700,
      0x00228989,
      0xc9016b0a,
      0x00224949,
-     0x21010600,
+     0x21010700,
      0xc9026b04,
      0x0b05da02,
      0x00028989,
@@ -334,13 +335,22 @@ const uint32_t in0_pdsp0[] =  {
      0xc9016b03,
      0x003a8989,
      0x24000042,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x21011000,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24002002,
      0x2400002e,
      0xc905b605,
      0x911008c1,
      0x1d0f8181,
      0x811008c1,
-     0x21017d00,
+     0x21018700,
      0x51016c6a,
      0x51046c69,
      0xd1006b09,
@@ -369,9 +379,9 @@ const uint32_t in0_pdsp0[] =  {
      0x69010206,
      0xd1076903,
      0x2400002e,
-     0x21012e00,
+     0x21013800,
      0x2400012e,
-     0x21012e00,
+     0x21013800,
      0x6905020e,
      0x1049492e,
      0xd10bb65a,
@@ -470,7 +480,7 @@ const uint32_t in0_pdsp0[] =  {
      0x812608d7,
      0x24007081,
      0x9081f489,
-     0x2100a200,
+     0x2100a300,
      0x108c8cd4,
      0x91001993,
      0x01045301,
@@ -484,23 +494,23 @@ const uint32_t in0_pdsp0[] =  {
      0x209e0000,
      0x0904dede,
      0x90def486,
-     0x2403369e,
-     0x2101b500,
+     0x2403529e,
+     0x2101bf00,
      0x2480099f,
-     0x2403369e,
+     0x2403529e,
      0xc909b603,
      0x2400f081,
-     0x2101a500,
+     0x2101af00,
      0xc908b605,
      0x2400e081,
      0x9081f486,
      0x51066602,
-     0x2101b500,
+     0x2101bf00,
      0xd10fb605,
      0x11033737,
      0x13003737,
      0x9100f486,
-     0x2101b500,
+     0x2101bf00,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -508,11 +518,11 @@ const uint32_t in0_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e286,
-     0x2101b500,
+     0x2101bf00,
      0x10d7d794,
      0x24000f42,
      0x83206796,
-     0x69006650,
+     0x69006659,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -543,7 +553,7 @@ const uint32_t in0_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2101de00,
+     0x2101e800,
      0xd1010106,
      0x113f1700,
      0x51030002,
@@ -556,11 +566,11 @@ const uint32_t in0_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x2101f000,
+     0x2101fa00,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x2101f000,
+     0x2101fa00,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -571,6 +581,15 @@ const uint32_t in0_pdsp0[] =  {
      0x912a0761,
      0x51000102,
      0x81340761,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21020600,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x51016937,
      0x51046936,
      0xd1006808,
@@ -665,29 +684,29 @@ const uint32_t in0_pdsp0[] =  {
      0xc909b604,
      0xc900020c,
      0x01048181,
-     0x21025800,
+     0x21026b00,
      0xc908b604,
      0xc901020b,
      0x01148181,
-     0x21025800,
+     0x21026b00,
      0xc902020c,
      0x01248181,
      0x9081fc89,
-     0x2100a100,
+     0x2100a200,
      0xc909b603,
      0x2400f081,
-     0x21025f00,
+     0x21027200,
      0xc908b605,
      0x2400e081,
      0x9081f489,
      0x51066902,
-     0x2100a100,
+     0x2100a200,
      0xd10fb606,
      0x11033737,
      0x13003737,
      0x812608d7,
      0x9100f489,
-     0x2100a100,
+     0x2100a200,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -695,7 +714,7 @@ const uint32_t in0_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e289,
-     0x2100a100,
+     0x2100a200,
      0x91002481,
      0x0101e1e1,
      0x81002481,
@@ -707,7 +726,7 @@ const uint32_t in0_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21033600,
+     0x21035200,
      0x2480009f,
      0xc9001d14,
      0x24880081,
@@ -728,7 +747,7 @@ const uint32_t in0_pdsp0[] =  {
      0x10c0c098,
      0x108181d8,
      0xc9000502,
-     0x2300819e,
+     0x2300829e,
      0x10ecece5,
      0x240008e4,
      0x2f000184,
@@ -737,28 +756,28 @@ const uint32_t in0_pdsp0[] =  {
      0x5100c90f,
      0x6908c904,
      0x0b036801,
-     0x511e0158,
-     0x511f0157,
+     0x511e0161,
+     0x511f0160,
      0x2e808b96,
      0x0b057601,
-     0x5100015a,
-     0x5304016f,
+     0x51000163,
+     0x53040178,
      0x2480139f,
      0x1f060e0e,
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21033600,
+     0x21035200,
      0xc9001d04,
      0x1f0ccaca,
      0xc907ff00,
      0x8110078a,
-     0xc9015d39,
+     0xc9015d42,
      0x09032881,
-     0x51008137,
+     0x51008140,
      0x01508181,
      0x90817c86,
-     0xc9006634,
+     0xc900663d,
      0x81e03585,
      0xc9067d14,
      0x1f017d7d,
@@ -775,9 +794,9 @@ const uint32_t in0_pdsp0[] =  {
      0xd106ff00,
      0x93202896,
      0xc9000403,
-     0x2300939e,
-     0x2102c200,
-     0x2302449e,
+     0x2300949e,
+     0x2102d500,
+     0x2302579e,
      0x1d067d7d,
      0x2e85098e,
      0xc907ff00,
@@ -785,7 +804,16 @@ const uint32_t in0_pdsp0[] =  {
      0xd1016604,
      0x81110726,
      0x2400022e,
-     0x2102ce00,
+     0x2102ea00,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2102e600,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2400002e,
      0x108686c5,
      0x10464605,
@@ -800,7 +828,7 @@ const uint32_t in0_pdsp0[] =  {
      0x1d000e0e,
      0xd1017d03,
      0x2f04898e,
-     0x2102da00,
+     0x2102f600,
      0x83402e8e,
      0x1f000e0e,
      0xc904ff00,
@@ -824,13 +852,13 @@ const uint32_t in0_pdsp0[] =  {
      0x2eff8b96,
      0x008f89d7,
      0x108989db,
-     0x2102fe00,
+     0x21031a00,
      0x2eff8b96,
      0x008f89d7,
      0x2f05098e,
      0x24001097,
-     0x24031c9e,
-     0x2106d100,
+     0x2403389e,
+     0x2106f800,
      0x24000104,
      0x0508c9c4,
      0xc9001d02,
@@ -850,18 +878,18 @@ const uint32_t in0_pdsp0[] =  {
      0x61100304,
      0x1f007d7d,
      0x240002de,
-     0x21034f00,
+     0x21036b00,
      0x2eff8792,
      0x2f018792,
      0x2f020792,
      0x2f028792,
      0x1f027d7d,
-     0x21031600,
+     0x21033200,
      0x70167c05,
      0x11033737,
      0x13143737,
      0x240002de,
-     0x21032f00,
+     0x21034b00,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -882,7 +910,7 @@ const uint32_t in0_pdsp0[] =  {
      0xc909b604,
      0xc9000207,
      0xc9030206,
-     0x21032e00,
+     0x21034a00,
      0xc908b604,
      0xc9010203,
      0xc9040202,
@@ -923,34 +951,34 @@ const uint32_t in0_pdsp0[] =  {
      0x510ade1b,
      0xc9007d03,
      0x1d007d7d,
-     0x21019e00,
+     0x2101a800,
      0x5103de07,
      0x5104de0a,
      0x5105de0d,
      0x5106de10,
      0x5107de17,
      0x0b0237de,
-     0x21019a00,
+     0x2101a400,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21033600,
+     0x21035200,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21033a00,
+     0x21035600,
      0x24402084,
      0x24001864,
      0x24000e2e,
-     0x21033600,
+     0x21035200,
      0x24402084,
      0x24001864,
      0x24000d2e,
-     0x21033600,
+     0x21035200,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x21033600,
+     0x21035200,
      0x0b069781,
      0x110f8181,
      0x240100c1,
@@ -959,11 +987,11 @@ const uint32_t in0_pdsp0[] =  {
      0x00c18181,
      0xc909b603,
      0x01048181,
-     0x21037900,
+     0x21039500,
      0x01148181,
      0x9081fc86,
-     0x2403369e,
-     0x2101b500,
+     0x2403529e,
+     0x2101bf00,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -984,26 +1012,26 @@ const uint32_t in0_pdsp0[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x240623c8,
-     0x24069088,
-     0x2406a6c9,
-     0x2406fb89,
-     0x2406fdca,
-     0x2406ff8a,
-     0x2406ffcb,
-     0x2406ff8b,
-     0x2406ffcc,
-     0x2406ff8c,
-     0x2406ffcd,
-     0x2406ff8d,
-     0x2406ffce,
-     0x2406f98e,
-     0x2406b8cf,
-     0x2406ff8f,
-     0x2406ffd0,
-     0x2406ff90,
-     0x2406ffd1,
-     0x2406ff91,
+     0x24064ac8,
+     0x2406b788,
+     0x2406cdc9,
+     0x24072289,
+     0x240724ca,
+     0x2407268a,
+     0x240726cb,
+     0x2407268b,
+     0x240726cc,
+     0x2407268c,
+     0x240726cd,
+     0x2407268d,
+     0x240726ce,
+     0x2407208e,
+     0x2406dfcf,
+     0x2407268f,
+     0x240726d0,
+     0x24072690,
+     0x240726d1,
+     0x24072691,
      0x8500f588,
      0x248100c8,
      0x2488a888,
@@ -1081,7 +1109,7 @@ const uint32_t in0_pdsp0[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21044500,
+     0x21046100,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1105,10 +1133,10 @@ const uint32_t in0_pdsp0[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x21044500,
+     0x21046100,
      0x81242e84,
      0x1f057d7d,
-     0x21044500,
+     0x21046100,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -1118,15 +1146,15 @@ const uint32_t in0_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21044500,
+     0x21046100,
      0x51006602,
-     0x21044500,
+     0x21046100,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21044500,
+     0x21046100,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -1151,20 +1179,20 @@ const uint32_t in0_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062780,
-     0x510c27eb,
-     0x530a2782,
-     0x5308277e,
-     0x530b277e,
-     0x5309277e,
-     0x5105272f,
+     0x5306278b,
+     0x510c27f6,
+     0x530a278d,
+     0x53082789,
+     0x530b2789,
+     0x53092789,
+     0x51052738,
      0x24000286,
      0x2f0080c6,
-     0x21044500,
-     0x2105bf00,
-     0x2103eb00,
-     0x2105bc00,
-     0x2105bc00,
+     0x21046100,
+     0x2105e600,
+     0x21040700,
+     0x2105e300,
+     0x2105e300,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -1185,11 +1213,11 @@ const uint32_t in0_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21046b00,
+     0x21049000,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21046100,
+     0x21047d00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -1198,16 +1226,25 @@ const uint32_t in0_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21046b00,
+     0x21049000,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21048c00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
-     0x21033a00,
-     0x21033a00,
-     0x59388004,
+     0x21035600,
+     0x21035600,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21044500,
+     0x21046100,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1304,7 +1341,7 @@ const uint32_t in0_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1333,10 +1370,12 @@ const uint32_t in0_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1386,7 +1425,7 @@ const uint32_t in0_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21044500,
+     0x21046100,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1396,20 +1435,20 @@ const uint32_t in0_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21044500,
+     0x21046100,
      0x240018c4,
      0x2f000384,
-     0x2105ad00,
+     0x2105d400,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2105aa00,
+     0x2105d100,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21044500,
+     0x21046100,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1420,10 +1459,10 @@ const uint32_t in0_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21044500,
+     0x21046100,
      0x69036a0b,
      0x59088002,
-     0x2105aa00,
+     0x2105d100,
      0x2e80818e,
      0x1d045d5d,
      0xc9006e05,
@@ -1431,10 +1470,10 @@ const uint32_t in0_pdsp0[] =  {
      0x1d055d5d,
      0xc9016e02,
      0x1f055d5d,
-     0x21044500,
+     0x21046100,
      0x69066a0e,
      0x59148002,
-     0x2105aa00,
+     0x2105d100,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1444,11 +1483,11 @@ const uint32_t in0_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21055500,
-     0x21044500,
+     0x21057c00,
+     0x21046100,
      0x69076a0e,
      0x59148002,
-     0x2105aa00,
+     0x2105d100,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1458,12 +1497,12 @@ const uint32_t in0_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21056300,
-     0x21044500,
+     0x21058a00,
+     0x21046100,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2105aa00,
+     0x2105d100,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1483,12 +1522,12 @@ const uint32_t in0_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21057200,
-     0x21044500,
+     0x21059900,
+     0x21046100,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2105aa00,
+     0x2105d100,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1504,27 +1543,27 @@ const uint32_t in0_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21059100,
+     0x2105b800,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21058b00,
-     0x21044500,
+     0x2105b200,
+     0x21046100,
      0x690a6a08,
      0x590c8002,
-     0x2105aa00,
+     0x2105d100,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21044500,
+     0x21046100,
      0x240002d9,
      0x1f047b7b,
-     0x21044500,
+     0x21046100,
      0x240010d9,
      0x1f047b7b,
-     0x21044500,
+     0x21046100,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1534,22 +1573,22 @@ const uint32_t in0_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21044500,
-     0x21044500,
-     0x21044500,
-     0x21044500,
-     0x21044500,
-     0x21044500,
+     0x21046100,
+     0x21046100,
+     0x21046100,
+     0x21046100,
+     0x21046100,
+     0x21046100,
      0x24000c86,
      0x2f0080c6,
-     0x21044500,
+     0x21046100,
      0x2e80838a,
      0x2eff818d,
      0x240068c0,
      0x58c08004,
      0x24001000,
      0xc9037b42,
-     0x21060200,
+     0x21062900,
      0x91200e61,
      0x240100c0,
      0x68c0ca12,
@@ -1557,7 +1596,7 @@ const uint32_t in0_pdsp0[] =  {
      0x69202104,
      0x24000400,
      0xc9037b3a,
-     0x21060200,
+     0x21062900,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -1565,15 +1604,15 @@ const uint32_t in0_pdsp0[] =  {
      0x69200304,
      0x24000400,
      0xc9037b32,
-     0x21060200,
+     0x21062900,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x2105e300,
+     0x21060a00,
      0x60c0ca04,
      0x24000400,
      0xc9037b2a,
-     0x21060200,
+     0x21062900,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1582,7 +1621,7 @@ const uint32_t in0_pdsp0[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x21060a00,
+     0x21063100,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -1606,18 +1645,18 @@ const uint32_t in0_pdsp0[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x21044500,
+     0x21046100,
      0x83242e84,
      0x1f057d7d,
-     0x21044500,
+     0x21046100,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21044500,
+     0x21046100,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x21044500,
+     0x21046100,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -1637,7 +1676,7 @@ const uint32_t in0_pdsp0[] =  {
      0x69032a03,
      0x1f016d6d,
      0x10cbcb8d,
-     0x2105e700,
+     0x21060e00,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
@@ -1689,11 +1728,11 @@ const uint32_t in0_pdsp0[] =  {
      0x111f0101,
      0x68013003,
      0x2480159f,
-     0x21068400,
+     0x2106ab00,
      0x011010c1,
      0x80c13991,
      0x81011961,
-     0x21068400,
+     0x2106ab00,
      0x1f039999,
      0x1f056a6a,
      0x10d0d0ce,
@@ -1705,21 +1744,21 @@ const uint32_t in0_pdsp0[] =  {
      0x00c41616,
      0x240001de,
      0x68d3ce02,
-     0x21068700,
+     0x2106ae00,
      0x6893ce02,
-     0x21068b00,
+     0x2106b200,
      0x68d2ce03,
      0x1f006a6a,
-     0x21069000,
+     0x2106b700,
      0x6892ce03,
      0x1f016a6a,
-     0x21069000,
+     0x2106b700,
      0x68d4ce02,
-     0x2106a600,
+     0x2106cd00,
      0x6894ce02,
-     0x2106a600,
+     0x2106cd00,
      0x68d5ce02,
-     0x2106b800,
+     0x2106df00,
      0x6895ce03,
      0x1f049999,
      0x1f046a6a,
@@ -1736,7 +1775,7 @@ const uint32_t in0_pdsp0[] =  {
      0x11f04700,
      0x69300003,
      0x13603737,
-     0x21068500,
+     0x2106ac00,
      0x2f02878a,
      0x209e0000,
      0x2480079f,
@@ -1766,14 +1805,14 @@ const uint32_t in0_pdsp0[] =  {
      0x10cececb,
      0x110f6b6b,
      0x0b0dce8c,
-     0x2106a200,
+     0x2106c900,
      0x10cece8b,
      0x110f2b2b,
      0x0b0dcecd,
      0x01021616,
      0x240002c4,
      0x2f000384,
-     0x21064000,
+     0x21066700,
      0x1f029999,
      0x24800e9f,
      0x2e80838e,
@@ -1787,9 +1826,9 @@ const uint32_t in0_pdsp0[] =  {
      0xc908ee06,
      0x0b046f00,
      0x69040002,
-     0x21068700,
+     0x2106ae00,
      0x69060002,
-     0x21068b00,
+     0x2106b200,
      0x24001003,
      0x209e0000,
      0x2e80838e,
@@ -1806,13 +1845,13 @@ const uint32_t in0_pdsp0[] =  {
      0x24002180,
      0x68808f03,
      0x01021616,
-     0x21068700,
+     0x2106ae00,
      0x24005780,
      0x68808f03,
      0x01021616,
-     0x21068b00,
+     0x2106b200,
      0x135c3737,
-     0x2106ce00,
+     0x2106f500,
      0x13583737,
      0x240002de,
      0x24001003,
@@ -1829,7 +1868,7 @@ const uint32_t in0_pdsp0[] =  {
      0xc9012f04,
      0x10cececb,
      0x108e8e8b,
-     0x2106e100,
+     0x21070800,
      0x1f026a6a,
      0x11ffcecb,
      0x11ff8e8b,
@@ -1846,7 +1885,7 @@ const uint32_t in0_pdsp0[] =  {
      0xc9022f04,
      0x10cececb,
      0x108e8e8b,
-     0x2106f200,
+     0x21071900,
      0x1f026a6a,
      0x11ffcecb,
      0x11ff8e8b,
diff --git a/fw/v1/pa2_in0_pdsp1_bin.c b/fw/v1/pa2_in0_pdsp1_bin.c
index 88620d1..563c5b3 100644
--- a/fw/v1/pa2_in0_pdsp1_bin.c
+++ b/fw/v1/pa2_in0_pdsp1_bin.c
@@ -74,9 +74,9 @@
 const uint32_t in0_pdsp1[] =  {
      0x21000300,
      0xbabe0001,
-     0x03000201,
-     0x2303469e,
-     0x24020182,
+     0x03000202,
+     0x23036b9e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -124,14 +124,14 @@ const uint32_t in0_pdsp1[] =  {
      0x93202896,
      0xc9000406,
      0xc9001d03,
-     0x2302f89e,
+     0x23031d9e,
      0x21003c00,
-     0x2300609e,
+     0x2300619e,
      0x21003c00,
      0xc9001d03,
-     0x2303429e,
+     0x2303679e,
      0x21003c00,
-     0x2300859e,
+     0x2300869e,
      0x1d067d7d,
      0xc9017d04,
      0x93402e8e,
@@ -162,12 +162,13 @@ const uint32_t in0_pdsp1[] =  {
      0xc9011d04,
      0xd1067d04,
      0xd1077d03,
-     0x2305e19e,
-     0xd304ffaf,
+     0x2306119e,
+     0xd104ff05,
      0xcf057db4,
      0xc910ff02,
      0x21001000,
-     0x2105da00,
+     0x21060a00,
+     0x21022f00,
      0x0906c481,
      0x92812088,
      0x10c8c89f,
@@ -181,11 +182,11 @@ const uint32_t in0_pdsp1[] =  {
      0x106a6a2e,
      0x244023e4,
      0x24001864,
-     0x21007c00,
+     0x21007d00,
      0xd1015d04,
      0x2400002e,
      0x240391c5,
-     0x21007400,
+     0x21007500,
      0x2400012e,
      0x240011c5,
      0x246023e4,
@@ -209,9 +210,18 @@ const uint32_t in0_pdsp1[] =  {
      0x51006904,
      0x24000b6a,
      0x2400000a,
-     0x21006500,
+     0x21006600,
      0x2400002e,
      0x2f04898e,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x21009600,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x246023e4,
      0x24001864,
      0x811208c9,
@@ -223,21 +233,30 @@ const uint32_t in0_pdsp1[] =  {
      0x51026904,
      0x1f060e0e,
      0x240020e4,
-     0x2102be00,
+     0x2102e300,
      0x24000b2e,
      0x244020e4,
      0x24001864,
-     0x2102be00,
+     0x2102e300,
      0x2400002e,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x2100b000,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24602084,
      0x24001864,
      0x10494905,
      0x811207c9,
-     0x2102be00,
+     0x2102e300,
      0x10d7d794,
      0x24000f42,
      0x6902691b,
-     0xd10bb6c1,
+     0xd10bb6ca,
      0xc9006805,
      0x81230848,
      0x11c01717,
@@ -250,7 +269,7 @@ const uint32_t in0_pdsp1[] =  {
      0x11c01717,
      0x51014a03,
      0x13161717,
-     0x2100b400,
+     0x2100c700,
      0x130d1717,
      0x812608d7,
      0xc9000a03,
@@ -261,14 +280,14 @@ const uint32_t in0_pdsp1[] =  {
      0x244023e4,
      0x24001864,
      0x2f000384,
-     0x51036cb0,
+     0x51036cb9,
      0x209e0000,
-     0x69006958,
+     0x69006961,
      0x51003802,
      0x81340858,
      0xd101b603,
      0xc9065d02,
-     0xd10bb6a2,
+     0xd10bb6ab,
      0x8118288a,
      0x51000b08,
      0x91090862,
@@ -299,7 +318,7 @@ const uint32_t in0_pdsp1[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2100e900,
+     0x2100fc00,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -311,11 +330,11 @@ const uint32_t in0_pdsp1[] =  {
      0x00214949,
      0x00018989,
      0x24000042,
-     0x2100fb00,
+     0x21010e00,
      0x00228989,
      0xc9016b0a,
      0x00224949,
-     0x2100fb00,
+     0x21010e00,
      0xc9026b04,
      0x0b05da02,
      0x00028989,
@@ -323,10 +342,19 @@ const uint32_t in0_pdsp1[] =  {
      0xc9016b03,
      0x003a8989,
      0x24000042,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x21011700,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24002002,
      0x2400002e,
      0xc905b602,
-     0x21015b00,
+     0x21017700,
      0x51016c56,
      0x51046c55,
      0xd1006b09,
@@ -355,9 +383,9 @@ const uint32_t in0_pdsp1[] =  {
      0x69010206,
      0xd1076903,
      0x2400002e,
-     0x21012000,
+     0x21013c00,
      0x2400012e,
-     0x21012000,
+     0x21013c00,
      0x6905020e,
      0x1049492e,
      0xd10bb646,
@@ -436,7 +464,7 @@ const uint32_t in0_pdsp1[] =  {
      0x812608d7,
      0x24007081,
      0x9081f489,
-     0x2100a300,
+     0x2100b600,
      0x108c8cd4,
      0x91001993,
      0x01045301,
@@ -450,12 +478,12 @@ const uint32_t in0_pdsp1[] =  {
      0x209e0000,
      0x0904dede,
      0x90def486,
-     0x2402be9e,
-     0x21017c00,
+     0x2402e39e,
+     0x21019800,
      0x10d7d794,
      0x24000f42,
      0x83206796,
-     0x6900664f,
+     0x69006658,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -486,7 +514,7 @@ const uint32_t in0_pdsp1[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2101a400,
+     0x2101c000,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -498,11 +526,11 @@ const uint32_t in0_pdsp1[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x2101b600,
+     0x2101d200,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x2101b600,
+     0x2101d200,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -513,6 +541,15 @@ const uint32_t in0_pdsp1[] =  {
      0x912a0761,
      0x51000102,
      0x81340761,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2101de00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x51016937,
      0x51046936,
      0xd1006808,
@@ -620,7 +657,7 @@ const uint32_t in0_pdsp1[] =  {
      0x2eff8390,
      0xc9025d03,
      0x24000010,
-     0x21022600,
+     0x21024b00,
      0x24000b10,
      0xc907ff00,
      0x81386790,
@@ -628,7 +665,7 @@ const uint32_t in0_pdsp1[] =  {
      0x2f018792,
      0x2f020792,
      0x2f028792,
-     0x21060500,
+     0x21063500,
      0x1d0fcaca,
      0x2f00808a,
      0x24001004,
@@ -636,7 +673,7 @@ const uint32_t in0_pdsp1[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x2102be00,
+     0x2102e300,
      0xc90dca2a,
      0x1d0dcaca,
      0x2f00808a,
@@ -656,14 +693,14 @@ const uint32_t in0_pdsp1[] =  {
      0x93202896,
      0xc9000406,
      0xc9001d03,
-     0x2302f89e,
-     0x21025000,
-     0x2300609e,
-     0x21025000,
+     0x23031d9e,
+     0x21027500,
+     0x2300619e,
+     0x21027500,
      0xc9001d03,
-     0x2303429e,
-     0x21025000,
-     0x2300859e,
+     0x2303679e,
+     0x21027500,
+     0x2300869e,
      0x1d067d7d,
      0x2e85098e,
      0x102e2e00,
@@ -673,7 +710,7 @@ const uint32_t in0_pdsp1[] =  {
      0x1d000e0e,
      0xd1017d03,
      0x2f04898e,
-     0x21025b00,
+     0x21028000,
      0x83402e8e,
      0x1000002e,
      0x1f000e0e,
@@ -681,7 +718,7 @@ const uint32_t in0_pdsp1[] =  {
      0x2e808f86,
      0xc90cca03,
      0xc9001d02,
-     0x21021300,
+     0x21023800,
      0x2480009f,
      0x240008e4,
      0x2f000184,
@@ -701,21 +738,21 @@ const uint32_t in0_pdsp1[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x2102be00,
-     0x21027100,
+     0x2102e300,
+     0x21029600,
      0x240832e4,
      0x2f000384,
      0xd106ff00,
      0x2eff8b96,
      0x008f89d7,
      0x108989db,
-     0x21028b00,
+     0x2102b000,
      0x2eff8b96,
      0x008f89d7,
      0x2f05098e,
      0x24001097,
-     0x2402b69e,
-     0x21070100,
+     0x2402db9e,
+     0x21073100,
      0x24000104,
      0x0508c9c4,
      0xc9001d02,
@@ -735,17 +772,17 @@ const uint32_t in0_pdsp1[] =  {
      0x11033737,
      0x1016161c,
      0x1f037d7d,
-     0x21029e00,
+     0x2102c300,
      0x1f007d7d,
      0x240002de,
      0xc907ff00,
      0x24001876,
      0x83206796,
-     0x2102d900,
+     0x2102fe00,
      0x2eff8390,
      0xc9025d03,
      0x24000010,
-     0x2102a300,
+     0x2102c800,
      0x24000b10,
      0xc907ff00,
      0x81386790,
@@ -754,12 +791,12 @@ const uint32_t in0_pdsp1[] =  {
      0x2f020792,
      0x2f028792,
      0x1f027d7d,
-     0x2102b000,
+     0x2102d500,
      0x70167c05,
      0x11033737,
      0x13143737,
      0x240002de,
-     0x2102b700,
+     0x2102dc00,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -805,33 +842,33 @@ const uint32_t in0_pdsp1[] =  {
      0x510ade1a,
      0xc9007d03,
      0x1d007d7d,
-     0x21009200,
+     0x21009c00,
      0x5103de06,
      0x5104de09,
      0x5105de0c,
      0x5106de0f,
      0x0b0237de,
-     0x21017800,
+     0x21019400,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x2102be00,
+     0x2102e300,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x2102be00,
+     0x2102e300,
      0x24402084,
      0x24001864,
      0x24000e2e,
-     0x2102be00,
+     0x2102e300,
      0x24402084,
      0x24001864,
      0x24000d2e,
-     0x2102be00,
+     0x2102e300,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x2102be00,
+     0x2102e300,
      0x0906c481,
      0x92812088,
      0xc904380f,
@@ -873,7 +910,7 @@ const uint32_t in0_pdsp1[] =  {
      0x111f0101,
      0x68017303,
      0x2480159f,
-     0x21032600,
+     0x21034b00,
      0x011053c1,
      0x80c13994,
      0x81011961,
@@ -882,13 +919,13 @@ const uint32_t in0_pdsp1[] =  {
      0xd1005d04,
      0x244023e4,
      0x24001864,
-     0x21033700,
+     0x21035c00,
      0xc9073802,
      0x24800a9f,
      0xd1015d04,
      0x2400002e,
      0x240391c5,
-     0x21033300,
+     0x21035800,
      0x2400012e,
      0x240011c5,
      0x246023e4,
@@ -905,11 +942,11 @@ const uint32_t in0_pdsp1[] =  {
      0x6f0b2ef9,
      0xcf0038f8,
      0x24000d2e,
-     0x21033700,
+     0x21035c00,
      0xcf060ee4,
      0x240024e4,
      0x1f070e0e,
-     0x21033700,
+     0x21035c00,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -930,26 +967,26 @@ const uint32_t in0_pdsp1[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x240605c8,
-     0x2406d288,
-     0x2406dfc9,
-     0x24073789,
-     0x24076eca,
-     0x2407908a,
-     0x24079dcb,
-     0x2407aa8b,
-     0x2407c2cc,
-     0x2407cf8c,
-     0x2407facd,
-     0x2407fc8d,
-     0x2407fcce,
-     0x2407048e,
-     0x2406eecf,
-     0x2407fe8f,
-     0x240822d0,
-     0x24080490,
-     0x24080ed1,
-     0x24081891,
+     0x240635c8,
+     0x24070288,
+     0x24070fc9,
+     0x24076789,
+     0x24079eca,
+     0x2407c08a,
+     0x2407cdcb,
+     0x2407da8b,
+     0x2407f2cc,
+     0x2407ff8c,
+     0x24082acd,
+     0x24082c8d,
+     0x24082cce,
+     0x2407348e,
+     0x24071ecf,
+     0x24082e8f,
+     0x240852d0,
+     0x24083490,
+     0x24083ed1,
+     0x24084891,
      0x8500f588,
      0x248100c8,
      0x2488a888,
@@ -1010,7 +1047,7 @@ const uint32_t in0_pdsp1[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x2103fe00,
+     0x21042300,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1034,10 +1071,10 @@ const uint32_t in0_pdsp1[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x2103fe00,
+     0x21042300,
      0x81242e84,
      0x1f057d7d,
-     0x2103fe00,
+     0x21042300,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -1047,15 +1084,15 @@ const uint32_t in0_pdsp1[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x2103fe00,
+     0x21042300,
      0x51006602,
-     0x2103fe00,
+     0x21042300,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x2103fe00,
+     0x21042300,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -1080,20 +1117,20 @@ const uint32_t in0_pdsp1[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062775,
-     0x510c27eb,
-     0x530a2777,
-     0x53082773,
-     0x530b2773,
-     0x53092773,
-     0x5105272f,
+     0x53062780,
+     0x510c27f6,
+     0x530a2782,
+     0x5308277e,
+     0x530b277e,
+     0x5309277e,
+     0x51052738,
      0x24000286,
      0x2f0080c6,
-     0x2103fe00,
-     0x21056d00,
-     0x2103a400,
-     0x21056a00,
-     0x21056a00,
+     0x21042300,
+     0x21059d00,
+     0x2103c900,
+     0x21059a00,
+     0x21059a00,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -1114,11 +1151,11 @@ const uint32_t in0_pdsp1[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21042400,
+     0x21045200,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21041a00,
+     0x21043f00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -1127,16 +1164,25 @@ const uint32_t in0_pdsp1[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21042400,
+     0x21045200,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21044e00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
-     0x2102be00,
-     0x2102be00,
-     0x59388004,
+     0x2102e300,
+     0x2102e300,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x2103fe00,
+     0x21042300,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1233,7 +1279,7 @@ const uint32_t in0_pdsp1[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1262,10 +1308,12 @@ const uint32_t in0_pdsp1[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1315,7 +1363,7 @@ const uint32_t in0_pdsp1[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x2103fe00,
+     0x21042300,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1325,20 +1373,20 @@ const uint32_t in0_pdsp1[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x2103fe00,
+     0x21042300,
      0x240018c4,
      0x2f000384,
-     0x21055b00,
+     0x21058b00,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x21055800,
+     0x21058800,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x2103fe00,
+     0x21042300,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1349,10 +1397,10 @@ const uint32_t in0_pdsp1[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x2103fe00,
+     0x21042300,
      0x69066a0e,
      0x59148002,
-     0x21055800,
+     0x21058800,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1362,11 +1410,11 @@ const uint32_t in0_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21050300,
-     0x2103fe00,
+     0x21053300,
+     0x21042300,
      0x69076a0e,
      0x59148002,
-     0x21055800,
+     0x21058800,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1376,12 +1424,12 @@ const uint32_t in0_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21051100,
-     0x2103fe00,
+     0x21054100,
+     0x21042300,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x21055800,
+     0x21058800,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1401,12 +1449,12 @@ const uint32_t in0_pdsp1[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21052000,
-     0x2103fe00,
+     0x21055000,
+     0x21042300,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x21055800,
+     0x21058800,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1422,27 +1470,27 @@ const uint32_t in0_pdsp1[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21053f00,
+     0x21056f00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21053900,
-     0x2103fe00,
+     0x21056900,
+     0x21042300,
      0x690a6a08,
      0x590c8002,
-     0x21055800,
+     0x21058800,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x2103fe00,
+     0x21042300,
      0x240002d9,
      0x1f047b7b,
-     0x2103fe00,
+     0x21042300,
      0x240010d9,
      0x1f047b7b,
-     0x2103fe00,
+     0x21042300,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1452,27 +1500,27 @@ const uint32_t in0_pdsp1[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x2103fe00,
-     0x2103fe00,
-     0x2103fe00,
-     0x2103fe00,
-     0x2103fe00,
-     0x2103fe00,
+     0x21042300,
+     0x21042300,
+     0x21042300,
+     0x21042300,
+     0x21042300,
+     0x21042300,
      0x24000c86,
      0x2f0080c6,
-     0x2103fe00,
+     0x21042300,
      0x2e80838a,
      0x2eff818d,
      0x240068c0,
      0x58c08004,
      0x24001000,
      0xc9037b50,
-     0x2105be00,
+     0x2105ee00,
      0x91200e61,
      0xc9001d04,
      0x240100c0,
      0x68c0ca17,
-     0x21057d00,
+     0x2105ad00,
      0x10cacacd,
      0x1f0fcdcd,
      0x0101cd8d,
@@ -1481,7 +1529,7 @@ const uint32_t in0_pdsp1[] =  {
      0x69202104,
      0x24000400,
      0xc9037b42,
-     0x2105be00,
+     0x2105ee00,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -1489,15 +1537,15 @@ const uint32_t in0_pdsp1[] =  {
      0x69200304,
      0x24000400,
      0xc9037b3a,
-     0x2105be00,
+     0x2105ee00,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x21059700,
+     0x2105c700,
      0x60c0ca04,
      0x24000400,
      0xc9037b32,
-     0x2105be00,
+     0x2105ee00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1506,7 +1554,7 @@ const uint32_t in0_pdsp1[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x2105c600,
+     0x2105f600,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -1538,18 +1586,18 @@ const uint32_t in0_pdsp1[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x2103fe00,
+     0x21042300,
      0x83242e84,
      0x1f057d7d,
-     0x2103fe00,
+     0x21042300,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x2103fe00,
+     0x21042300,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x2103fe00,
+     0x21042300,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -1569,13 +1617,13 @@ const uint32_t in0_pdsp1[] =  {
      0x69032a03,
      0x1f016d6d,
      0x10cbcb8d,
-     0x21059b00,
+     0x2105cb00,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
      0xc910ff00,
      0xc9011d02,
-     0x2305e19e,
+     0x2306119e,
      0x21005e00,
      0xd110ff00,
      0x9180309a,
@@ -1614,7 +1662,7 @@ const uint32_t in0_pdsp1[] =  {
      0x1d011d1d,
      0x209e0000,
      0xd1001d02,
-     0x21082900,
+     0x21085900,
      0x240000fb,
      0x2eff878a,
      0x1028284c,
@@ -1652,21 +1700,21 @@ const uint32_t in0_pdsp1[] =  {
      0x00c41818,
      0x240001de,
      0x68d3ce02,
-     0x21067d00,
+     0x2106ad00,
      0x6893ce02,
-     0x21069900,
+     0x2106c900,
      0x68d2ce03,
      0x1f006a6a,
-     0x2106d200,
+     0x21070200,
      0x6892ce03,
      0x1f016a6a,
-     0x2106d200,
+     0x21070200,
      0x68d4ce02,
-     0x2106df00,
+     0x21070f00,
      0x6894ce02,
-     0x2106df00,
+     0x21070f00,
      0x68d5ce02,
-     0x2106ee00,
+     0x21071e00,
      0x6895ce02,
      0x1f046a6a,
      0x24890280,
@@ -1676,59 +1724,59 @@ const uint32_t in0_pdsp1[] =  {
      0x111f6601,
      0x51000103,
      0x1f063838,
-     0x21065700,
+     0x21068700,
      0x0b056678,
      0x10464658,
      0x692a4604,
      0x1f033838,
      0x1f053838,
-     0x21065700,
+     0x21068700,
      0x692b4604,
      0x1f033838,
      0x1f053838,
-     0x21065700,
+     0x21068700,
      0x692d4603,
      0x1f033838,
-     0x21065700,
+     0x21068700,
      0x692e4603,
      0x1f033838,
-     0x21065700,
+     0x21068700,
      0x692f4602,
      0x1f033838,
      0x910c7081,
      0x5100c120,
      0x68cec103,
      0x1f023838,
-     0x21067800,
+     0x2106a800,
      0x5100811c,
      0x68ce8103,
      0x1f023838,
-     0x21067800,
+     0x2106a800,
      0x5100c218,
      0x68cec203,
      0x1f023838,
-     0x21067800,
+     0x2106a800,
      0x51008214,
      0x68ce8203,
      0x1f023838,
-     0x21067800,
+     0x2106a800,
      0x91147081,
      0x5100c10f,
      0x68cec103,
      0x1f023838,
-     0x21067800,
+     0x2106a800,
      0x5100810b,
      0x68ce8103,
      0x1f023838,
-     0x21067800,
+     0x2106a800,
      0x5100c207,
      0x6ecec2ea,
      0x1f023838,
-     0x21067800,
+     0x2106a800,
      0x51008203,
      0x68ce8202,
      0x1f023838,
-     0x2102b700,
+     0x2102dc00,
      0x2480079f,
      0x13143737,
      0x240002de,
@@ -1760,7 +1808,7 @@ const uint32_t in0_pdsp1[] =  {
      0x50808102,
      0x6880c102,
      0x1f013838,
-     0x2102b700,
+     0x2102dc00,
      0x2e808386,
      0x1f003838,
      0x1f037d7d,
@@ -1785,7 +1833,7 @@ const uint32_t in0_pdsp1[] =  {
      0x51006004,
      0x512b6003,
      0x513c6002,
-     0x2106c400,
+     0x2106f400,
      0x90800680,
      0x593f4011,
      0x01014040,
@@ -1793,7 +1841,7 @@ const uint32_t in0_pdsp1[] =  {
      0x00408080,
      0x101818d1,
      0x00401818,
-     0x2106ac00,
+     0x2106dc00,
      0xd101b605,
      0xc9005d04,
      0x10181891,
@@ -1817,20 +1865,20 @@ const uint32_t in0_pdsp1[] =  {
      0x50808102,
      0x6880c102,
      0x1f013838,
-     0x2102b700,
+     0x2102dc00,
      0x2e80808e,
      0xc9006a05,
      0x10cececb,
      0x110f6b6b,
      0x0b0dce8c,
-     0x2106db00,
+     0x21070b00,
      0x10cece8b,
      0x110f2b2b,
      0x0b0dcecd,
      0x01021818,
      0x240002c4,
      0x2f000384,
-     0x21061b00,
+     0x21064b00,
      0x2e80838e,
      0x0b0ceeee,
      0x2f02018e,
@@ -1842,10 +1890,10 @@ const uint32_t in0_pdsp1[] =  {
      0xc908ee06,
      0x0b046f00,
      0x69040002,
-     0x21067d00,
+     0x2106ad00,
      0x69060002,
-     0x21069900,
-     0x2102b700,
+     0x2106c900,
+     0x2102dc00,
      0x2e80838e,
      0xc9075d03,
      0x69116e10,
@@ -1858,14 +1906,14 @@ const uint32_t in0_pdsp1[] =  {
      0x24002180,
      0x68808f03,
      0x01021818,
-     0x21067d00,
+     0x2106ad00,
      0x24005780,
      0x68808f03,
      0x01021818,
-     0x21069900,
-     0x21070000,
-     0x2102b700,
-     0x21082900,
+     0x2106c900,
+     0x21073000,
+     0x2102dc00,
+     0x21085900,
      0x240002de,
      0x209e0000,
      0x240002de,
@@ -1875,7 +1923,7 @@ const uint32_t in0_pdsp1[] =  {
      0x11f066e0,
      0x5140e003,
      0x5160e018,
-     0x21082900,
+     0x21085900,
      0x10949480,
      0x10d5d5c0,
      0x2eff8792,
@@ -1968,8 +2016,8 @@ const uint32_t in0_pdsp1[] =  {
      0x209e0000,
      0x11033737,
      0x13143737,
-     0x21076c00,
-     0x21082900,
+     0x21079c00,
+     0x21085900,
      0x11033737,
      0x13643737,
      0x240002de,
@@ -2131,7 +2179,7 @@ const uint32_t in0_pdsp1[] =  {
      0x240001de,
      0xc9001d03,
      0xd104b602,
-     0x21070600,
+     0x21073600,
      0x1d04b6b6,
      0x209e0000,
      0x2e808386,
@@ -2141,7 +2189,7 @@ const uint32_t in0_pdsp1[] =  {
      0x240001de,
      0xc9001d03,
      0xd104b602,
-     0x21070600,
+     0x21073600,
      0x1d04b6b6,
      0x209e0000,
      0x2e808986,
@@ -2151,7 +2199,7 @@ const uint32_t in0_pdsp1[] =  {
      0x240001de,
      0xc9001d03,
      0xd104b602,
-     0x21070600,
+     0x21073600,
      0x1d04b6b6,
      0x209e0000,
      0x240001de,
diff --git a/fw/v1/pa2_in1_pdsp0_bin.c b/fw/v1/pa2_in1_pdsp0_bin.c
index 5cb3f1a..3f360cf 100644
--- a/fw/v1/pa2_in1_pdsp0_bin.c
+++ b/fw/v1/pa2_in1_pdsp0_bin.c
@@ -74,9 +74,9 @@
 const uint32_t in1_pdsp0[] =  {
      0x21000300,
      0xbabe0002,
-     0x03000201,
-     0x2302ac9e,
-     0x24020182,
+     0x03000202,
+     0x2302bf9e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -141,9 +141,9 @@ const uint32_t in1_pdsp0[] =  {
      0xd106ff00,
      0x93202896,
      0xc9000403,
-     0x23005e9e,
+     0x23005f9e,
      0x21004800,
-     0x2302039e,
+     0x2302169e,
      0x1d067d7d,
      0xc9077d0f,
      0x1d077d7d,
@@ -161,11 +161,12 @@ const uint32_t in1_pdsp0[] =  {
      0x21005700,
      0x21005800,
      0xd1057d02,
-     0xd304ffc1,
+     0xd104ff05,
      0xcf057db6,
      0xc910ff02,
      0x21001000,
-     0x21053b00,
+     0x21055900,
+     0x21022d00,
      0x2480089f,
      0x0906c481,
      0x92812088,
@@ -183,7 +184,7 @@ const uint32_t in1_pdsp0[] =  {
      0x10d7d794,
      0x24000f42,
      0x6902691f,
-     0xd10bb6d9,
+     0xd10bb6e2,
      0xc9006805,
      0x81230848,
      0x11c01717,
@@ -196,7 +197,7 @@ const uint32_t in1_pdsp0[] =  {
      0x11c01717,
      0x51014a03,
      0x13161717,
-     0x21007e00,
+     0x21007f00,
      0x130d1717,
      0x812608d7,
      0x690b6a04,
@@ -211,14 +212,14 @@ const uint32_t in1_pdsp0[] =  {
      0x244023e4,
      0x24001864,
      0x2f000384,
-     0x51036cc4,
+     0x51036ccd,
      0x209e0000,
-     0x6900695b,
+     0x69006964,
      0x51003802,
      0x81340858,
      0xd101b603,
      0xc9065d02,
-     0xd10bb6b6,
+     0xd10bb6bf,
      0x8118288a,
      0x51000b08,
      0x91090862,
@@ -249,7 +250,7 @@ const uint32_t in1_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2100b700,
+     0x2100b800,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -261,11 +262,11 @@ const uint32_t in1_pdsp0[] =  {
      0x00214949,
      0x00018989,
      0x24000042,
-     0x2100c900,
+     0x2100ca00,
      0x00228989,
      0xc9016b0a,
      0x00224949,
-     0x2100c900,
+     0x2100ca00,
      0xc9026b04,
      0x0b05da02,
      0x00028989,
@@ -273,13 +274,22 @@ const uint32_t in1_pdsp0[] =  {
      0xc9016b03,
      0x003a8989,
      0x24000042,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x2100d300,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24002002,
      0x2400002e,
      0xc905b605,
      0x911008c1,
      0x1d0f8181,
      0x811008c1,
-     0x21013d00,
+     0x21014700,
      0x51016c67,
      0x51046c66,
      0xd1006b09,
@@ -308,9 +318,9 @@ const uint32_t in1_pdsp0[] =  {
      0x69010206,
      0xd1076903,
      0x2400002e,
-     0x2100f100,
+     0x2100fb00,
      0x2400012e,
-     0x2100f100,
+     0x2100fb00,
      0x6905020e,
      0x1049492e,
      0xd10bb657,
@@ -406,7 +416,7 @@ const uint32_t in1_pdsp0[] =  {
      0x812608d7,
      0x24007081,
      0x9081f489,
-     0x21006d00,
+     0x21006e00,
      0x108c8cd4,
      0x91001993,
      0x01045301,
@@ -420,23 +430,23 @@ const uint32_t in1_pdsp0[] =  {
      0x209e0000,
      0x0904dede,
      0x90def486,
-     0x2402749e,
-     0x21017500,
+     0x2402879e,
+     0x21017f00,
      0x2480099f,
-     0x2402749e,
+     0x2402879e,
      0xc909b603,
      0x2400f081,
-     0x21016500,
+     0x21016f00,
      0xc908b605,
      0x2400e081,
      0x9081f486,
      0x51066602,
-     0x21017500,
+     0x21017f00,
      0xd10fb605,
      0x11033737,
      0x13003737,
      0x9100f486,
-     0x21017500,
+     0x21017f00,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -444,11 +454,11 @@ const uint32_t in1_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e286,
-     0x21017500,
+     0x21017f00,
      0x10d7d794,
      0x24000f42,
      0x83206796,
-     0x6900664f,
+     0x69006658,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -479,7 +489,7 @@ const uint32_t in1_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21019d00,
+     0x2101a700,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -491,11 +501,11 @@ const uint32_t in1_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x2101af00,
+     0x2101b900,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x2101af00,
+     0x2101b900,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -506,6 +516,15 @@ const uint32_t in1_pdsp0[] =  {
      0x912a0761,
      0x51000102,
      0x81340761,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2101c500,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x51016937,
      0x51046936,
      0xd1006808,
@@ -590,18 +609,18 @@ const uint32_t in1_pdsp0[] =  {
      0x2480099f,
      0xc909b603,
      0x2400f081,
-     0x21020900,
+     0x21021c00,
      0xc908b605,
      0x2400e081,
      0x9081f489,
      0x51066902,
-     0x21006c00,
+     0x21006d00,
      0xd10fb606,
      0x11033737,
      0x13003737,
      0x812608d7,
      0x9100f489,
-     0x21006c00,
+     0x21006d00,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -609,7 +628,7 @@ const uint32_t in1_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e289,
-     0x21006c00,
+     0x21006d00,
      0x91002481,
      0x0101e1e1,
      0x81002481,
@@ -621,7 +640,7 @@ const uint32_t in1_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21027400,
+     0x21028700,
      0x2480009f,
      0x240008e4,
      0x2f000184,
@@ -641,19 +660,19 @@ const uint32_t in1_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21027400,
+     0x21028700,
      0x240832e4,
      0x2f000384,
      0xd106ff00,
      0x2eff8b96,
      0x008f89d7,
-     0x21024d00,
+     0x21026000,
      0x2eff8b96,
      0x008f89d7,
      0x2f05098e,
      0x24001097,
-     0x24026b9e,
-     0x21054200,
+     0x24027e9e,
+     0x21056000,
      0x24000104,
      0x0508c9c4,
      0xc9001d02,
@@ -673,18 +692,18 @@ const uint32_t in1_pdsp0[] =  {
      0x61100304,
      0x1f007d7d,
      0x240002de,
-     0x21028d00,
+     0x2102a000,
      0x2eff8792,
      0x2f018792,
      0x2f020792,
      0x2f028792,
      0x1f027d7d,
-     0x21026500,
+     0x21027800,
      0x70167c05,
      0x11033737,
      0x13143737,
      0x240002de,
-     0x21026d00,
+     0x21028000,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -729,33 +748,33 @@ const uint32_t in1_pdsp0[] =  {
      0x510ade1a,
      0xc9007d03,
      0x1d007d7d,
-     0x21015e00,
+     0x21016800,
      0x5103de06,
      0x5104de09,
      0x5105de0c,
      0x5106de0f,
      0x0b0237de,
-     0x21015a00,
+     0x21016400,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21027400,
+     0x21028700,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21027800,
+     0x21028b00,
      0x24402084,
      0x24001864,
      0x24000e2e,
-     0x21027400,
+     0x21028700,
      0x24402084,
      0x24001864,
      0x24000d2e,
-     0x21027400,
+     0x21028700,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x21027400,
+     0x21028700,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -775,26 +794,26 @@ const uint32_t in1_pdsp0[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x240540c8,
-     0x24054288,
-     0x240542c9,
-     0x24056589,
-     0x2405f8ca,
-     0x2406878a,
-     0x240693cb,
-     0x24069f8b,
-     0x2406b0cc,
-     0x2406bc8c,
-     0x2406e4cd,
-     0x2406ed8d,
-     0x2406edce,
-     0x2405448e,
-     0x240542cf,
-     0x2407088f,
-     0x240723d0,
-     0x24072390,
-     0x240723d1,
-     0x24072391,
+     0x24055ec8,
+     0x24056088,
+     0x240560c9,
+     0x24058389,
+     0x24061fca,
+     0x2406b78a,
+     0x2406c3cb,
+     0x2406cf8b,
+     0x2406e0cc,
+     0x2406ec8c,
+     0x240714cd,
+     0x24071d8d,
+     0x24071dce,
+     0x2405628e,
+     0x240560cf,
+     0x2407388f,
+     0x240753d0,
+     0x24075390,
+     0x240753d1,
+     0x24075391,
      0x8500f588,
      0x24505084,
      0x108484c4,
@@ -865,7 +884,7 @@ const uint32_t in1_pdsp0[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21036d00,
+     0x21038000,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -889,10 +908,10 @@ const uint32_t in1_pdsp0[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x21036d00,
+     0x21038000,
      0x81242e84,
      0x1f057d7d,
-     0x21036d00,
+     0x21038000,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -902,15 +921,15 @@ const uint32_t in1_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21036d00,
+     0x21038000,
      0x51006602,
-     0x21036d00,
+     0x21038000,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21036d00,
+     0x21038000,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -935,20 +954,20 @@ const uint32_t in1_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062775,
-     0x510c27eb,
-     0x530a2777,
-     0x53082773,
-     0x530b2773,
-     0x53092773,
-     0x5105272f,
+     0x53062780,
+     0x510c27f6,
+     0x530a2782,
+     0x5308277e,
+     0x530b277e,
+     0x5309277e,
+     0x51052738,
      0x24000286,
      0x2f0080c6,
-     0x21036d00,
-     0x2104dc00,
-     0x21031300,
-     0x2104d900,
-     0x2104d900,
+     0x21038000,
+     0x2104fa00,
+     0x21032600,
+     0x2104f700,
+     0x2104f700,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -969,11 +988,11 @@ const uint32_t in1_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21039300,
+     0x2103af00,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21038900,
+     0x21039c00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -982,16 +1001,25 @@ const uint32_t in1_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21039300,
+     0x2103af00,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x2103ab00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
-     0x21027800,
-     0x21027800,
-     0x59388004,
+     0x21028b00,
+     0x21028b00,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21036d00,
+     0x21038000,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1088,7 +1116,7 @@ const uint32_t in1_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1117,10 +1145,12 @@ const uint32_t in1_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1170,7 +1200,7 @@ const uint32_t in1_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21036d00,
+     0x21038000,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1180,20 +1210,20 @@ const uint32_t in1_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21036d00,
+     0x21038000,
      0x240018c4,
      0x2f000384,
-     0x2104ca00,
+     0x2104e800,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2104c700,
+     0x2104e500,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21036d00,
+     0x21038000,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1204,10 +1234,10 @@ const uint32_t in1_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21036d00,
+     0x21038000,
      0x69066a0e,
      0x59148002,
-     0x2104c700,
+     0x2104e500,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1217,11 +1247,11 @@ const uint32_t in1_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21047200,
-     0x21036d00,
+     0x21049000,
+     0x21038000,
      0x69076a0e,
      0x59148002,
-     0x2104c700,
+     0x2104e500,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1231,12 +1261,12 @@ const uint32_t in1_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21048000,
-     0x21036d00,
+     0x21049e00,
+     0x21038000,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2104c700,
+     0x2104e500,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1256,12 +1286,12 @@ const uint32_t in1_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21048f00,
-     0x21036d00,
+     0x2104ad00,
+     0x21038000,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2104c700,
+     0x2104e500,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1277,27 +1307,27 @@ const uint32_t in1_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x2104ae00,
+     0x2104cc00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2104a800,
-     0x21036d00,
+     0x2104c600,
+     0x21038000,
      0x690a6a08,
      0x590c8002,
-     0x2104c700,
+     0x2104e500,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21036d00,
+     0x21038000,
      0x240002d9,
      0x1f047b7b,
-     0x21036d00,
+     0x21038000,
      0x240010d9,
      0x1f047b7b,
-     0x21036d00,
+     0x21038000,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1307,22 +1337,22 @@ const uint32_t in1_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21036d00,
-     0x21036d00,
-     0x21036d00,
-     0x21036d00,
-     0x21036d00,
-     0x21036d00,
+     0x21038000,
+     0x21038000,
+     0x21038000,
+     0x21038000,
+     0x21038000,
+     0x21038000,
      0x24000c86,
      0x2f0080c6,
-     0x21036d00,
+     0x21038000,
      0x2e80838a,
      0x2eff818d,
      0x240068c0,
      0x58c08004,
      0x24001000,
      0xc9037b42,
-     0x21051f00,
+     0x21053d00,
      0x91200e61,
      0x240100c0,
      0x68c0ca12,
@@ -1330,7 +1360,7 @@ const uint32_t in1_pdsp0[] =  {
      0x69202104,
      0x24000400,
      0xc9037b3a,
-     0x21051f00,
+     0x21053d00,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -1338,15 +1368,15 @@ const uint32_t in1_pdsp0[] =  {
      0x69200304,
      0x24000400,
      0xc9037b32,
-     0x21051f00,
+     0x21053d00,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x21050000,
+     0x21051e00,
      0x60c0ca04,
      0x24000400,
      0xc9037b2a,
-     0x21051f00,
+     0x21053d00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1355,7 +1385,7 @@ const uint32_t in1_pdsp0[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x21052700,
+     0x21054500,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -1379,18 +1409,18 @@ const uint32_t in1_pdsp0[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x21036d00,
+     0x21038000,
      0x83242e84,
      0x1f057d7d,
-     0x21036d00,
+     0x21038000,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21036d00,
+     0x21038000,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x21036d00,
+     0x21038000,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -1410,7 +1440,7 @@ const uint32_t in1_pdsp0[] =  {
      0x69032a03,
      0x1f016d6d,
      0x10cbcb8d,
-     0x21050400,
+     0x21052200,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
@@ -1475,7 +1505,7 @@ const uint32_t in1_pdsp0[] =  {
      0x2eff8792,
      0xd102b603,
      0x10d9d995,
-     0x21057f00,
+     0x21059d00,
      0x10dada95,
      0x111f3535,
      0x1d02b6b6,
@@ -1518,7 +1548,7 @@ const uint32_t in1_pdsp0[] =  {
      0x2700ea01,
      0x69200103,
      0x1f08b6b6,
-     0x2105aa00,
+     0x2105c800,
      0x61e06a03,
      0x49ef6a02,
      0x1f09b6b6,
@@ -1536,12 +1566,12 @@ const uint32_t in1_pdsp0[] =  {
      0x209e0000,
      0x11033737,
      0x13143737,
-     0x2105bb00,
+     0x2105d900,
      0x11033737,
      0x13643737,
      0x240002de,
      0x209e0000,
-     0xd104b62a,
+     0xd104b633,
      0x2e808986,
      0x11f066e0,
      0x6f40e0f9,
@@ -1559,7 +1589,7 @@ const uint32_t in1_pdsp0[] =  {
      0x6e484bf9,
      0x01016b6b,
      0x808e100b,
-     0x2105df00,
+     0x2105fd00,
      0x57008197,
      0x586e4e0d,
      0x2700f07b,
@@ -1573,11 +1603,20 @@ const uint32_t in1_pdsp0[] =  {
      0x2400016b,
      0x09047b8e,
      0x808eb08b,
-     0x2105df00,
+     0x2105fd00,
      0x2400ff7b,
      0x2400015b,
      0x1f04b6b6,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c8138f,
+     0x21060900,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91ca138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1585,34 +1624,34 @@ const uint32_t in1_pdsp0[] =  {
      0x209e0000,
      0x1d04b6b6,
      0x51ff7b0d,
-     0x5f207bcd,
+     0x5f207bc4,
      0x09047b81,
      0x9081308b,
      0x705b6b04,
      0x045b6b6b,
      0x8081308b,
-     0x2105f500,
+     0x21061c00,
      0x9100b18e,
      0x1c7bf0f0,
      0x51004e02,
      0x05014e4e,
      0x8100b18e,
-     0xcf05b672,
+     0xcf05b669,
      0x24000ade,
      0x209e0000,
-     0xd105b648,
+     0xd105b651,
      0x2e808386,
      0x11f06600,
-     0x6f6000be,
+     0x6f6000b5,
      0x24000004,
      0x240008c4,
      0x2f000384,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
-     0xd101b64f,
-     0xc9037d4e,
-     0xd104b63c,
+     0xd101b658,
+     0xc9037d57,
+     0xd104b645,
      0x2eff8580,
      0x10272760,
      0x01681680,
@@ -1627,12 +1666,12 @@ const uint32_t in1_pdsp0[] =  {
      0x51006004,
      0x512b6003,
      0x513c6002,
-     0x21061b00,
+     0x21064200,
      0x90800680,
      0x010140c2,
      0x0903c2c2,
      0x00c28080,
-     0x21060e00,
+     0x21063500,
      0x90800600,
      0x1f006161,
      0x10f1f1e2,
@@ -1648,8 +1687,8 @@ const uint32_t in1_pdsp0[] =  {
      0x6e604bf9,
      0x01016b6b,
      0x808e100b,
-     0x21063800,
-     0xc9006128,
+     0x21065f00,
+     0xc9006131,
      0x586e4e0d,
      0x2700f07b,
      0x51207b0b,
@@ -1662,11 +1701,20 @@ const uint32_t in1_pdsp0[] =  {
      0x2400016b,
      0x09047b8e,
      0x808eb08b,
-     0x21063800,
+     0x21065f00,
      0x2400ff7b,
      0x2400015b,
      0x1f04b6b6,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c8138f,
+     0x21066b00,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91ca138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1674,13 +1722,13 @@ const uint32_t in1_pdsp0[] =  {
      0x209e0000,
      0x1d04b6b6,
      0x51ff7b0d,
-     0x5f207b74,
+     0x5f207b62,
      0x09047b81,
      0x9081308b,
      0x705b6b04,
      0x045b6b6b,
      0x8081308b,
-     0x21064e00,
+     0x21067e00,
      0x9100b18e,
      0x1c7bf0f0,
      0x51004e02,
@@ -1709,7 +1757,7 @@ const uint32_t in1_pdsp0[] =  {
      0x2eff878a,
      0xd102b603,
      0x10d9d98d,
-     0x21066900,
+     0x21069900,
      0x10dada8d,
      0x111f2d2d,
      0x1d02b6b6,
@@ -1745,7 +1793,7 @@ const uint32_t in1_pdsp0[] =  {
      0x209e0000,
      0x2e808086,
      0x09034680,
-     0x4fff8030,
+     0x4fff801e,
      0x010880c4,
      0x00c41616,
      0x2f000384,
@@ -1762,7 +1810,7 @@ const uint32_t in1_pdsp0[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff801f,
+     0x4fff800d,
      0x010880c4,
      0x2f000384,
      0x00c41616,
@@ -1791,7 +1839,7 @@ const uint32_t in1_pdsp0[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff8002,
+     0x4dff80f0,
      0x010880c4,
      0x2f000384,
      0x00c41616,
@@ -1858,7 +1906,7 @@ const uint32_t in1_pdsp0[] =  {
      0x1f046c6c,
      0xd102b603,
      0x10d9d98d,
-     0x2106fe00,
+     0x21072e00,
      0x10dada8d,
      0x111f2d2d,
      0x1d02b6b6,
diff --git a/fw/v1/pa2_in1_pdsp1_bin.c b/fw/v1/pa2_in1_pdsp1_bin.c
index eae3491..88d2e89 100644
--- a/fw/v1/pa2_in1_pdsp1_bin.c
+++ b/fw/v1/pa2_in1_pdsp1_bin.c
@@ -74,9 +74,9 @@
 const uint32_t in1_pdsp1[] =  {
      0x21000300,
      0xbabe0101,
-     0x03000201,
-     0x2302809e,
-     0x24020182,
+     0x03000202,
+     0x2302939e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -107,9 +107,9 @@ const uint32_t in1_pdsp1[] =  {
      0xd106ff00,
      0x93202896,
      0xc9000403,
-     0x2300429e,
+     0x2300439e,
      0x21002600,
-     0x2301cf9e,
+     0x2301e29e,
      0x1d067d7d,
      0xc9077d15,
      0x1d077d7d,
@@ -133,11 +133,12 @@ const uint32_t in1_pdsp1[] =  {
      0x21003b00,
      0x21003c00,
      0xd1057d02,
-     0xd304ffa9,
+     0xd104ff05,
      0xcf057dd2,
      0xc910ff02,
      0x21001000,
-     0x21050d00,
+     0x21052b00,
+     0x2101f900,
      0x2480089f,
      0x0906c481,
      0x92812088,
@@ -155,7 +156,7 @@ const uint32_t in1_pdsp1[] =  {
      0x10d7d794,
      0x24000f42,
      0x6902691b,
-     0xd10bb6c1,
+     0xd10bb6ca,
      0xc9006805,
      0x81230848,
      0x11c01717,
@@ -168,7 +169,7 @@ const uint32_t in1_pdsp1[] =  {
      0x11c01717,
      0x51014a03,
      0x13161717,
-     0x21006200,
+     0x21006300,
      0x130d1717,
      0x812608d7,
      0xc9000a03,
@@ -179,14 +180,14 @@ const uint32_t in1_pdsp1[] =  {
      0x244023e4,
      0x24001864,
      0x2f000384,
-     0x51036cb0,
+     0x51036cb9,
      0x209e0000,
-     0x69006958,
+     0x69006961,
      0x51003802,
      0x81340858,
      0xd101b603,
      0xc9065d02,
-     0xd10bb6a2,
+     0xd10bb6ab,
      0x8118288a,
      0x51000b08,
      0x91090862,
@@ -217,7 +218,7 @@ const uint32_t in1_pdsp1[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21009700,
+     0x21009800,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -229,11 +230,11 @@ const uint32_t in1_pdsp1[] =  {
      0x00214949,
      0x00018989,
      0x24000042,
-     0x2100a900,
+     0x2100aa00,
      0x00228989,
      0xc9016b0a,
      0x00224949,
-     0x2100a900,
+     0x2100aa00,
      0xc9026b04,
      0x0b05da02,
      0x00028989,
@@ -241,10 +242,19 @@ const uint32_t in1_pdsp1[] =  {
      0xc9016b03,
      0x003a8989,
      0x24000042,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x2100b300,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24002002,
      0x2400002e,
      0xc905b602,
-     0x21010900,
+     0x21011300,
      0x51016c56,
      0x51046c55,
      0xd1006b09,
@@ -273,9 +283,9 @@ const uint32_t in1_pdsp1[] =  {
      0x69010206,
      0xd1076903,
      0x2400002e,
-     0x2100ce00,
+     0x2100d800,
      0x2400012e,
-     0x2100ce00,
+     0x2100d800,
      0x6905020e,
      0x1049492e,
      0xd10bb646,
@@ -354,7 +364,7 @@ const uint32_t in1_pdsp1[] =  {
      0x812608d7,
      0x24007081,
      0x9081f489,
-     0x21005100,
+     0x21005200,
      0x108c8cd4,
      0x91001993,
      0x01045301,
@@ -368,23 +378,23 @@ const uint32_t in1_pdsp1[] =  {
      0x209e0000,
      0x0904dede,
      0x90def486,
-     0x2402469e,
-     0x21014100,
+     0x2402599e,
+     0x21014b00,
      0x2480099f,
-     0x2402469e,
+     0x2402599e,
      0xc909b603,
      0x2400f081,
-     0x21013100,
+     0x21013b00,
      0xc908b605,
      0x2400e081,
      0x9081f486,
      0x51066602,
-     0x21014100,
+     0x21014b00,
      0xd10fb605,
      0x11033737,
      0x13003737,
      0x9100f486,
-     0x21014100,
+     0x21014b00,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -392,11 +402,11 @@ const uint32_t in1_pdsp1[] =  {
      0x09024141,
      0x90413882,
      0xf081e286,
-     0x21014100,
+     0x21014b00,
      0x10d7d794,
      0x24000f42,
      0x83206796,
-     0x6900664f,
+     0x69006658,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -427,7 +437,7 @@ const uint32_t in1_pdsp1[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21016900,
+     0x21017300,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -439,11 +449,11 @@ const uint32_t in1_pdsp1[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x21017b00,
+     0x21018500,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x21017b00,
+     0x21018500,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -454,6 +464,15 @@ const uint32_t in1_pdsp1[] =  {
      0x912a0761,
      0x51000102,
      0x81340761,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21019100,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x51016937,
      0x51046936,
      0xd1006808,
@@ -538,18 +557,18 @@ const uint32_t in1_pdsp1[] =  {
      0x2480099f,
      0xc909b603,
      0x2400f081,
-     0x2101d500,
+     0x2101e800,
      0xc908b605,
      0x2400e081,
      0x9081f489,
      0x51066902,
-     0x21005000,
+     0x21005100,
      0xd10fb606,
      0x11033737,
      0x13003737,
      0x812608d7,
      0x9100f489,
-     0x21005000,
+     0x21005100,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -557,7 +576,7 @@ const uint32_t in1_pdsp1[] =  {
      0x09024141,
      0x90413882,
      0xf081e289,
-     0x21005000,
+     0x21005100,
      0x91002481,
      0x0101e1e1,
      0x81002481,
@@ -571,7 +590,7 @@ const uint32_t in1_pdsp1[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21024600,
+     0x21025900,
      0x2480009f,
      0x240008e4,
      0x2f000184,
@@ -584,9 +603,9 @@ const uint32_t in1_pdsp1[] =  {
      0x511f0115,
      0x2e808b96,
      0xc905b604,
-     0x2305129e,
+     0x2305309e,
      0x1f047d7d,
-     0x21024600,
+     0x21025900,
      0x0b057601,
      0x51000114,
      0x510401f1,
@@ -595,19 +614,19 @@ const uint32_t in1_pdsp1[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21024600,
+     0x21025900,
      0x240832e4,
      0x2f000384,
      0xd106ff00,
      0x2eff8b96,
      0x008f89d7,
-     0x21021f00,
+     0x21023200,
      0x2eff8b96,
      0x008f89d7,
      0x2f05098e,
      0x24001097,
-     0x24023d9e,
-     0x21052900,
+     0x2402509e,
+     0x21054700,
      0x24000104,
      0x0508c9c4,
      0xc9001d02,
@@ -627,18 +646,18 @@ const uint32_t in1_pdsp1[] =  {
      0x61100304,
      0x51110303,
      0x240005de,
-     0x21023f00,
+     0x21025200,
      0x2eff8792,
      0x2f018792,
      0x2f020792,
      0x2f028792,
      0x1f027d7d,
-     0x21023700,
+     0x21024a00,
      0x70167c05,
      0x11033737,
      0x13143737,
      0x240002de,
-     0x21023f00,
+     0x21025200,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -685,33 +704,33 @@ const uint32_t in1_pdsp1[] =  {
      0x510ade1a,
      0xc9007d03,
      0x1d007d7d,
-     0x21012a00,
+     0x21013400,
      0x5103de06,
      0x5104de09,
      0x5105de0c,
      0x5106de0f,
      0x0b0237de,
-     0x21012600,
+     0x21013000,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21024600,
+     0x21025900,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21024600,
+     0x21025900,
      0x24402084,
      0x24001864,
      0x24000e2e,
-     0x21024600,
+     0x21025900,
      0x24402084,
      0x24001864,
      0x24000d2e,
-     0x21024600,
+     0x21025900,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x21024600,
+     0x21025900,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -731,26 +750,26 @@ const uint32_t in1_pdsp1[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x240527c8,
-     0x24052988,
-     0x240529c9,
-     0x24052d89,
-     0x24052fca,
-     0x2405318a,
-     0x240531cb,
-     0x2405318b,
-     0x240531cc,
-     0x2405318c,
-     0x240531cd,
-     0x2405438d,
-     0x240543ce,
-     0x24052b8e,
-     0x240529cf,
-     0x2405588f,
-     0x240574d0,
-     0x24055890,
-     0x240574d1,
-     0x24057491,
+     0x240545c8,
+     0x24054788,
+     0x240547c9,
+     0x24054b89,
+     0x24054dca,
+     0x24054f8a,
+     0x24054fcb,
+     0x24054f8b,
+     0x24054fcc,
+     0x24054f8c,
+     0x24054fcd,
+     0x2405618d,
+     0x240561ce,
+     0x2405498e,
+     0x240547cf,
+     0x2405768f,
+     0x240592d0,
+     0x24057690,
+     0x240592d1,
+     0x24059291,
      0x8500f588,
      0x24505084,
      0x108484c4,
@@ -802,7 +821,7 @@ const uint32_t in1_pdsp1[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21032e00,
+     0x21034100,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -826,10 +845,10 @@ const uint32_t in1_pdsp1[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x21032e00,
+     0x21034100,
      0x81242e84,
      0x1f057d7d,
-     0x21032e00,
+     0x21034100,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -839,15 +858,15 @@ const uint32_t in1_pdsp1[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21032e00,
+     0x21034100,
      0x51006602,
-     0x21032e00,
+     0x21034100,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21032e00,
+     0x21034100,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -872,20 +891,20 @@ const uint32_t in1_pdsp1[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062786,
-     0x510c27eb,
-     0x530a2788,
-     0x53082784,
-     0x530b2784,
-     0x53092784,
-     0x5105272f,
+     0x53062791,
+     0x510c27f6,
+     0x530a2793,
+     0x5308278f,
+     0x530b278f,
+     0x5309278f,
+     0x51052738,
      0x24000286,
      0x2f0080c6,
-     0x21032e00,
-     0x2104ae00,
-     0x2102d400,
-     0x2104ab00,
-     0x2104ab00,
+     0x21034100,
+     0x2104cc00,
+     0x2102e700,
+     0x2104c900,
+     0x2104c900,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -906,11 +925,11 @@ const uint32_t in1_pdsp1[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21035400,
+     0x21037000,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21034a00,
+     0x21035d00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -919,16 +938,25 @@ const uint32_t in1_pdsp1[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21035400,
+     0x21037000,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21036c00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
-     0x21024600,
-     0x21024600,
-     0x59388004,
+     0x21025900,
+     0x21025900,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21032e00,
+     0x21034100,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1025,7 +1053,7 @@ const uint32_t in1_pdsp1[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1054,10 +1082,12 @@ const uint32_t in1_pdsp1[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1107,7 +1137,7 @@ const uint32_t in1_pdsp1[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21032e00,
+     0x21034100,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1117,20 +1147,20 @@ const uint32_t in1_pdsp1[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21032e00,
+     0x21034100,
      0x240018c4,
      0x2f000384,
-     0x21049c00,
+     0x2104ba00,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x21049900,
+     0x2104b700,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21032e00,
+     0x21034100,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1141,10 +1171,10 @@ const uint32_t in1_pdsp1[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21032e00,
+     0x21034100,
      0x69046a11,
      0x59088002,
-     0x21049900,
+     0x2104b700,
      0x2e80818e,
      0x1d025d5d,
      0xc9006e0a,
@@ -1158,10 +1188,10 @@ const uint32_t in1_pdsp1[] =  {
      0x6f00e0ff,
      0xe1042281,
      0x81b8338e,
-     0x21032e00,
+     0x21034100,
      0x69066a0e,
      0x59148002,
-     0x21049900,
+     0x2104b700,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1171,11 +1201,11 @@ const uint32_t in1_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21044400,
-     0x21032e00,
+     0x21046200,
+     0x21034100,
      0x69076a0e,
      0x59148002,
-     0x21049900,
+     0x2104b700,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1185,12 +1215,12 @@ const uint32_t in1_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21045200,
-     0x21032e00,
+     0x21047000,
+     0x21034100,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x21049900,
+     0x2104b700,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1210,12 +1240,12 @@ const uint32_t in1_pdsp1[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21046100,
-     0x21032e00,
+     0x21047f00,
+     0x21034100,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x21049900,
+     0x2104b700,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1231,27 +1261,27 @@ const uint32_t in1_pdsp1[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21048000,
+     0x21049e00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21047a00,
-     0x21032e00,
+     0x21049800,
+     0x21034100,
      0x690a6a08,
      0x590c8002,
-     0x21049900,
+     0x2104b700,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21032e00,
+     0x21034100,
      0x240002d9,
      0x1f047b7b,
-     0x21032e00,
+     0x21034100,
      0x240010d9,
      0x1f047b7b,
-     0x21032e00,
+     0x21034100,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1261,22 +1291,22 @@ const uint32_t in1_pdsp1[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21032e00,
-     0x21032e00,
-     0x21032e00,
-     0x21032e00,
-     0x21032e00,
-     0x21032e00,
+     0x21034100,
+     0x21034100,
+     0x21034100,
+     0x21034100,
+     0x21034100,
+     0x21034100,
      0x24000c86,
      0x2f0080c6,
-     0x21032e00,
+     0x21034100,
      0x2e80838a,
      0x2eff818d,
      0x240068c0,
      0x58c08004,
      0x24001000,
      0xc9037b42,
-     0x2104f100,
+     0x21050f00,
      0x91200e61,
      0x240100c0,
      0x68c0ca12,
@@ -1284,7 +1314,7 @@ const uint32_t in1_pdsp1[] =  {
      0x69202104,
      0x24000400,
      0xc9037b3a,
-     0x2104f100,
+     0x21050f00,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -1292,15 +1322,15 @@ const uint32_t in1_pdsp1[] =  {
      0x69200304,
      0x24000400,
      0xc9037b32,
-     0x2104f100,
+     0x21050f00,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x2104d200,
+     0x2104f000,
      0x60c0ca04,
      0x24000400,
      0xc9037b2a,
-     0x2104f100,
+     0x21050f00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1309,7 +1339,7 @@ const uint32_t in1_pdsp1[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x2104f900,
+     0x21051700,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -1333,18 +1363,18 @@ const uint32_t in1_pdsp1[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x21032e00,
+     0x21034100,
      0x83242e84,
      0x1f057d7d,
-     0x21032e00,
+     0x21034100,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21032e00,
+     0x21034100,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x21032e00,
+     0x21034100,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -1364,7 +1394,7 @@ const uint32_t in1_pdsp1[] =  {
      0x69032a03,
      0x1f016d6d,
      0x10cbcb8d,
-     0x2104d600,
+     0x2104f400,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
@@ -1408,7 +1438,7 @@ const uint32_t in1_pdsp1[] =  {
      0x1f046c6c,
      0xd102b603,
      0x10d9d98d,
-     0x21053c00,
+     0x21055a00,
      0x10dada8d,
      0x111f2d2d,
      0x1d02b6b6,
@@ -1426,7 +1456,7 @@ const uint32_t in1_pdsp1[] =  {
      0x1f046c6c,
      0xd102b603,
      0x10d9d98d,
-     0x21054e00,
+     0x21056c00,
      0x10dada8d,
      0x111f2d2d,
      0x1d02b6b6,
diff --git a/fw/v1/pa2_in2_pdsp0_bin.c b/fw/v1/pa2_in2_pdsp0_bin.c
index 63e7233..57a1180 100644
--- a/fw/v1/pa2_in2_pdsp0_bin.c
+++ b/fw/v1/pa2_in2_pdsp0_bin.c
@@ -74,9 +74,9 @@
 const uint32_t in2_pdsp0[] =  {
      0x21000300,
      0xbabe0200,
-     0x03000201,
-     0x23027c9e,
-     0x24020182,
+     0x03000202,
+     0x23028f9e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -107,9 +107,9 @@ const uint32_t in2_pdsp0[] =  {
      0xd106ff00,
      0x93202896,
      0xc9000403,
-     0x2300429e,
+     0x2300439e,
      0x21002600,
-     0x2301cf9e,
+     0x2301e29e,
      0x1d067d7d,
      0xc9077d15,
      0x1d077d7d,
@@ -133,11 +133,12 @@ const uint32_t in2_pdsp0[] =  {
      0x21003b00,
      0x21003c00,
      0xd1057d02,
-     0xd304ffa9,
+     0xd104ff05,
      0xcf057dd2,
      0xc910ff02,
      0x21001000,
-     0x21050900,
+     0x21052700,
+     0x2101f900,
      0x2480089f,
      0x0906c481,
      0x92812088,
@@ -155,7 +156,7 @@ const uint32_t in2_pdsp0[] =  {
      0x10d7d794,
      0x24000f42,
      0x6902691b,
-     0xd10bb6c1,
+     0xd10bb6ca,
      0xc9006805,
      0x81230848,
      0x11c01717,
@@ -168,7 +169,7 @@ const uint32_t in2_pdsp0[] =  {
      0x11c01717,
      0x51014a03,
      0x13161717,
-     0x21006200,
+     0x21006300,
      0x130d1717,
      0x812608d7,
      0xc9000a03,
@@ -179,14 +180,14 @@ const uint32_t in2_pdsp0[] =  {
      0x244023e4,
      0x24001864,
      0x2f000384,
-     0x51036cb0,
+     0x51036cb9,
      0x209e0000,
-     0x69006958,
+     0x69006961,
      0x51003802,
      0x81340858,
      0xd101b603,
      0xc9065d02,
-     0xd10bb6a2,
+     0xd10bb6ab,
      0x8118288a,
      0x51000b08,
      0x91090862,
@@ -217,7 +218,7 @@ const uint32_t in2_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21009700,
+     0x21009800,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -229,11 +230,11 @@ const uint32_t in2_pdsp0[] =  {
      0x00214949,
      0x00018989,
      0x24000042,
-     0x2100a900,
+     0x2100aa00,
      0x00228989,
      0xc9016b0a,
      0x00224949,
-     0x2100a900,
+     0x2100aa00,
      0xc9026b04,
      0x0b05da02,
      0x00028989,
@@ -241,10 +242,19 @@ const uint32_t in2_pdsp0[] =  {
      0xc9016b03,
      0x003a8989,
      0x24000042,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x2100b300,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24002002,
      0x2400002e,
      0xc905b602,
-     0x21010900,
+     0x21011300,
      0x51016c56,
      0x51046c55,
      0xd1006b09,
@@ -273,9 +283,9 @@ const uint32_t in2_pdsp0[] =  {
      0x69010206,
      0xd1076903,
      0x2400002e,
-     0x2100ce00,
+     0x2100d800,
      0x2400012e,
-     0x2100ce00,
+     0x2100d800,
      0x6905020e,
      0x1049492e,
      0xd10bb646,
@@ -354,7 +364,7 @@ const uint32_t in2_pdsp0[] =  {
      0x812608d7,
      0x24007081,
      0x9081f489,
-     0x21005100,
+     0x21005200,
      0x108c8cd4,
      0x91001993,
      0x01045301,
@@ -368,23 +378,23 @@ const uint32_t in2_pdsp0[] =  {
      0x209e0000,
      0x0904dede,
      0x90def486,
-     0x2402429e,
-     0x21014100,
+     0x2402559e,
+     0x21014b00,
      0x2480099f,
-     0x2402429e,
+     0x2402559e,
      0xc909b603,
      0x2400f081,
-     0x21013100,
+     0x21013b00,
      0xc908b605,
      0x2400e081,
      0x9081f486,
      0x51066602,
-     0x21014100,
+     0x21014b00,
      0xd10fb605,
      0x11033737,
      0x13003737,
      0x9100f486,
-     0x21014100,
+     0x21014b00,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -392,11 +402,11 @@ const uint32_t in2_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e286,
-     0x21014100,
+     0x21014b00,
      0x10d7d794,
      0x24000f42,
      0x83206796,
-     0x6900664f,
+     0x69006658,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -427,7 +437,7 @@ const uint32_t in2_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21016900,
+     0x21017300,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -439,11 +449,11 @@ const uint32_t in2_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x21017b00,
+     0x21018500,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x21017b00,
+     0x21018500,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -454,6 +464,15 @@ const uint32_t in2_pdsp0[] =  {
      0x912a0761,
      0x51000102,
      0x81340761,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21019100,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x51016937,
      0x51046936,
      0xd1006808,
@@ -538,18 +557,18 @@ const uint32_t in2_pdsp0[] =  {
      0x2480099f,
      0xc909b603,
      0x2400f081,
-     0x2101d500,
+     0x2101e800,
      0xc908b605,
      0x2400e081,
      0x9081f489,
      0x51066902,
-     0x21005000,
+     0x21005100,
      0xd10fb606,
      0x11033737,
      0x13003737,
      0x812608d7,
      0x9100f489,
-     0x21005000,
+     0x21005100,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -557,7 +576,7 @@ const uint32_t in2_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e289,
-     0x21005000,
+     0x21005100,
      0x91002481,
      0x0101e1e1,
      0x81002481,
@@ -571,7 +590,7 @@ const uint32_t in2_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21024200,
+     0x21025500,
      0x2480009f,
      0x240008e4,
      0x2f000184,
@@ -591,19 +610,19 @@ const uint32_t in2_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21024200,
+     0x21025500,
      0x240832e4,
      0x2f000384,
      0xd106ff00,
      0x2eff8b96,
      0x008f89d7,
-     0x21021b00,
+     0x21022e00,
      0x2eff8b96,
      0x008f89d7,
      0x2f05098e,
      0x24001097,
-     0x2402399e,
-     0x21051000,
+     0x24024c9e,
+     0x21052e00,
      0x24000104,
      0x0508c9c4,
      0xc9001d02,
@@ -623,18 +642,18 @@ const uint32_t in2_pdsp0[] =  {
      0x61100304,
      0x1f007d7d,
      0x240002de,
-     0x21025d00,
+     0x21027000,
      0x2eff8792,
      0x2f018792,
      0x2f020792,
      0x2f028792,
      0x1f027d7d,
-     0x21023300,
+     0x21024600,
      0x70167c05,
      0x11033737,
      0x13143737,
      0x240002de,
-     0x21023b00,
+     0x21024e00,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -681,33 +700,33 @@ const uint32_t in2_pdsp0[] =  {
      0x510ade1a,
      0xc9007d03,
      0x1d007d7d,
-     0x21012a00,
+     0x21013400,
      0x5103de06,
      0x5104de09,
      0x5105de0c,
      0x5106de0f,
      0x0b0237de,
-     0x21012600,
+     0x21013000,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21024200,
+     0x21025500,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21024200,
+     0x21025500,
      0x24402084,
      0x24001864,
      0x24000e2e,
-     0x21024200,
+     0x21025500,
      0x24402084,
      0x24001864,
      0x24000d2e,
-     0x21024200,
+     0x21025500,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x21024200,
+     0x21025500,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -727,26 +746,26 @@ const uint32_t in2_pdsp0[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x24050ec8,
-     0x24051088,
-     0x240510c9,
-     0x24051489,
-     0x240516ca,
-     0x2405188a,
-     0x240518cb,
-     0x2405188b,
-     0x240518cc,
-     0x2405188c,
-     0x240518cd,
-     0x24052a8d,
-     0x240537ce,
-     0x2405128e,
-     0x240510cf,
-     0x24054c8f,
-     0x24054cd0,
-     0x24054c90,
-     0x24054cd1,
-     0x24054c91,
+     0x24052cc8,
+     0x24052e88,
+     0x24052ec9,
+     0x24053289,
+     0x240534ca,
+     0x2405368a,
+     0x240536cb,
+     0x2405368b,
+     0x240536cc,
+     0x2405368c,
+     0x240536cd,
+     0x2405488d,
+     0x240555ce,
+     0x2405308e,
+     0x24052ecf,
+     0x24056a8f,
+     0x24056ad0,
+     0x24056a90,
+     0x24056ad1,
+     0x24056a91,
      0x8500f588,
      0x24505084,
      0x108484c4,
@@ -815,7 +834,7 @@ const uint32_t in2_pdsp0[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21033b00,
+     0x21034e00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -839,10 +858,10 @@ const uint32_t in2_pdsp0[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x21033b00,
+     0x21034e00,
      0x81242e84,
      0x1f057d7d,
-     0x21033b00,
+     0x21034e00,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -852,15 +871,15 @@ const uint32_t in2_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21033b00,
+     0x21034e00,
      0x51006602,
-     0x21033b00,
+     0x21034e00,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21033b00,
+     0x21034e00,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -885,20 +904,20 @@ const uint32_t in2_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062775,
-     0x510c27eb,
-     0x530a2777,
-     0x53082773,
-     0x530b2773,
-     0x53092773,
-     0x5105272f,
+     0x53062780,
+     0x510c27f6,
+     0x530a2782,
+     0x5308277e,
+     0x530b277e,
+     0x5309277e,
+     0x51052738,
      0x24000286,
      0x2f0080c6,
-     0x21033b00,
-     0x2104aa00,
-     0x2102e100,
-     0x2104a700,
-     0x2104a700,
+     0x21034e00,
+     0x2104c800,
+     0x2102f400,
+     0x2104c500,
+     0x2104c500,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -919,11 +938,11 @@ const uint32_t in2_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21036100,
+     0x21037d00,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21035700,
+     0x21036a00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -932,16 +951,25 @@ const uint32_t in2_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21036100,
+     0x21037d00,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21037900,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
-     0x21024200,
-     0x21024200,
-     0x59388004,
+     0x21025500,
+     0x21025500,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21033b00,
+     0x21034e00,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1038,7 +1066,7 @@ const uint32_t in2_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1067,10 +1095,12 @@ const uint32_t in2_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1120,7 +1150,7 @@ const uint32_t in2_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21033b00,
+     0x21034e00,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1130,20 +1160,20 @@ const uint32_t in2_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21033b00,
+     0x21034e00,
      0x240018c4,
      0x2f000384,
-     0x21049800,
+     0x2104b600,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x21049500,
+     0x2104b300,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21033b00,
+     0x21034e00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1154,10 +1184,10 @@ const uint32_t in2_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21033b00,
+     0x21034e00,
      0x69066a0e,
      0x59148002,
-     0x21049500,
+     0x2104b300,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1167,11 +1197,11 @@ const uint32_t in2_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21044000,
-     0x21033b00,
+     0x21045e00,
+     0x21034e00,
      0x69076a0e,
      0x59148002,
-     0x21049500,
+     0x2104b300,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1181,12 +1211,12 @@ const uint32_t in2_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21044e00,
-     0x21033b00,
+     0x21046c00,
+     0x21034e00,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x21049500,
+     0x2104b300,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1206,12 +1236,12 @@ const uint32_t in2_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21045d00,
-     0x21033b00,
+     0x21047b00,
+     0x21034e00,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x21049500,
+     0x2104b300,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1227,27 +1257,27 @@ const uint32_t in2_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21047c00,
+     0x21049a00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21047600,
-     0x21033b00,
+     0x21049400,
+     0x21034e00,
      0x690a6a08,
      0x590c8002,
-     0x21049500,
+     0x2104b300,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21033b00,
+     0x21034e00,
      0x240002d9,
      0x1f047b7b,
-     0x21033b00,
+     0x21034e00,
      0x240010d9,
      0x1f047b7b,
-     0x21033b00,
+     0x21034e00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1257,22 +1287,22 @@ const uint32_t in2_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21033b00,
-     0x21033b00,
-     0x21033b00,
-     0x21033b00,
-     0x21033b00,
-     0x21033b00,
+     0x21034e00,
+     0x21034e00,
+     0x21034e00,
+     0x21034e00,
+     0x21034e00,
+     0x21034e00,
      0x24000c86,
      0x2f0080c6,
-     0x21033b00,
+     0x21034e00,
      0x2e80838a,
      0x2eff818d,
      0x240068c0,
      0x58c08004,
      0x24001000,
      0xc9037b42,
-     0x2104ed00,
+     0x21050b00,
      0x91200e61,
      0x240100c0,
      0x68c0ca12,
@@ -1280,7 +1310,7 @@ const uint32_t in2_pdsp0[] =  {
      0x69202104,
      0x24000400,
      0xc9037b3a,
-     0x2104ed00,
+     0x21050b00,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -1288,15 +1318,15 @@ const uint32_t in2_pdsp0[] =  {
      0x69200304,
      0x24000400,
      0xc9037b32,
-     0x2104ed00,
+     0x21050b00,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x2104ce00,
+     0x2104ec00,
      0x60c0ca04,
      0x24000400,
      0xc9037b2a,
-     0x2104ed00,
+     0x21050b00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1305,7 +1335,7 @@ const uint32_t in2_pdsp0[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x2104f500,
+     0x21051300,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -1329,18 +1359,18 @@ const uint32_t in2_pdsp0[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x21033b00,
+     0x21034e00,
      0x83242e84,
      0x1f057d7d,
-     0x21033b00,
+     0x21034e00,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21033b00,
+     0x21034e00,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x21033b00,
+     0x21034e00,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -1360,7 +1390,7 @@ const uint32_t in2_pdsp0[] =  {
      0x69032a03,
      0x1f016d6d,
      0x10cbcb8d,
-     0x2104d200,
+     0x2104f000,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
@@ -1383,7 +1413,7 @@ const uint32_t in2_pdsp0[] =  {
      0x1f046c6c,
      0xd102b603,
      0x10d9d98d,
-     0x21052300,
+     0x21054100,
      0x10dada8d,
      0x111f2d2d,
      0x1d02b6b6,
@@ -1414,7 +1444,7 @@ const uint32_t in2_pdsp0[] =  {
      0x1f046c6c,
      0xd102b603,
      0x10d9d98d,
-     0x21054200,
+     0x21056000,
      0x10dada8d,
      0x111f2d2d,
      0x1d02b6b6,
diff --git a/fw/v1/pa2_in3_pdsp0_bin.c b/fw/v1/pa2_in3_pdsp0_bin.c
index a8aee94..e260f0d 100644
--- a/fw/v1/pa2_in3_pdsp0_bin.c
+++ b/fw/v1/pa2_in3_pdsp0_bin.c
@@ -74,9 +74,9 @@
 const uint32_t in3_pdsp0[] =  {
      0x21000300,
      0xbabe0300,
-     0x03000201,
-     0x23029f9e,
-     0x24020182,
+     0x03000202,
+     0x2302c49e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -116,9 +116,9 @@ const uint32_t in3_pdsp0[] =  {
      0xd106ff00,
      0x93202896,
      0xc9000403,
-     0x23004f9e,
+     0x2300509e,
      0x21002f00,
-     0x2300749e,
+     0x2300759e,
      0x1d067d7d,
      0xc9077d15,
      0x1d077d7d,
@@ -145,12 +145,13 @@ const uint32_t in3_pdsp0[] =  {
      0xc9011d04,
      0xd1067d04,
      0xd1077d03,
-     0x23053e9e,
-     0xd304ffaf,
+     0x23056e9e,
+     0xd104ff05,
      0xcf057dc5,
      0xc910ff02,
      0x21001000,
-     0x21053700,
+     0x21056700,
+     0x21021e00,
      0x0906c481,
      0x92812088,
      0x10c8c89f,
@@ -164,11 +165,11 @@ const uint32_t in3_pdsp0[] =  {
      0x106a6a2e,
      0x244023e4,
      0x24001864,
-     0x21006b00,
+     0x21006c00,
      0xd1015d04,
      0x2400002e,
      0x240391c5,
-     0x21006300,
+     0x21006400,
      0x2400012e,
      0x240011c5,
      0x246023e4,
@@ -192,9 +193,18 @@ const uint32_t in3_pdsp0[] =  {
      0x51006904,
      0x24000e6a,
      0x2400000a,
-     0x21005400,
+     0x21005500,
      0x2400002e,
      0x2f04898e,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x21008500,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x246023e4,
      0x24001864,
      0x811208c9,
@@ -206,21 +216,30 @@ const uint32_t in3_pdsp0[] =  {
      0x51026904,
      0x1f060e0e,
      0x240020e4,
-     0x21026500,
+     0x21028a00,
      0x24000e2e,
      0x244020e4,
      0x24001864,
-     0x21026500,
+     0x21028a00,
      0x2400002e,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x21009f00,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24602084,
      0x24001864,
      0x10494905,
      0x811207c9,
-     0x21026500,
+     0x21028a00,
      0x10d7d794,
      0x24000f42,
      0x6902691b,
-     0xd10bb6c1,
+     0xd10bb6ca,
      0xc9006805,
      0x81230848,
      0x11c01717,
@@ -233,7 +252,7 @@ const uint32_t in3_pdsp0[] =  {
      0x11c01717,
      0x51014a03,
      0x13161717,
-     0x2100a300,
+     0x2100b600,
      0x130d1717,
      0x812608d7,
      0xc9000a03,
@@ -244,14 +263,14 @@ const uint32_t in3_pdsp0[] =  {
      0x244023e4,
      0x24001864,
      0x2f000384,
-     0x51036cb0,
+     0x51036cb9,
      0x209e0000,
-     0x69006958,
+     0x69006961,
      0x51003802,
      0x81340858,
      0xd101b603,
      0xc9065d02,
-     0xd10bb6a2,
+     0xd10bb6ab,
      0x8118288a,
      0x51000b08,
      0x91090862,
@@ -282,7 +301,7 @@ const uint32_t in3_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2100d800,
+     0x2100eb00,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -294,11 +313,11 @@ const uint32_t in3_pdsp0[] =  {
      0x00214949,
      0x00018989,
      0x24000042,
-     0x2100ea00,
+     0x2100fd00,
      0x00228989,
      0xc9016b0a,
      0x00224949,
-     0x2100ea00,
+     0x2100fd00,
      0xc9026b04,
      0x0b05da02,
      0x00028989,
@@ -306,10 +325,19 @@ const uint32_t in3_pdsp0[] =  {
      0xc9016b03,
      0x003a8989,
      0x24000042,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x21010600,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24002002,
      0x2400002e,
      0xc905b602,
-     0x21014a00,
+     0x21016600,
      0x51016c56,
      0x51046c55,
      0xd1006b09,
@@ -338,9 +366,9 @@ const uint32_t in3_pdsp0[] =  {
      0x69010206,
      0xd1076903,
      0x2400002e,
-     0x21010f00,
+     0x21012b00,
      0x2400012e,
-     0x21010f00,
+     0x21012b00,
      0x6905020e,
      0x1049492e,
      0xd10bb646,
@@ -419,7 +447,7 @@ const uint32_t in3_pdsp0[] =  {
      0x812608d7,
      0x24007081,
      0x9081f489,
-     0x21009200,
+     0x2100a500,
      0x108c8cd4,
      0x91001993,
      0x01045301,
@@ -433,12 +461,12 @@ const uint32_t in3_pdsp0[] =  {
      0x209e0000,
      0x0904dede,
      0x90def486,
-     0x2402659e,
-     0x21016b00,
+     0x24028a9e,
+     0x21018700,
      0x10d7d794,
      0x24000f42,
      0x83206796,
-     0x6900664f,
+     0x69006658,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -469,7 +497,7 @@ const uint32_t in3_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21019300,
+     0x2101af00,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -481,11 +509,11 @@ const uint32_t in3_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x2101a500,
+     0x2101c100,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x2101a500,
+     0x2101c100,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -496,6 +524,15 @@ const uint32_t in3_pdsp0[] =  {
      0x912a0761,
      0x51000102,
      0x81340761,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2101cd00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x51016937,
      0x51046936,
      0xd1006808,
@@ -590,7 +627,7 @@ const uint32_t in3_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21026500,
+     0x21028a00,
      0x2480009f,
      0x240008e4,
      0x2f000184,
@@ -612,20 +649,20 @@ const uint32_t in3_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21026500,
-     0x21021800,
+     0x21028a00,
+     0x21023d00,
      0x240832e4,
      0x2f000384,
      0xd106ff00,
      0x2eff8b96,
      0x008f89d7,
-     0x21023100,
+     0x21025600,
      0x2eff8b96,
      0x008f89d7,
      0x2f05098e,
      0x24001097,
-     0x24025d9e,
-     0x21056600,
+     0x2402829e,
+     0x21059600,
      0x24000104,
      0x0508c9c4,
      0xc9001d02,
@@ -645,17 +682,17 @@ const uint32_t in3_pdsp0[] =  {
      0x11033737,
      0x1016161c,
      0x1f037d7d,
-     0x21024400,
+     0x21026900,
      0x1f007d7d,
      0x240002de,
      0xc907ff00,
      0x24001876,
      0x83206796,
-     0x21028000,
+     0x2102a500,
      0x2eff8390,
      0xc9025d03,
      0x24000010,
-     0x21024900,
+     0x21026e00,
      0x24000e10,
      0x1f061010,
      0xc907ff00,
@@ -665,12 +702,12 @@ const uint32_t in3_pdsp0[] =  {
      0x2f020792,
      0x2f028792,
      0x1f027d7d,
-     0x21025700,
+     0x21027c00,
      0x70167c05,
      0x11033737,
      0x13143737,
      0x240002de,
-     0x21025e00,
+     0x21028300,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -716,33 +753,33 @@ const uint32_t in3_pdsp0[] =  {
      0x510ade1a,
      0xc9007d03,
      0x1d007d7d,
-     0x21008100,
+     0x21008b00,
      0x5103de06,
      0x5104de09,
      0x5105de0c,
      0x5106de0f,
      0x0b0237de,
-     0x21016700,
+     0x21018300,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21026500,
+     0x21028a00,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21026500,
+     0x21028a00,
      0x24402084,
      0x24001864,
      0x24000e2e,
-     0x21026500,
+     0x21028a00,
      0x24402084,
      0x24001864,
      0x24000d2e,
-     0x21026500,
+     0x21028a00,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x21026500,
+     0x21028a00,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -763,26 +800,26 @@ const uint32_t in3_pdsp0[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x240562c8,
-     0x24056688,
-     0x240566c9,
-     0x24059c89,
-     0x2405d5ca,
-     0x2405f98a,
-     0x240606cb,
-     0x2406138b,
-     0x24062bcc,
-     0x2406388c,
-     0x240663cd,
-     0x2406658d,
-     0x240674ce,
-     0x2405698e,
-     0x240566cf,
-     0x2406768f,
-     0x24069ad0,
-     0x24067c90,
-     0x240686d1,
-     0x24069091,
+     0x240592c8,
+     0x24059688,
+     0x240596c9,
+     0x2405cc89,
+     0x240605ca,
+     0x2406298a,
+     0x240636cb,
+     0x2406438b,
+     0x24065bcc,
+     0x2406688c,
+     0x240693cd,
+     0x2406958d,
+     0x2406a4ce,
+     0x2405998e,
+     0x240596cf,
+     0x2406a68f,
+     0x2406cad0,
+     0x2406ac90,
+     0x2406b6d1,
+     0x2406c091,
      0x8500f588,
      0x24505084,
      0x108484c4,
@@ -851,7 +888,7 @@ const uint32_t in3_pdsp0[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21035f00,
+     0x21038400,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -875,10 +912,10 @@ const uint32_t in3_pdsp0[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x21035f00,
+     0x21038400,
      0x81242e84,
      0x1f057d7d,
-     0x21035f00,
+     0x21038400,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -888,15 +925,15 @@ const uint32_t in3_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21035f00,
+     0x21038400,
      0x51006602,
-     0x21035f00,
+     0x21038400,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21035f00,
+     0x21038400,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -921,20 +958,20 @@ const uint32_t in3_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062775,
-     0x510c27eb,
-     0x530a2777,
-     0x53082773,
-     0x530b2773,
-     0x53092773,
-     0x5105272f,
+     0x53062780,
+     0x510c27f6,
+     0x530a2782,
+     0x5308277e,
+     0x530b277e,
+     0x5309277e,
+     0x51052738,
      0x24000286,
      0x2f0080c6,
-     0x21035f00,
-     0x2104ce00,
-     0x21030500,
-     0x2104cb00,
-     0x2104cb00,
+     0x21038400,
+     0x2104fe00,
+     0x21032a00,
+     0x2104fb00,
+     0x2104fb00,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -955,11 +992,11 @@ const uint32_t in3_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21038500,
+     0x2103b300,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21037b00,
+     0x2103a000,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -968,16 +1005,25 @@ const uint32_t in3_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21038500,
+     0x2103b300,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x2103af00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
-     0x21026500,
-     0x21026500,
-     0x59388004,
+     0x21028a00,
+     0x21028a00,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21035f00,
+     0x21038400,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1074,7 +1120,7 @@ const uint32_t in3_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1103,10 +1149,12 @@ const uint32_t in3_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1156,7 +1204,7 @@ const uint32_t in3_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21035f00,
+     0x21038400,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1166,20 +1214,20 @@ const uint32_t in3_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21035f00,
+     0x21038400,
      0x240018c4,
      0x2f000384,
-     0x2104bc00,
+     0x2104ec00,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2104b900,
+     0x2104e900,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21035f00,
+     0x21038400,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1190,10 +1238,10 @@ const uint32_t in3_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21035f00,
+     0x21038400,
      0x69066a0e,
      0x59148002,
-     0x2104b900,
+     0x2104e900,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1203,11 +1251,11 @@ const uint32_t in3_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21046400,
-     0x21035f00,
+     0x21049400,
+     0x21038400,
      0x69076a0e,
      0x59148002,
-     0x2104b900,
+     0x2104e900,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1217,12 +1265,12 @@ const uint32_t in3_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21047200,
-     0x21035f00,
+     0x2104a200,
+     0x21038400,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2104b900,
+     0x2104e900,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1242,12 +1290,12 @@ const uint32_t in3_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21048100,
-     0x21035f00,
+     0x2104b100,
+     0x21038400,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2104b900,
+     0x2104e900,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1263,27 +1311,27 @@ const uint32_t in3_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x2104a000,
+     0x2104d000,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21049a00,
-     0x21035f00,
+     0x2104ca00,
+     0x21038400,
      0x690a6a08,
      0x590c8002,
-     0x2104b900,
+     0x2104e900,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21035f00,
+     0x21038400,
      0x240002d9,
      0x1f047b7b,
-     0x21035f00,
+     0x21038400,
      0x240010d9,
      0x1f047b7b,
-     0x21035f00,
+     0x21038400,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1293,22 +1341,22 @@ const uint32_t in3_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21035f00,
-     0x21035f00,
-     0x21035f00,
-     0x21035f00,
-     0x21035f00,
-     0x21035f00,
+     0x21038400,
+     0x21038400,
+     0x21038400,
+     0x21038400,
+     0x21038400,
+     0x21038400,
      0x24000c86,
      0x2f0080c6,
-     0x21035f00,
+     0x21038400,
      0x2e80838a,
      0x2eff818d,
      0x240068c0,
      0x58c08004,
      0x24001000,
      0xc9037b4c,
-     0x21051b00,
+     0x21054b00,
      0x91200e61,
      0x10cacacd,
      0x1f0fcdcd,
@@ -1318,7 +1366,7 @@ const uint32_t in3_pdsp0[] =  {
      0x69202104,
      0x24000400,
      0xc9037b42,
-     0x21051b00,
+     0x21054b00,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -1326,15 +1374,15 @@ const uint32_t in3_pdsp0[] =  {
      0x69200304,
      0x24000400,
      0xc9037b3a,
-     0x21051b00,
+     0x21054b00,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x2104f400,
+     0x21052400,
      0x60c0ca04,
      0x24000400,
      0xc9037b32,
-     0x21051b00,
+     0x21054b00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1343,7 +1391,7 @@ const uint32_t in3_pdsp0[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x21052300,
+     0x21055300,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -1375,18 +1423,18 @@ const uint32_t in3_pdsp0[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x21035f00,
+     0x21038400,
      0x83242e84,
      0x1f057d7d,
-     0x21035f00,
+     0x21038400,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21035f00,
+     0x21038400,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x21035f00,
+     0x21038400,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -1406,13 +1454,13 @@ const uint32_t in3_pdsp0[] =  {
      0x69032a03,
      0x1f016d6d,
      0x10cbcb8d,
-     0x2104f800,
+     0x21052800,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
      0xc910ff00,
      0xc9011d02,
-     0x23053e9e,
+     0x23056e9e,
      0x21004d00,
      0xd110ff00,
      0x9180309a,
@@ -1451,10 +1499,10 @@ const uint32_t in3_pdsp0[] =  {
      0x1d011d1d,
      0x209e0000,
      0xd1001d02,
-     0x2106a100,
+     0x2106d100,
      0x240002de,
      0x209e0000,
-     0x2106a100,
+     0x2106d100,
      0x240002de,
      0x209e0000,
      0x240002de,
@@ -1464,7 +1512,7 @@ const uint32_t in3_pdsp0[] =  {
      0x11f066e0,
      0x5140e003,
      0x5160e018,
-     0x2106a100,
+     0x2106d100,
      0x10949480,
      0x10d5d5c0,
      0x2eff8792,
@@ -1559,8 +1607,8 @@ const uint32_t in3_pdsp0[] =  {
      0x209e0000,
      0x11033737,
      0x13143737,
-     0x2105d300,
-     0x2106a100,
+     0x21060300,
+     0x2106d100,
      0x11033737,
      0x13643737,
      0x240002de,
@@ -1739,7 +1787,7 @@ const uint32_t in3_pdsp0[] =  {
      0x240001de,
      0xc9001d03,
      0xd104b602,
-     0x21056b00,
+     0x21059b00,
      0x1d04b6b6,
      0x209e0000,
      0x2e808386,
@@ -1749,7 +1797,7 @@ const uint32_t in3_pdsp0[] =  {
      0x240001de,
      0xc9001d03,
      0xd104b602,
-     0x21056b00,
+     0x21059b00,
      0x1d04b6b6,
      0x209e0000,
      0x2e808986,
@@ -1759,7 +1807,7 @@ const uint32_t in3_pdsp0[] =  {
      0x240001de,
      0xc9001d03,
      0xd104b602,
-     0x21056b00,
+     0x21059b00,
      0x1d04b6b6,
      0x209e0000,
      0x240001de,
diff --git a/fw/v1/pa2_in4_pdsp0_bin.c b/fw/v1/pa2_in4_pdsp0_bin.c
index 035b137..767cd91 100644
--- a/fw/v1/pa2_in4_pdsp0_bin.c
+++ b/fw/v1/pa2_in4_pdsp0_bin.c
@@ -74,9 +74,9 @@
 const uint32_t in4_pdsp0[] =  {
      0x21000300,
      0xbabe0401,
-     0x03000201,
-     0x2302b79e,
-     0x24020182,
+     0x03000202,
+     0x2302ca9e,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8582,
@@ -141,9 +141,9 @@ const uint32_t in4_pdsp0[] =  {
      0xd106ff00,
      0x93202896,
      0xc9000403,
-     0x23005e9e,
+     0x23005f9e,
      0x21004800,
-     0x2302069e,
+     0x2302199e,
      0x1d067d7d,
      0xc9077d0f,
      0x1d077d7d,
@@ -161,11 +161,12 @@ const uint32_t in4_pdsp0[] =  {
      0x21005700,
      0x21005800,
      0xd1057d02,
-     0xd304ffc4,
+     0xd104ff05,
      0xcf057db6,
      0xc910ff02,
      0x21001000,
-     0x21054600,
+     0x21056400,
+     0x21023000,
      0x2480089f,
      0x0906c481,
      0x92812088,
@@ -183,7 +184,7 @@ const uint32_t in4_pdsp0[] =  {
      0x10d7d794,
      0x24000f42,
      0x6902691f,
-     0xd10bb6dc,
+     0xd10bb6e5,
      0xc9006805,
      0x81230848,
      0x11c01717,
@@ -196,7 +197,7 @@ const uint32_t in4_pdsp0[] =  {
      0x11c01717,
      0x51014a03,
      0x13161717,
-     0x21007e00,
+     0x21007f00,
      0x130d1717,
      0x812608d7,
      0x690e6a04,
@@ -211,14 +212,14 @@ const uint32_t in4_pdsp0[] =  {
      0x244023e4,
      0x24001864,
      0x2f000384,
-     0x51036cc7,
+     0x51036cd0,
      0x209e0000,
-     0x6900695b,
+     0x69006964,
      0x51003802,
      0x81340858,
      0xd101b603,
      0xc9065d02,
-     0xd10bb6b9,
+     0xd10bb6c2,
      0x8118288a,
      0x51000b08,
      0x91090862,
@@ -249,7 +250,7 @@ const uint32_t in4_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2100b700,
+     0x2100b800,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -261,11 +262,11 @@ const uint32_t in4_pdsp0[] =  {
      0x00214949,
      0x00018989,
      0x24000042,
-     0x2100c900,
+     0x2100ca00,
      0x00228989,
      0xc9016b0a,
      0x00224949,
-     0x2100c900,
+     0x2100ca00,
      0xc9026b04,
      0x0b05da02,
      0x00028989,
@@ -273,13 +274,22 @@ const uint32_t in4_pdsp0[] =  {
      0xc9016b03,
      0x003a8989,
      0x24000042,
+     0xc90e8905,
+     0x1d0e8989,
+     0x811e08c9,
+     0x91c813c9,
+     0x2100d300,
+     0xc90f8904,
+     0x1d0f8989,
+     0x811e08c9,
+     0x91ca13c9,
      0x24002002,
      0x2400002e,
      0xc905b605,
      0x911008c1,
      0x1d0f8181,
      0x811008c1,
-     0x21014000,
+     0x21014a00,
      0x51016c6a,
      0x51046c69,
      0xd1006b09,
@@ -308,9 +318,9 @@ const uint32_t in4_pdsp0[] =  {
      0x69010206,
      0xd1076903,
      0x2400002e,
-     0x2100f100,
+     0x2100fb00,
      0x2400012e,
-     0x2100f100,
+     0x2100fb00,
      0x6905020e,
      0x1049492e,
      0xd10bb65a,
@@ -409,7 +419,7 @@ const uint32_t in4_pdsp0[] =  {
      0x812608d7,
      0x24007081,
      0x9081f489,
-     0x21006d00,
+     0x21006e00,
      0x108c8cd4,
      0x91001993,
      0x01045301,
@@ -423,23 +433,23 @@ const uint32_t in4_pdsp0[] =  {
      0x209e0000,
      0x0904dede,
      0x90def486,
-     0x24027f9e,
-     0x21017800,
+     0x2402929e,
+     0x21018200,
      0x2480099f,
-     0x24027f9e,
+     0x2402929e,
      0xc909b603,
      0x2400f081,
-     0x21016800,
+     0x21017200,
      0xc908b605,
      0x2400e081,
      0x9081f486,
      0x51066602,
-     0x21017800,
+     0x21018200,
      0xd10fb605,
      0x11033737,
      0x13003737,
      0x9100f486,
-     0x21017800,
+     0x21018200,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -447,11 +457,11 @@ const uint32_t in4_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e286,
-     0x21017800,
+     0x21018200,
      0x10d7d794,
      0x24000f42,
      0x83206796,
-     0x6900664f,
+     0x69006658,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -482,7 +492,7 @@ const uint32_t in4_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x2101a000,
+     0x2101aa00,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -494,11 +504,11 @@ const uint32_t in4_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x2101b200,
+     0x2101bc00,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x2101b200,
+     0x2101bc00,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -509,6 +519,15 @@ const uint32_t in4_pdsp0[] =  {
      0x912a0761,
      0x51000102,
      0x81340761,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2101c800,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x51016937,
      0x51046936,
      0xd1006808,
@@ -593,18 +612,18 @@ const uint32_t in4_pdsp0[] =  {
      0x2480099f,
      0xc909b603,
      0x2400f081,
-     0x21020c00,
+     0x21021f00,
      0xc908b605,
      0x2400e081,
      0x9081f489,
      0x51066902,
-     0x21006c00,
+     0x21006d00,
      0xd10fb606,
      0x11033737,
      0x13003737,
      0x812608d7,
      0x9100f489,
-     0x21006c00,
+     0x21006d00,
      0x0b0ad941,
      0x10d9d981,
      0x11032121,
@@ -612,7 +631,7 @@ const uint32_t in4_pdsp0[] =  {
      0x09024141,
      0x90413882,
      0xf081e289,
-     0x21006c00,
+     0x21006d00,
      0x91002481,
      0x0101e1e1,
      0x81002481,
@@ -624,7 +643,7 @@ const uint32_t in4_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21027f00,
+     0x21029200,
      0x2480009f,
      0x240008e4,
      0x2f000184,
@@ -644,19 +663,19 @@ const uint32_t in4_pdsp0[] =  {
      0x24002004,
      0x24000024,
      0x1f047d7d,
-     0x21027f00,
+     0x21029200,
      0x240832e4,
      0x2f000384,
      0xd106ff00,
      0x2eff8b96,
      0x008f89d7,
-     0x21025000,
+     0x21026300,
      0x2eff8b96,
      0x008f89d7,
      0x2f05098e,
      0x24001097,
-     0x2402769e,
-     0x21054d00,
+     0x2402899e,
+     0x21056b00,
      0x24000104,
      0x0508c9c4,
      0xc9001d02,
@@ -677,25 +696,25 @@ const uint32_t in4_pdsp0[] =  {
      0x69100304,
      0x1f007d7d,
      0x240002de,
-     0x21029800,
+     0x2102ab00,
      0x1f047d7d,
      0xc907ff00,
      0x24001876,
      0x83206796,
      0x24402084,
      0x24001864,
-     0x21028300,
+     0x21029600,
      0x2eff8792,
      0x2f018792,
      0x2f020792,
      0x2f028792,
      0x1f027d7d,
-     0x21027000,
+     0x21028300,
      0x70167c05,
      0x11033737,
      0x13143737,
      0x240002de,
-     0x21027800,
+     0x21028b00,
      0x1016167c,
      0x09010300,
      0x90001580,
@@ -740,33 +759,33 @@ const uint32_t in4_pdsp0[] =  {
      0x510ade1a,
      0xc9007d03,
      0x1d007d7d,
-     0x21016100,
+     0x21016b00,
      0x5103de06,
      0x5104de09,
      0x5105de0c,
      0x5106de0f,
      0x0b0237de,
-     0x21015d00,
+     0x21016700,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21027f00,
+     0x21029200,
      0x24402084,
      0x24001864,
      0x2400002e,
-     0x21028300,
+     0x21029600,
      0x24402084,
      0x24001864,
      0x24000e2e,
-     0x21027f00,
+     0x21029200,
      0x24402084,
      0x24001864,
      0x24000d2e,
-     0x21027f00,
+     0x21029200,
      0x1f060e0e,
      0x24002004,
      0x24000024,
-     0x21027f00,
+     0x21029200,
      0x240000e3,
      0x31ff0007,
      0xd110ff00,
@@ -786,26 +805,26 @@ const uint32_t in4_pdsp0[] =  {
      0x85002e83,
      0x2eff8983,
      0x83242e83,
-     0x24054bc8,
-     0x24054d88,
-     0x24054dc9,
-     0x24057089,
-     0x240604ca,
-     0x2406948a,
-     0x2406a0cb,
-     0x2406ac8b,
-     0x2406bdcc,
-     0x2406c98c,
-     0x2406f1cd,
-     0x2406f18d,
-     0x2406fece,
-     0x24054f8e,
-     0x24054dcf,
-     0x2406fe8f,
-     0x240719d0,
-     0x24071990,
-     0x240719d1,
-     0x24071991,
+     0x240569c8,
+     0x24056b88,
+     0x24056bc9,
+     0x24058e89,
+     0x24062bca,
+     0x2406c48a,
+     0x2406d0cb,
+     0x2406dc8b,
+     0x2406edcc,
+     0x2406f98c,
+     0x240721cd,
+     0x2407218d,
+     0x24072ece,
+     0x24056d8e,
+     0x24056bcf,
+     0x24072e8f,
+     0x240749d0,
+     0x24074990,
+     0x240749d1,
+     0x24074991,
      0x8500f588,
      0x24505084,
      0x108484c4,
@@ -876,7 +895,7 @@ const uint32_t in4_pdsp0[] =  {
      0x240004d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21037800,
+     0x21038b00,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -900,10 +919,10 @@ const uint32_t in4_pdsp0[] =  {
      0xd110ff00,
      0x2f010184,
      0xc910ff00,
-     0x21037800,
+     0x21038b00,
      0x81242e84,
      0x1f057d7d,
-     0x21037800,
+     0x21038b00,
      0x2eff8b96,
      0x05108980,
      0x24000d04,
@@ -913,15 +932,15 @@ const uint32_t in4_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21037800,
+     0x21038b00,
      0x51006602,
-     0x21037800,
+     0x21038b00,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21037800,
+     0x21038b00,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -946,20 +965,20 @@ const uint32_t in4_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062775,
-     0x510c27eb,
-     0x530a2777,
-     0x53082773,
-     0x530b2773,
-     0x53092773,
-     0x5105272f,
+     0x53062780,
+     0x510c27f6,
+     0x530a2782,
+     0x5308277e,
+     0x530b277e,
+     0x5309277e,
+     0x51052738,
      0x24000286,
      0x2f0080c6,
-     0x21037800,
-     0x2104e700,
-     0x21031e00,
-     0x2104e400,
-     0x2104e400,
+     0x21038b00,
+     0x21050500,
+     0x21033100,
+     0x21050200,
+     0x21050200,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -980,11 +999,11 @@ const uint32_t in4_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21039e00,
+     0x2103ba00,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21039400,
+     0x2103a700,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -993,16 +1012,25 @@ const uint32_t in4_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21039e00,
+     0x2103ba00,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x2103b600,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
-     0x21028300,
-     0x21028300,
-     0x59388004,
+     0x21029600,
+     0x21029600,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21037800,
+     0x21038b00,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -1099,7 +1127,7 @@ const uint32_t in4_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -1128,10 +1156,12 @@ const uint32_t in4_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -1181,7 +1211,7 @@ const uint32_t in4_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21037800,
+     0x21038b00,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -1191,20 +1221,20 @@ const uint32_t in4_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21037800,
+     0x21038b00,
      0x240018c4,
      0x2f000384,
-     0x2104d500,
+     0x2104f300,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2104d200,
+     0x2104f000,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21037800,
+     0x21038b00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -1215,10 +1245,10 @@ const uint32_t in4_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21037800,
+     0x21038b00,
      0x69066a0e,
      0x59148002,
-     0x2104d200,
+     0x2104f000,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1228,11 +1258,11 @@ const uint32_t in4_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21047d00,
-     0x21037800,
+     0x21049b00,
+     0x21038b00,
      0x69076a0e,
      0x59148002,
-     0x2104d200,
+     0x2104f000,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -1242,12 +1272,12 @@ const uint32_t in4_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21048b00,
-     0x21037800,
+     0x2104a900,
+     0x21038b00,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2104d200,
+     0x2104f000,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1267,12 +1297,12 @@ const uint32_t in4_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21049a00,
-     0x21037800,
+     0x2104b800,
+     0x21038b00,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2104d200,
+     0x2104f000,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1288,27 +1318,27 @@ const uint32_t in4_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x2104b900,
+     0x2104d700,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2104b300,
-     0x21037800,
+     0x2104d100,
+     0x21038b00,
      0x690a6a08,
      0x590c8002,
-     0x2104d200,
+     0x2104f000,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21037800,
+     0x21038b00,
      0x240002d9,
      0x1f047b7b,
-     0x21037800,
+     0x21038b00,
      0x240010d9,
      0x1f047b7b,
-     0x21037800,
+     0x21038b00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1318,22 +1348,22 @@ const uint32_t in4_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21037800,
-     0x21037800,
-     0x21037800,
-     0x21037800,
-     0x21037800,
-     0x21037800,
+     0x21038b00,
+     0x21038b00,
+     0x21038b00,
+     0x21038b00,
+     0x21038b00,
+     0x21038b00,
      0x24000c86,
      0x2f0080c6,
-     0x21037800,
+     0x21038b00,
      0x2e80838a,
      0x2eff818d,
      0x240068c0,
      0x58c08004,
      0x24001000,
      0xc9037b42,
-     0x21052a00,
+     0x21054800,
      0x91200e61,
      0x240100c0,
      0x68c0ca12,
@@ -1341,7 +1371,7 @@ const uint32_t in4_pdsp0[] =  {
      0x69202104,
      0x24000400,
      0xc9037b3a,
-     0x21052a00,
+     0x21054800,
      0x090221c1,
      0x0100c1c1,
      0x90c12e82,
@@ -1349,15 +1379,15 @@ const uint32_t in4_pdsp0[] =  {
      0x69200304,
      0x24000400,
      0xc9037b32,
-     0x21052a00,
+     0x21054800,
      0x090521ca,
      0x0003caca,
      0x2f00808a,
-     0x21050b00,
+     0x21052900,
      0x60c0ca04,
      0x24000400,
      0xc9037b2a,
-     0x21052a00,
+     0x21054800,
      0x0b05ca21,
      0x090221c1,
      0x0100c1c1,
@@ -1366,7 +1396,7 @@ const uint32_t in4_pdsp0[] =  {
      0x24000004,
      0x240018c4,
      0x2f000384,
-     0x21053200,
+     0x21055000,
      0x1e03e2e2,
      0x80c12e82,
      0x2700e223,
@@ -1390,18 +1420,18 @@ const uint32_t in4_pdsp0[] =  {
      0xd110ff00,
      0x2f010984,
      0xc910ff00,
-     0x21037800,
+     0x21038b00,
      0x83242e84,
      0x1f057d7d,
-     0x21037800,
+     0x21038b00,
      0x100000d9,
      0x1f047b7b,
      0x1d057b7b,
-     0x21037800,
+     0x21038b00,
      0x10000086,
      0x2f0080c6,
      0x1d057b7b,
-     0x21037800,
+     0x21038b00,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
@@ -1421,7 +1451,7 @@ const uint32_t in4_pdsp0[] =  {
      0x69032a03,
      0x1f016d6d,
      0x10cbcb8d,
-     0x21050f00,
+     0x21052d00,
      0x1d057d7d,
      0x93242e84,
      0x2f010984,
@@ -1487,7 +1517,7 @@ const uint32_t in4_pdsp0[] =  {
      0x2eff8792,
      0xd102b603,
      0x10d9d995,
-     0x21058b00,
+     0x2105a900,
      0x10dada95,
      0x111f3535,
      0x1d02b6b6,
@@ -1530,7 +1560,7 @@ const uint32_t in4_pdsp0[] =  {
      0x2700ea01,
      0x69200103,
      0x1f08b6b6,
-     0x2105b600,
+     0x2105d400,
      0x61e06a03,
      0x49ef6a02,
      0x1f09b6b6,
@@ -1548,12 +1578,12 @@ const uint32_t in4_pdsp0[] =  {
      0x209e0000,
      0x11033737,
      0x13143737,
-     0x2105c700,
+     0x2105e500,
      0x11033737,
      0x13643737,
      0x240002de,
      0x209e0000,
-     0xd104b62a,
+     0xd104b633,
      0x2e808986,
      0x11f066e0,
      0x6f40e0f9,
@@ -1571,7 +1601,7 @@ const uint32_t in4_pdsp0[] =  {
      0x6e484bf9,
      0x01016b6b,
      0x808e100b,
-     0x2105eb00,
+     0x21060900,
      0x57008196,
      0x586e4e0d,
      0x2700f07b,
@@ -1585,11 +1615,20 @@ const uint32_t in4_pdsp0[] =  {
      0x2400016b,
      0x09047b8e,
      0x808eb08b,
-     0x2105eb00,
+     0x21060900,
      0x2400ff7b,
      0x2400015b,
      0x1f04b6b6,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c8138f,
+     0x21061500,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91ca138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1597,34 +1636,34 @@ const uint32_t in4_pdsp0[] =  {
      0x209e0000,
      0x1d04b6b6,
      0x51ff7b0d,
-     0x5f207bcd,
+     0x5f207bc4,
      0x09047b81,
      0x9081308b,
      0x705b6b04,
      0x045b6b6b,
      0x8081308b,
-     0x21060100,
+     0x21062800,
      0x9100b18e,
      0x1c7bf0f0,
      0x51004e02,
      0x05014e4e,
      0x8100b18e,
-     0xcf05b671,
+     0xcf05b668,
      0x24000ade,
      0x209e0000,
-     0xd105b648,
+     0xd105b651,
      0x2e808386,
      0x11f06600,
-     0x6f6000be,
+     0x6f6000b5,
      0x24000004,
      0x240008c4,
      0x2f000384,
      0x2e808f8e,
      0x2f01878e,
      0x2f020792,
-     0xd101b64f,
-     0xc9037d4e,
-     0xd104b63c,
+     0xd101b658,
+     0xc9037d57,
+     0xd104b645,
      0x2eff8580,
      0x10272760,
      0x01681680,
@@ -1639,12 +1678,12 @@ const uint32_t in4_pdsp0[] =  {
      0x51006004,
      0x512b6003,
      0x513c6002,
-     0x21062700,
+     0x21064e00,
      0x90800680,
      0x010140c2,
      0x0903c2c2,
      0x00c28080,
-     0x21061a00,
+     0x21064100,
      0x90800600,
      0x1f006161,
      0x10f1f1e2,
@@ -1660,8 +1699,8 @@ const uint32_t in4_pdsp0[] =  {
      0x6e604bf9,
      0x01016b6b,
      0x808e100b,
-     0x21064400,
-     0xc9006128,
+     0x21066b00,
+     0xc9006131,
      0x586e4e0d,
      0x2700f07b,
      0x51207b0b,
@@ -1674,11 +1713,20 @@ const uint32_t in4_pdsp0[] =  {
      0x2400016b,
      0x09047b8e,
      0x808eb08b,
-     0x21064400,
+     0x21066b00,
      0x2400ff7b,
      0x2400015b,
      0x1f04b6b6,
      0xc907ff00,
+     0xc90ecf05,
+     0x1d0ecfcf,
+     0x811e078f,
+     0x91c8138f,
+     0x21067700,
+     0xc90fcf04,
+     0x1d0fcfcf,
+     0x811e078f,
+     0x91ca138f,
      0x8112078f,
      0x810b074f,
      0x240003de,
@@ -1686,13 +1734,13 @@ const uint32_t in4_pdsp0[] =  {
      0x209e0000,
      0x1d04b6b6,
      0x51ff7b0d,
-     0x5f207b74,
+     0x5f207b62,
      0x09047b81,
      0x9081308b,
      0x705b6b04,
      0x045b6b6b,
      0x8081308b,
-     0x21065a00,
+     0x21068a00,
      0x9100b18e,
      0x1c7bf0f0,
      0x51004e02,
@@ -1722,7 +1770,7 @@ const uint32_t in4_pdsp0[] =  {
      0x2eff878a,
      0xd102b603,
      0x10d9d98d,
-     0x21067600,
+     0x2106a600,
      0x10dada8d,
      0x111f2d2d,
      0x1d02b6b6,
@@ -1758,7 +1806,7 @@ const uint32_t in4_pdsp0[] =  {
      0x209e0000,
      0x2e808086,
      0x09034680,
-     0x4fff802f,
+     0x4fff801d,
      0x010880c4,
      0x00c41616,
      0x2f000384,
@@ -1775,7 +1823,7 @@ const uint32_t in4_pdsp0[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff801e,
+     0x4fff800c,
      0x010880c4,
      0x2f000384,
      0x00c41616,
@@ -1804,7 +1852,7 @@ const uint32_t in4_pdsp0[] =  {
      0x113f0103,
      0x0b0601de,
      0x09034680,
-     0x4fff8001,
+     0x4dff80ef,
      0x010880c4,
      0x2f000384,
      0x00c41616,
diff --git a/fw/v1/pa2_in4_pdsp1_bin.c b/fw/v1/pa2_in4_pdsp1_bin.c
index 2b61da5..95f8fbe 100644
--- a/fw/v1/pa2_in4_pdsp1_bin.c
+++ b/fw/v1/pa2_in4_pdsp1_bin.c
@@ -74,7 +74,7 @@
 const uint32_t in4_pdsp1[] =  {
      0x21000300,
      0xbabe0401,
-     0x03000201,
+     0x03000202,
      0x2300f79e,
      0x2eff8582,
      0x8104a482,
@@ -85,7 +85,7 @@ const uint32_t in4_pdsp1[] =  {
      0x2eff819d,
      0x24000702,
      0x81001762,
-     0x24020182,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0xc901ff08,
@@ -171,7 +171,7 @@ const uint32_t in4_pdsp1[] =  {
      0x2e838786,
      0x24801c83,
      0x2400109e,
-     0x2103ea00,
+     0x2103f500,
      0x2e838786,
      0xc90d9908,
      0x11033737,
@@ -194,13 +194,13 @@ const uint32_t in4_pdsp1[] =  {
      0x90413882,
      0xf081e286,
      0x24801c83,
-     0x2103ea00,
+     0x2103f500,
      0x0b0237de,
      0x0904dede,
      0x90def486,
      0x24801c83,
      0x2400109e,
-     0x2103ea00,
+     0x2103f500,
      0xd106ff00,
      0x9110078a,
      0x24002004,
@@ -652,13 +652,13 @@ const uint32_t in4_pdsp1[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x530627a1,
-     0x510c27f7,
-     0x530a27a3,
-     0x5308279f,
-     0x530b279f,
-     0x5309279f,
-     0x5105273b,
+     0x530627ac,
+     0x530c2702,
+     0x530a27ae,
+     0x530827aa,
+     0x530b27aa,
+     0x530927aa,
+     0x51052744,
      0x24000286,
      0x2f0080c6,
      0x21025200,
@@ -685,7 +685,7 @@ const uint32_t in4_pdsp1[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21027c00,
+     0x21028500,
      0xc9057b04,
      0x24008000,
      0x81200760,
@@ -698,7 +698,16 @@ const uint32_t in4_pdsp1[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
+     0x21028500,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
      0x21027c00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -717,7 +726,7 @@ const uint32_t in4_pdsp1[] =  {
      0x2f04898e,
      0x2f000384,
      0x21001000,
-     0x59388004,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
      0x21025200,
@@ -817,7 +826,7 @@ const uint32_t in4_pdsp1[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -846,10 +855,12 @@ const uint32_t in4_pdsp1[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -912,12 +923,12 @@ const uint32_t in4_pdsp1[] =  {
      0x21025200,
      0x240018c4,
      0x2f000384,
-     0x2103db00,
+     0x2103e600,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2103d800,
+     0x2103e300,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
@@ -936,7 +947,7 @@ const uint32_t in4_pdsp1[] =  {
      0x21025200,
      0x69026a0c,
      0x59148002,
-     0x2103d800,
+     0x2103e300,
      0x2e80878e,
      0x71106e04,
      0x240012d9,
@@ -948,7 +959,7 @@ const uint32_t in4_pdsp1[] =  {
      0x21025200,
      0x69046a09,
      0x59088002,
-     0x2103d800,
+     0x2103e300,
      0x2e80818e,
      0x1d021d1d,
      0xc9006e02,
@@ -957,7 +968,7 @@ const uint32_t in4_pdsp1[] =  {
      0x21025200,
      0x69056a0b,
      0x59088002,
-     0x2103d800,
+     0x2103e300,
      0x2e80818e,
      0x1d011d1d,
      0xc9006e02,
@@ -968,7 +979,7 @@ const uint32_t in4_pdsp1[] =  {
      0x21025200,
      0x69066a0e,
      0x59148002,
-     0x2103d800,
+     0x2103e300,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -978,11 +989,11 @@ const uint32_t in4_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21038300,
+     0x21038e00,
      0x21025200,
      0x69076a0e,
      0x59148002,
-     0x2103d800,
+     0x2103e300,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -992,12 +1003,12 @@ const uint32_t in4_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21039100,
+     0x21039c00,
      0x21025200,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2103d800,
+     0x2103e300,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -1017,12 +1028,12 @@ const uint32_t in4_pdsp1[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x2103a000,
+     0x2103ab00,
      0x21025200,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2103d800,
+     0x2103e300,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1038,16 +1049,16 @@ const uint32_t in4_pdsp1[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x2103bf00,
+     0x2103ca00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x2103b900,
+     0x2103c400,
      0x21025200,
      0x690a6a08,
      0x590c8002,
-     0x2103d800,
+     0x2103e300,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
@@ -1089,7 +1100,7 @@ const uint32_t in4_pdsp1[] =  {
      0x11c00101,
      0x51014703,
      0x24001641,
-     0x2103fb00,
+     0x21040600,
      0x24000d41,
      0x12410101,
      0x812607c1,
@@ -1102,9 +1113,9 @@ const uint32_t in4_pdsp1[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x510369c0,
+     0x510369c9,
      0x209e0000,
-     0x69006657,
+     0x69006660,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -1135,7 +1146,7 @@ const uint32_t in4_pdsp1[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21042d00,
+     0x21043800,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -1147,11 +1158,11 @@ const uint32_t in4_pdsp1[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x21043f00,
+     0x21044a00,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x21043f00,
+     0x21044a00,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -1159,6 +1170,15 @@ const uint32_t in4_pdsp1[] =  {
      0xc9016803,
      0x003a8686,
      0x24000042,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21045300,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x2400002e,
      0x51016976,
      0x51046975,
@@ -1195,9 +1215,9 @@ const uint32_t in4_pdsp1[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21046800,
+     0x21047c00,
      0x2400012e,
-     0x21046800,
+     0x21047c00,
      0x69050214,
      0x1046462e,
      0x81186787,
diff --git a/fw/v1/pa2_post_pdsp0_bin.c b/fw/v1/pa2_post_pdsp0_bin.c
index 97c18f0..aedf505 100644
--- a/fw/v1/pa2_post_pdsp0_bin.c
+++ b/fw/v1/pa2_post_pdsp0_bin.c
@@ -74,8 +74,8 @@
 const uint32_t post_pdsp0[] =  {
      0x21000300,
      0xbabe0500,
-     0x03000201,
-     0x2305369e,
+     0x03000202,
+     0x23055f9e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -83,7 +83,7 @@ const uint32_t post_pdsp0[] =  {
      0xc900ff00,
      0xd100ff00,
      0x2eff819d,
-     0x24020182,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -111,7 +111,7 @@ const uint32_t post_pdsp0[] =  {
      0x01042f2f,
      0x111f2f2f,
      0x808e004f,
-     0x2302019e,
+     0x2302169e,
      0x104e4e5d,
      0xcf04ffe7,
      0x91002481,
@@ -133,7 +133,7 @@ const uint32_t post_pdsp0[] =  {
      0x2400109e,
      0x24001004,
      0x2f000384,
-     0x21045600,
+     0x21047600,
      0x24000804,
      0x2f000184,
      0x242031e4,
@@ -162,11 +162,11 @@ const uint32_t post_pdsp0[] =  {
      0x2f04898e,
      0x2f000384,
      0x21001000,
-     0x21021e00,
+     0x21023300,
      0x2400109e,
      0xc907b602,
      0x21005400,
-     0xd305b65f,
+     0xd305b668,
      0xd106b602,
      0x21004700,
      0x24000104,
@@ -482,7 +482,7 @@ const uint32_t post_pdsp0[] =  {
      0x05014c4c,
      0x108686d0,
      0x10d7d790,
-     0x2302019e,
+     0x2302169e,
      0x21007600,
      0x908cb187,
      0x010c8c8c,
@@ -494,7 +494,7 @@ const uint32_t post_pdsp0[] =  {
      0x911007c0,
      0x1f0f8080,
      0x811007c0,
-     0x69004715,
+     0x6900471e,
      0xc907ff00,
      0x81182789,
      0xc9065403,
@@ -507,6 +507,15 @@ const uint32_t post_pdsp0[] =  {
      0x0081d7d7,
      0x05047400,
      0x8f20c716,
+     0xc90ec805,
+     0x1d0ec8c8,
+     0x811e0788,
+     0x91c81388,
+     0x2101bc00,
+     0xc90fc804,
+     0x1d0fc8c8,
+     0x811e0788,
+     0x91ca1388,
      0x24e020e4,
      0x102d2d64,
      0x10c8c8c5,
@@ -577,6 +586,18 @@ const uint32_t post_pdsp0[] =  {
      0x24000104,
      0x106b6bc4,
      0x2f000384,
+     0x24001084,
+     0x2f000184,
+     0xc907ff00,
+     0xc90e8b05,
+     0x1d0e8b8b,
+     0x811e07cb,
+     0x91c813cb,
+     0x21020e00,
+     0xc90f8b04,
+     0x1d0f8b8b,
+     0x811e07cb,
+     0x91ca13cb,
      0x2eff8384,
      0x2400a024,
      0x24002004,
@@ -595,24 +616,24 @@ const uint32_t post_pdsp0[] =  {
      0x90c77088,
      0xd10ec603,
      0x0101e9e9,
-     0x21020d00,
+     0x21022200,
      0x0090e9e9,
      0x0300e8e8,
      0x80c77088,
-     0x21021900,
+     0x21022e00,
      0x048ad081,
      0x090281c7,
      0x0087c7c7,
      0x90c73088,
      0xd10ec603,
      0x0101e8e8,
-     0x21021800,
+     0x21022d00,
      0x0090e8e8,
      0x80c73088,
      0xd10fc604,
      0x10c6c6d0,
      0x110f7070,
-     0x21020300,
+     0x21021800,
      0x209e0000,
      0x2eff8b96,
      0x05108980,
@@ -623,15 +644,15 @@ const uint32_t post_pdsp0[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x21025600,
+     0x21026b00,
      0x51006602,
-     0x21025600,
+     0x21026b00,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x21025600,
+     0x21026b00,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -656,20 +677,20 @@ const uint32_t post_pdsp0[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x5306277d,
-     0x510c27f3,
-     0x530a27ee,
-     0x530827be,
-     0x530b27be,
-     0x530927ea,
-     0x51052737,
+     0x53062788,
+     0x510c27fe,
+     0x530a27f9,
+     0x530827c9,
+     0x530b27c9,
+     0x530927f5,
+     0x51052740,
      0x24000286,
      0x2f0080c6,
-     0x21025600,
-     0x21053300,
-     0x21053300,
-     0x21052c00,
-     0x21053300,
+     0x21026b00,
+     0x21055c00,
+     0x21055c00,
+     0x21055500,
+     0x21055c00,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -689,11 +710,11 @@ const uint32_t post_pdsp0[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21027f00,
+     0x21029d00,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21027100,
+     0x21028600,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -702,7 +723,16 @@ const uint32_t post_pdsp0[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21027f00,
+     0x21029d00,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21029500,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -717,10 +747,10 @@ const uint32_t post_pdsp0[] =  {
      0x2f04898e,
      0x2f000384,
      0x21001000,
-     0x59388004,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x21025600,
+     0x21026b00,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -817,7 +847,7 @@ const uint32_t post_pdsp0[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -846,10 +876,12 @@ const uint32_t post_pdsp0[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -899,7 +931,7 @@ const uint32_t post_pdsp0[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x21025600,
+     0x21026b00,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -909,20 +941,20 @@ const uint32_t post_pdsp0[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21025600,
+     0x21026b00,
      0x240018c4,
      0x2f000384,
-     0x2103bb00,
+     0x2103db00,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x2103b800,
+     0x2103d800,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x21025600,
+     0x21026b00,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -933,10 +965,10 @@ const uint32_t post_pdsp0[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x21025600,
+     0x21026b00,
      0x69066a0e,
      0x59148002,
-     0x2103b800,
+     0x2103d800,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -946,11 +978,11 @@ const uint32_t post_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21036300,
-     0x21025600,
+     0x21038300,
+     0x21026b00,
      0x69076a0e,
      0x59148002,
-     0x2103b800,
+     0x2103d800,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -960,12 +992,12 @@ const uint32_t post_pdsp0[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21037100,
-     0x21025600,
+     0x21039100,
+     0x21026b00,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x2103b800,
+     0x2103d800,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -985,12 +1017,12 @@ const uint32_t post_pdsp0[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21038000,
-     0x21025600,
+     0x2103a000,
+     0x21026b00,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x2103b800,
+     0x2103d800,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -1006,27 +1038,27 @@ const uint32_t post_pdsp0[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21039f00,
+     0x2103bf00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21039900,
-     0x21025600,
+     0x2103b900,
+     0x21026b00,
      0x690a6a08,
      0x590c8002,
-     0x2103b800,
+     0x2103d800,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x21025600,
+     0x21026b00,
      0x240002d9,
      0x1f047b7b,
-     0x21025600,
+     0x21026b00,
      0x240010d9,
      0x1f047b7b,
-     0x21025600,
+     0x21026b00,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -1036,20 +1068,20 @@ const uint32_t post_pdsp0[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x21025600,
+     0x21026b00,
      0x2e80818a,
      0x24000004,
      0x240014c4,
      0x2f000384,
      0x51014a02,
-     0x21025600,
+     0x21026b00,
      0xc9016a06,
      0x240037e4,
      0x240008c4,
      0x24fff8c5,
      0x24080085,
      0x2f000384,
-     0xcd006a85,
+     0xcd006a7a,
      0x69008a09,
      0x2eff8f8e,
      0x240000e2,
@@ -1058,7 +1090,7 @@ const uint32_t post_pdsp0[] =  {
      0x82e2f08e,
      0x0120e2e2,
      0x6ee1e2fe,
-     0x21025600,
+     0x21026b00,
      0x91b0338b,
      0x608acb2c,
      0x24000004,
@@ -1068,7 +1100,7 @@ const uint32_t post_pdsp0[] =  {
      0x51008b04,
      0x24000800,
      0x09038bd0,
-     0x2103e600,
+     0x21040600,
      0x24000400,
      0x2e80818e,
      0x2f000184,
@@ -1086,12 +1118,12 @@ const uint32_t post_pdsp0[] =  {
      0x0b018181,
      0x0081d08f,
      0x24000400,
-     0x2103e600,
+     0x21040600,
      0x1081818f,
-     0x2103e600,
+     0x21040600,
      0x090220c0,
      0x00c08f8f,
-     0x2103e600,
+     0x21040600,
      0xc830ee04,
      0x8e8fd012,
      0x1c30eeee,
@@ -1103,20 +1135,20 @@ const uint32_t post_pdsp0[] =  {
      0x00008f8f,
      0x6ed08fe4,
      0x24000400,
-     0x2103e900,
-     0x21025600,
-     0x21025600,
+     0x21040900,
+     0x21026b00,
+     0x21026b00,
      0x240004c0,
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21025600,
+     0x21026b00,
      0x2e80818a,
      0x91b0338b,
      0x70cb8a04,
      0x24001486,
      0x2f0080c6,
-     0x21025600,
+     0x21026b00,
      0xc9006a08,
      0x24000082,
      0x240400c2,
@@ -1133,7 +1165,7 @@ const uint32_t post_pdsp0[] =  {
      0x2e85098e,
      0x24001481,
      0x240000c1,
-     0x55008a31,
+     0x55008a26,
      0x60ce8109,
      0x588fc108,
      0xf0c13096,
@@ -1142,7 +1174,7 @@ const uint32_t post_pdsp0[] =  {
      0x80c20fd6,
      0x05018a8a,
      0x0104c1c1,
-     0x21042500,
+     0x21044500,
      0x2e808196,
      0x0901d6c2,
      0x0082c2c2,
@@ -1150,19 +1182,19 @@ const uint32_t post_pdsp0[] =  {
      0x05018a8a,
      0x01048181,
      0x2f000384,
-     0x21042500,
-     0x21025600,
+     0x21044500,
+     0x21026b00,
      0x240080c0,
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x21025600,
+     0x21026b00,
      0x2e80818a,
      0x91ac338b,
      0x606b6a04,
      0x24001386,
      0x2f0080c6,
-     0x21025600,
+     0x21026b00,
      0x09066a81,
      0x69804b02,
      0x09018181,
@@ -1181,7 +1213,7 @@ const uint32_t post_pdsp0[] =  {
      0x4f2040fb,
      0x2e80bf0e,
      0x8e81f10e,
-     0x21025600,
+     0x21026b00,
      0xc907ff00,
      0x911007ca,
      0x1f0f8a8a,
@@ -1197,7 +1229,7 @@ const uint32_t post_pdsp0[] =  {
      0x11c00101,
      0x51014703,
      0x24001641,
-     0x21046700,
+     0x21048700,
      0x24000d41,
      0x12410101,
      0x812607c1,
@@ -1210,9 +1242,9 @@ const uint32_t post_pdsp0[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x510369af,
+     0x510369b8,
      0x209e0000,
-     0x69006658,
+     0x69006661,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -1243,7 +1275,7 @@ const uint32_t post_pdsp0[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21049900,
+     0x2104b900,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -1255,11 +1287,11 @@ const uint32_t post_pdsp0[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x2104ab00,
+     0x2104cb00,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x2104ab00,
+     0x2104cb00,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -1267,6 +1299,15 @@ const uint32_t post_pdsp0[] =  {
      0xc9016803,
      0x003a8686,
      0x24000042,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x2104d400,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x81340758,
      0x2400002e,
      0x51016964,
@@ -1304,9 +1345,9 @@ const uint32_t post_pdsp0[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x2104d500,
+     0x2104fe00,
      0x2400012e,
-     0x2104d500,
+     0x2104fe00,
      0x69050214,
      0x1046462e,
      0x81186787,
@@ -1402,10 +1443,10 @@ const uint32_t post_pdsp0[] =  {
      0x24ff00c2,
      0x240000e1,
      0xe1742281,
-     0x21025600,
+     0x21026b00,
      0x24000c86,
      0x2f0080c6,
-     0x21025600,
+     0x21026b00,
      0x240000f4,
      0x240400f5,
      0x24a00080,
diff --git a/fw/v1/pa2_post_pdsp1_bin.c b/fw/v1/pa2_post_pdsp1_bin.c
index 6975e4f..c404170 100644
--- a/fw/v1/pa2_post_pdsp1_bin.c
+++ b/fw/v1/pa2_post_pdsp1_bin.c
@@ -74,8 +74,8 @@
 const uint32_t post_pdsp1[] =  {
      0x21000300,
      0xbabe0501,
-     0x03000201,
-     0x23039d9e,
+     0x03000202,
+     0x2303c69e,
      0x2eff8582,
      0x8104a482,
      0x240001e2,
@@ -83,7 +83,7 @@ const uint32_t post_pdsp1[] =  {
      0xc900ff00,
      0xd100ff00,
      0x2eff819d,
-     0x24020182,
+     0x24020282,
      0x240300c2,
      0x81043782,
      0x2eff8780,
@@ -108,7 +108,7 @@ const uint32_t post_pdsp1[] =  {
      0x2400109e,
      0x24001004,
      0x2f000384,
-     0x2102be00,
+     0x2102de00,
      0x24000804,
      0x2f000184,
      0x242031e4,
@@ -171,10 +171,10 @@ const uint32_t post_pdsp1[] =  {
      0x2f04898e,
      0x2f000384,
      0x21001000,
-     0x2100ae00,
+     0x2100ba00,
      0x2400109e,
      0xc907b602,
-     0x21029100,
+     0x2102a800,
      0xd105b603,
      0xd104b61b,
      0x21002e00,
@@ -238,6 +238,18 @@ const uint32_t post_pdsp1[] =  {
      0x24000104,
      0x106b6bc4,
      0x2f000384,
+     0x24001084,
+     0x2f000184,
+     0xc907ff00,
+     0xc90e8b05,
+     0x1d0e8b8b,
+     0x811e07cb,
+     0x91c813cb,
+     0x2100b200,
+     0xc90f8b04,
+     0x1d0f8b8b,
+     0x811e07cb,
+     0x91ca13cb,
      0x2eff8384,
      0x2400a024,
      0x24002004,
@@ -255,15 +267,15 @@ const uint32_t post_pdsp1[] =  {
      0x10e9e9fa,
      0x51ce0703,
      0x1f077b7b,
-     0x2100e600,
+     0x2100f200,
      0x51006602,
-     0x2100e600,
+     0x2100f200,
      0x51004606,
      0x05014646,
      0x2f008026,
      0x2400045b,
      0x1f057b7b,
-     0x2100e600,
+     0x2100f200,
      0x81182788,
      0x2f05098e,
      0x1f067b7b,
@@ -288,20 +300,20 @@ const uint32_t post_pdsp1[] =  {
      0x5102270e,
      0x5103270e,
      0x5104270e,
-     0x53062781,
-     0x510c27f7,
-     0x530a27b6,
-     0x5308277f,
-     0x530b27b2,
-     0x530927b2,
-     0x5105273b,
+     0x5306278c,
+     0x530c2702,
+     0x530a27c1,
+     0x5308278a,
+     0x530b27bd,
+     0x530927bd,
+     0x51052744,
      0x24000286,
      0x2f0080c6,
-     0x2100e600,
-     0x21039a00,
-     0x21039a00,
-     0x21039300,
-     0x21039a00,
+     0x2100f200,
+     0x2103c300,
+     0x2103c300,
+     0x2103bc00,
+     0x2103c300,
      0xc9067b02,
      0x2e85098e,
      0xc9047b08,
@@ -321,11 +333,11 @@ const uint32_t post_pdsp1[] =  {
      0x1f0f8181,
      0x811007c1,
      0x1f060e0e,
-     0x21011000,
+     0x21012500,
      0xc9057b04,
      0x24008000,
      0x81200760,
-     0x21010100,
+     0x21010d00,
      0x911007c1,
      0x1f0f8181,
      0x811007c1,
@@ -334,7 +346,16 @@ const uint32_t post_pdsp1[] =  {
      0x81082481,
      0x51003a03,
      0x1f060e0e,
-     0x21011000,
+     0x21012500,
+     0xc90eda05,
+     0x1d0edada,
+     0x811e079a,
+     0x91c8139a,
+     0x21011c00,
+     0xc90fda04,
+     0x1d0fdada,
+     0x811e079a,
+     0x91ca139a,
      0x8112079a,
      0x101a1a05,
      0x13202424,
@@ -353,10 +374,10 @@ const uint32_t post_pdsp1[] =  {
      0x2f04898e,
      0x2f000384,
      0x21001000,
-     0x59388004,
+     0x595c8004,
      0x24001086,
      0x2f0080c6,
-     0x2100e600,
+     0x2100f200,
      0x24000086,
      0x2f0080c6,
      0x2e80878a,
@@ -453,7 +474,7 @@ const uint32_t post_pdsp1[] =  {
      0xe10c2281,
      0x240018c4,
      0x2f000184,
-     0x2e80878e,
+     0x2e80898e,
      0xc907ca02,
      0x81c0338e,
      0xc908ca02,
@@ -482,10 +503,12 @@ const uint32_t post_pdsp1[] =  {
      0xf10c2280,
      0x6f00e0ff,
      0xe10c2281,
-     0x240010c4,
+     0xc90bca02,
+     0x81c83392,
+     0xc90cca35,
+     0x240014c4,
      0x2f000184,
      0x2e808f8e,
-     0xc90bca32,
      0x240200c1,
      0x24000081,
      0x1f002121,
@@ -535,7 +558,7 @@ const uint32_t post_pdsp1[] =  {
      0xf1042280,
      0x6f00e0ff,
      0xe1042281,
-     0x2100e600,
+     0x2100f200,
      0x24000086,
      0x2f0080c6,
      0x2e80838a,
@@ -545,20 +568,20 @@ const uint32_t post_pdsp1[] =  {
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x2100e600,
+     0x2100f200,
      0x240018c4,
      0x2f000384,
-     0x21024f00,
+     0x21026600,
      0x240014c4,
      0x2f000384,
      0x69016a13,
      0x592c8002,
-     0x21024c00,
+     0x21026300,
      0x2e80838e,
      0x71046e04,
      0x240011d9,
      0x1f047b7b,
-     0x2100e600,
+     0x2100f200,
      0x09056e81,
      0x09036ec1,
      0x00c18181,
@@ -569,10 +592,10 @@ const uint32_t post_pdsp1[] =  {
      0x2e808f8e,
      0x01088181,
      0x8281f38e,
-     0x2100e600,
+     0x2100f200,
      0x69066a0e,
      0x59148002,
-     0x21024c00,
+     0x21026300,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -582,11 +605,11 @@ const uint32_t post_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x2101f700,
-     0x2100e600,
+     0x21020e00,
+     0x2100f200,
      0x69076a0e,
      0x59148002,
-     0x21024c00,
+     0x21026300,
      0x2e80878e,
      0x24000cc4,
      0x51006e08,
@@ -596,12 +619,12 @@ const uint32_t post_pdsp1[] =  {
      0x2f000384,
      0x2e80858f,
      0x05016e6e,
-     0x21020500,
-     0x2100e600,
+     0x21021c00,
+     0x2100f200,
      0x69086a19,
      0x24003cc0,
      0x58c08002,
-     0x21024c00,
+     0x21026300,
      0x2e808b8e,
      0x240100c2,
      0x51006e12,
@@ -621,12 +644,12 @@ const uint32_t post_pdsp1[] =  {
      0x2f000184,
      0x2e80898f,
      0x05016e6e,
-     0x21021400,
-     0x2100e600,
+     0x21022b00,
+     0x2100f200,
      0x69096a1a,
      0x2400a0c0,
      0x58c08002,
-     0x21024c00,
+     0x21026300,
      0x2e808d8e,
      0x240300c2,
      0x51006e13,
@@ -642,27 +665,27 @@ const uint32_t post_pdsp1[] =  {
      0x8082fc91,
      0x01108282,
      0x05014e4e,
-     0x21023300,
+     0x21024a00,
      0x240018c4,
      0x2f000184,
      0x2e808b8f,
      0x05016e6e,
-     0x21022d00,
-     0x2100e600,
+     0x21024400,
+     0x2100f200,
      0x690a6a08,
      0x590c8002,
-     0x21024c00,
+     0x21026300,
      0x2e80838e,
      0x24ffa8c2,
      0x24100082,
      0xe1d0628e,
-     0x2100e600,
+     0x2100f200,
      0x240002d9,
      0x1f047b7b,
-     0x2100e600,
+     0x2100f200,
      0x240010d9,
      0x1f047b7b,
-     0x2100e600,
+     0x2100f200,
      0x240000e1,
      0x240010c4,
      0x2e80878e,
@@ -672,18 +695,18 @@ const uint32_t post_pdsp1[] =  {
      0x01010101,
      0x0110c1c1,
      0x671f01fa,
-     0x2100e600,
-     0x2100e600,
+     0x2100f200,
+     0x2100f200,
      0x240044c0,
      0x58c08004,
      0x24001086,
      0x2f0080c6,
-     0x2100e600,
+     0x2100f200,
      0x2e80818a,
      0x71206a04,
      0x24000e86,
      0x2f0080c6,
-     0x2100e600,
+     0x2100f200,
      0x2eff8f8e,
      0x09066ac2,
      0x69004a14,
@@ -705,12 +728,12 @@ const uint32_t post_pdsp1[] =  {
      0x09036060,
      0x2e80bf8e,
      0x82c2f28e,
-     0x2100e600,
+     0x2100f200,
      0x69014a05,
      0x82c2f28e,
      0x0120c2c2,
      0x82c2f28e,
-     0x2100e600,
+     0x2100f200,
      0x69024a0c,
      0x24000004,
      0x240014c4,
@@ -722,13 +745,13 @@ const uint32_t post_pdsp1[] =  {
      0x24200085,
      0x00c2e5e5,
      0x2f000384,
-     0x2100e600,
+     0x2100f200,
      0x24000f86,
      0x2f0080c6,
-     0x2100e600,
-     0x2100e600,
-     0x2100e600,
-     0x2100e600,
+     0x2100f200,
+     0x2100f200,
+     0x2100f200,
+     0x2100f200,
      0x1d000e0e,
      0x10cece81,
      0x108f8fc1,
@@ -758,6 +781,15 @@ const uint32_t post_pdsp1[] =  {
      0xc9017403,
      0xd106ff00,
      0x81182795,
+     0xc90e9405,
+     0x1d0e9494,
+     0x811e07d4,
+     0x91c813d4,
+     0x2102ce00,
+     0xc90f9404,
+     0x1d0f9494,
+     0x811e07d4,
+     0x91ca13d4,
      0x2eff8384,
      0x2400e024,
      0x24002204,
@@ -772,8 +804,8 @@ const uint32_t post_pdsp1[] =  {
      0x2f000384,
      0x108181ce,
      0x10c1c18f,
-     0x570800e2,
-     0x21029c00,
+     0x570800d9,
+     0x2102b300,
      0xc907ff00,
      0x911007ca,
      0x1d0f8a8a,
@@ -789,7 +821,7 @@ const uint32_t post_pdsp1[] =  {
      0x11c00101,
      0x51014703,
      0x24001641,
-     0x2102cf00,
+     0x2102ef00,
      0x24000d41,
      0x12410101,
      0x812607c1,
@@ -802,9 +834,9 @@ const uint32_t post_pdsp1[] =  {
      0x244020e4,
      0x24001864,
      0x2f000384,
-     0x510369ae,
+     0x510369b7,
      0x209e0000,
-     0x69006658,
+     0x69006661,
      0x81182787,
      0x51000808,
      0x91090762,
@@ -835,7 +867,7 @@ const uint32_t post_pdsp1[] =  {
      0x11c01a00,
      0x51000003,
      0x0b057a21,
-     0x21030100,
+     0x21032100,
      0xd1010105,
      0x11071a00,
      0x51000003,
@@ -847,11 +879,11 @@ const uint32_t post_pdsp1[] =  {
      0x00214646,
      0x00018686,
      0x24000042,
-     0x21031300,
+     0x21033300,
      0x00228686,
      0xc901680a,
      0x00224646,
-     0x21031300,
+     0x21033300,
      0xc9026804,
      0x0b057a02,
      0x00028686,
@@ -859,6 +891,15 @@ const uint32_t post_pdsp1[] =  {
      0xc9016803,
      0x003a8686,
      0x24000042,
+     0xc90e8605,
+     0x1d0e8686,
+     0x811e07c6,
+     0x91c813c6,
+     0x21033c00,
+     0xc90f8604,
+     0x1d0f8686,
+     0x811e07c6,
+     0x91ca13c6,
      0x81340758,
      0x2400002e,
      0x51016963,
@@ -896,9 +937,9 @@ const uint32_t post_pdsp1[] =  {
      0x69010206,
      0xd1076603,
      0x2400002e,
-     0x21033d00,
+     0x21036600,
      0x2400012e,
-     0x21033d00,
+     0x21036600,
      0x69050214,
      0x1046462e,
      0x81186787,
@@ -993,10 +1034,10 @@ const uint32_t post_pdsp1[] =  {
      0x24ff00c2,
      0x240000e1,
      0xe1742281,
-     0x2100e600,
+     0x2100f200,
      0x24000c86,
      0x2f0080c6,
-     0x2100e600,
+     0x2100f200,
      0x2eff9f89,
      0x24000085,
      0x240800c5,
diff --git a/fw/v1/pacfgcmn.p b/fw/v1/pacfgcmn.p
index c3c721a..78752a2 100644
--- a/fw/v1/pacfgcmn.p
+++ b/fw/v1/pacfgcmn.p
@@ -346,7 +346,26 @@ l_cfgReply3:
         
 l_cfgReply4:
         
-l_cfgReply5:
+l_cfgReply5:

+

+l_cfgReply5_queue_bounce:

+        // Check for Queue Bounce operation

+l_cfgReply5_queue_bounce_ddr:

+        qbbc l_cfgReply5_queue_bounce_msmc, s_pktCxt2.replyQueue.t_pa_forward_queue_bounce_ddr

+            clr s_pktCxt2.replyQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_pktCxt2.replyQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_pktCxt2.replyQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_cfgReply5_queue_bounce_end

+

+l_cfgReply5_queue_bounce_msmc:

+        qbbc l_cfgReply5_queue_bounce_end, s_pktCxt2.replyQueue.t_pa_forward_queue_bounce_msmc

+            clr s_pktCxt2.replyQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_pktCxt2.replyQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_pktCxt2.replyQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_cfgReply5_queue_bounce_end:

+
    //   CDE workaround: do not use CDE_FLG_SET_DESTQUEUE
    //mov  s_cdeCmdPkt.destQueue,   s_pktCxt2.replyQueue
    sbco s_pktCxt2.replyQueue,    cCdeOutPkt, OFFSET(s_pktDescr.destQ),  SIZE(s_pktDescr.destQ)  
@@ -434,14 +453,14 @@ l_cfgReply7_1:
 // *   R11:          | max counts             
 // *   R12:          | outer IP Reassm        
 // *   R13:          | inner IP Reassm        
-// *   R14:            | cmdset                                      
-// *   R15:            | usrStats
-// *   R16:            | queueDiverst
-// *   R17:            | pktCtrl
-// *   R18:            | pktCtrl (MacPaddingCfg)
-// *   R19:            | outer ACL
-// *   R20:            | inner ACL
-// *   R21:            | RA control
+// *   R14:            | cmdset                  | outer ACL        | Eoam
+// *   R15:            | usrStats                | inner ACL        |
+// *   R16:            | queueDiverst            | RA control       |
+// *   R17:            | pktCtrl                 | RA control2      |
+// *   R18:            | pktCtrl (MacPaddingCfg) | Queue Bounce     |
+// *   R19:            | pktCtrl                                    |
+// *   R20:            |                                            |
+// *   R21:            |                                            |
 // *   R22:     |     
 // *   R23:     |  Packet context - pktScope   
 // *   R24:     |
@@ -665,7 +684,7 @@ l_paComConfigPa7:
    mov  s_cdeCmdWd.byteCount,  SIZE(s_paComCmdSetCfg) + SIZE(s_paComUsrStats) + SIZE(s_paComQueueDivert) + SIZE(s_paComPktCtrl)
    xout XID_CDECTRL,  s_cdeCmdWd,    4
    
-   xin  XID_CDEDATA,  s_paComOutAcl, 2*SIZE(s_paComOutAcl) + 2*SIZE(s_paComRa) 
+   xin  XID_CDEDATA,  s_paComOutAcl, 2*SIZE(s_paComOutAcl) + 2*SIZE(s_paComRa) + SIZE(s_paComQueueBounce)
 
    qbbc  l_paComConfigPa8, s_paCmdCfgA.validFlag.t_paCmdConfigValidOutAcl
         // Configure outer IP ACL
@@ -728,21 +747,27 @@ l_paComConfig10b_wait:
         qbne l_paComConfig10b_wait, r0, 0
         
         sbbo r1,r2, FIRMWARE_CMD_RA_CFG_OFFSET, 4        
-        //pass through 
+        //pass through

+

+l_paComConfigPa11:

+   qbbc  l_paComConfigPa12, s_paCmdCfgA.validFlag.t_paCmdConfigValidQueueBounce

+   // Configure queue bounce

+       sbco s_paComQueueBounce,  PAMEM_CONST_CUSTOM,  OFFSET_QUEUE_BOUNCE_CFG,     SIZE(s_paComQueueBounce)

+       //pass through
         
-l_paComConfigPa11:
-   mov  s_cdeCmdWd.byteCount,  2*SIZE(s_paComOutAcl) + 2*SIZE(s_paComRa)
+l_paComConfigPa12:
+   qbbc  l_paComConfigPa13, s_paCmdCfgA.validFlag.t_paCmdConfigValidEoam
+   mov  s_cdeCmdWd.byteCount,  2*SIZE(s_paComOutAcl) + 2*SIZE(s_paComRa) + SIZE(s_paComQueueBounce)
    xout XID_CDECTRL,  s_cdeCmdWd,    4
    
    xin  XID_CDEDATA,  s_eoamCfg, SIZE(s_eoamCfg)
-   qbbc  l_paComConfigPa12, s_paCmdCfgA.validFlag.t_paCmdConfigValidEoam
       // clear eoam valid bits and control bits
       mov  r1, FIRMWARE_CMD_EOAM_CFG  << 24
       // post EOAM enable (PDSP1, PDSP5) and PA time Stamp enable for all the Ingress PDSPs when EOAM is enabled
       // qbbc     l_paComConfigPa12, s_paComPktCtrl.validBitMap.t_pa_pkt_ctrl_eoam_mode
       // there is no valid bit map for EOAM, it is always valid when EOAM configuration is sent
       set r1.b1.t_eoamEn
-      qbbc l_paComConfigPa11_0, s_eoamCfg.ctrlBitmap.t_eoam_ctrl_enable
+      qbbc l_paComConfigPa12_0, s_eoamCfg.ctrlBitmap.t_eoam_ctrl_enable
         // The EOAM global configurations are split and stored into Ingress 0 and Egress 0 scratch
         // Store multiplication factor (2 bytes) in Egress0 Scratch
         mov  r0, PAMEM_CONST_MODIFY_EGRESS0
@@ -757,7 +782,7 @@ l_paComConfigPa11:
         // Enable EOAM
         set r1.b0.t_eoamEn
         
-l_paComConfigPa11_0:
+l_paComConfigPa12_0:
 
 #ifdef TO_BE_DELETE  
         mov r1.w0, r2.w0
@@ -765,186 +790,186 @@ l_paComConfigPa11_0:
         mov r1.w2,  FIRMWARE_CMD_EOAM_CFG  << 8             
         // Wait until the previous command is ack-ed BIG Loop
         mov     r0.w2,  0            
-l_paComConfigPa11_1:
-        qbbs l_paComConfigPa11_2, r0.w2.t0
+l_paComConfigPa12_1:
+        qbbs l_paComConfigPa12_2, r0.w2.t0
           // Mail box posting is not done yet, check if we are done waiting?  
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P0_MBOX                  
           lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-          qbne l_paComConfigPa11_2, r0.b0, 0
+          qbne l_paComConfigPa12_2, r0.b0, 0
           // Command can be posted          
           sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
           // Indicate mail box post done for PDSP0
           set r0.w2.t0
                 
-l_paComConfigPa11_2:
-         qbbs l_paComConfigPa11_3, r0.w2.t1
+l_paComConfigPa12_2:
+         qbbs l_paComConfigPa12_3, r0.w2.t1
            // Mail box posting is not done yet, check if we are done waiting?              
           // Ingress 0 PDSP1 post           
            mov  r2.w0, FIRMWARE_P1_MBOX                  
            lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-           qbne l_paComConfigPa11_3, r0.b0, 0
+           qbne l_paComConfigPa12_3, r0.b0, 0
            // Command can be posted            
            sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
            // Indicate mail box post done for PDSP1
            set r0.w2.t1            
 
-l_paComConfigPa11_3:
-         qbbs l_paComConfigPa11_4, r0.w2.t2
+l_paComConfigPa12_3:
+         qbbs l_paComConfigPa12_4, r0.w2.t2
            // Mail box posting is not done yet, check if we are done waiting?              
           // Ingress 1 PDSP0 post           
            mov  r2.w0, FIRMWARE_P2_MBOX                  
            lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-           qbne l_paComConfigPa11_4, r0.b0, 0
+           qbne l_paComConfigPa12_4, r0.b0, 0
            // Command can be posted            
            sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
            // Indicate mail box post done for PDSP2
            set r0.w2.t2           
 
-l_paComConfigPa11_4:
-          qbbs l_paComConfigPa11_5, r0.w2.t3
+l_paComConfigPa12_4:
+          qbbs l_paComConfigPa12_5, r0.w2.t3
             // Mail box posting is not done yet, check if we are done waiting?              
             // Ingress 2 PDSP0 post            
             mov  r2.w0, FIRMWARE_P4_MBOX                  
             lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-            qbne l_paComConfigPa11_5, r0.b0, 0
+            qbne l_paComConfigPa12_5, r0.b0, 0
               // Command can be posted            
               sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
                 // Indicate mail box post done for PDSP4
                 set r0.w2.t3            
 
-l_paComConfigPa11_5:
-            qbbs l_paComConfigPa11_6, r0.w2.t4
+l_paComConfigPa12_5:
+            qbbs l_paComConfigPa12_6, r0.w2.t4
               // Mail box posting is not done yet, check if we are done waiting?              
               // Ingress 3 PDSP0 post              
               mov  r2.w0, FIRMWARE_P5_MBOX                  
               lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-              qbne l_paComConfigPa11_6, r0.b0, 0
+              qbne l_paComConfigPa12_6, r0.b0, 0
                 // Command can be posted            
                 sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
                 // Indicate mail box post done for PDSP5
                 set r0.w2.t4
                 
-l_paComConfigPa11_6:
-            qbbs l_paComConfigPa11_7, r0.w2.t5
+l_paComConfigPa12_6:
+            qbbs l_paComConfigPa12_7, r0.w2.t5
               // Mail box posting is not done yet, check if we are done waiting?              
               // Ingress 4 PDSP0 post              
               mov  r2.w0, FIRMWARE_P6_MBOX                  
               lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-              qbne l_paComConfigPa11_7, r0.b0, 0
+              qbne l_paComConfigPa12_7, r0.b0, 0
                 // Command can be posted            
                 sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
                 // Indicate mail box post done for PDSP5
                 set r0.w2.t5
 
-l_paComConfigPa11_7:
-            qbbs l_paComConfigPa11_8, r0.w2.t6
+l_paComConfigPa12_7:
+            qbbs l_paComConfigPa12_8, r0.w2.t6
               // Mail box posting is not done yet, check if we are done waiting?              
               // Ingress 4 PDSP1 post              
               mov  r2.w0, FIRMWARE_P7_MBOX                  
               lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-              qbne l_paComConfigPa11_8, r0.b0, 0
+              qbne l_paComConfigPa12_8, r0.b0, 0
                 // Command can be posted            
                 sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
                 // Indicate mail box post done for PDSP5
                 set r0.w2.t6
 
-l_paComConfigPa11_8:
-            qbbs l_paComConfigPa11_9, r0.w2.t7
+l_paComConfigPa12_8:
+            qbbs l_paComConfigPa12_9, r0.w2.t7
               // Mail box posting is not done yet, check if we are done waiting?              
               // Post Processing PDSP0 post              
               mov  r2.w0, FIRMWARE_P8_MBOX                  
               lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-              qbne l_paComConfigPa11_9, r0.b0, 0
+              qbne l_paComConfigPa12_9, r0.b0, 0
                 // Command can be posted            
                 sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
                 // Indicate mail box post done for PDSP5
                 set r0.w2.t7
 
-l_paComConfigPa11_9: 
-            qbbs l_paComConfigPa11_10, r0.w2.t8
+l_paComConfigPa12_9: 
+            qbbs l_paComConfigPa12_10, r0.w2.t8
               // Mail box posting is not done yet, check if we are done waiting?              
               // Post Processing PDSP0 post              
               mov  r2.w0, FIRMWARE_P3_MBOX                  
               lbbo r0.b0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 1
-              qbne l_paComConfigPa11_10, r0.b0, 0
+              qbne l_paComConfigPa12_10, r0.b0, 0
                 // Command can be posted            
                 sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
                 // Indicate mail box post done for PDSP5
                 set r0.w2.t8
 
-l_paComConfigPa11_10:
+l_paComConfigPa12_10:
             // Wait until all mail box are posted
             mov  r2.w0, 0x1FF
-            qbne l_paComConfigPa11_1, r0.w2, r2.w0
+            qbne l_paComConfigPa12_1, r0.w2, r2.w0
 
 #else
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P0_MBOX           
-l_paComConfig11a_wait:
+l_paComConfig12a_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11a_wait, r0, 0          
+        qbne l_paComConfig12a_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4    
 
           // Ingress 1 PDSP0 post
           mov  r2.w0, FIRMWARE_P1_MBOX           
-l_paComConfig11b_wait:
+l_paComConfig12b_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11b_wait, r0, 0          
+        qbne l_paComConfig12b_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P2_MBOX           
-l_paComConfig11c_wait:
+l_paComConfig12c_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11c_wait, r0, 0          
+        qbne l_paComConfig12c_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P3_MBOX           
-l_paComConfig11d_wait:
+l_paComConfig12d_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11d_wait, r0, 0          
+        qbne l_paComConfig12d_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P4_MBOX           
-l_paComConfig11e_wait:
+l_paComConfig12e_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11e_wait, r0, 0          
+        qbne l_paComConfig12e_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P5_MBOX           
-l_paComConfig11f_wait:
+l_paComConfig12f_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11f_wait, r0, 0          
+        qbne l_paComConfig12f_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P6_MBOX           
-l_paComConfig11g_wait:
+l_paComConfig12g_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11g_wait, r0, 0          
+        qbne l_paComConfig12g_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P7_MBOX           
-l_paComConfig11h_wait:
+l_paComConfig12h_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11h_wait, r0, 0          
+        qbne l_paComConfig12h_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
           // Ingress 0 PDSP0 post
           mov  r2.w0, FIRMWARE_P8_MBOX           
-l_paComConfig11i_wait:
+l_paComConfig12i_wait:
         lbbo r0, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4
-        qbne l_paComConfig11i_wait, r0, 0          
+        qbne l_paComConfig12i_wait, r0, 0
         sbbo r1, r2, FIRMWARE_CMD_EOAM_CFG_OFFSET, 4 
 
 #endif
         //pass through 
-l_paComConfigPa12:   
+l_paComConfigPa13:
    jmp f_cfgReply
 
     .leave cdeScope
@@ -2384,6 +2409,24 @@ l_paMultiFwd5:
     sbco  s_paSr3.swInfo0,  cCdeOutPkt,  OFFSET(s_pktDescr.swinfo0),  SIZE(s_pktDescr.swinfo0)
 
 l_paMultiFwd6:
+l_paMultiFwd6_queue_bounce:

+        // Check for Queue Bounce operation

+l_paMultiFwd6_queue_bounce_ddr:

+        qbbc l_paMultiFwd6_queue_bounce_msmc, s_paSr3.queue.t_pa_forward_queue_bounce_ddr

+            clr s_paSr3.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_paSr3.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paSr3.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_paMultiFwd6_queue_bounce_end

+

+l_paMultiFwd6_queue_bounce_msmc:

+        qbbc l_paMultiFwd6_queue_bounce_end, s_paSr3.queue.t_pa_forward_queue_bounce_msmc

+            clr s_paSr3.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_paSr3.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paSr3.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_paMultiFwd6_queue_bounce_end:

+

   zero &s_cdeCmdPkt,            SIZE(s_cdeCmdPkt)
   mov  s_cdeCmdPkt.optionsFlag, CDE_FLG_SET_FLOWID | CDE_FLG_SET_PSINFO | CDE_FLG_SET_DESTQUEUE
   mov  s_cdeCmdPkt.operation,   CDE_CMD_PACKET_COPY
@@ -2654,6 +2697,24 @@ l_curPktForward1_dscp_priority:
             mov  r2.b2,  THREADID_CDMA0    
 l_curPktForward1_no_priority:
 
+l_curPktForward1_queue_bounce:

+        // Check for Queue Bounce operation

+l_curPktForward1_queue_bounce_ddr:

+        qbbc l_curPktForward1_queue_bounce_msmc, s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_curPktForward1_queue_bounce_end

+

+l_curPktForward1_queue_bounce_msmc:

+        qbbc l_curPktForward1_queue_bounce_end, s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            clr s_curFwd.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_curFwd.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_curFwd.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+

+l_curPktForward1_queue_bounce_end:

+

 #ifndef PASS_PROC_LUT2
         // store L3offset2 only if host route
         sbco   s_pktCxt5.l3l5offset,   cCdeOutPkt,  SIZE(s_pktDescr)+OFFSET(s_pktCxt5.l3offset2), 1
diff --git a/fw/v1/pam.p b/fw/v1/pam.p
index 7e9dc81..4e20d1a 100644
--- a/fw/v1/pam.p
+++ b/fw/v1/pam.p
@@ -1449,6 +1449,23 @@ l_nextRoute_copy:
             jmp  l_nextRoute_eth_dest_copy_send
        
 l_nextRoute_eth_dest_copy_host:
+l_nextRoute_eth_dest_copy_host_queue_bounce:

+        // Check for Queue Bounce operation

+l_nextRoute_eth_dest_copy_host_queue_bounce_ddr:

+        qbbc l_nextRoute_eth_dest_copy_host_queue_bounce_msmc, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_ddr

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_nextRoute_eth_dest_copy_host_queue_bounce_end

+

+l_nextRoute_eth_dest_copy_host_queue_bounce_msmc:

+        qbbc l_nextRoute_eth_dest_copy_host_queue_bounce_end, s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            clr s_paPktCapScr.destQueue.t_pa_forward_queue_bounce_msmc

+            sbco s_paPktCapScr.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_paPktCapScr.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_nextRoute_eth_dest_copy_host_queue_bounce_end:

+

             // Packet Capture activity
             mov  s_pktExtDescr.threadId,   PA_DEST_CDMA
             mov  s_cdeCmdPkt.destQueue,    s_paPktCapScr.destQueue
@@ -4497,6 +4514,23 @@ l_rxVerifyPktErr_1_2:
             sbco  s_pktCxt,  cCdeOutPkt,  SIZE(s_pktDescr),  b0
         
 l_rxVerifyPktErr_1_3:
+l_rxVerifyPktErr_1_3_queue_bounce:

+        // Check for Queue Bounce operation

+l_rxVerifyPktErr_1_3_queue_bounce_ddr:

+        qbbc l_rxVerifyPktErr_1_3_queue_bounce_msmc, s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_ddr

+            clr s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_rxCmdVerifyPktErr.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_rxCmdVerifyPktErr.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_rxVerifyPktErr_1_3_queue_bounce_end

+

+l_rxVerifyPktErr_1_3_queue_bounce_msmc:

+        qbbc l_rxVerifyPktErr_1_3_queue_bounce_end, s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_msmc

+            clr s_rxCmdVerifyPktErr.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_rxCmdVerifyPktErr.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_rxCmdVerifyPktErr.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_rxVerifyPktErr_1_3_queue_bounce_end:

+

             // Send the packet on its way
             ldi  r4,  CDE_CMD_PACKET_ADVANCE | ((CDE_FLG_SET_PSINFO | CDE_FLG_SET_FLOWID | CDE_FLG_SET_DESTQUEUE) << 8)
             mov  s_cdeCmdPkt.psInfoSize,   s_rxCmdCxt.psInfoSize
@@ -4768,6 +4802,28 @@ l_paRxPayloadSplit2:
     mov  s_cdeCmdWd.byteCount,  s_rxSplitCxt.hdrSize
     xout XID_CDECTRL,           s_cdeCmdWd,        SIZE(s_cdeCmdWd)
     
+l_paRxPayloadSplit2_queue_bounce:

+    // Move to the end of the packet

+    mov  s_cdeCmd.v0.w0, CDE_CMD_ADVANCE_TO_END

+    xout XID_CDECTRL, s_cdeCmd, 4              // Send the command

+

+    // Check for Queue Bounce operation

+    wbs s_flags.info.tStatus_CDEOutPacket

+l_paRxPayloadSplit2_queue_bounce_ddr:

+    qbbc l_paRxPayloadSplit2_queue_bounce_msmc, s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_ddr

+        clr s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_ddr

+        sbco s_rxSplitCxt.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_rxSplitCxt.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+        jmp  l_paRxPayloadSplit2_queue_bounce_end

+

+l_paRxPayloadSplit2_queue_bounce_msmc:

+    qbbc l_paRxPayloadSplit2_queue_bounce_end, s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_msmc

+        clr s_rxSplitCxt.destQueue.t_pa_forward_queue_bounce_msmc

+        sbco s_rxSplitCxt.destQueue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_rxSplitCxt.destQueue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+        // pass through

+l_paRxPayloadSplit2_queue_bounce_end:

+

     // Forward the packet out
     zero &s_cdeCmdPkt,            SIZE(s_cdeCmdPkt)
     mov  s_cdeCmdPkt.optionsFlag, CDE_FLG_SET_FLOWID | CDE_FLG_SET_DESTQUEUE
diff --git a/fw/v1/parse1.p b/fw/v1/parse1.p
index 0c897e0..308e05d 100644
--- a/fw/v1/parse1.p
+++ b/fw/v1/parse1.p
@@ -2330,6 +2330,24 @@ l_c1IpReassm_pass1_4:
   mov   s_pktCxt3.fragCnt,  1
   set   s_pktCxt.flags.t_flag_2nd_pass  
   wbs   s_flags.info.tStatus_CDEOutPacket
+

+l_c1IpReassm_pass1_4_queue_bounce:

+        // Check for Queue Bounce operation

+l_c1IpReassm_pass1_4_queue_bounce_ddr:

+        qbbc l_c1IpReassm_pass1_4_queue_bounce_msmc, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+            clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+            sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+            jmp  l_c1IpReassm_pass1_4_queue_bounce_end

+

+l_c1IpReassm_pass1_4_queue_bounce_msmc:

+        qbbc l_c1IpReassm_pass1_4_queue_bounce_end, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+            clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+            sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+            lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+            // pass through

+l_c1IpReassm_pass1_4_queue_bounce_end:

+

   sbco  s_ipReassmCxt.queue,  cCdeOutPkt,  OFFSET(s_pktDescr.destQ),    SIZE(s_pktDescr.destQ)
   sbco  s_ipReassmCxt.flowId, cCdeOutPkt,  OFFSET(s_pktDescr.flowIdx),  SIZE(s_pktDescr.flowIdx)
   mov   s_param.action,     SUBS_ACTION_FWPKT
@@ -2603,6 +2621,24 @@ l_c1Ipv6ExtReasm_pass1_5:
     mov   s_pktCxt3.fragCnt,  1
     set   s_pktCxt.flags.t_flag_2nd_pass  
     wbs   s_flags.info.tStatus_CDEOutPacket
+
+l_c1Ipv6ExtReasm_pass1_5_queue_bounce:

+    // Check for Queue Bounce operation

+l_c1Ipv6ExtReasm_pass1_5_queue_bounce_ddr:

+    qbbc l_c1Ipv6ExtReasm_pass1_5_queue_bounce_msmc, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+        clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_ddr

+        sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG, 2

+        jmp  l_c1Ipv6ExtReasm_pass1_5_queue_bounce_end

+

+l_c1Ipv6ExtReasm_pass1_5_queue_bounce_msmc:

+    qbbc l_c1Ipv6ExtReasm_pass1_5_queue_bounce_end, s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+        clr s_ipReassmCxt.queue.t_pa_forward_queue_bounce_msmc

+        sbco s_ipReassmCxt.queue,  cCdeOutPkt, OFFSET(s_pktDescr.swinfo1) + 2,  2

+        lbco s_ipReassmCxt.queue,  PAMEM_CONST_CUSTOM, OFFSET_QUEUE_BOUNCE_CFG+2, 2

+         // pass through

+l_c1Ipv6ExtReasm_pass1_5_queue_bounce_end:

+

     sbco  s_ipReassmCxt.queue,  cCdeOutPkt,  OFFSET(s_pktDescr.destQ),    SIZE(s_pktDescr.destQ)
     sbco  s_ipReassmCxt.flowId, cCdeOutPkt,  OFFSET(s_pktDescr.flowIdx),  SIZE(s_pktDescr.flowIdx)
     mov   s_param.action,     SUBS_ACTION_FWPKT
diff --git a/fw/v1/parsescope.h b/fw/v1/parsescope.h
index 0f51ec6..f021673 100644
--- a/fw/v1/parsescope.h
+++ b/fw/v1/parsescope.h
@@ -346,12 +346,13 @@
         .assign struct_paUsrStatsGlobCfg,       r15,    r15,    s_paComUsrStats              // Must follow paComCmdSetCfg
         .assign struct_paQueueDivertCfg,        r16,    r16,    s_paComQueueDivert           // Must follow psComUsrStats
         .assign struct_paPktCtrlCfg,            r17,    r19,    s_paComPktCtrl               // Must follow paQueueDivert 
-        .assign struct_paMacPaddingCfg,         r18,    r18,    s_paComMacPadding            // First entry at the next configuration block
-        .assign struct_paAclCfg,                r14,    r14,    s_paComOutAcl                // Must follow paComPktCtrl
+        .assign struct_paMacPaddingCfg,         r18,    r18,    s_paComMacPadding            // Must align  paComPktCtrl
+        .assign struct_paAclCfg,                r14,    r14,    s_paComOutAcl                // First entry at the next configuration block
         .assign struct_paAclCfg,                r15,    r15,    s_paComInAcl                 // Must follow paComOutAcl
         .assign struct_paRaCfg,                 r16,    r16,    s_paComRa                    // Must follow paComInAcl
         .assign struct_paRaCfg,                 r17,    r17,    s_paComRa2                   // Must follow paComRa
-        .assign struct_eoamCfg,                 r14,    r21,    s_eoamCfg                    // Must follow paComRa2
+        .assign struct_paQueueDivertCfg,        r18,    r18,    s_paComQueueBounce           // Must follow paComRa2

+        .assign struct_eoamCfg,                 r14,    r21,    s_eoamCfg                    // First entry at the next configuration block
         .assign struct_timeAccConstants,        r15,    r17,    s_timeAccConstants           // Split up of s_eoamCfg structure
         .assign struct_eoamExceptionTbl,        r18,    r21,    s_eoamExceptionTbl           // Split up of s_eoamCfg structure
         .assign struct_timeConvConst,           r14,    r16,    s_timeConvConst              // Alias to map multiplication          
diff --git a/fw/v1/pdsp_mem.h b/fw/v1/pdsp_mem.h
index 2d2e20d..0d028b5 100644
--- a/fw/v1/pdsp_mem.h
+++ b/fw/v1/pdsp_mem.h
@@ -155,6 +155,7 @@
 //                  |  MAC Padding Config       4 bytes        |                                  OFFSET_MAC_PADDING_CFG
 //                  |  Outer IP ACL Config      4 bytes        |                                  OFFSET_OUT_IP_ACL_CFG
 //                  |  Inner IP ACL Config      4 bytes        |                                  OFFSET_IN_IP_ACL_CFG
+//                  |  Queue Bounce Config      4 bytes        |                                  OFFSET_QUEUE_BOUNCE_CFG

 //                  |  Raw Timestamp Acc       12 bytes        |                                  OFFSET_RAW_TIME_ACC        = 0xD0
 //                  |  System Timestamp Tmp     8 bytes        |                                  OFFSET_TIMESTAMP_TMP       = 0xE0
 //                  |  System Timestamp         8 bytes        |                                  OFFSET_SYSTEM_TIMESTAMP    = 0xF0
@@ -405,6 +406,7 @@
 #define OFFSET_MAC_PADDING_CFG          OFFSET_IPSEC_NAT_T_CFG + 4
 #define OFFSET_OUT_IP_ACL_CFG           OFFSET_MAC_PADDING_CFG + 4
 #define OFFSET_IN_IP_ACL_CFG            OFFSET_OUT_IP_ACL_CFG + 4
+#define OFFSET_QUEUE_BOUNCE_CFG         OFFSET_IN_IP_ACL_CFG + 4

 #define OFFSET_RAW_TIME_ACC             0xD0
 #define OFFSET_TIMESTAMP_TMP            0xE0
 #define OFFSET_SYS_TIMESTAMP            0xF0
diff --git a/fw/v1/pdsp_mem2.h b/fw/v1/pdsp_mem2.h
index beb818a..2519d44 100644
--- a/fw/v1/pdsp_mem2.h
+++ b/fw/v1/pdsp_mem2.h
@@ -112,6 +112,7 @@
 //                  |  MAC Padding Config       4 bytes        |                                  OFFSET_MAC_PADDING_CFG
 //                  |  Outer IP ACL Config      4 bytes        |                                  OFFSET_OUT_IP_ACL_CFG
 //                  |  Inner IP ACL Config      4 bytes        |                                  OFFSET_IN_IP_ACL_CFG
+//                  |  Queue Bounce Config      4 bytes        |                                  OFFSET_QUEUE_BOUNCE_CFG

 //                  |  System Timestamp         4 bytes        |                                  OFFSET_SYSTEM_TIMESTAMP  = 0xF0
 //                  |  IPv6 Fragmentation ID    4 bytes        |                                  OFFSET_IPV6_FRAG_ID      = 0xF8
 //     0xFF02:0400  |  Configurable Exception  Routing         |      c20 - all pdsps  EROUTE     // Global Memory 
diff --git a/fw/v1/pdsp_pa.h b/fw/v1/pdsp_pa.h
index 8f261a3..fb6e304 100644
--- a/fw/v1/pdsp_pa.h
+++ b/fw/v1/pdsp_pa.h
@@ -250,6 +250,12 @@
 #define t_pa_fwd_type_ctrl_use_loc_dma      t7
 #define PA_FORWARD_TYPE_MASK                0x0F
 
+#define PA_FOWARD_QUEUE_MASK                0x3FFF

+#define t_pa_forward_queue_bounce_ddr       t14

+#define t_pa_forward_queue_bounce_msmc      t15

+

+
+
 // Placeholder structure for PA forward
 .struct struct_paFwdPlace
     .u32   p0
@@ -1019,6 +1025,11 @@
 #define t_pa_ra_ctrl_use_loc_dma  t1
 #define t_pa_ra_ctrl_to_queue     t2
 
+.struct struct_paQueueBounceCfg

+    .u16 ddrQueue      //   Bounce queue where PASS will deliver the host-routed packet with DDR bit set

+    .u16 msmcQueue     //   Bounce queue where PASS will deliver the host-routed packet with MSMC bit set

+.ends

+
 //  Configure PA. These configurations apply globally (to all PDSPs). Any
 //  PDSP can do the configuration
 .struct  struct_paCommandConfig
@@ -1037,6 +1048,8 @@
     //  Configure inner IP ACL
     //  Configure outer IP RA 
     //  Configure inner IP RA
+    //  Configure Queue Bounce
+    //  Configure EOAM
 .ends
 
 #define t_paCmdConfigValidMaxCount      t0
@@ -1050,7 +1063,8 @@
 #define t_paCmdConfigValidInAcl         t8
 #define t_paCmdConfigValidOutRa         t9
 #define t_paCmdConfigValidInRa          t10
-#define t_paCmdConfigValidEoam          t11
+#define t_paCmdConfigValidQueueBounce   t11

+#define t_paCmdConfigValidEoam          t12
 
 // Command sizes. The assembler can't do all the SIZE(x)+SIZE(y)+... because of line size limitations
 // Command size in 32 bit words is:  struct_paCommand:         4
@@ -1066,10 +1080,11 @@
 //                                   struct_paAclCfg:          1
 //                                   struct_paRaCfg:           1
 //                                   struct_paRaCfg:           1
-//
+//                                   struct_paQueueBounceCfg:  1
+//                                   struct_eoamCfg            8

 // 
-//                                               Total:       18   words = 72 bytes
-#define PA_CONFIG_COMMAND_SIZE_CONFIG_PA              (72 - 16)  
+//                                               Total:       27   words = 108 bytes
+#define PA_CONFIG_COMMAND_SIZE_CONFIG_PA              (108 - 16)
 #define PA_CONFIG_COMMAND_SIZE_THROUGH_IN_IP_REASM    32  // Byte up to and including struct_paIpReassmCfg for inner IP
 
 
diff --git a/fw/v1/pdsp_ver.h b/fw/v1/pdsp_ver.h
index 3b5dd26..850a94b 100644
--- a/fw/v1/pdsp_ver.h
+++ b/fw/v1/pdsp_ver.h
@@ -62,9 +62,9 @@
 #ifndef _PDSP_VER_GEN2_H

 #define _PDSP_VER_GEN2_H  1

 

-#define PASS_VERSION_STR  "03.00.02.01"

+#define PASS_VERSION_STR  "03.00.02.02"

 

 // Common PDSP version number

-#define PASS_VERSION      0x03000201

+#define PASS_VERSION      0x03000202

 

 #endif

diff --git a/fw/v1/post_pdsp0.bib b/fw/v1/post_pdsp0.bib
index 5a123e4..691a18a 100644
--- a/fw/v1/post_pdsp0.bib
+++ b/fw/v1/post_pdsp0.bib
diff --git a/fw/v1/post_pdsp1.bib b/fw/v1/post_pdsp1.bib
index 24a0301..c64f5d5 100644
--- a/fw/v1/post_pdsp1.bib
+++ b/fw/v1/post_pdsp1.bib
diff --git a/pa.h b/pa.h
index 693b627..b79a304 100644
--- a/pa.h
+++ b/pa.h
@@ -602,7 +602,7 @@ extern "C" {
  *        The minmium command buffer size allowed when using the @ref Pa_control (pa_CONTROL_SYS_CONFIG) function to perform PASS 
  *        global configuration.
  */
-#define pa_GLOBAL_CONFIG_MIN_CMD_BUF_SIZE_BYTES      104
+#define pa_GLOBAL_CONFIG_MIN_CMD_BUF_SIZE_BYTES      108
 
 /**
  *  @def  pa_802_1ag_DET_MIN_CMD_BUF_SIZE_BYTES
@@ -2077,6 +2077,148 @@ typedef struct {
 } paEoamGlobalConfig_t;
 
 /**
+ *  @defgroup paQueueBounceRoutingClass PA Queue Bounce Routing Class
+ *  @ingroup palld_api_constants
+ *  @{
+ *
+ *  @name PA Queue Bounce Routing Class
+ *
+ *  Definition of PA Queue Bounce Routing Classes
+ */
+/** @ingroup paQueueBounceRoutingClass */
+/*@{*/
+typedef enum {
+  pa_QUEUE_BOUNCE_ROUTING_CLASS_CMD_RET = 0,   /**< Command Return */
+  pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS,           /**< Ingress QoS Packets */
+  pa_QUEUE_BOUNCE_ROUTING_CLASS_CAPTURE,       /**< Packet Capture */
+  pa_QUEUE_BOUNCE_ROUTING_CLASS_IP_REASSEMBLY, /**< IP Reassembly-assisted packets */
+  pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC,          /**< All other Traffic */
+  PA_MAX_QUEUE_BOUNCE_ROUTING_CLASSES
+}paQueueBounceRoutingClass_e ;
+/*@}*/
+/** @} */
+
+/**
+ *  @defgroup  paQueueBounceOperationTypes PA Queue Bounce operation modes
+ *  @ingroup palld_api_constants
+ *  @{
+ *
+ *  @name   PA Queue Bounce operation modes
+ *  @brief  Define the Queue Bounce operation modes.
+ */
+/* @{ */
+/**
+ *  @def  pa_QUEUE_BOUNCE_OP_NONE
+ *        No bounce, use the user specified destination queue as it is
+ */
+#define  pa_QUEUE_BOUNCE_OP_NONE    0
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_OP_DDR
+ *        Add control bits to indicate bouncing to the DDR Queue
+ */
+#define  pa_QUEUE_BOUNCE_OP_DDR     1
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_OP_MSMC
+ *        Add control bits to indicate bouncing to the MSMC queue
+ */
+#define  pa_QUEUE_BOUNCE_OP_MSMC    2
+
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_OP_MAX
+ *        Number of Queue Bounce Operation modes
+ */
+#define pa_QUEUE_BOUNCE_OP_MAX        pa_QUEUE_BOUNCE_OP_MSMC
+/*@}*/
+/** @} */
+
+/**
+ *  @ingroup palld_api_structures
+ *  @brief  PA Queue Bounce Configuration Information.
+ *
+ *  @details  paQueueBounceConfig_t is used to configure the PA Queue Bounce operation as described at @ref appendix9.
+ *
+ *  @note The Queue Bounce Configuration should be specified at PA system initialization and only once. The dynamic
+ *  re-configuration is not supported and may cause undefined behaviors.
+ */
+typedef struct {
+
+  uint32_t  enable;         /**< Enable/Disable(1/0) Queue Bounce operation, default = 0 (disable) */
+  uint16_t  ddrQueueId;     /**< Bounce queue where PASS will deliver the host-routed packet with DDR bit set */
+  uint16_t  msmcQueueId;    /**< Bounce queue where PASS will deliver the host-routed packet with MSMC bit set */
+  uint16_t  hwQueueBegin;   /**< Queue number of the first NetCP hardware queue */
+  uint16_t  hwQueueEnd;     /**< Queue number of the last NetCP hardware queue */
+  uint16_t  defOp[PA_MAX_QUEUE_BOUNCE_ROUTING_CLASSES];  /**< Default Queue Bounce operations per class */
+
+} paQueueBounceConfig_t;
+
+/**
+ *  @defgroup  paQueueBounceControlBits PA Queue Bounce Control Bits and related definitions
+ *  @ingroup palld_api_constants
+ *  @{
+ *
+ *  @name   PA Queue Bounce Control Bits
+ *  @brief  PA Queue Bounce Control Bits and related definitions
+ */
+/* @{ */
+/**
+ *  @def  pa_QUEUE_BOUNCE_CTRL_DEFAULT
+ *        Use default rule
+ */
+#define  pa_QUEUE_BOUNCE_CTRL_DEFAULT   0
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_CTRL_DDR
+ *        Bounce to the DDR Queue
+ */
+#define  pa_QUEUE_BOUNCE_CTRL_DDR       1
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_CTRL_MSMC
+ *        Bounce to the MSMC queue
+ */
+#define  pa_QUEUE_BOUNCE_CTRL_MSMC      2
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_CTRL_NONE
+ *        No bounce, clear the control bits
+ */
+#define  pa_QUEUE_BOUNCE_CTRL_NONE      3
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_CTRL_LOC
+ *        Bit location of the queue bounce control bits
+ */
+#define pa_QUEUE_BOUNCE_CTRL_LOC        14
+
+/**
+ *  @def  pa_QUEUE_BOUNCE_QUEUE_MASK
+ *        Actual queue number mask
+ */
+#define pa_QUEUE_BOUNCE_QUEUE_MASK      0x3FFF
+
+/*@}*/
+/** @} */
+
+/**
+ *  @defgroup PA_queue_bounce_op_macros  PA Queue Bounce Operation Macros
+ *  @ingroup palld_api_macros
+ *  @{
+ *  @name PA Queue Bounce Operation Macros
+ *  Macros used by the PA Queue Bounce Operation to insert/clear control bits
+ */
+/*@{*/
+#define PA_BOUNCE_QUEUE_DDR(queueId)        (((queueId) & pa_QUEUE_BOUNCE_QUEUE_MASK) | (pa_QUEUE_BOUNCE_CTRL_DDR << pa_QUEUE_BOUNCE_CTRL_LOC))    /**< Insert control bits to indicate DDR queue bouncing */
+#define PA_BOUNCE_QUEUE_MSMC(queueId)       (((queueId) & pa_QUEUE_BOUNCE_QUEUE_MASK) | (pa_QUEUE_BOUNCE_CTRL_MSMC << pa_QUEUE_BOUNCE_CTRL_LOC))   /**< Insert control bits to indicate MSMC queue bouncing */
+#define PA_BOUNCE_QUEUE_NONE(queueId)       (((queueId) & pa_QUEUE_BOUNCE_QUEUE_MASK) | (pa_QUEUE_BOUNCE_CTRL_NONE << pa_QUEUE_BOUNCE_CTRL_LOC))   /**< Incert control bits to indicate no queue bouncing */
+#define PA_BOUNCE_QUEUE_DEFAULT(queueId)    ((queueId) & pa_QUEUE_BOUNCE_QUEUE_MASK)    /**< Clear control bits to indicate default operation */
+
+/*@}*/ /* PA_queue_bounce_op_macros */
+/** @}*/ /* PA Queue Bounce Operation Macros */
+
+/**
  * @ingroup palld_api_structures
  * @brief PA System Configuration Information structure
  *
@@ -2091,11 +2233,12 @@ typedef struct {
   paUsrStatsConfig_t*       pUsrStatsConfig;       /**< Pointer to the user-defined statistics configuration structure */
   paQueueDivertConfig_t*    pQueueDivertConfig;    /**< Pointer to the queue-diversion configuration structure */
   paPacketControlConfig_t*  pPktControl;           /**< Pointer to the packet control configuration structure */
+  paQueueBounceConfig_t*    pQueueBounceConfig;    /**< Pointer to the Queue Bounce configuration structure */
   paAclConfig_t*            pOutAclConfig;         /**< Pointer to the outer ACL configuration structure */
   paAclConfig_t*            pInAclConfig;          /**< Pointer to the inner ACL configuration structure */
   paRaGroupConfig_t*        pOutIpRaGroupConfig;   /**< Poimter to the outer IP Reassembly group configuration structure */
   paRaGroupConfig_t*        pInIpRaGroupConfig;    /**< Poimter to the inner IP Reassembly group configuration structure */
-  paPacketControl2Config_t* pPktControl2;         /**< Pointer to the packet control 2 configuration structure */  
+  paPacketControl2Config_t* pPktControl2;          /**< Pointer to the packet control 2 configuration structure */
   paEoamGlobalConfig_t*     pEoamConfig;           /**< Pointer to the EOAM Global configuration structure */
 } paSysConfig_t;
 
@@ -8157,6 +8300,51 @@ paReturn_t Pa_getLUT1Info ( Pa_Handle       iHandle,
  *
  */
 
+
+/**
+ *      @page appendix9 Destination Queue Bounce Operation
+ *
+ *      There is a hardware deficiency identified at the Keystone2 devices where memory consistency is not guaranteed for
+ *  IO coherent A15 and PktDMA masters at some rare conditions. Therefore it is possible that the data arrival signal
+ *  to the ARM (i.e., presence of a descriptor in QMSS queue) may occur prior to the data arriving properly in the
+ *  ARM cache.  Thus, the ARM core may access stale data.
+ *  To ensure ARM Cache consistency, one of the QMSS PDSP is enhanced to provide a DMA barrier function. Packets destined
+ *  to ARM queues may be delivered first to one of the QMSS "bounce" queues serviced by this function. The QMSS PDSP  f/w
+ *  will pop packets from these queues, perform the necessary barrier operation (that will cause the ARM cache to get
+ *  invalidated for the descriptor and buffer locations), and then will relay the packet to the final destination queue.

+ *
+ *  The Destination Queue Bounce Operation is designed to enable the QMSS proxy bounce on packets PA sends to queues
+ *  served by ARM user space by embedding 2 control bits into the destination queue ID to instruct the PASS firmware
+ *  to re-route the packets to the specified QMSS bounce queues.
+ *
+ *  This operation can be enabled and configured by a global configuration message including the following parameters:
+ *  - Enable/Disable
+ *  - QMSS Bounce Queue IDs
+ *    - DDR Queue: All PktMDA descriptors and buffers use DDR memory only
+ *    - MSMC Queue: PktDMA descriptor and buffers may use MSMC memory and/or DDR memory
+ *  - Default Behavior map []: Specify the default queue bounce operation for each traffic class such as Command Response
+ *    and ingress QoS routing
+ *  - NetCP hardware queue info
+ *    - Number of NetCP queue
+ *    - NetCP queue base
+ *
+ *  The Destination Queue Bounce operation is described below in details:
+ *  - When the queue bounce feature is disabled, all PA LLD APIs work as before and the two control bits of the destination
+ *    queue ID will be cleared.
+ *  - When the queue bounce feature is enabled, the application may invoke the following PA Macros to specify the
+ *    queue ID in PA LLD APIs:
+ *     - PA_BOUNCE_QUEUE_DDR(queueId): Bounce to DDR queue
+ *     - PA_BOUNCE_QUEUE_MSMC(queueId): Bounce to MSMC queue
+ *     - PA_BOUNCE_QUEUE_NONE(queueId): No Bounce
+ *    Or the application may allow the LLD to specify the embedded destination queue ID based on the default behavior map
+ *    by invoking the following PA Macro optionally
+ *     - PA_BOUNCE_QUEUE_DEFAULT(queueId): Use default behavior map by cleraing the two control bits
+ *
+ *  @note PA_BOUNCE_QUEUE_DEFAULT() is a no-operation, so if queueid is used as is, then default behavior rule will be applied automatically
+ *  @note For any SOC h/w queues (as indicated to PA in global configuration), all bounce settings are ignored so that packets to these queues
+ *        will never be bounced to the barrier function.
+ */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/package.xdc b/package.xdc
index 1237943..6f89a3b 100644
--- a/package.xdc
+++ b/package.xdc
@@ -9,7 +9,7 @@
  * Copyright (C) 2009-2016, Texas Instruments, Inc.
  *****************************************************************************/
 
-package ti.drv.pa[3,0,2,01] {
+package ti.drv.pa[3,0,2,2] {
   module Settings;
 }
 
diff --git a/paver.h b/paver.h
index fcbc6a6..afddb32 100644
--- a/paver.h
+++ b/paver.h
@@ -51,13 +51,13 @@ extern "C" {
  * format:
  *  0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
  */
-#define PA_LLD_VERSION_ID                   (0x03000201)
+#define PA_LLD_VERSION_ID                   (0x03000202)
 
 /**
  * @brief   This is the version string which describes the PA LLD along with the
  * date and build information.
  */
-#define PA_LLD_VERSION_STR                  "PA LLD Revision: 03.00.02.01"
+#define PA_LLD_VERSION_STR                  "PA LLD Revision: 03.00.02.02"
 
 
 #ifdef __cplusplus
diff --git a/src/v0/pa.c b/src/v0/pa.c
index 021d410..ef985b5 100644
--- a/src/v0/pa.c
+++ b/src/v0/pa.c
@@ -540,6 +540,57 @@ static int  pa_verify_usr_stats(paInst_t *paInst, int32_t cntIndex, int fCache)
     return (ret);

 } /* pa_verify_usr_stats */

 

+

+/*******************************************************************************************

+ * FUNCTION PURPOSE: Derive the destination queue Id

+ *******************************************************************************************

+ * DESCRIPTION: This function is used to derive the destination queue Id with the embedded

+ *              control bits based on the input queue Id, the Queue Bounce configuration

+ *              and the traffic class associated with the originated API.

+ *

+ *  return queueId with embedded control bits

+ *

+ ********************************************************************************************/

+static uint16_t  pa_convert_queue_id(paInst_t *paInst, int routingClass, uint16_t queue)

+{

+    paQueueBounceConfig_t* pQueueBounceCfg = &paInst->cfg.queueBounceConfig;

+    uint16_t queueBounceCtrlType = queue >> pa_QUEUE_BOUNCE_CTRL_LOC;

+    uint16_t queueNum = queue & pa_QUEUE_BOUNCE_QUEUE_MASK;

+

+    if (!pQueueBounceCfg->enable)

+    {

+        return(queueNum);

+    }

+

+    if ((queueNum >= pQueueBounceCfg->hwQueueBegin) &&

+       (queueNum <= pQueueBounceCfg->hwQueueEnd))

+    {

+        /* It is a hardware queue, queue bounce is not required */

+        return(queueNum);

+    }

+

+    if (queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_DEFAULT)

+    {

+        /*

+        * Error check is not required here because routingClass is set by internal

+        * function and the range check of default operation mode has been performed

+        * at Queue Bounce Configuration time

+        */

+        uint16_t defOp = pQueueBounceCfg->defOp[routingClass];

+

+        return(queueNum | (defOp << pa_QUEUE_BOUNCE_CTRL_LOC));

+    }

+    else if ((queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_DDR) ||

+             (queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_MSMC))

+    {

+        return(queue);

+    }

+    else /* pa_QUEUE_BOUNCE_CTRL_NONE */

+    {

+        return(queueNum);

+    }

+}

+

 /*************************************************************************

  * FUNCTION PURPOSE: Convert RouteInfo 

  ************************************************************************* 

@@ -754,7 +805,7 @@ static void pa_format_lut2ParamDesc(paLut2ParamDesc *params,
  *              firmware forward information

  * Returns FALSE if error occurs

  *************************************************************************/

-static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo2_t *routeInfo, int cmdDest, uint16_t failRoute)

+static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo2_t *routeInfo, int cmdDest, uint16_t failRoute, int routingClass)

 {

 

   /*

@@ -768,9 +819,7 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
   uint8_t psFlags = 0;                                    

   uint8_t *pCmd = fwdInfo->u.host.cmd;

   int     fcmdSetNotSupport = FALSE;

-  

-  fwdInfo->flowId = routeInfo->flowId;

-  fwdInfo->queue = SWIZ(routeInfo->queue);

+  uint16_t queue = routeInfo->queue;

   

   if ((routeInfo->dest == pa_DEST_HOST) || (routeInfo->dest == pa_DEST_EMAC)) {

     if (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_PKTTYPE_EMAC) 

@@ -791,10 +840,12 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
       if(routeInfo->priorityType == pa_ROUTE_PRIORITY_VLAN)

       {

         fwdInfo->u.host.ctrlBitMap   |= PAFRM_ROUTING_PRIORITY_VLAN_ENABLE;

+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;

       }

       else if(routeInfo->priorityType == pa_ROUTE_PRIORITY_DSCP)

       {

         fwdInfo->u.host.ctrlBitMap   |= PAFRM_ROUTING_PRIORITY_DSCP_ENABLE;

+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;

       }

       else if (routeInfo->priorityType ==  pa_ROUTE_INTF)

       {

@@ -814,6 +865,7 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
           return (pa_ERR_CONFIG);

         }

            

+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;

         fwdInfo->u.host.ctrlBitMap   |= (PAFRM_ROUTING_IF_DEST_SELECT_ENABLE |

                                          PAFRM_ROUTING_FLOW_EQOS_IF_ENABLE);

       }

@@ -823,6 +875,8 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
       }

     }

 

+    queue = pa_convert_queue_id(paInst, routingClass, queue);

+

     if (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_MROUTEINDEX)  {

       if (routeInfo->mRouteIndex >= pa_MAX_MULTI_ROUTE_SETS) {

         return (pa_ERR_CONFIG);

@@ -894,6 +948,9 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
     return (pa_ERR_CONFIG);

   }

   

+  fwdInfo->flowId = routeInfo->flowId;

+  fwdInfo->queue = SWIZ(queue);

+

   if (pCmd && (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_PCMD))  {

   

     paCmdInfo_t* paCmd = routeInfo->pCmd;

@@ -970,7 +1027,7 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
  *              firmware forward information

  * Returns FALSE if error occurs

  *************************************************************************/

-static paReturn_t pa_conv_routing_info (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo_t *routeInfo, int cmdDest, uint16_t failRoute)

+static paReturn_t pa_conv_routing_info (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo_t *routeInfo, int cmdDest, uint16_t failRoute, int routingClass)

 {

   paRouteInfo2_t routeInfo2; 

   memset(&routeInfo2, 0, sizeof(paRouteInfo2_t));

@@ -1001,7 +1058,7 @@ static paReturn_t pa_conv_routing_info (paInst_t *paInst, pafrmForward_t *fwdInf
     routeInfo2.pCmd         = routeInfo->pCmd;

   }

   

-  return pa_conv_routing_info2(paInst, fwdInfo, &routeInfo2, cmdDest, failRoute);

+  return pa_conv_routing_info2(paInst, fwdInfo, &routeInfo2, cmdDest, failRoute, routingClass);

 }

 

 /***************************************************************************

@@ -1058,7 +1115,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
       {

         /* Obtain the information from the configuration */

         capturePort = pktCapCfg[i].portToBeCaptured;

-        queue       = pktCapCfg[i].queue;

+        queue       = pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CAPTURE, pktCapCfg[i].queue);

         flow        = pktCapCfg[i].flowId;

         swInfo0     = pktCapCfg[i].swInfo0;

 

@@ -1192,7 +1249,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
         /* store multi cast default route information if enabled */

         if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_MC_ENABLE)

         {

-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_MULTICAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_MULTICAST], pa_CMD_TX_DEST_5, FALSE);

+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_MULTICAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_MULTICAST], pa_CMD_TX_DEST_5, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

           /* Error checking */

           if (retCode != pa_OK)

             return (retCode);

@@ -1200,7 +1257,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
         /* Store broad cast default route information if enabled */

         if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_BC_ENABLE)

         {

-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_BROADCAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_BROADCAST], pa_CMD_TX_DEST_5, FALSE);

+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_BROADCAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_BROADCAST], pa_CMD_TX_DEST_5, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

           /* Error checking */

           if (retCode != pa_OK)

             return (retCode);        

@@ -1208,7 +1265,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
 

         if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_UC_ENABLE)

         {

-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_NO_MATCH], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_NO_MATCH], pa_CMD_TX_DEST_5, FALSE);

+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_NO_MATCH], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_NO_MATCH], pa_CMD_TX_DEST_5, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

           /* Error checking */

           if (retCode != pa_OK)

             return (retCode);        

@@ -1298,7 +1355,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
  * DESCRIPTION: Clear and construct the firmware command header

  * Returns pointer to the firmware command

  *************************************************************************/

-static pafrmCommand_t* pa_format_fcmd_header (void *pCmd, paCmdReply_t *reply, uint8_t cmd, uint16_t comId, uint16_t cmdSize)

+static pafrmCommand_t* pa_format_fcmd_header (paInst_t *paInst, void *pCmd, paCmdReply_t *reply, uint8_t cmd, uint16_t comId, uint16_t cmdSize)

 {

   pafrmCommand_t *fcmd = (pafrmCommand_t *) pCmd;

   

@@ -1308,7 +1365,7 @@ static pafrmCommand_t* pa_format_fcmd_header (void *pCmd, paCmdReply_t *reply, u
   fcmd->magic         = PAFRM_CONFIG_COMMAND_SEC_BYTE;

   fcmd->comId         = SWIZ(comId);

   fcmd->retContext    = SWIZ(reply->replyId);

-  fcmd->replyQueue    = SWIZ(reply->queue);

+  fcmd->replyQueue    = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CMD_RET, reply->queue));

   fcmd->flowId        = SWIZ(reply->flowId);

   

   return(fcmd);

@@ -1634,7 +1691,7 @@ Pa_addMac2_send_cmd:
   *handle = (paLnkHandle_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l2Table[i]);

 

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -1722,14 +1779,14 @@ Pa_addMac2_send_cmd:
   al1->u.ethIp.matchFlags  = SWIZ(al1->u.ethIp.matchFlags);

 

   /* Forwarding information */

-  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE);

+  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addMac2_end;

   }

 

   /* Next fail information */

-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE);

+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addMac2_end;

@@ -2028,7 +2085,7 @@ Pa_addSrio_send_cmd:
   *handle = (paHandleL2L3_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l2Table[i]);

 

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -2092,14 +2149,14 @@ Pa_addSrio_send_cmd:
   al1->u.srio.key           = SWIZ(al1->u.srio.key);

 

   /* Forwarding information */

-  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE);

+  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1; 

     goto Pa_addSrio_end;                 

   }

 

   /* Next fail information */

-  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE);

+  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret != pa_OK) {

     ret = ret1;

     goto Pa_addSrio_end;                 

@@ -2267,7 +2324,7 @@ paReturn_t Pa_delHandle (Pa_Handle       iHandle,
   }

   

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, csize);

   

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -2318,7 +2375,7 @@ paReturn_t Pa_getLUT1Info ( Pa_Handle       iHandle,
                             paHandleL2L3_t  l2l3handle,

                             paLUT1Info_t    *lut1Info)

 {

-  paL2L3Header_t  *hdr = (paL2L3Header_t *) l2l3handle;  /* L2L3 header, Must be first entry */

+  paL2L3Header_t  *hdr = (paL2L3Header_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr,l2l3handle);

   paReturn_t      ret = pa_OK;

 

   /* Basic sanity check. The base address of the table is not verified, however */

@@ -3129,7 +3186,7 @@ Pa_addIp2_send_cmd:
   *retHandle = (paLnkHandle_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l3Table[i]);

 

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -3243,14 +3300,14 @@ Pa_addIp2_send_cmd:
   al1->u.ethIp.matchFlags = SWIZ(al1->u.ethIp.matchFlags);  

   al1->u.ethIp.key        = SWIZ(al1->u.ethIp.key); 

   

-  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, *cmdDest, FALSE);

+  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, *cmdDest, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addIp2_end;

   }

 

   /* Next fail information */

-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE);

+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addIp2_end;

@@ -3540,7 +3597,7 @@ paReturn_t  Pa_addPort2 (Pa_Handle        iHandle,
   }

 

   /* Create the command */   

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -3562,7 +3619,7 @@ paReturn_t  Pa_addPort2 (Pa_Handle        iHandle,
   }

   

   /* Forwarding information */

-  ret1 = pa_conv_routing_info2(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_3, FALSE);

+  ret1 = pa_conv_routing_info2(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_3, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addPort_end;

@@ -3647,6 +3704,8 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
   uint16_t                csize;

   pafrmCommand_t         *fcmd;

   pafrmCommandSysConfigPa_t *ccfg;

+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);

+  uint32_t               mtCsKey;

   

   if((byteMasks == NULL) || (cmd == NULL) || (cmdSize == NULL) || (reply == NULL) || (cmdDest == NULL))

   {

@@ -3672,8 +3731,12 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
   if (reply->dest != pa_DEST_HOST)

     return (pa_INVALID_CMD_REPLY_DEST);

 

+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -3693,6 +3756,9 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
    * since it is typically lightly loaded */

   *cmdDest = pa_CMD_TX_DEST_5;

 

+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

+

   return (pa_OK);

 

 } /* Pa_setCustomLUT1 */

@@ -3858,7 +3924,7 @@ Pa_addCustomLut1_send_cmd:
   *retHandle = (paHandleL2L3_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l3Table[i]);

 

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -3889,14 +3955,14 @@ Pa_addCustomLut1_send_cmd:
   al1->u.custom.key        = SWIZ(al1->u.custom.key);  

   

   /* Forwarding information */

-  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, *cmdDest, FALSE);

+  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, *cmdDest, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addCustomLUT1_end;

   }

 

   /* Next fail information */

-  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE);

+  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addCustomLUT1_end;

@@ -3994,6 +4060,8 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
                               paCmdReply_t   *reply,

                               int            *cmdDest )

 {

+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);

+  uint32_t               mtCsKey;

   uint16_t                csize;

   pafrmCommand_t         *fcmd;

   pafrmCommandSysConfigPa_t *ccfg;

@@ -4025,8 +4093,12 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
     if (byteOffsets[i] >= byteOffsets[i+1])

       return (pa_ERR_CONFIG);

 

+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

   

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -4047,6 +4119,9 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
   /* Only PDSP0 or PDSP3 can be used due to constant register configuration */

   *cmdDest = pa_CMD_TX_DEST_0;

 

+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

+

   return (pa_OK);

 

 } /* Pa_setCustomLUT2 */

@@ -4135,7 +4210,7 @@ paReturn_t Pa_addCustomLUT2 ( Pa_Handle       iHandle,
   /* Refresh PA Instance */

   Pa_osalMtCsEnter(&mtCsKey);

   Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

-  

+

   Pa_osalBeginMemAccess ((void *) l3Table,

                          paInst->paBufs[PA_BUFFNUM_L3_TABLE].size);

 

@@ -4153,7 +4228,7 @@ paReturn_t Pa_addCustomLUT2 ( Pa_Handle       iHandle,
   }

   

   /* Create the command */   

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -4183,7 +4258,7 @@ paReturn_t Pa_addCustomLUT2 ( Pa_Handle       iHandle,
   al2->lnkTableIdx  = SWIZ(al2->lnkTableIdx);

 

   /* Forwarding information */

-  ret1 = pa_conv_routing_info(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_3, FALSE);

+  ret1 = pa_conv_routing_info(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_3, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

   if (ret1 != pa_OK) {

     ret = ret1;

     goto Pa_addCustomLUT2_end;

@@ -4254,11 +4329,12 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
       (hl4->lnkType != PA_TABLE_ENTRY_TYPE_VL) &&

       (hl4->lnkType != PA_TABLE_ENTRY_TYPE_NONE))

     return (pa_INVALID_INPUT_HANDLE);

-    

+

+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_L3) {

-    /* Refresh PA Instance */

-    Pa_osalMtCsEnter(&mtCsKey);

-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

   

     /* Inform the host a table entry will be changed */ 

     Pa_osalBeginMemAccess ((void *) l3Table,

@@ -4277,13 +4353,8 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
 

     Pa_osalEndMemAccess ((void *) l3Table,

                          paInst->paBufs[PA_BUFFNUM_L3_TABLE].size);

-    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

-    Pa_osalMtCsExit(mtCsKey);  

   }

   else if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_VL)  {

-    /* Refresh PA Instance */

-    Pa_osalMtCsEnter(&mtCsKey);

-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

   

     /* Inform the host a table entry will be changed */ 

     Pa_osalBeginMemAccess ((void *) vlnkTable,

@@ -4302,12 +4373,14 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
 

     Pa_osalEndMemAccess ((void *) vlnkTable,

                          paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].size);

-    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

-    Pa_osalMtCsExit(mtCsKey);  

   }

 

+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

+

+

   /* Create the command */   

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT2, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT2, 0, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

@@ -4582,8 +4655,12 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
   if ((nRoute <= 0) || (nRoute > pa_EROUTE_MAX))

     return (pa_ERR_CONFIG);

 

+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

 

   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 

    * must be considered */

@@ -4598,10 +4675,6 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
 

   cpa->u.eroute.routeBitMap = 0;

   

-  /* Refresh PA Instance */

-  Pa_osalMtCsEnter(&mtCsKey);

-  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

-  

   for (i = 0; i < nRoute; i++)  {

 

     if (  (eRoutes[i].dest != pa_DEST_HOST)    &&

@@ -4620,7 +4693,7 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
 

     cpa->u.eroute.routeBitMap |=  (1 << routeTypes[i]);

     

-    retCode =  pa_conv_routing_info2 (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], pa_CMD_TX_DEST_5, FALSE);

+    retCode =  pa_conv_routing_info2 (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], pa_CMD_TX_DEST_5, FALSE, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);

     

     if(retCode != pa_OK)

       break;

@@ -4696,6 +4769,8 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
                                 paCmdReply_t           *reply,

                                 int                    *cmdDest)

 {

+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);

+  uint32_t               mtCsKey;

   pafrmCommand_t           *fcmd;

   pafrmCommandMultiRoute_t *mr;

   int                       i;

@@ -4729,8 +4804,15 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
   if((mode != pa_MULTI_ROUTE_MODE_CONFIG) && (mode != pa_MULTI_ROUTE_MODE_RESET))

     return (pa_ERR_CONFIG);  

 

+  if ((mode == pa_MULTI_ROUTE_MODE_CONFIG) && (routeEntry == NULL))

+    return (pa_ERR_CONFIG);

+

+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_ROUTE, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_ROUTE, 0, csize);

 

   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 

    * must be considered */

@@ -4747,14 +4829,11 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
     mr->mode = PAFRM_COMMAND_MULTI_ROUTE_MODE_ADD;

     mr->nRoutes = (uint8_t)nRoute;

     

-    if(routeEntry == NULL)

-        return (pa_INSUFFICIENT_CMD_BUFFER_SIZE);

-  

     for (i = 0; i < nRoute; i++)  {

       mr->quFl[i].ctrlFlags = routeEntry[i].ctrlBitfield | PAFRM_MULTI_RUOTE_CTRL_ACTIVE;

       mr->quFl[i].ctrlFlags = SWIZ(mr->quFl[i].ctrlFlags);

       mr->quFl[i].flowId = SWIZ(routeEntry[i].flowId);

-      mr->quFl[i].queue = SWIZ(routeEntry[i].queue);

+      mr->quFl[i].queue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, routeEntry[i].queue));

       mr->quFl[i].swInfo0 = SWIZ(routeEntry[i].swInfo0);

     }

   }

@@ -4765,6 +4844,9 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
   /* Destination should be either PDSP4 or PDSP5 where multiple routes is executed */

   *cmdDest = pa_CMD_TX_DEST_5;

 

+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

+

   return (pa_OK);

 

 } /* Pa_configMultiRoute */

@@ -4807,6 +4889,8 @@ paReturn_t Pa_configCrcEngine (Pa_Handle       iHandle,
                                paCmdReply_t   *reply,

                                int            *cmdDest)

 {

+  paInst_t                 *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);

+  uint32_t                  mtCsKey;

   pafrmCommand_t           *fcmd;

   pafrmCommandConfigCRC_t  *ccrc;

   uint16_t                  csize;

@@ -4833,8 +4917,12 @@ paReturn_t Pa_configCrcEngine (Pa_Handle       iHandle,
   if(cfgInfo->size > pa_CRC_SIZE_32)

     return (pa_ERR_CONFIG);   

     

+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_CRC_ENGINE, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_CRC_ENGINE, 0, csize);

 

   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 

    * must be considered */

@@ -4858,6 +4946,9 @@ paReturn_t Pa_configCrcEngine (Pa_Handle       iHandle,
   /* Destination is the PDSP corresping to the CRC engine index */

   *cmdDest = (int)index;

 

+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

+

   return (pa_OK);

 

 } /* Pa_configCrcEngine */

@@ -4925,7 +5016,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
                                   64 - offsetof(pafrmCommandCmdSet_t, cmd);  

     

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_CMD_SET, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_CMD_SET, 0, csize);

 

   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 

    * must be considered */

@@ -5105,7 +5196,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
           }

           pCmdSplit->ctrlFlags = SWIZ(pCmdSplit->ctrlFlags);

           pCmdSplit->flowId    = (uint8_t)split->flowId;

-          pCmdSplit->destQueue = SWIZ(split->destQueue);

+          pCmdSplit->destQueue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, split->destQueue));

           pCmdSplit->startOffset = (uint8_t)split->startOffset;

           

         }

@@ -5184,7 +5275,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
             case pa_DEST_HOST:

                 pCmdVerifyPktErr->forwardType = PAFRM_FORWARD_TYPE_HOST;   

                 pCmdVerifyPktErr->flowId  = SWIZ(verifyPktErr->flowId);

-                pCmdVerifyPktErr->queue   = SWIZ(verifyPktErr->queue);

+                pCmdVerifyPktErr->queue   = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, verifyPktErr->queue));

                 pCmdVerifyPktErr->swInfo0 = SWIZ(verifyPktErr->swInfo0);

                 break;

                     

@@ -5346,7 +5437,7 @@ paReturn_t Pa_configUsrStats (Pa_Handle                iHandle,
   memcpy(usrStatsLnkTbl, uslnkTable, paInst->nUsrStats * sizeof(paUsrStatsLnkEntry_t));                       

     

   /* Create the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_USR_STATS, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_USR_STATS, 0, csize);

 

   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 

    * must be considered */

@@ -5478,8 +5569,11 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
 

     *cmdSize = csize;

 

+    Pa_osalMtCsEnter(&mtCsKey);

+    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

     /* Create the command */

-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_CONFIG_PA, 0, csize);

+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_CONFIG_PA, 0, csize);

 

     /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 

     * must be considered */

@@ -5490,9 +5584,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
     

     cpa = (pafrmCommandConfigPa_t *)&(fcmd->cmd);

   

-    Pa_osalMtCsEnter(&mtCsKey);

-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

-  

     /* Protocol Limitations */

     if (cfg->pProtoLimit)

     {

@@ -5516,6 +5607,35 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
   

     }

   

+    /* Queue Bounce configuration */

+    if (cfg->pQueueBounceConfig)

+    {

+        int i;

+        paQueueBounceConfig_t* pQueueBounceCfg = cfg->pQueueBounceConfig;

+

+        paInst->cfg.queueBounceConfig = *pQueueBounceCfg;

+

+        for (i = 0; i < PA_MAX_QUEUE_BOUNCE_ROUTING_CLASSES; i++)

+        {

+            if (pQueueBounceCfg->defOp[i] > pa_QUEUE_BOUNCE_OP_MAX)

+            {

+                paInst->cfg.queueBounceConfig.enable = FALSE;

+                ret = pa_ERR_CONFIG;

+                break;

+            }

+        }

+

+        if (ret == pa_OK)

+        {

+            cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_QUEUE_BOUNCE;

+            cpa->queueBounce.ddrQueue     = SWIZ(pQueueBounceCfg->ddrQueueId);

+            cpa->queueBounce.msmcQueue    = SWIZ(pQueueBounceCfg->msmcQueueId);

+        }

+

+        /* the return queue may be updated per this configuration */

+        fcmd->replyQueue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CMD_RET, reply->queue));

+    }

+

     /* Outer IP configuration */

     if (cfg->pOutIpReassmConfig)

     {

@@ -5532,7 +5652,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_OUT_IP_REASSEM;

             cpa->outIpReasm.numTrafficFlow = SWIZ(pIpReassmCfg->numTrafficFlow);

             cpa->outIpReasm.destFlowId     = SWIZ(pIpReassmCfg->destFlowId);

-            cpa->outIpReasm.destQueue      = SWIZ(pIpReassmCfg->destQueue);

+            cpa->outIpReasm.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_IP_REASSEMBLY, pIpReassmCfg->destQueue));

         }

     }

   

@@ -5552,7 +5672,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_IN_IP_REASSEM;

             cpa->inIpReasm.numTrafficFlow = SWIZ(pIpReassmCfg->numTrafficFlow);

             cpa->inIpReasm.destFlowId     = SWIZ(pIpReassmCfg->destFlowId);

-            cpa->inIpReasm.destQueue      = SWIZ(pIpReassmCfg->destQueue);

+            cpa->inIpReasm.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_IP_REASSEMBLY, pIpReassmCfg->destQueue));

         }

     }

   

@@ -5704,8 +5824,11 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
 

     *cmdSize = csize;

 

+    Pa_osalMtCsEnter(&mtCsKey);

+    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

     /* Create the command */

-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, csize);

 

     /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 

      * must be considered */

@@ -5749,9 +5872,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
                 {

             paGtpuConfig_t *gtpuCfg = &ctrl->params.gtpuCfg;

           

-            Pa_osalMtCsEnter(&mtCsKey);

-            Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

-          

             ccfg->cfgCode = PAFRM_SYSTEM_CONFIG_CODE_GTPU;

           

             if (gtpuCfg->ctrlBitMap & pa_GTPU_CTRL_USE_LINK)

@@ -5773,8 +5893,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             /* GTP-U classification is at PDSP3 only */

             *cmdDest = pa_CMD_TX_DEST_3;

       

-            Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

-            Pa_osalMtCsExit(mtCsKey);

             break;

         }

         case pa_CONTROL_EMAC_PORT_CONFIG:

@@ -5788,6 +5906,10 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
           ret = pa_ERR_CONFIG;

           break;       

       }

+

+    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+    Pa_osalMtCsExit(mtCsKey);

+

   }

   

   return (ret);

@@ -5836,7 +5958,7 @@ static paReturn_t pa_format_stats_request  (paInst_t      *paInst,
     return (pa_ERR_CONFIG);

 

   /* Form the command */

-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_REQ_STATS, 0, csize);

+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_REQ_STATS, 0, csize);

 

   /* Validity of the destination was already checked (HOST), so no other cases 

    * must be considered */

diff --git a/src/v0/pafrm.h b/src/v0/pafrm.h
index b60686e..ff33a33 100644
--- a/src/v0/pafrm.h
+++ b/src/v0/pafrm.h
@@ -300,6 +300,14 @@ typedef struct pafrmPacketControlConfig_s{
   uint16_t  rsvd2;        /* alignmnet */

            

 } pafrmPacketControlConfig_t;

+
+/* Queue Bounce Configuration */

+typedef struct pafrmQueueBounceConfig_s{

+

+  uint16_t ddrQueue;     /* Bounce queue where PASS will deliver the host-routed packet with DDR bit set */

+  uint16_t msmcQueue;    /* Bounce queue where PASS will deliver the host-routed packet with MSMC bit set */

+} pafrmQueueBounceConfig_t;

+

 

 #define PAFRM_PACKET_VERIFY_PPPoE               pa_PKT_CTRL_HDR_VERIFY_PPPoE

 #define PAFRM_PACKET_VERIFY_IP                  pa_PKT_CTRL_HDR_VERIFY_IP

@@ -561,7 +569,7 @@ typedef struct pafrmCommandConfigPa_s
   pafrmUsrStatsConfig_t     usrStats;       /* User-defined Statistics Configuration */

   pafrmQueueDivertConfig_t  queueDivert;    /* LUT2 queue diversion configuration */

   pafrmPacketControlConfig_t pktCtrl;       /* Packet control configuration */ 

-  pafrmComEvents_t          events;         /* Error events configuration */

+  pafrmQueueBounceConfig_t  queueBounce;    /* Queue bounce configuration */

   

 } pafrmCommandConfigPa_t;

 

@@ -572,7 +580,7 @@ typedef struct pafrmCommandConfigPa_s
 #define PAFRM_COMMAND_CONFIG_VALID_USR_STATS        (1 << 4)

 #define PAFRM_COMMAND_CONFIG_VALID_QUEUE_DIVERT     (1 << 5)

 #define PAFRM_COMMAND_CONFIG_VALID_PKT_CTRL         (1 << 6)

-#define PAFRM_COMMAND_CONFIG_VALID_EVENTS           (1 << 7)

+#define PAFRM_COMMAND_CONFIG_VALID_QUEUE_BOUNCE     (1 << 7)

 

 /* PA system configuration command */

 typedef struct pafrmCommandSysConfigPa_s

diff --git a/src/v0/paloc.h b/src/v0/paloc.h
index c45f6e2..f6290b6 100644
--- a/src/v0/paloc.h
+++ b/src/v0/paloc.h
@@ -283,6 +283,7 @@ typedef struct {
   paCmdSetConfig_t          cmdSetConfig;         /* the command set configuration structure */

   paUsrStatsConfig_t        usrStatsConfig;       /* the user-defined statistics configuration structure */

   paQueueDivertConfig_t     queueDivertConfig;    /* the queue-diversion configuration structure */

+  paQueueBounceConfig_t     queueBounceConfig;    /* the queue-bounce configuration structure */

 } paSysInfo_t;

   

 /*

diff --git a/src/v1/pa.c b/src/v1/pa.c
index a08bf43..7bef36a 100644
--- a/src/v1/pa.c
+++ b/src/v1/pa.c
@@ -423,7 +423,57 @@ static int  pa_verify_usr_stats(paInst_t *paInst, int32_t cntIndex, int fCache)
     }
     return (ret);
 } /* pa_verify_usr_stats */
-
+

+/*******************************************************************************************

+ * FUNCTION PURPOSE: Derive the destination queue Id

+ *******************************************************************************************

+ * DESCRIPTION: This function is used to derive the destination queue Id with the embedded

+ *              control bits based on the input queue Id, the Queue Bounce configuration

+ *              and the traffic class associated with the originated API.

+ *

+ *  return queueId with embedded control bits

+ *

+ ********************************************************************************************/

+static uint16_t  pa_convert_queue_id(paInst_t *paInst, int routingClass, uint16_t queue)

+{

+    paQueueBounceConfig_t* pQueueBounceCfg = &paInst->cfg.queueBounceConfig;

+    uint16_t queueBounceCtrlType = queue >> pa_QUEUE_BOUNCE_CTRL_LOC;

+    uint16_t queueNum = queue & pa_QUEUE_BOUNCE_QUEUE_MASK;

+

+    if (!pQueueBounceCfg->enable)

+    {

+        return(queueNum);

+    }

+

+    if ((queueNum >= pQueueBounceCfg->hwQueueBegin) &&

+       (queueNum <= pQueueBounceCfg->hwQueueEnd))

+    {

+        /* It is a hardware queue, queue bounce is not required */

+        return(queueNum);

+    }

+

+    if (queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_DEFAULT)

+    {

+        /*

+        * Error check is not required here because routingClass is set by internal

+        * function and the range check of default operation mode has been performed

+        * at Queue Bounce Configuration time

+        */

+        uint16_t defOp = pQueueBounceCfg->defOp[routingClass];

+

+        return(queueNum | (defOp << pa_QUEUE_BOUNCE_CTRL_LOC));

+    }

+    else if ((queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_DDR) ||

+             (queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_MSMC))

+    {

+        return(queue);

+    }

+    else /* pa_QUEUE_BOUNCE_CTRL_NONE */

+    {

+        return(queueNum);

+    }

+}

+

 /*************************************************************************
  * FUNCTION PURPOSE: Convert RouteInfo 
  ************************************************************************* 
@@ -666,7 +716,7 @@ static void pa_format_lut2ParamDesc(paLut2ParamDesc *params,
  *              firmware forward information
  * Returns FALSE if error occurs
  *************************************************************************/
-static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo2_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp, uint8_t paFlags)
+static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo2_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp, uint8_t paFlags, int routingClass)
 {
 
   /*
@@ -680,9 +730,7 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
   uint8_t psFlags = 0;                                    
   uint8_t *pCmd = fwdInfo->u.host.cmd;
   int     fcmdSetNotSupport = FALSE;
-  
-  fwdInfo->flowId = routeInfo->flowId;
-  fwdInfo->queue = SWIZ(routeInfo->queue);
+  uint16_t queue = routeInfo->queue;

   
   if ((routeInfo->dest == pa_DEST_HOST) || (routeInfo->dest == pa_DEST_EMAC)) {
     if (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_PKTTYPE_EMAC) 
@@ -703,10 +751,12 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
       if(routeInfo->priorityType == pa_ROUTE_PRIORITY_VLAN)
       {
         fwdInfo->u.host.ctrlBitMap   |= PAFRM_ROUTING_PRIORITY_VLAN_ENABLE;
+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;

       }
       else if(routeInfo->priorityType == pa_ROUTE_PRIORITY_DSCP)
       {
         fwdInfo->u.host.ctrlBitMap   |= PAFRM_ROUTING_PRIORITY_DSCP_ENABLE;
+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;

       }
       else if (routeInfo->priorityType ==  pa_ROUTE_INTF)
       {
@@ -728,6 +778,7 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
            
         fwdInfo->u.host.ctrlBitMap   |= (PAFRM_ROUTING_IF_DEST_SELECT_ENABLE |
                                          PAFRM_ROUTING_FLOW_EQOS_IF_ENABLE);
+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;

       }
       else
       {
@@ -735,6 +786,8 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
       }
     }
 
+    queue = pa_convert_queue_id(paInst, routingClass, queue);

+

     if (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_MROUTEINDEX)  {
       if (routeInfo->mRouteIndex >= pa_MAX_MULTI_ROUTE_SETS) {
         return (pa_ERR_CONFIG);
@@ -865,6 +918,9 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
     return (pa_ERR_CONFIG);
   }
   
+  fwdInfo->flowId = routeInfo->flowId;

+  fwdInfo->queue = SWIZ(queue);

+

   if (pCmd && (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_PCMD))  {
   
     paCmdInfo_t* paCmd = routeInfo->pCmd;
@@ -941,13 +997,13 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
  *              firmware forward information
  * Returns FALSE if error occurs
  *************************************************************************/
-static paReturn_t pa_conv_routing_info (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp)
+static paReturn_t pa_conv_routing_info (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp, int routingClass)
 {
   paRouteInfo2_t routeInfo2; 
   
   pa_convert_routeInfo_to_routeInfo2(routeInfo, &routeInfo2);
   
-  return(pa_conv_routing_info2(paInst, fwdInfo, &routeInfo2, cmdDest, failRoute, destPdsp, 0));
+  return(pa_conv_routing_info2(paInst, fwdInfo, &routeInfo2, cmdDest, failRoute, destPdsp, 0, routingClass));
     
 } /* pa_conv_routing_info */
 
@@ -1075,7 +1131,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
       {
         /* Obtain the information from the configuration */
         capturePort = pktCapCfg[i].portToBeCaptured;
-        queue       = pktCapCfg[i].queue;
+        queue       = pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CAPTURE, pktCapCfg[i].queue);
         flow        = pktCapCfg[i].flowId;
         swInfo0     = pktCapCfg[i].swInfo0;
         
@@ -1208,7 +1264,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
         /* store multi cast default route information if enabled */
         if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_MC_ENABLE)
         {
-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_MULTICAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_MULTICAST], pa_CMD_TX_DEST_0, TRUE, 0, 0);
+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_MULTICAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_MULTICAST], pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
           /* Error checking */
           if (retCode != pa_OK)
             return (retCode);
@@ -1216,7 +1272,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
         /* Store broad cast default route information if enabled */
         if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_BC_ENABLE)
         {
-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_BROADCAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_BROADCAST], pa_CMD_TX_DEST_0, TRUE, 0, 0);
+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_BROADCAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_BROADCAST], pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
           /* Error checking */
           if (retCode != pa_OK)
             return (retCode);        
@@ -1224,7 +1280,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
 
         if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_UC_ENABLE)
         {
-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_NO_MATCH], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_NO_MATCH], pa_CMD_TX_DEST_0, TRUE, 0, 0);
+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_NO_MATCH], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_NO_MATCH], pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
           /* Error checking */
           if (retCode != pa_OK)
             return (retCode);        
@@ -1315,7 +1371,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
  * DESCRIPTION: Clear and construct the firmware command header
  * Returns pointer to the firmware command
  *************************************************************************/
-static pafrmCommand_t* pa_format_fcmd_header (void *pCmd, paCmdReply_t *reply, uint8_t cmd, uint16_t comId, uint8_t firstPdsp, uint16_t cmdSize)
+static pafrmCommand_t* pa_format_fcmd_header (paInst_t *paInst, void *pCmd, paCmdReply_t *reply, uint8_t cmd, uint16_t comId, uint8_t firstPdsp, uint16_t cmdSize)
 {
   pafrmCommand_t *fcmd = (pafrmCommand_t *) pCmd;
   
@@ -1327,7 +1383,7 @@ static pafrmCommand_t* pa_format_fcmd_header (void *pCmd, paCmdReply_t *reply, u
   fcmd->magic         = PAFRM_CONFIG_COMMAND_SEC_BYTE;
   fcmd->comId         = SWIZ(comId);
   fcmd->retContext    = SWIZ(reply->replyId);
-  fcmd->replyQueue    = SWIZ(reply->queue);
+  fcmd->replyQueue    = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CMD_RET, reply->queue));
   fcmd->flowId        = SWIZ(reply->flowId);
   
   return(fcmd);
@@ -2086,7 +2142,7 @@ Pa_addMac2_send_cmd:
   *handle = (paLnkHandle_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l2Table[i]);
 
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -2192,14 +2248,14 @@ Pa_addMac2_send_cmd:
   al1->bitMask  = SWIZ(bitMask);
 
   /* Forwarding information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
     ret = ret1;
     goto Pa_addMac2_end;
   }
 
   /* Next fail information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
     ret = ret1;
     goto Pa_addMac2_end;
@@ -2500,7 +2556,7 @@ Pa_addSrio_send_cmd:
   *handle = (paHandleL2L3_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l2Table[i]);
 
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -2574,14 +2630,14 @@ Pa_addSrio_send_cmd:
   al1->bitMask  = SWIZ(bitMask);
 
   /* Forwarding information */
-  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
     ret = ret1; 
     goto Pa_addSrio_end;                 
   }
 
   /* Next fail information */
-  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret != pa_OK) {
     ret = ret1;
     goto Pa_addSrio_end;                 
@@ -2756,7 +2812,7 @@ paReturn_t Pa_delHandle (Pa_Handle       iHandle,
   /* Create the command */
   if (fDelLnk)
   {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, pdsp, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, pdsp, csize);
     cmdHdr = (pafrmCommandCmdHdr_t *) &(fcmd->cmd);
     cmdHdr->command = PAFRM_CONFIG_COMMAND_DEL_LUT1;
     cmdHdr->offset =  sizeof(pafrmCommand_t)+sizeof(pafrmCommandDelLut1_t)+sizeof(pafrmCommandCmdHdr_t)-sizeof(uint32_t);
@@ -2768,7 +2824,7 @@ paReturn_t Pa_delHandle (Pa_Handle       iHandle,
   }
   else
   {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
     del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
     del->index = SWIZ((uint16_t)hdr->lutIdx);
   }  
@@ -2926,7 +2982,7 @@ paReturn_t Pa_delAclHandle (Pa_Handle       iHandle,
   }
   
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
   del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
   del->index = SWIZ((uint16_t) hdr->lutIdx);
   
@@ -3032,7 +3088,7 @@ paReturn_t Pa_delEoamHandle (Pa_Handle       iHandle,
   }
   
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
   del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
   del->index = SWIZ((uint16_t) hdr->lutIdx);
   
@@ -3123,7 +3179,7 @@ paReturn_t Pa_delFcHandle (Pa_Handle       iHandle,
   *cmdDest = pa_CMD_TX_DEST_6;
   
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, 0, csize);
   del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
   del->index = SWIZ((uint16_t) hdr->lutIdx);
   
@@ -4111,7 +4167,7 @@ Pa_addIp2_send_cmd:
   /* Create the command */                            
   if (fl3Entry2)
   {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, 0, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, 0, csize);
     cmdHdr = (pafrmCommandCmdHdr_t *) &(fcmd->cmd);
     cmdHdr->command = PAFRM_CONFIG_COMMAND_ADDREP_LUT1;
     cmdHdr->offset =  sizeof(pafrmCommand_t)+sizeof(pafrmCommandAddLut1_t)+sizeof(pafrmCommandCmdHdr_t)-sizeof(uint32_t);
@@ -4123,7 +4179,7 @@ Pa_addIp2_send_cmd:
   }
   else
   {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, firstPdsp, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, firstPdsp, csize);
     al1  = (pafrmCommandAddLut1_t *) &(fcmd->cmd);
   } 
 
@@ -4319,14 +4375,14 @@ Pa_addIp2_send_cmd:
     nfRoute = nextRtFail;
   }
   
-  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
       ret = ret1;
       goto Pa_addIp2_end;
   }
 
   /* Next fail information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
       ret = ret1;
       goto Pa_addIp2_end;
@@ -4395,14 +4451,14 @@ Pa_addIp2_send_cmd:
     al1->CBWords1 = SWIZ(CBWords1); 
     al1->priority = SWIZ(priority);  
     
-    ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 1, 0);
+    ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 1, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
     if (ret1 != pa_OK) {
         ret = ret1;
         goto Pa_addIp2_end;
     }
 
     /* Next fail information */
-    ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 1, 0);
+    ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 1, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
     if (ret1 != pa_OK) {
         ret = ret1;
         goto Pa_addIp2_end;
@@ -4590,7 +4646,7 @@ Pa_addEoamFlow_send_cmd:
   *handle = (paHandleEoam_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&eoamTable[i]);
 
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_EOAM  | i, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_EOAM  | i, 1, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -5020,7 +5076,7 @@ paReturn_t  Pa_addAcl  (Pa_Handle          iHandle,
   *retHandle =  (paHandleAcl_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&(aclTable[i]));
 
   /* Create the command */                            
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_ACL  | i, firstPdsp, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_ACL  | i, firstPdsp, csize);
   al1  = (pafrmCommandAddLut1_t *) &(fcmd->cmd);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
@@ -5210,8 +5266,8 @@ paReturn_t  Pa_addAcl  (Pa_Handle          iHandle,
   }
 
   /* Insert the entry to the Link List */
-  ret1 = pa_insert_entry(listElemTable, paInst->nAcl, listInfoTable, insertMode,
-                         (paHandleAcl_t) (nextEntry?pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,nextEntry):0),
+  ret1 = pa_insert_entry(listElemTable, paInst->nAcl, listInfoTable, insertMode,

+                         nextEntry?(paHandleAcl_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,nextEntry):0,

                          i, &priority, *retHandle);
 
   if (ret1 != pa_OK) {
@@ -5269,14 +5325,14 @@ paReturn_t  Pa_addAcl  (Pa_Handle          iHandle,
   
   nfRoute = &pauFailRoute;
   
-  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, paFlags);
+  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, paFlags, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
       ret = ret1;
       goto Pa_addAcl_end;
   }
   
   /* Next fail information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
       ret = ret1;
       goto Pa_addAcl_end;
@@ -5538,7 +5594,7 @@ Pa_addFc_send_cmd:
   *retHandle =  (paHandleFc_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&(fcTable[i]));
 
   /* Create the command */                            
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_FC  | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_FC  | i, 0, csize);
   al1  = (pafrmCommandAddLut1_t *) &(fcmd->cmd);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
@@ -5929,7 +5985,7 @@ paReturn_t  Pa_addPort2 (Pa_Handle        iHandle,
   }
 
   /* Create the command */   
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -5981,7 +6037,7 @@ paReturn_t  Pa_addPort2 (Pa_Handle        iHandle,
   al2->ctrlBitMap   = SWIZ(al2->ctrlBitMap);  
      
   /* Forwarding information */
-  ret1 = pa_conv_routing_info2(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
     ret = ret1;
     goto Pa_addPort_end;
@@ -6029,6 +6085,8 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
   uint16_t                csize;
   pafrmCommand_t         *fcmd;
   pafrmCommandSysConfigPa_t *ccfg;
+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);

+  uint32_t               mtCsKey;

   
   if((byteMasks == NULL) || (cmd == NULL) || (cmdSize == NULL) || (reply == NULL) || (cmdDest == NULL))
   {
@@ -6054,8 +6112,12 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
   if (reply->dest != pa_DEST_HOST)
     return (pa_INVALID_CMD_REPLY_DEST);
 
+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -6074,6 +6136,9 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
   /* Any PDSP can be used to handle the command. POST PDSP0 is chosen
    * since it is typically lightly loaded */
   *cmdDest = pa_CMD_TX_DEST_5;
+

+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

 
   return (pa_OK);
 
@@ -6244,7 +6309,7 @@ Pa_addCustomLut1_send_cmd:
   *retHandle = (paHandleL2L3_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l3Table[i]);
 
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3 | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3 | i, 0, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -6326,14 +6391,14 @@ Pa_addCustomLut1_send_cmd:
   }    
   
   /* Forwarding information */
-  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
     ret = ret1;
     goto Pa_addCustomLUT1_end;
   }
 
   /* Next fail information */
-  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
     ret = ret1;
     goto Pa_addCustomLUT1_end;
@@ -6383,6 +6448,8 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
                               paCmdReply_t   *reply,
                               int            *cmdDest )
 {
+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);

+  uint32_t               mtCsKey;

   uint16_t                csize;
   pafrmCommand_t         *fcmd;
   pafrmCommandSysConfigPa_t *ccfg;
@@ -6414,8 +6481,12 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
     if (byteOffsets[i] >= byteOffsets[i+1])
       return (pa_ERR_CONFIG);
 
+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 1, csize);
   
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -6436,6 +6507,9 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
   /* LUT2 resides at Ingress4 PDSP1 */
   *cmdDest = pa_CMD_TX_DEST_4;
 
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

+

   return (pa_OK);
 
 } /* Pa_setCustomLUT2 */
@@ -6541,7 +6615,7 @@ paReturn_t Pa_addCustomLUT2 ( Pa_Handle       iHandle,
   hl4->lnk = PAFRM_MK_SRC_VC(hdr->pdspNum, hdr->lutIdx);
   
   /* Create the command */   
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -6571,7 +6645,7 @@ paReturn_t Pa_addCustomLUT2 ( Pa_Handle       iHandle,
   al2->ctrlBitMap   = SWIZ(al2->ctrlBitMap);  
 
   /* Forwarding information */
-  ret1 = pa_conv_routing_info(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1);
+  ret1 = pa_conv_routing_info(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
   if (ret1 != pa_OK) {
     ret = ret1;
     goto Pa_addCustomLUT2_end;
@@ -6643,11 +6717,11 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
       (hl4->lnkType != PA_TABLE_ENTRY_TYPE_NONE))
     return (pa_INVALID_INPUT_HANDLE);
     
-  if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_L3) {
-    /* Refresh PA Instance */
-    Pa_osalMtCsEnter(&mtCsKey);
-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
+  /* Refresh PA Instance */
+  Pa_osalMtCsEnter(&mtCsKey);
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
   
+  if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_L3) {
     /* Inform the host a table entry will be changed */ 
     Pa_osalBeginMemAccess ((void *) l3Table,
                            paInst->paBufs[PA_BUFFNUM_L3_TABLE].size);
@@ -6665,14 +6739,8 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
 
     Pa_osalEndMemAccess ((void *) l3Table,
                          paInst->paBufs[PA_BUFFNUM_L3_TABLE].size);
-    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-    Pa_osalMtCsExit(mtCsKey);  
   }
   else if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_VL)  {
-    /* Refresh PA Instance */
-    Pa_osalMtCsEnter(&mtCsKey);
-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  
     /* Inform the host a table entry will be changed */ 
     Pa_osalBeginMemAccess ((void *) vlnkTable,
                            paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].size);
@@ -6690,11 +6758,13 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
 
     Pa_osalEndMemAccess ((void *) vlnkTable,
                          paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].size);
-    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-    Pa_osalMtCsExit(mtCsKey);  
-  }
+  }

+

+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+  Pa_osalMtCsExit(mtCsKey);
+
   /* Create the command */   
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT2, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT2, 0, 1, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
@@ -7117,8 +7187,12 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
   if ((nRoute <= 0) || (nRoute > pa_EROUTE_MAX))
     return (pa_ERR_CONFIG);
 
+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
 
   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
    * must be considered */
@@ -7133,10 +7207,6 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
 
   cpa->u.eroute.routeBitMap = 0;
   
-  /* Refresh PA Instance */
-  Pa_osalMtCsEnter(&mtCsKey);
-  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  
   for (i = 0; i < nRoute; i++)  {
 
     if (  (eRoutes[i].dest != pa_DEST_HOST)    &&
@@ -7155,7 +7225,7 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
 
     cpa->u.eroute.routeBitMap |=  (1 << routeTypes[i]);
     
-    retCode =  pa_conv_routing_info2 (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], pa_CMD_TX_DEST_5, FALSE, 0, 0);
+    retCode =  pa_conv_routing_info2 (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], pa_CMD_TX_DEST_5, FALSE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
     
     if(retCode != pa_OK)
       break;
@@ -7224,8 +7294,12 @@ paReturn_t Pa_configExceptionRouteCommon(Pa_Handle       iHandle,
   if (nRoute <= 0)
     return (pa_ERR_CONFIG);
 
+  /* Refresh PA Instance for read only */
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
 
   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
    * must be considered */
@@ -7240,10 +7314,6 @@ paReturn_t Pa_configExceptionRouteCommon(Pa_Handle       iHandle,
 
   cpa->u.eroute.routeBitMap = 0;
   
-  /* Refresh PA Instance for read only */
-  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-
   for (i = 0; i < nRoute; i++)  {
 
     if (  (eRoutes[i].dest != pa_DEST_HOST)    &&
@@ -7256,7 +7326,7 @@ paReturn_t Pa_configExceptionRouteCommon(Pa_Handle       iHandle,
 
     cpa->u.eroute.routeBitMap |=  (1 << routeTypes[i]);
     
-    retCode =  pa_conv_routing_info (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], dest, FALSE, 0);
+    retCode =  pa_conv_routing_info (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], dest, FALSE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
     if(retCode != pa_OK)
         return(retCode);
     
@@ -7327,6 +7397,8 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
                                 paCmdReply_t           *reply,
                                 int                    *cmdDest)
 {
+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);

+  uint32_t               mtCsKey;

   pafrmCommand_t           *fcmd;
   pafrmCommandMultiRoute_t *mr;
   int                       i;
@@ -7360,8 +7432,15 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
   if((mode != pa_MULTI_ROUTE_MODE_CONFIG) && (mode != pa_MULTI_ROUTE_MODE_RESET))
     return (pa_ERR_CONFIG);  
 
+  if ((mode == pa_MULTI_ROUTE_MODE_CONFIG) && (routeEntry == NULL))

+    return (pa_ERR_CONFIG);

+

+  /* Refresh PA Instance */

+  Pa_osalMtCsEnter(&mtCsKey);

+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

+

   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_ROUTE, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_ROUTE, 0, 1, csize);
 
   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
    * must be considered */
@@ -7378,14 +7457,11 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
     mr->mode = PAFRM_COMMAND_MULTI_ROUTE_MODE_ADD;
     mr->nRoutes = (uint8_t)nRoute;
   
-    if(routeEntry == NULL)
-        return (pa_INSUFFICIENT_CMD_BUFFER_SIZE);
-  
     for (i = 0; i < nRoute; i++)  {
       mr->quFl[i].ctrlFlags = routeEntry[i].ctrlBitfield | PAFRM_MULTI_RUOTE_CTRL_ACTIVE;
       mr->quFl[i].ctrlFlags = SWIZ(mr->quFl[i].ctrlFlags);
       mr->quFl[i].flowId = SWIZ(routeEntry[i].flowId);
-      mr->quFl[i].queue = SWIZ(routeEntry[i].queue);
+      mr->quFl[i].queue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, routeEntry[i].queue));
       mr->quFl[i].swInfo0 = SWIZ(routeEntry[i].swInfo0);
     }
   }
@@ -7396,6 +7472,9 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
   /* Multi-route processing PDSP: POST PDSP1 */
   *cmdDest = pa_CMD_TX_DEST_5;
 
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+  Pa_osalMtCsExit(mtCsKey);

+

   return (pa_OK);
 
 } /* Pa_configMultiRoute */
@@ -7561,7 +7640,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
                                   64 - offsetof(pafrmCommandCmdSet_t, cmd);  
     
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_CMD_SET, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_CMD_SET, 0, 0, csize);
 
   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
    * must be considered */
@@ -7742,7 +7821,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
           }
           pCmdSplit->ctrlFlags = SWIZ(pCmdSplit->ctrlFlags);
           pCmdSplit->flowId    = (uint8_t)split->flowId;
-          pCmdSplit->destQueue = SWIZ(split->destQueue);
+          pCmdSplit->destQueue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, split->destQueue));
           pCmdSplit->startOffset = (uint8_t)split->startOffset;
           
         }
@@ -7821,7 +7900,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
             case pa_DEST_HOST:
                 pCmdVerifyPktErr->forwardType = PAFRM_FORWARD_TYPE_HOST;   
                 pCmdVerifyPktErr->flowId  = SWIZ(verifyPktErr->flowId);
-                pCmdVerifyPktErr->queue   = SWIZ(verifyPktErr->queue);
+                pCmdVerifyPktErr->queue   = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, verifyPktErr->queue));
                 pCmdVerifyPktErr->swInfo0 = SWIZ(verifyPktErr->swInfo0);
                 break;
                     
@@ -7981,7 +8060,7 @@ paReturn_t Pa_configUsrStats (Pa_Handle                iHandle,
   memcpy(usrStatsLnkTbl, uslnkTable, paInst->nUsrStats * sizeof(paUsrStatsLnkEntry_t));                       
     
   /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_USR_STATS, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_USR_STATS, 0, 0, csize);
 
   /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
    * must be considered */
@@ -8637,8 +8716,11 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
   {
     pafrmCommandConfigPa_t *cpa;
 
+    Pa_osalMtCsEnter(&mtCsKey);
+    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
+
     /* Create the command */
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_CONFIG_PA, 0, 0, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_CONFIG_PA, 0, 0, csize);
 
     /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
     * must be considered */
@@ -8649,9 +8731,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
     
     cpa = (pafrmCommandConfigPa_t *)&(fcmd->cmd);
   
-    Pa_osalMtCsEnter(&mtCsKey);
-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  
     /* Protocol Limitations */
     if (cfg->pProtoLimit)
     {
@@ -8675,6 +8754,35 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
   
     }
   
+    /* Queue Bounce configuration */

+    if (cfg->pQueueBounceConfig)

+    {

+        int i;

+        paQueueBounceConfig_t* pQueueBounceCfg = cfg->pQueueBounceConfig;

+

+        paInst->cfg.queueBounceConfig = *pQueueBounceCfg;

+

+        for (i = 0; i < PA_MAX_QUEUE_BOUNCE_ROUTING_CLASSES; i++)

+        {

+            if (pQueueBounceCfg->defOp[i] > pa_QUEUE_BOUNCE_OP_MAX)

+            {

+                paInst->cfg.queueBounceConfig.enable = FALSE;

+                ret = pa_ERR_CONFIG;

+                break;

+            }

+        }

+

+        if (ret == pa_OK)

+        {

+            cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_QUEUE_BOUNCE;

+            cpa->queueBounce.ddrQueue     = SWIZ(pQueueBounceCfg->ddrQueueId);

+            cpa->queueBounce.msmcQueue    = SWIZ(pQueueBounceCfg->msmcQueueId);

+        }

+

+        /* the return queue may be updated per this configuration */

+        fcmd->replyQueue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CMD_RET, reply->queue));

+    }

+

     /* Outer IP configuration */
     if (cfg->pOutIpReassmConfig)
     {
@@ -8691,7 +8799,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_OUT_IP_REASSEM;
             cpa->outIpReasm.numTrafficFlow = SWIZ(pIpReassmCfg->numTrafficFlow);
             cpa->outIpReasm.destFlowId     = SWIZ(pIpReassmCfg->destFlowId);
-            cpa->outIpReasm.destQueue      = SWIZ(pIpReassmCfg->destQueue);
+            cpa->outIpReasm.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_IP_REASSEMBLY, pIpReassmCfg->destQueue));
         }
     }
   
@@ -8711,7 +8819,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_IN_IP_REASSEM;
             cpa->inIpReasm.numTrafficFlow = SWIZ(pIpReassmCfg->numTrafficFlow);
             cpa->inIpReasm.destFlowId     = SWIZ(pIpReassmCfg->destFlowId);
-            cpa->inIpReasm.destQueue      = SWIZ(pIpReassmCfg->destQueue);
+            cpa->inIpReasm.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_IP_REASSEMBLY, pIpReassmCfg->destQueue));
         }
     }
   
@@ -8878,7 +8986,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             
             }
             cpa->outAcl.destFlowId     = SWIZ(pAclCfg->destFlowId);
-            cpa->outAcl.destQueue      = SWIZ(pAclCfg->destQueue);
+            cpa->outAcl.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, pAclCfg->destQueue));
         }
     }
     
@@ -8923,7 +9031,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             
             }
             cpa->inAcl.destFlowId     = SWIZ(pAclCfg->destFlowId);
-            cpa->inAcl.destQueue      = SWIZ(pAclCfg->destQueue);
+            cpa->inAcl.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, pAclCfg->destQueue));
         }
     }
     
@@ -9073,11 +9181,14 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
   else
   {
     pafrmCommandSysConfigPa_t *ccfg;
+
+    Pa_osalMtCsEnter(&mtCsKey);

+    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));

   
     if (csize)
     {
         /* Create the command */
-        fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 
+        fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0,
                                     ((ctrl->code == pa_CONTROL_802_1ag_CONFIG) || (ctrl->code == pa_CONTROL_EMAC_PORT_CONFIG))?0:1, csize);
 
         /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
@@ -9124,9 +9235,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
         {
             paGtpuConfig_t *gtpuCfg = &ctrl->params.gtpuCfg;
           
-            Pa_osalMtCsEnter(&mtCsKey);
-            Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-          
             ccfg->cfgCode = PAFRM_SYSTEM_CONFIG_CODE_GTPU;
           
             if (gtpuCfg->ctrlBitMap & pa_GTPU_CTRL_USE_LINK)
@@ -9148,8 +9256,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
             /* GTP-U classification is at Ingress4 PDSP1 only */
             *cmdDest = pa_CMD_TX_DEST_4;
     
-            Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-            Pa_osalMtCsExit(mtCsKey);
             break;
         }
         
@@ -9173,8 +9279,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
         
             pa_ra_global_cfg(&ctrl->params.raCfg, paLObj.pSysRegs);
     
-            Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-            Pa_osalMtCsExit(mtCsKey);
             break;
         }
 
@@ -9198,6 +9302,10 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
           ret = pa_ERR_CONFIG;
           break;       
     }
+
+    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));

+    Pa_osalMtCsExit(mtCsKey);

+
   }
   return (ret);
 
@@ -9240,7 +9348,7 @@ static paReturn_t pa_format_stats_request  (paInst_t      *paInst,
     return (pa_ERR_CONFIG);
 
   /* Form the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_REQ_STATS, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_REQ_STATS, 0, 0, csize);
 
   /* Validity of the destination was already checked (HOST), so no other cases 
    * must be considered */
diff --git a/src/v1/pafrm.h b/src/v1/pafrm.h
index ec904ac..2069d43 100644
--- a/src/v1/pafrm.h
+++ b/src/v1/pafrm.h
@@ -459,6 +459,13 @@ typedef struct pafrmRaConfig_s{
 /* Ethernet OAM Global configuration (Shared Scratch RAM) */
 #define     PAFRM_EOAM_MAX_PROTOCOLS    8
 
+/* Queue Bounce Configuration */

+typedef struct pafrmQueueBounceConfig_s{

+

+  uint16_t ddrQueue;     /* Bounce queue where PASS will deliver the host-routed packet with DDR bit set */

+  uint16_t msmcQueue;    /* Bounce queue where PASS will deliver the host-routed packet with MSMC bit set */

+} pafrmQueueBounceConfig_t;

+
 typedef struct pafrmEoamCfg_s {
   uint8_t   ctrlBitMap;   /* EOAM Control Bits */
   uint8_t   rsvd[3];      /* alignment */
@@ -720,6 +727,7 @@ typedef struct pafrmCommandConfigPa_s
   pafrmAclConfig_t           inAcl;          /* Inner IP ACL Configuration */
   pafrmRaConfig_t            outRa;          /* Outer IP RA configuration */
   pafrmRaConfig_t            inRa;           /* Inner IP RA configuration */
+  pafrmQueueBounceConfig_t   queueBounce;    /* Queue bounce configuration */

   pafrmEoamCfg_t             eoam;           /* Ethernet OAM global configuration */  
 } pafrmCommandConfigPa_t;
 
@@ -734,7 +742,8 @@ typedef struct pafrmCommandConfigPa_s
 #define PAFRM_COMMAND_CONFIG_VALID_IN_IP_ACL        (1 << 8)
 #define PAFRM_COMMAND_CONFIG_VALID_OUT_IP_RA        (1 << 9)
 #define PAFRM_COMMAND_CONFIG_VALID_IN_IP_RA         (1 << 10)
-#define PAFRM_COMMAND_CONFIG_VALID_EOAM             (1 << 11)
+#define PAFRM_COMMAND_CONFIG_VALID_QUEUE_BOUNCE     (1 << 11)

+#define PAFRM_COMMAND_CONFIG_VALID_EOAM             (1 << 12)
 
 /* PA system configuration command */
 typedef struct pafrmCommandSysConfigPa_s
diff --git a/src/v1/paloc.h b/src/v1/paloc.h
index 585d684..6763e6a 100644
--- a/src/v1/paloc.h
+++ b/src/v1/paloc.h
@@ -391,6 +391,7 @@ typedef struct {
   paRaGroupConfig_t         outIpRaGroupConfig;   /* the outer IP Reassembly group configuration structures */
   paRaGroupConfig_t         inIpRaGroupConfig;    /* the inner IP Reassembly group configuration structures */
   paEoamGlobalConfig_t      eOamConfig;           /* the ethernet OAM configuration structure */
+  paQueueBounceConfig_t     queueBounceConfig;    /* the queue-bounce configuration structure */

 } paSysInfo_t;
 
 /*
diff --git a/test/PAPktCapTest/src/c66x/bios/framework.c b/test/PAPktCapTest/src/c66x/bios/framework.c
index 520f28d..e08ac00 100644
--- a/test/PAPktCapTest/src/c66x/bios/framework.c
+++ b/test/PAPktCapTest/src/c66x/bios/framework.c
@@ -148,6 +148,24 @@ uTestEmacport_t ports[8]={
 

 };

 

+

+static  paQueueBounceConfig_t pcapQueueBounceCfg =

+                {

+                    1,      /* Enable */

+                PA_PKT_CAP_QUEUE_BOUNCE_QUEUE_DDR,              /* ddrQueueId */

+                PA_PKT_CAP_QUEUE_BOUNCE_QUEUE_MSMC,             /* msmcQueueId */

+                QMSS_PASS_QUEUE_BASE,                           /* hwQueueBegin */

+                QMSS_PASS_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,   /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* QoS mode */

+                    pa_QUEUE_BOUNCE_OP_DDR,     /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_NONE     /* All traffics */

+                }

+                };

+

+

 uint8_t * DataBufAlloc(void)

 {

     uint8_t* pDataBuffer = NULL;

@@ -1275,6 +1293,75 @@ int32_t pcap_disable_global_egress ( )
         return 0;

 }

 

+int32_t pcap_global_queue_bounce_config (int enable)

+{

+        paCtrlInfo_t cfgInfo;

+    paQueueBounceConfig_t queueBounceDisable;

+    uint32_t swInfoId = 0xFFFF0005;

+

+        memset (&cfgInfo, 0, sizeof (cfgInfo));

+    memset (&queueBounceDisable, 0, sizeof(paQueueBounceConfig_t));

+

+        cfgInfo.code = pa_CONTROL_SYS_CONFIG;

+    cfgInfo.params.sysCfg.pQueueBounceConfig = (enable)?&pcapQueueBounceCfg:

+                                                        &queueBounceDisable;

+

+        pa_global_config (&cfgInfo, swInfoId );

+

+        return 0;

+}

+

+static void pcap_relay_queue_bounce_pkts (uint32_t ddrQ, uint32_t msmcQ, int* ddrCnt, int* msmcCnt)

+{

+        Cppi_HostDesc    *hd;

+        uint32_t                 *swInfo;

+    int              ddrCount = 0, msmcCount = 0;

+    uint32_t         queueId;

+    Qmss_QueueHnd    ddrQHnd  = Qmss_getHandleFromQID(ddrQ);

+    Qmss_QueueHnd    msmcQHnd = Qmss_getHandleFromQID(msmcQ);

+    /*

+     * Look for entries in the Queue bounce DDR queue

+     */

+        while (Qmss_getQueueEntryCount(ddrQHnd) > 0)  {

+

+            hd = (Cppi_HostDesc *)(((uint32_t)Qmss_queuePop (ddrQHnd)) & ~15);

+            if (hd == NULL)  {

+                    System_printf ("pcap_relay_queue_bounce_pkts: Failed to pop a Queue Bounce DDR queue packet\n");

+                    break;

+            }

+

+                Cppi_getSoftwareInfo (Cppi_DescType_HOST, (Cppi_Desc *)hd, (uint8_t **)&swInfo);

+        queueId = swInfo[1] &0x3FFF;

+                Qmss_queuePushDescSize (Qmss_getHandleFromQID(queueId), (Ptr)hd, SIZE_HOST_DESC);

+

+        ddrCount++;

+

+        }

+

+    /*

+     * Look for entries in the Queue bounce DDR queue

+     */

+        while (Qmss_getQueueEntryCount(msmcQHnd) > 0)  {

+

+            hd = (Cppi_HostDesc *)(((uint32_t)Qmss_queuePop (msmcQHnd)) & ~15);

+            if (hd == NULL)  {

+                    System_printf ("pcap_relay_queue_bounce_pkts: Failed to pop a Queue Bounce MSMC queue packet\n");

+                    break;

+            }

+

+                Cppi_getSoftwareInfo (Cppi_DescType_HOST, (Cppi_Desc *)hd, (uint8_t **)&swInfo);

+        queueId = swInfo[1] &0x3FFF;

+                Qmss_queuePushDescSize (Qmss_getHandleFromQID(queueId), (Ptr)hd, SIZE_HOST_DESC);

+

+        msmcCount++;

+

+        }

+

+    if(ddrCnt)*ddrCnt += ddrCount;

+    if(msmcCnt)*msmcCnt += msmcCount;

+}

+

+

 int32_t  pkt_capture_test(int ingress, int dest_emac_port_id)

 {

         paCtrlInfo_t    paCtrl;

@@ -1282,6 +1369,11 @@ int32_t  pkt_capture_test(int ingress, int dest_emac_port_id)
         int             i, retVal = 0;

     int             maxRetry = MAX_RETRIES;

     paReturn_t        paRetVal;

+    int             bounceCount = 0;

+

+    /* Enable Queue Bounce */

+    pcap_global_queue_bounce_config(1);

+

         /* Can be at most pa_MAX_NUM_EMAC_PORT_CONFIG_ENTRIES */

         paPktCaptureConfig_t pktCapCfg[1];

 

@@ -1383,6 +1475,10 @@ int32_t  pkt_capture_test(int ingress, int dest_emac_port_id)
                  /* Wait for some cycles to receive all packets */

                  CycleDelay(200000);

 

+         pcap_relay_queue_bounce_pkts(PA_PKT_CAP_QUEUE_BOUNCE_QUEUE_DDR,

+                                      PA_PKT_CAP_QUEUE_BOUNCE_QUEUE_MSMC,

+                                      &bounceCount, &bounceCount);

+

             /* This would validate all the captured packets in the host */

         if (VerifyPacket_queue(ingress, dest_emac_port_id, PA_PKT_CAP_SWINFO_HIGH_WORD | dest_emac_port_id) != 0)

         {

@@ -1420,8 +1516,13 @@ int32_t  pkt_capture_test(int ingress, int dest_emac_port_id)
                 System_printf ("|Egress Packet Capture Test \t|%d\t\t|%d\t\t|%d\t\t|%d\t\t\t|FAIL\n", dest_emac_port_id + pa_EMAC_PORT_0,actual.txCount, actual.emacRxCount, actual.cloneCaptureCount);

     }

 

+    //System_printf("pkt_capture_test: receives %d queue bounce packets\n", bounceCount);

+

     System_flush();

 

+    /* Disable Queue Bounce */

+    pcap_global_queue_bounce_config(0);

+

     paRetVal = pcap_disable_global_ingress();

     if (paRetVal != pa_OK)

         return (-1);

diff --git a/test/PAPktCapTest/src/pcap_singlecore.h b/test/PAPktCapTest/src/pcap_singlecore.h
index 83e3241..9c8ee4a 100644
--- a/test/PAPktCapTest/src/pcap_singlecore.h
+++ b/test/PAPktCapTest/src/pcap_singlecore.h
@@ -55,6 +55,7 @@
 
 #include <ti/csl/csl_device_interrupt.h>
 #include <ti/csl/cslr_msmc.h>
+#include <ti/csl/csl_qm_queue.h>
 
 /* CPPI LLD include */
 #include <ti/drv/cppi/cppi_drv.h>
@@ -106,6 +107,8 @@
 /* Packet Capture configuration unit test structure */
 #define    PA_PKT_CAP_INGRESS_CAP_BASE_QUEUE   950
 #define    PA_PKT_CAP_EGRESS_CAP_BASE_QUEUE    960
+#define    PA_PKT_CAP_QUEUE_BOUNCE_QUEUE_DDR   970
+#define    PA_PKT_CAP_QUEUE_BOUNCE_QUEUE_MSMC  971
 #define    PA_PKT_CAP_FLOW                       0
 #define    PA_PKT_CAP_SWINFO_HIGH_WORD         0xFFFF0000
 #define    INGRESS_MIRROR_PORT                 pa_EMAC_PORT_1
diff --git a/test/PAUnitTest/src/c66x/bios/framework.c b/test/PAUnitTest/src/c66x/bios/framework.c
index ee3c24c..97a442f 100644
--- a/test/PAUnitTest/src/c66x/bios/framework.c
+++ b/test/PAUnitTest/src/c66x/bios/framework.c
@@ -1327,6 +1327,7 @@ int initPa (void)
 #ifndef SIMULATOR_SUPPORT

   paCfg.initDefaultRoute = TRUE;

 #endif

+  paCfg.instPoolBaseAddr = (void *)memPaInst;

   paCfg.baseAddr = CSL_NETCP_CFG_REGS;

   paCfg.sizeCfg = &paSize;

 

diff --git a/test/PAUnitTest/src/common/common.c b/test/PAUnitTest/src/common/common.c
index d199941..17769b7 100644
--- a/test/PAUnitTest/src/common/common.c
+++ b/test/PAUnitTest/src/common/common.c
@@ -2249,6 +2249,22 @@ int testCommonSetDefaultGlobalConfig (void)
                     65   /* txPaddingStatsIndex */

                 };

 

+        paQueueBounceConfig_t paDefQueueBounceCfg =

+                {

+                    0,      /* Enable */

+                0,      /* ddrQueueId */

+                0,      /* msmcQueueId */

+                0,      /* hwQueueBegin */

+                0,      /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* EQoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_NONE     /* All traffics */

+                }

+                };

+

         paIpReassmConfig_t       paDefReassmConfig =

                 {

                     0,  /* numTrafficFlow */

@@ -2312,6 +2328,7 @@ int testCommonSetDefaultGlobalConfig (void)
         paDefGlobalCfg.pProtoLimit         = &paDefProtocolLimit;

         paDefGlobalCfg.pQueueDivertConfig  = &paDefQueueDivertCfg;

         paDefGlobalCfg.pUsrStatsConfig     = &paDefUsrStatsCfg;

+        paDefGlobalCfg.pQueueBounceConfig  = &paDefQueueBounceCfg;

 #ifdef NSS_GEN2

     paDefGlobalCfg.pOutAclConfig       = &paAclCfg;

     paDefGlobalCfg.pOutAclConfig->insertMode = pa_ACL_INSERT_RANDOM;

@@ -3916,9 +3933,57 @@ int testCommonCheckWait (tFramework_t *tf, pauTestSetup_t *setup, char *tfName,
         return (0);

         

 }

-                

-                                

-                                                                                 

+

+

+/* Search the Queue Bounce queue for received packets. */

+void testCommonRelayQueueBouncePkts (tFramework_t *tf, char *tfName, int ddrQIdx, int msmcQIdx, int* ddrCnt, int* msmcCnt)

+{

+        Cppi_HostDesc    *hd;

+        uint32_t                 *swInfo;

+    int              ddrCount = 0, msmcCount = 0;

+    uint32_t         queueId;

+

+    /*

+     * Look for entries in the Queue bounce DDR queue

+     */

+        while (Qmss_getQueueEntryCount(tf->QGen[ddrQIdx]) > 0)  {

+

+            hd = (Cppi_HostDesc *)(((uint32_t)Qmss_queuePop (tf->QGen[ddrQIdx])) & ~15);

+            if (hd == NULL)  {

+                    System_printf ("%s (%s:%d): Failed to pop a Queue Bounce DDR queue packet\n", tfName, __FILE__, __LINE__);

+                    break;

+            }

+

+                Cppi_getSoftwareInfo (Cppi_DescType_HOST, (Cppi_Desc *)hd, (uint8_t **)&swInfo);

+        queueId = swInfo[1] &0x3FFF;

+                Qmss_queuePushDescSize (Qmss_getHandleFromQID(queueId), (Ptr)hd, TF_SIZE_DESC);

+

+        ddrCount++;

+

+        }

+

+    /*

+     * Look for entries in the Queue bounce DDR queue

+     */

+        while (Qmss_getQueueEntryCount(tf->QGen[msmcQIdx]) > 0)  {

+

+            hd = (Cppi_HostDesc *)(((uint32_t)Qmss_queuePop (tf->QGen[msmcQIdx])) & ~15);

+            if (hd == NULL)  {

+                    System_printf ("%s (%s:%d): Failed to pop a Queue Bounce MSMC queue packet\n", tfName, __FILE__, __LINE__);

+                    break;

+            }

+

+                Cppi_getSoftwareInfo (Cppi_DescType_HOST, (Cppi_Desc *)hd, (uint8_t **)&swInfo);

+        queueId = swInfo[1] &0x3FFF;

+                Qmss_queuePushDescSize (Qmss_getHandleFromQID(queueId), (Ptr)hd, TF_SIZE_DESC);

+

+        msmcCount++;

+

+        }

+

+    if(ddrCnt)*ddrCnt += ddrCount;

+    if(msmcCnt)*msmcCnt += msmcCount;

+}

                 

                 

 /* Setup PA for a test */

diff --git a/test/PAUnitTest/src/pautest.h b/test/PAUnitTest/src/pautest.h
index 295d25e..d09f4e0 100755..100644
--- a/test/PAUnitTest/src/pautest.h
+++ b/test/PAUnitTest/src/pautest.h
@@ -854,7 +854,8 @@ void mdebugHaltPdsp (int pdspNum);
 void mdebugRunPdsp (int pdspNum);

 paTestStatus_t testCommonPrintDbgInfo(tFramework_t *tf, paTest_t *pat, char *tName, paSnapShotDebugInfo_t* paDbgInfo, uint32_t debugType);

 Cppi_HostDesc *testCommonConfigDefaultRoute2 (tFramework_t *tf, int nPorts, int nRoute, int *routeTypes, paRouteInfo2_t *dRoutes,

-                                                        int32_t Qrecycle, int32_t QCmdMem, paCmdReply_t *repInfo, int *cmdDest, uint16_t *cmdSize, paReturn_t *paret);

+                                              int32_t Qrecycle, int32_t QCmdMem, paCmdReply_t *repInfo, int *cmdDest, uint16_t *cmdSize, paReturn_t *paret);
+void testCommonRelayQueueBouncePkts (tFramework_t *tf, char *tfName, int ddrQIdx, int msmcQIdx, int* ddrCnt, int* msmcCnt);

 /* Tests */

 #ifdef __LINUX_USER_SPACE

 void* paTestUnconfigured (void *args);

diff --git a/test/PAUnitTest/src/tests/test10.c b/test/PAUnitTest/src/tests/test10.c
index 5ba898e..9fcf920 100644
--- a/test/PAUnitTest/src/tests/test10.c
+++ b/test/PAUnitTest/src/tests/test10.c
@@ -121,6 +121,8 @@
  #define Q_IP_REASSM2             7             /* IP Reassembly Input Queue 2 (Inner IP) */

 

  #define Q_IP_FRAG           13     /* IP Fragmentation */

+ #define Q_BOUNCE_DDR        21     /* Queue Bounce DDR queue */

+ #define Q_BOUNCE_MSMC       22     /* Queue Bounce MSMC queue */

 

 #include "test10pkts.h"

 

@@ -244,6 +246,22 @@ static paPacketControlConfig_t  t10PktCtrlCfg =
             0                   /* txPaddingStatsIndex */

         };

 

+static  paQueueBounceConfig_t t10QueueBounceCfg =

+                {

+                    1,      /* Enable */

+                Q_BOUNCE_DDR  + TF_FIRST_GEN_QUEUE,             /* ddrQueueId */

+                Q_BOUNCE_MSMC + TF_FIRST_GEN_QUEUE,             /* msmcQueueId */

+                TF_PA_TX_QUEUE_BASE,                            /* hwQueueBegin */

+                TF_PA_TX_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,    /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* QoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_DDR,     /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_NONE     /* All traffics */

+                }

+                };

+

 #ifdef NSS_GEN2

 

 static  paRaGroupConfig_t t10OutRaGroupCfg =

@@ -324,6 +342,7 @@ static  paSysConfig_t  t10GlobalCfg =
             &t10UsrStatsCfg,    /* pUsrStatsConfig */

             NULL,               /* pQueueDivertConfig */

             NULL,               /* pPktControl */

+            &t10QueueBounceCfg, /* pQueueBounceConfig */

             NULL,               /* pOutAclConfig */

             NULL,               /* pInAclConfig */

             #ifdef NSS_GEN2

@@ -345,6 +364,7 @@ static  paSysConfig_t  t10GlobalCfg2 =
             NULL,               /* pUsrStatsConfig */

             NULL,               /* pQueueDivertConfig */

             &t10PktCtrlCfg,     /* pPktControl */

+            NULL,               /* pQueueBounceConfig */

             NULL,               /* pOutAclConfig */

             NULL,               /* pInAclConfig */

             NULL,               /* pOutIpRaGroupConfig */

@@ -1013,7 +1033,7 @@ static void t10UpdatesStats(paSysStats_t *stats, int pktIndex, uint16_t pktLen,
             stats->classify1.nPackets += numFrags;

     }

 }

-

+#ifndef PA_USE_HW_RA

 #ifndef SIMULATOR_SUPPORT

 static void t10IpRreassemTimeoutUpdatesStats(paSysStats_t *stats, uint32_t count)

 {

@@ -1024,6 +1044,7 @@ static void t10IpRreassemTimeoutUpdatesStats(paSysStats_t *stats, uint32_t count
 

 }

 #endif

+#endif

 

 #if 0

 

@@ -1386,6 +1407,7 @@ static void t10SendDataPkts (t10TestEncap_t *tencap, int nL4Handles, int group,
         }

 

 }

+#ifndef PA_USE_HW_RA

 

 #define MAX_RX_FRAGS_PER_CALL       20

 

@@ -1398,6 +1420,7 @@ static int t10RxFrags(t10TestEncap_t *tencap, Qmss_QueueHnd inQ, Qmss_QueueHnd o
 

     q.qMgr = 0;

         q.qNum = TF_DEF_RET_Q;

+

         /* Process the received fragments */

         while ((Qmss_getQueueEntryCount(inQ) > 0) && (fragCnt < MAX_RX_FRAGS_PER_CALL))  {

 

@@ -1510,7 +1533,7 @@ static int t10RxFrags(t10TestEncap_t *tencap, Qmss_QueueHnd inQ, Qmss_QueueHnd o
 

     return (0);

 }

-

+#endif

 

 /* Search the receive data packet queue for received data packets. Remain in

  * this function until all buffers are restored to their respective queues */

@@ -1525,12 +1548,17 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
         uint32_t                          flags;

     unsigned int              eflags;

     int               count = 0;

-

+#ifndef PA_USE_HW_RA

+    int               ddrBounceCount=0;

+#endif

 

         for (i = 0; i < 100; i++)  {

 

         utilCycleDelay (5000);

 

+#ifndef PA_USE_HW_RA

+        testCommonRelayQueueBouncePkts (tencap->tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

+

         /* Process OutIp fragments */

         if (t10RxFrags(tencap, tencap->tf->QGen[Q_IP_REASSM1], tencap->tf->QPaTx[TF_PA_Q_OUTER_IP], &expCount))

         {

@@ -1544,6 +1572,7 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
             return (-1);

         }

 

+#endif

             /* Look for packets in the rx packet queue, verify that the UDP port found matches the next value in

             * the fifo, then verify the receive packet information */

             while (Qmss_getQueueEntryCount(tencap->tf->QGen[Q_MATCH]) > 0)  {

@@ -1627,6 +1656,7 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
                 return (-1);

         }

 

+

         /* Since the packets went to the modify PDSP and then back to the QM, a descriptor

          * and linked buffer was required while the packet was in the QM. This will

          * be recycled to the default recycle queue */

@@ -1641,6 +1671,10 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
 

         }

 

+#ifndef PA_USE_HW_RA

+    if(ddrBounceCount != count)

+        System_printf("t10ReceiveDataPkts: receives %d queue bounce packets and %d final reassembled packets\n", ddrBounceCount, count);

+#endif

         return (0);

 

 }

diff --git a/test/PAUnitTest/src/tests/test11.c b/test/PAUnitTest/src/tests/test11.c
index 94f55ee..1c50e3c 100644
--- a/test/PAUnitTest/src/tests/test11.c
+++ b/test/PAUnitTest/src/tests/test11.c
@@ -117,6 +117,8 @@
  #define Q_IP_REASSM2             7             /* IP Reassembly Input Queue 2 (Inner IP) */
 
  #define Q_IP_FRAG           13     /* IP Fragmentation */
+ #define Q_BOUNCE_DDR        21     /* Queue Bounce DDR queue */

+ #define Q_BOUNCE_MSMC       22     /* Queue Bounce MSMC queue */

 
 #include "test11pkts.h"
 
@@ -200,16 +202,32 @@ static paIpReassmConfig_t   t11OutIpReassmCfg =
         {
             2,      /* Number of traffic Flow */
             0,      /* CPPI Flow */
-            TF_FIRST_GEN_QUEUE + Q_IP_REASSM1   /* destination queue */
+            PA_BOUNCE_QUEUE_DDR(TF_FIRST_GEN_QUEUE + Q_IP_REASSM1)   /* destination queue */
         };
 
 static paIpReassmConfig_t   t11InIpReassmCfg =
         {
             2,      /* Number of traffic Flow */
             0,      /* CPPI Flow */
-            TF_FIRST_GEN_QUEUE + Q_IP_REASSM2   /* destination queue */
+            PA_BOUNCE_QUEUE_DDR(TF_FIRST_GEN_QUEUE + Q_IP_REASSM2)   /* destination queue */
         };
 
+static  paQueueBounceConfig_t t11QueueBounceCfg =

+                {

+                    1,      /* Enable */

+                Q_BOUNCE_DDR  + TF_FIRST_GEN_QUEUE,             /* ddrQueueId */

+                Q_BOUNCE_MSMC + TF_FIRST_GEN_QUEUE,             /* msmcQueueId */

+                TF_PA_TX_QUEUE_BASE,                            /* hwQueueBegin */

+                TF_PA_TX_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,    /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* QoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_MSMC,     /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_NONE     /* All traffics */

+                }

+                };

+
 static  paRaGroupConfig_t t11OutRaGroupCfg =
         {
         #ifdef PA_USE_HW_RA
@@ -287,6 +305,7 @@ static  paSysConfig_t  t11GlobalCfg =
             NULL,               /* pUsrStatsConfig */
             NULL,               /* pQueueDivertConfig */
             NULL,               /* pPktControl */
+            &t11QueueBounceCfg, /* pQueueBounceConfig */

             NULL,               /* pOutAclConfig */
             NULL,               /* pInAclConfig */
             &t11OutRaGroupCfg,     /* pOutIpRaGroupConfig */
@@ -913,6 +932,7 @@ static void t11UpdatesStats(paSysStats_t *stats, int pktIndex, uint16_t pktLen,
             stats->classify1.nPackets += numFrags;
     }
 }
+#ifndef PA_USE_HW_RA

 #ifndef SIMULATOR_SUPPORT
 static void t11IpRreassemTimeoutUpdatesStats(paSysStats_t *stats, uint32_t count)
 {
@@ -923,7 +943,7 @@ static void t11IpRreassemTimeoutUpdatesStats(paSysStats_t *stats, uint32_t count
 
 }
 #endif
-
+#endif
 
 
 static paTxChksum_t t11pktChksum = {  /* The UDP checksum command */
@@ -1250,6 +1270,7 @@ static void t11SendFragDataPkts (t11TestEncap_t *tencap, int nL4Handles)
    }
 }
 
+#ifndef PA_USE_HW_RA

 
 #define MAX_RX_FRAGS_PER_CALL       20
 
@@ -1366,7 +1387,8 @@ static int t11RxFrags(t11TestEncap_t *tencap, Qmss_QueueHnd inQ, Qmss_QueueHnd o
 
     return (0);
 }
-
+

+#endif
 
 /* Search the receive data packet queue for received data packets. Remain in
  * this function until all buffers are restored to their respective queues */
@@ -1381,11 +1403,15 @@ static int t11ReceiveDataPkts (t11TestEncap_t *tencap, int expCount)
         uint32_t                          flags;
     uint32_t              eflags;
     int32_t               count = 0;
-
+#ifndef PA_USE_HW_RA

+    int                   ddrBounceCount=0;

+#endif
 
         for (i = 0; i < 100; i++)  {
 
         utilCycleDelay (5000);
+#ifndef PA_USE_HW_RA

+        testCommonRelayQueueBouncePkts (tencap->tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

 
         /* Process OutIp fragments */
         if (t11RxFrags(tencap, tencap->tf->QGen[Q_IP_REASSM1], tencap->tf->QPaTx[TF_PA_Q_OUTER_IP], &expCount))
@@ -1400,6 +1426,7 @@ static int t11ReceiveDataPkts (t11TestEncap_t *tencap, int expCount)
         {
             return (-1);
         }
+#endif
 
             /* Look for packets in the rx packet queue, verify that the UDP port found matches the next value in
             * the fifo, then verify the receive packet information */
@@ -1504,7 +1531,10 @@ static int t11ReceiveDataPkts (t11TestEncap_t *tencap, int expCount)
         testCommonRecycleLBDesc (tencap->tf, hd);
 
         }
-
+#ifndef PA_USE_HW_RA

+    if(ddrBounceCount != count)

+        System_printf("t11ReceiveDataPkts: receives %d queue bounce packets and %d final reassembled packets\n", ddrBounceCount, count);

+#endif

         return (0);
 }
 
@@ -1627,19 +1657,19 @@ void paTestIPv6FragReassem (UArg a0, UArg a1)
                 t11Cleanup (&t11Encap, newStatus);  /* No return */
 
         /* Burst in the L2 configuraton */
-    clearEthPrevCmdAck(&t11EthSetup, T11_NUM_LOCAL_L2_HANDLES);
+    clearEthPrevCmdAck(t11EthSetup, T11_NUM_LOCAL_L2_HANDLES);
         newStatus = t11OpenL2 (&t11Encap, t11EthSetup, T11_NUM_LOCAL_L2_HANDLES);
         if (newStatus == PA_TEST_FAILED)
                 t11Cleanup (&t11Encap, newStatus);  /* No return */
 
         /* Burst in the L3 configuration */
-    clearIpPrevCmdAck(&t11IpSetup, T11_NUM_LOCAL_L3_HANDLES);
+    clearIpPrevCmdAck(t11IpSetup, T11_NUM_LOCAL_L3_HANDLES);
         newStatus = t11OpenL3 (&t11Encap, t11IpSetup, T11_NUM_LOCAL_L3_HANDLES);
         if (newStatus == PA_TEST_FAILED)
                 t11Cleanup (&t11Encap, newStatus);
 
         /* Burst in the L4 configuration */
-    clearUdpPrevCmdAck(&t11UdpSetup, T11_NUM_LOCAL_L4_HANDLES);
+    clearUdpPrevCmdAck(t11UdpSetup, T11_NUM_LOCAL_L4_HANDLES);
         newStatus = t11OpenL4 (&t11Encap, t11UdpSetup, T11_NUM_LOCAL_L4_HANDLES);
         if (newStatus == PA_TEST_FAILED)
                 t11Cleanup (&t11Encap, newStatus);
diff --git a/test/PAUnitTest/src/tests/test13.c b/test/PAUnitTest/src/tests/test13.c
index b70d3d2..2493c21 100644
--- a/test/PAUnitTest/src/tests/test13.c
+++ b/test/PAUnitTest/src/tests/test13.c
@@ -127,6 +127,8 @@ static char *tfName = "paTestEFlow";
 #define Q_IP_FRAG               13  /* IP Fragmentation */
 #define Q_EF_EXP                14  /* Egess Flow Exception route */
 #define Q_L2_RELAY              15  /* Temporary Host queue to forward L2 traffic to PASS input queue */
+#define Q_BOUNCE_DDR            16  /* Queue Bounce DDR queue */

+#define Q_BOUNCE_MSMC           17  /* Queue Bounce MSMC queue */

 #define Q_QoS_BASE              20  /* First QoS queue */
 
 #define T13_NUM_QoS_QUEUES      16
@@ -326,6 +328,24 @@ static  paIpsecNatTConfig_t  t13NatTCfg =
             4500                           /* UDP port number */
         };
 
+static  paQueueBounceConfig_t t13QueueBounceCfg =

+                {

+                    1,      /* Enable */

+                Q_BOUNCE_DDR  + TF_FIRST_GEN_QUEUE,             /* ddrQueueId */

+                Q_BOUNCE_MSMC + TF_FIRST_GEN_QUEUE,             /* msmcQueueId */

+                TF_PA_TX_QUEUE_BASE,                            /* hwQueueBegin */

+                TF_PA_TX_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,    /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_MSMC,    /* QoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_DDR      /* All traffics */

+                }

+                };

+

+
+
 static  paSysConfig_t  t13GlobalCfg =
         {
             NULL,               /* pProtoLimit */
@@ -335,6 +355,7 @@ static  paSysConfig_t  t13GlobalCfg =
             &t13UsrStatsCfg,    /* pUsrStatsConfig */
             NULL,               /* pQueueDivertConfig */
             NULL,               /* pPktControl */
+            &t13QueueBounceCfg, /* pQueueBounceConfig */
             NULL,               /* pOutAclConfig */
             NULL,               /* pInAclConfig */
             &t13OutRaGroupCfg,  /* pOutIpRaGroupConfig */
@@ -2110,11 +2131,12 @@ static int t13ReceiveDataPkts (t13TestEncap_t *tencap, int expCount)
         uint32_t                          flags;
     unsigned int              eflags;
     int               count = 0;
-
+    int               ddrBounceCount=0;

 
         for (i = 0; i < 100; i++)  {
 
         utilCycleDelay (5000);
+        testCommonRelayQueueBouncePkts (tencap->tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

 
         /*
          * Look for L2 Relay packets: Examine and push to PASS input queue
@@ -2267,6 +2289,9 @@ static int t13ReceiveDataPkts (t13TestEncap_t *tencap, int expCount)
         testCommonRecycleLBDesc (tencap->tf, hd);
         }
 
+    if(ddrBounceCount < count)

+        System_printf("t13ReceiveDataPkts: receives %d queue bounce packets and %d final packets\n", ddrBounceCount, count);

+
         return (0);
 
 }
@@ -2418,11 +2443,12 @@ static int t13ReceiveFwdPkts (t13TestEncap_t *tencap, int expCount)
         uint32_t                          flags;
     unsigned int              eflags;
     int               count = 0;
-
+    int               ddrBounceCount=0;

 
         for (i = 0; i < 100; i++)  {
 
         utilCycleDelay (5000);
+        testCommonRelayQueueBouncePkts (tencap->tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

 
 
             /* Look for packets in the rx packet queue, verify that the UDP port found matches the next value in
@@ -2514,6 +2540,9 @@ static int t13ReceiveFwdPkts (t13TestEncap_t *tencap, int expCount)
         testCommonRecycleLBDesc (tencap->tf, hd);
         }
 
+    if(ddrBounceCount != count)

+        System_printf("t13ReceiveFwdPkts: receives %d queue bounce packets and %d final packets\n", ddrBounceCount, count);

+

         return (0);
 }
 
@@ -2626,10 +2655,12 @@ static int t13ReceiveExpPkts (t13TestEncap_t *tencap, int expCount)
         uint32_t                     *swInfo;
         int               i;
     int               count = 0;
+    int               ddrBounceCount=0;

 
         for (i = 0; i < 100; i++)  {
 
         utilCycleDelay (5000);
+        testCommonRelayQueueBouncePkts (tencap->tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

 
             /* Look for packets in the rx packet queue, verify that the UDP port found matches the next value in
              * the fifo, then verify the receive packet information */
@@ -2675,6 +2706,9 @@ static int t13ReceiveExpPkts (t13TestEncap_t *tencap, int expCount)
         System_flush();
                 return (-1);
         }
+

+    if(ddrBounceCount != count)

+        System_printf("t13ReceiveExpPkts: receives %d queue bounce packets and %d final packets\n", ddrBounceCount, count);

 
         return (0);
 }
@@ -2799,8 +2833,7 @@ static Cppi_HostDesc *t13GetQoSPkt (tFramework_t *tf)
 
 }
 
-
-/* Search the receive data packet queue for received data packets. Remain in
+/* Search the QoS queues for Egress QoS packets. Remain in
  * this function until all buffers are restored to their respective queues */
 static int t13ReceiveQoSPkts (t13TestEncap_t *tencap, int expCount)
 {
@@ -2809,12 +2842,9 @@ static int t13ReceiveQoSPkts (t13TestEncap_t *tencap, int expCount)
         int               i;
     int               count = 0;
 
-
         for (i = 0; i < 100; i++)  {
 
         utilCycleDelay (5000);
-
-
             /* Look for packets in the rx QoS queues */
             while ((hd = t13GetQoSPkt (tencap->tf)) != NULL)  {
 
@@ -2844,8 +2874,8 @@ static int t13ReceiveQoSPkts (t13TestEncap_t *tencap, int expCount)
                 System_printf ("%s (%s:%d): Error - unable to recover all QoS packets\n", tfName, __FILE__, __LINE__);
         System_flush();
                 return (-1);
-        }
-
+        }

+    
         return (0);
 }
 
diff --git a/test/PAUnitTest/src/tests/test14.c b/test/PAUnitTest/src/tests/test14.c
index c915e5a..5d5171c 100644
--- a/test/PAUnitTest/src/tests/test14.c
+++ b/test/PAUnitTest/src/tests/test14.c
@@ -503,6 +503,7 @@ static  paSysConfig_t  t14GlobalCfg =
             NULL,               /* pUsrStatsConfig */
             NULL,               /* pQueueDivertConfig */
             NULL,               /* pPktControl */
+            NULL,               /* pQueueBounceConfig */
             NULL,               /* pOutAclConfig */
             NULL,               /* pInAclConfig */
            &t14OutRaGroupCfg,   /* pOutIpRaGroupConfig */
@@ -520,6 +521,7 @@ static  paSysConfig_t  t14GlobalCfg2 =
             NULL,               /* pUsrStatsConfig */
             NULL,               /* pQueueDivertConfig */
             &t14PktCtrlCfg,     /* pPktControl */
+            NULL,               /* pQueueBounceConfig */
             NULL,               /* pOutAclConfig */
             NULL,               /* pInAclConfig */
             NULL,               /* pOutIpRaGroupConfig */
diff --git a/test/PAUnitTest/src/tests/test16.c b/test/PAUnitTest/src/tests/test16.c
index eb10647..eb10647 100755..100644
--- a/test/PAUnitTest/src/tests/test16.c
+++ b/test/PAUnitTest/src/tests/test16.c
diff --git a/test/PAUnitTest/src/tests/test2.c b/test/PAUnitTest/src/tests/test2.c
index 0af5cf8..61f6cf7 100644
--- a/test/PAUnitTest/src/tests/test2.c
+++ b/test/PAUnitTest/src/tests/test2.c
@@ -85,7 +85,9 @@ static char *tfName = "paTestL2Routing";
 #define Q_802_1AG             9     /* 802.1ag queue */

 #define Q_QoS_BASE            10    /* First QoS queue */

 #define Q_IF_BASE             3     /* First EMAC Interfcae queue */

-#define Q_DROUTE              20 

+#define Q_DROUTE              20    /* Default Route queue */

+#define Q_BOUNCE_DDR          21    /* Queue Bounce DDR queue */

+#define Q_BOUNCE_MSMC         22    /* Queue Bounce MSMC queue */

 

 #define T2_NUM_QoS_QUEUES     8

 #define T2_NUM_IF_QUEUES      4

@@ -121,6 +123,7 @@ static char *tfName = "paTestL2Routing";
 #define T2_CMD_SWINFO0_802_1AG_CFG_ID   0x77770000  /* 802.1ag detector configuration */

 #define T2_CMD_SWINFO0_DROUTE_CFG_ID    0x88880000  /* Default Routes configuration */

 #define T2_CMD_SWINFO0_DR_GLOB_CFG_ID   0x88890000  /* Default Route Global configuration */

+#define T2_CMD_SWINFO0_GLOB_CFG_ID      0x888A0000  /* Global configuration */

 #define T2_CMD_SWINFO0_EQoS_CFG_ID      0x99990000  /* EQoS Mode configuration */

  

 #define T2_NUM_PACKET_ITERATIONS        1    /* 3 */

@@ -745,6 +748,34 @@ static paCmdInfo_t t2CmdSetCmd2 =
         }    

     };

     

+static  paQueueBounceConfig_t t2QueueBounceCfg =

+                {

+                    1,      /* Enable */

+                Q_BOUNCE_DDR  + TF_FIRST_GEN_QUEUE,             /* ddrQueueId */

+                Q_BOUNCE_MSMC + TF_FIRST_GEN_QUEUE,             /* msmcQueueId */

+                TF_PA_TX_QUEUE_BASE,                            /* hwQueueBegin */

+                TF_PA_TX_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,    /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_MSMC,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_DDR,     /* QoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_MSMC     /* All traffics */

+                }

+                };

+

+static  paSysConfig_t  t2GlobalCfg =

+        {

+            NULL,                   /* pProtoLimit */

+            NULL,                   /* pOutIpReassmConfig */

+            NULL,                   /* pInIpReassmConfig */

+            NULL,                   /* pCmdSetConfig */

+            NULL,                   /* pUsrStatsConfig */

+            NULL,                   /* pQueueDivertConfig */

+            NULL,                   /* pPktControl */

+            &t2QueueBounceCfg       /* pQueueBounceConfig */

+        };

+

 /* Prototype required due to circular function calling */                                                                               

 paTestStatus_t t2CheckStats (tFramework_t *tf, paTest_t *pat, Bool clear, t2Handles_t *l2Handles);                      

 

@@ -796,6 +827,7 @@ int t2StateDel (tFramework_t *tf, paTest_t *pat, t2Handles_t *l2Handles)
         }

                         

         utilCycleDelay (1000);  

+    testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, NULL);

         while (Qmss_getQueueEntryCount (tf->QGen[Q_CMD_REPLY]) > 0)  {

                                 

                 /* Recycle the command descriptor/buffer */

@@ -965,7 +997,8 @@ void t2L2CmdRep (tFramework_t *tf, paTest_t *pat, t2Handles_t *localHandles, int
         paEntryHandle_t reth;

         int                             htype;

         int                             cmdDest;

-        

+

+    testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, NULL);

         while (Qmss_getQueueEntryCount ((tf->QGen)[Q_CMD_REPLY]) > 0)  {

                 

                 hd = (Cppi_HostDesc *)(((uint32_t)Qmss_queuePop ((tf->QGen[Q_CMD_REPLY]))) & ~15);

@@ -982,6 +1015,7 @@ void t2L2CmdRep (tFramework_t *tf, paTest_t *pat, t2Handles_t *localHandles, int
            (swInfoCmd == T2_CMD_SWINFO0_EROUTE_CFG_ID)   ||

            (swInfoCmd == T2_CMD_SWINFO0_DROUTE_CFG_ID)   ||

            (swInfoCmd == T2_CMD_SWINFO0_DR_GLOB_CFG_ID)  ||

+           (swInfoCmd == T2_CMD_SWINFO0_GLOB_CFG_ID)     ||

            (swInfoCmd == T2_CMD_SWINFO0_EQoS_CFG_ID)     ||

            (swInfoCmd == T2_CMD_SWINFO0_802_1AG_CFG_ID))

         {

@@ -1101,6 +1135,7 @@ paTestStatus_t t2CheckStats (tFramework_t *tf, paTest_t *pat, Bool clear, t2Hand
         /* Wait for the stats reply */

         for (i = 0; i < 100; i++)  {

                 utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, NULL);

                 if (Qmss_getQueueEntryCount (tf->QGen[Q_CMD_REPLY]) > 0)

                         break;

         }

@@ -1334,6 +1369,61 @@ static paTestStatus_t t2DefaultRouteGlobalControl (tFramework_t *tf, paTest_t *p
         return (PA_TEST_PASSED);

 }

 

+static paTestStatus_t t2GlobalConfiguration (tFramework_t *tf, paTest_t *pat, paSysConfig_t *pCfg)

+{

+        int                     i;

+        Cppi_HostDesc  *hd;

+        paReturn_t      paret;

+        int                     cmdDest;

+        uint16_t                cmdSize;

+    paCtrlInfo_t    ctrlInfo;

+    int             fCmdReply;

+

+    paCmdReply_t cmdReply = {  pa_DEST_HOST,            /* Dest */

+                               0,                       /* Reply ID (returned in swinfo0) */

+                               0,                       /* Queue */

+                               0 };                     /* Flow ID */

+

+    memset (&ctrlInfo, 0, sizeof (paCtrlInfo_t));

+

+    /* set System Global default configuration */

+    ctrlInfo.code = pa_CONTROL_SYS_CONFIG;

+    ctrlInfo.params.sysCfg = *pCfg;

+    cmdReply.replyId  = T2_CMD_SWINFO0_GLOB_CFG_ID;

+    cmdReply.queue    = tf->QGen[Q_CMD_REPLY];

+    cmdReply.flowId   = tf->tfFlowNum[0];

+

+    hd = testCommonGlobalConfig (tf, &ctrlInfo,

+                                 tf->QGen[Q_CMD_RECYCLE], tf->QLinkedBuf3,

+                                 &cmdReply, &cmdDest, &cmdSize, &paret);

+

+    if (hd == NULL)  {

+        System_printf ("%s: (%s:%d): Failure in Global Configuration command with error code = %d\n", tfName, __FILE__, __LINE__, paret);

+        return (PA_TEST_FAILED);

+    }

+

+    /* Send command */

+    Qmss_queuePush (tf->QPaTx[cmdDest - pa_CMD_TX_DEST_0 + TF_PA_Q_CONFIG_BASE], (Ptr)hd, cmdSize, TF_SIZE_DESC, Qmss_Location_TAIL);

+

+    /* All the packets should have been acked */

+    /* Wait for a PA reply */

+    fCmdReply = FALSE;

+    for (i = 0; i < 100; i++)  {

+        utilCycleDelay (1000);

+        t2L2CmdRep (tf, pat, NULL, &fCmdReply);

+        if (fCmdReply)

+            break;

+    }

+

+    if (i == 100)  {

+        System_printf ("%s: (%s:%d): Pa_control (Global Configuration) commands was not acked\n", tfName, __FILE__, __LINE__);

+        return (PA_TEST_FAILED);

+    }

+

+    return (PA_TEST_PASSED);

+}

+

+

 static paEQosModeConfig_t  defEQoSModeCfg[T2_NUM_EQoS_PORTS];

 

 static paTestStatus_t t2ConfigEQoSModes(tFramework_t *tf, paTest_t *pat, int clear)

@@ -1495,6 +1585,7 @@ int t2ReceiveDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actualPktCount,
         unsigned int      chan;

     uint8_t           psFlags;

     int               count = 0;

+    int               msmcBounceCount=0;

 #ifdef NSS_GEN2    

     Cppi_DescTag      tag;

 #endif       

@@ -1509,6 +1600,7 @@ int t2ReceiveDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actualPktCount,
                 

         /* Wait for packets to arrive */

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &msmcBounceCount);

                 while ((hd = t2GetDataPkt (tf)) != NULL) {

                         

                         /* Verify PS flags (= pa_EMAC_PORT_0) */

@@ -1602,6 +1694,9 @@ int t2ReceiveDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actualPktCount,
                 return (-1);

         }

         

+    if(msmcBounceCount != count)

+        System_printf("t2ReceiveDataPkts: receives %d queue bounce packets and %d final packets\n", msmcBounceCount, count);

+

         return (0);

 

 }

@@ -1669,6 +1764,7 @@ static int t2ReceiveQoSPkts (tFramework_t *tf, paTest_t *pat, int expCount)
         int               i, j;

         unsigned int                  chan;

     int               count = 0;

+    int               ddrBounceCount=0;

     

     if (!expCount)

     {

@@ -1679,6 +1775,7 @@ static int t2ReceiveQoSPkts (tFramework_t *tf, paTest_t *pat, int expCount)
         for (i = 0; i < 100; i++)  {

                 

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

                 while ((hd = t2GetQoSPkt (tf)) != NULL)  {

                         

                         /* Verify swInfo0 for packet match and packet ID number */

@@ -1751,7 +1848,10 @@ static int t2ReceiveQoSPkts (tFramework_t *tf, paTest_t *pat, int expCount)
                 return (-1);

         }

         

-        return (0);

+    if(ddrBounceCount != count)

+        System_printf("t2ReceiveQoSPkts: receives %d queue bounce packets and %d final packets\n", ddrBounceCount, count);

+

+    return (0);

 

 }

 

@@ -1831,6 +1931,7 @@ static int t2ReceiveIfPkts (tFramework_t *tf, paTest_t *pat, int expCount)
         int               i, j;

         unsigned int      chan;

     int               count = 0;

+    int               msmcBounceCount=0;

     

     if (!expCount)

     {

@@ -1841,6 +1942,7 @@ static int t2ReceiveIfPkts (tFramework_t *tf, paTest_t *pat, int expCount)
         for (i = 0; i < 100; i++)  {

                 

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &msmcBounceCount);

                 while ((hd = t2GetIfPkt (tf)) != NULL)  {

                         

                         /* Verify swInfo0 for packet match and packet ID number */

@@ -1909,6 +2011,9 @@ static int t2ReceiveIfPkts (tFramework_t *tf, paTest_t *pat, int expCount)
                 return (-1);

         }

         

+    if(msmcBounceCount != count)

+        System_printf("t2ReceiveIfPkts: receives %d queue bounce packets and %d final packets\n", msmcBounceCount, count);

+

         return (0);

 

 }

@@ -1955,6 +2060,7 @@ static int t2Receive802p1agPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actua
         int               i, j;

         unsigned int                  chan;

     int               count = 0;

+    int               msmcBounceCount=0;

     

     if (!expCount)

     {

@@ -1965,6 +2071,7 @@ static int t2Receive802p1agPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actua
         for (i = 0; i < 100; i++)  {

                 

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &msmcBounceCount);

                 while ((hd = (Cppi_HostDesc *)(((uint32_t)Qmss_queuePop (tf->QGen[Q_802_1AG])) & ~15)) != NULL)  {

                         

                         /* Verify swInfo0 for packet match and packet ID number */

@@ -2027,7 +2134,10 @@ static int t2Receive802p1agPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actua
                 return (-1);

         }

         

-        return (0);

+    if(msmcBounceCount != count)

+        System_printf("t2Receive802p1agPkts: receives %d queue bounce packets and %d final packets\n", msmcBounceCount, count);

+

+    return (0);

 

 }

 

@@ -2159,6 +2269,7 @@ static int t2ReceiveDRpkts (tFramework_t *tf, paTest_t *pat, int expCount)
         int               i, j;

         unsigned int      chan;

     int               count = 0;

+    int               msmcBounceCount=0;

     

     if (!expCount)

     {

@@ -2169,6 +2280,7 @@ static int t2ReceiveDRpkts (tFramework_t *tf, paTest_t *pat, int expCount)
         for (i = 0; i < 100; i++)  {

                 

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &msmcBounceCount);

                 while ((hd = t2GetDRpkt (tf)) != NULL)  {

                         

                         /* Verify swInfo0 for packet match and packet ID number */

@@ -2237,6 +2349,9 @@ static int t2ReceiveDRpkts (tFramework_t *tf, paTest_t *pat, int expCount)
                 return (-1);

         }

         

+    if(msmcBounceCount != count)

+        System_printf("t2ReceiveDRpkts: receives %d queue bounce packets and %d final packets\n", msmcBounceCount, count);

+

         return (0);

 

 }

@@ -2316,6 +2431,7 @@ static int t2ReceiveEQoSPkts (tFramework_t *tf, paTest_t *pat, int expCount)
         int               i, j;

         unsigned int      chan;

     int               count = 0;

+    int               ddrBounceCount=0;

     

     if (!expCount)

     {

@@ -2326,6 +2442,8 @@ static int t2ReceiveEQoSPkts (tFramework_t *tf, paTest_t *pat, int expCount)
         for (i = 0; i < 100; i++)  {

                 

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

+

                 while ((hd = t2GetEQoSPkt (tf)) != NULL)  {

                         

                         /* Verify swInfo0 for packet match and packet ID number */

@@ -2395,7 +2513,10 @@ static int t2ReceiveEQoSPkts (tFramework_t *tf, paTest_t *pat, int expCount)
         System_flush();

                 return (-1);

         }

-        

+

+    if(ddrBounceCount != count)

+        System_printf("t2ReceiveEQoSPkts: receives %d queue bounce packets and %d final packets\n", ddrBounceCount, count);

+

         return (0);

 }

 

@@ -2776,6 +2897,11 @@ paRouteInfo2_t nfailRoute4 = {
     /* Zero out the expected stats. The stats will be updated as packets are sent into PA */

     memset (&paTestL2ExpectedStats, 0, sizeof(paTestL2ExpectedStats));

     

+    /* Global Configuration */

+    testStatus = t2GlobalConfiguration(tf, pat, &t2GlobalCfg);

+        if (testStatus == PA_TEST_FAILED)

+                paTestL2RecoverAndExit (tf, pat, l2Handles, PA_TEST_FAILED, TRUE);  /* no return */

+

     /* Issue the command set command */

     cmdReply.replyId  = T2_CMD_SWINFO0_CMDSET_CFG_ID;

         hd[0] = testCommonConfigCmdSet (tf, T2_CMDSET_INDEX, T2_CMDSET_NUM_CMDS, t2CmdSet20,  

diff --git a/test/PAUnitTest/src/tests/test4.c b/test/PAUnitTest/src/tests/test4.c
index ee436fc..39313d9 100644
--- a/test/PAUnitTest/src/tests/test4.c
+++ b/test/PAUnitTest/src/tests/test4.c
@@ -492,7 +492,8 @@ static  paSysConfig_t  t4GlobalCfg =
             NULL,                   /* pCmdSetConfig */

             &t4UsrStatsCfg,         /* pUsrStatsConfig */

             NULL,                   /* pQueueDivertConfig */

-            NULL                    /* pPktControl */

+            NULL,                   /* pPktControl */

+            NULL                    /* pQueueBounceConfig */

         };

 

 static  paSysConfig_t  t4GlobalCfg2 =

@@ -503,10 +504,10 @@ static  paSysConfig_t  t4GlobalCfg2 =
             NULL,                   /* pCmdSetConfig */

             NULL,                   /* pUsrStatsConfig */

             NULL,                   /* pQueueDivertConfig */

-            &t4PktCtrlCfg           /* pPktControl */

+            &t4PktCtrlCfg,          /* pPktControl */

+            NULL                    /* pQueueBounceConfig */

         };

 

-

  static int t4ErouteTypes[] = {

     pa_EROUTE_PPPoE_FAIL,

     pa_EROUTE_PPPoE_CTRL,

diff --git a/test/PAUnitTest/src/tests/test5.c b/test/PAUnitTest/src/tests/test5.c
index 674751d..f7dea9f 100644
--- a/test/PAUnitTest/src/tests/test5.c
+++ b/test/PAUnitTest/src/tests/test5.c
@@ -140,6 +140,8 @@
  #define Q_GTPU_MATCH_FAIL   18     /* GTPU Match Fail */

  #define Q_EROUTE_FIRST      Q_GTPU_PING_REQ

  #define Q_EROUTE_LAST       Q_GTPU_MATCH_FAIL

+ #define Q_BOUNCE_DDR        21     /* Queue Bounce DDR queue */

+ #define Q_BOUNCE_MSMC       22     /* Queue Bounce MSMC queue */

  

  

 #ifdef  SIMULATOR_SUPPORT

@@ -300,7 +302,23 @@ static paPacketControlConfig_t  t5PktCtrlCfg =
             pa_PKT_CTRL_HDR_VERIFY_PPPoE | pa_PKT_CTRL_HDR_VERIFY_IP,  /* ctrlBitMap */

             0,                                                         /* rxPaddingErrStatsIndex */

             0                                                          /* txPaddingStatsIndex */

-        };    

+        };
+
+static  paQueueBounceConfig_t t5QueueBounceCfg =

+                {

+                    1,      /* Enable */

+                Q_BOUNCE_DDR  + TF_FIRST_GEN_QUEUE,             /* ddrQueueId */

+                Q_BOUNCE_MSMC + TF_FIRST_GEN_QUEUE,             /* msmcQueueId */

+                TF_PA_TX_QUEUE_BASE,                            /* hwQueueBegin */

+                TF_PA_TX_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,    /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_DDR,     /* QoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_MSMC     /* All traffics */

+                }

+                };

 

 static  paSysConfig_t  t5GlobalCfg = 

         {

@@ -310,7 +328,8 @@ static  paSysConfig_t  t5GlobalCfg =
             &t5CmdSetCfg,

             &t5UsrStatsCfg,         /* pUsrStatsConfig */

             &t5QueueDivertCfg,

-            &t5PktCtrlCfg           /* pPktControl */

+            &t5PktCtrlCfg,          /* pPktControl */
+            &t5QueueBounceCfg       /* pQueueBounceConfig */

         };

 

 /* Command set related definitions */

@@ -2188,8 +2207,11 @@ static int t5RxPkts (t5TestEncap_t *tencap, pauFifo_t *fifo)
         unsigned int                             port;

         unsigned int                             eport;

         int                                      nQ, i, n;

+    int                  msmcBounceCount=0;

+    int                  count = 0;

 

         for (i = 0 ;i < 100; i++) {     

+        testCommonRelayQueueBouncePkts (tencap->tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &msmcBounceCount);

         /* Look for packets in the rx packet queue, verify that the UDP port found matches the next value in

          * the fifo, then verify the receive packet information */

         while (Qmss_getQueueEntryCount(tencap->tf->QGen[Q_MATCH]) > 0)  {

@@ -2262,6 +2284,8 @@ static int t5RxPkts (t5TestEncap_t *tencap, pauFifo_t *fifo)
             }

                 

                 testCommonRecycleLBDesc (tencap->tf, hd);

+

+            count++;

         }       

         

         

@@ -2296,7 +2320,10 @@ static int t5RxPkts (t5TestEncap_t *tencap, pauFifo_t *fifo)
                 return (-1);

         }               

                 

-        return (0);

+    if(msmcBounceCount != count)

+        System_printf("t5RxPkts: receives %d queue bounce packets and %d final packets\n", msmcBounceCount, count);

+

+    return (0);

 }

 

 static Cppi_HostDesc *t5GetRxPkt (tFramework_t *tf)

@@ -2356,10 +2383,12 @@ static int t5ReceiveGTPUDataPkts (tFramework_t *tf, paTest_t *pat, pktTestInfo_t
         int               i, j;

         unsigned int                  chan;

     int               count = 0;

+    int               msmcBounceCount=0;

         

         for (i = 0; i < 100; i++)  {

                 

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &msmcBounceCount);

                 while ((hd = t5GetRxPkt (tf)) != NULL)  {

                         

                         /* Verify swInfo0 for packet match and packet ID number */

@@ -2420,7 +2449,10 @@ static int t5ReceiveGTPUDataPkts (tFramework_t *tf, paTest_t *pat, pktTestInfo_t
                 return (-1);

         }

         

-        return (0);

+    if(msmcBounceCount != count)

+        System_printf("t5ReceiveGTPUDataPkts: receives %d queue bounce packets and %d final packets\n", msmcBounceCount, count);

+

+    return (0);

 

 }

 

@@ -2437,6 +2469,7 @@ static int t5ReceiveNatTDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actu
         int               i, j;

         unsigned int                  chan;

     int               count = 0;

+    int               msmcBounceCount=0;

     

     if (!expCount)

     {

@@ -2447,6 +2480,7 @@ static int t5ReceiveNatTDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actu
         for (i = 0; i < 100; i++)  {

                 

         utilCycleDelay (1000);

+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &msmcBounceCount);

                 while ((hd = t5GetRxPkt (tf)) != NULL)  {

                         

                         /* Verify swInfo0 for packet match and packet ID number */

@@ -2509,7 +2543,10 @@ static int t5ReceiveNatTDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actu
                 return (-1);

         }

         

-        return (0);

+    if(msmcBounceCount != count)

+        System_printf("t2ReceiveNatTDataPkts: receives %d queue bounce packets and %d final packets\n", msmcBounceCount, count);

+

+    return (0);

 

 }

 

@@ -2839,7 +2876,7 @@ static int t5ReceiveDataPacket (t5TestEncap_t *tencap, uint16_t eport, uint16_t
                 

                 testCommonRecycleLBDesc (tencap->tf, hd);

         }

-                

+

         return (0);

 }

 

@@ -2925,6 +2962,7 @@ void paTestL4Routing (UArg a0, UArg a1)
         uint8_t                 expectedPktCount[T5_MAX_GTPU_CHAN];

         uint8_t                 actualPktCount[T5_MAX_GTPU_CHAN];

     int             numUsrStatsEntries;

+    int             bounceCount = 0;

     

         //volatile int mdebugWait = 1;

     #ifndef  SIMULATOR_SUPPORT

@@ -3209,6 +3247,11 @@ void paTestL4Routing (UArg a0, UArg a1)
     /* Give some time for all the packets to get through the system */

     utilCycleDelay (5000);

 

+    testCommonRelayQueueBouncePkts (t5Encap.tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &bounceCount);

+

+    if(bounceCount != 10)

+        System_printf("LUT2 Queue Diversion Test (Phase 1): receives %d queue bounce packets\n", bounceCount);

+

     newStatus = t5UpdateL4(&t5Encap, T5_FIRST_DEST_PORT);

         if (newStatus == PA_TEST_FAILED)

                 t5Cleanup (&t5Encap, newStatus);

@@ -3227,6 +3270,11 @@ void paTestL4Routing (UArg a0, UArg a1)
         /* Give some time for all the packets to get through the system */

         utilCycleDelay (4000);

     

+    bounceCount = 0;

+    testCommonRelayQueueBouncePkts (t5Encap.tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, NULL, &bounceCount);

+    if(bounceCount != 10)

+        System_printf("LUT2 Queue Diversion Test (Phase 2): receives %d queue bounce packets\n", bounceCount);

+

     if (t5ReceiveDataPacket(&t5Encap, T5_FIRST_DEST_PORT, 20, 0))

     {

                 System_printf ("%s (%s:%d): L4 Queue Diversion test fails\n", tfName, __FILE__, __LINE__);

diff --git a/test/PAUnitTest/src/tests/test7.c b/test/PAUnitTest/src/tests/test7.c
index 9c28bc1..8e9d8b4 100644
--- a/test/PAUnitTest/src/tests/test7.c
+++ b/test/PAUnitTest/src/tests/test7.c
@@ -120,7 +120,8 @@ static  paSysConfig_t  t7GlobalCfg =
             &t7CmdSetCfg,
             NULL,                   /* pUsrStatsConfig */
             NULL,                   /* pQueueDivertConfig */
-            NULL                    /* pPktVerify */
+            NULL,                   /* pPktVerify */
+            NULL                    /* pQueueBounceConfig */
         };
 
 Cppi_HostDesc *t7GetRxPkt (tFramework_t *tf)
diff --git a/test/PAUnitTest/src/tests/test8.c b/test/PAUnitTest/src/tests/test8.c
index ab27482..bc2cfad 100644
--- a/test/PAUnitTest/src/tests/test8.c
+++ b/test/PAUnitTest/src/tests/test8.c
@@ -89,6 +89,9 @@
  #define Q_MULTI_15                      18             /* Multi route queue 5 */
  #define Q_MULTI_16          19         /* Multi route queue 6 */
  #define Q_MULTI_17          20         /* Multi route queue 7 */
+

+#define Q_BOUNCE_DDR         21     /* Queue Bounce DDR queue */

+#define Q_BOUNCE_MSMC        22     /* Queue Bounce MSMC queue */

  
 #define  Q_MULTI_START  Q_MULTI_0
 #define  Q_MULTI_END    Q_MULTI_17
@@ -106,6 +109,7 @@
 #define T8_CMD_SWINFO0_STATS_REQ_ID         0x33330000  /* Identifies the req stats command */
 #define T8_CMD_SWINFO0_EROUTE_CFG_ID    0x44440000  /* Identifies Eroute configuration command */
 #define T8_CMD_SWINFO0_MROUTE_CFG_ID    0x55550000  /* Identifies Multi-route configuration command */
+#define T8_CMD_SWINFO0_GLOB_CFG_ID      0x55560000  /* Identifies Global configuration command */
 #define T8_CMD_SWINFO0_PKT_ID               0x66660000  /* Identifies the packet as a data packet */
 
 #define T8_MAX_CHAN                     T8_IP_MULTICAST_PKT_INDEX
@@ -701,7 +705,34 @@ static t8EthAndRoute_t  t8EthAndSwinfo[] =  {
     }
     
  };
- 
+
+static  paQueueBounceConfig_t t8QueueBounceCfg =

+                {

+                    1,      /* Enable */

+                Q_BOUNCE_DDR  + TF_FIRST_GEN_QUEUE,             /* ddrQueueId */

+                Q_BOUNCE_MSMC + TF_FIRST_GEN_QUEUE,             /* msmcQueueId */

+                TF_PA_TX_QUEUE_BASE,                            /* hwQueueBegin */

+                TF_PA_TX_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,    /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* EQoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_DDR      /* All traffics */

+                }

+                };

+

+static  paSysConfig_t  t8GlobalCfg =

+        {

+            NULL,                   /* pProtoLimit */

+            NULL,                   /* pOutIpReassmConfig */

+            NULL,                   /* pInIpReassmConfig */

+            NULL,                   /* pCmdSetConfig */

+            NULL,                   /* pUsrStatsConfig */

+            NULL,                   /* pQueueDivertConfig */

+            NULL,                   /* pPktControl */

+            &t8QueueBounceCfg       /* pQueueBounceConfig */

+        };

                                                                                 
 /* Prototype required due to circular function calling */                                                                               
 static paTestStatus_t testCheckStats (tFramework_t *tf, paTest_t *pat, Bool clear, t8Handles_t *l2Handles);                     
@@ -873,7 +904,7 @@ static void paTestRecoverAndExit (tFramework_t *tf, paTest_t *pat, t8Handles_t *
 }               
                                 
 /* Look for command replies from PA */                                       
-void tsetL2CmdRep (tFramework_t *tf, paTest_t *pat, t8Handles_t *localHandles)
+void testL2CmdRep (tFramework_t *tf, paTest_t *pat, t8Handles_t *localHandles)
 {
         Cppi_HostDesc  *hd;
         uint32_t         *swInfo0;
@@ -932,6 +963,7 @@ void tsetL2CmdRep (tFramework_t *tf, paTest_t *pat, t8Handles_t *localHandles)
                 
              case T8_CMD_SWINFO0_EROUTE_CFG_ID:
              case T8_CMD_SWINFO0_MROUTE_CFG_ID:
+             case T8_CMD_SWINFO0_GLOB_CFG_ID:
                         /* Extract the local instance value */
                         if (lid >= T8_MAX_CMDS_PER_BURST)  {
                                 System_printf ("%s (%s:%d): Received PA command reply for out of range command id %d (max %d)\n", tfName, __FILE__, __LINE__, lid, T8_MAX_CMDS_PER_BURST);
@@ -944,8 +976,11 @@ void tsetL2CmdRep (tFramework_t *tf, paTest_t *pat, t8Handles_t *localHandles)
                         if (paret != pa_OK)  {
                     if (swInfoCmd == T8_CMD_SWINFO0_EROUTE_CFG_ID)
                                     System_printf ("%s (%s:%d): paForwardResult returned error %d in response to Pa_configExceptionRoute reply from PA\n", tfName, __FILE__, __LINE__);
-                    else
-                                    System_printf ("%s (%s:%d): paForwardResult returned error %d in response to Pa_configMultiRouter reply from PA\n", tfName, __FILE__, __LINE__);
+                    else if (swInfoCmd == T8_CMD_SWINFO0_MROUTE_CFG_ID)
+                                    System_printf ("%s (%s:%d): paForwardResult returned error %d in response to Pa_configMultiRouter reply from PA\n", tfName, __FILE__, __LINE__);

+                    else

+                                    System_printf ("%s (%s:%d): paForwardResult returned error %d in response to Pa_control(Global Configuration) reply from PA\n", tfName, __FILE__, __LINE__);

+
                                 testCommonRecycleLBDesc (tf, hd);  /* Ignore return code */
                                 paTestRecoverAndExit (tf, pat, localHandles, PA_TEST_FAILED, TRUE);  /* No Return */
                         }
@@ -999,6 +1034,56 @@ static void paL2HandleError (tFramework_t *tf, paTest_t *pat, t8Handles_t *l2Han
         }
 }
 
+static paTestStatus_t t8GlobalConfiguration (tFramework_t *tf, paTest_t *pat, paSysConfig_t *pCfg, t8Handles_t *l2Handles)

+{

+        int                     i;

+        Cppi_HostDesc  *hd;

+        paReturn_t      paret;

+        int                     cmdDest;

+        uint16_t                cmdSize;

+    paCtrlInfo_t    ctrlInfo;

+    int             fCmdReply;

+

+    paCmdReply_t cmdReply = {  pa_DEST_HOST,            /* Dest */

+                               0,                       /* Reply ID (returned in swinfo0) */

+                               0,                       /* Queue */

+                               0 };                     /* Flow ID */

+

+    memset (&ctrlInfo, 0, sizeof (paCtrlInfo_t));

+

+    /* set System Global default configuration */

+    ctrlInfo.code = pa_CONTROL_SYS_CONFIG;

+    ctrlInfo.params.sysCfg = *pCfg;

+    cmdReply.replyId  = T8_CMD_SWINFO0_GLOB_CFG_ID;

+    cmdReply.queue    = tf->QGen[Q_CMD_REPLY];

+    cmdReply.flowId   = tf->tfFlowNum[0];

+

+    hd = testCommonGlobalConfig (tf, &ctrlInfo,

+                                 tf->QGen[Q_CMD_RECYCLE], tf->QLinkedBuf3,

+                                 &cmdReply, &cmdDest, &cmdSize, &paret);

+

+    paL2HandleError (tf, pat, l2Handles, paret, hd);  /* Will not return on error */
+

+    /* Send command */

+    Qmss_queuePush (tf->QPaTx[cmdDest - pa_CMD_TX_DEST_0 + TF_PA_Q_CONFIG_BASE], (Ptr)hd, cmdSize, TF_SIZE_DESC, Qmss_Location_TAIL);

+

+    /* All the packets should have been acked */

+    /* Wait for a PA reply */

+    t8CmdAck[0] = FALSE;

+    for (i = 0; i < 100; i++)  {

+        utilCycleDelay (1000);

+        testL2CmdRep (tf, pat, l2Handles);

+        if (t8CmdAck[0])

+            break;

+    }

+

+    if (i == 100)  {

+        System_printf ("%s: (%s:%d): Pa_control (Global Configuration) commands was not acked\n", tfName, __FILE__, __LINE__);

+    return (PA_TEST_FAILED);

+    }

+

+    return (PA_TEST_PASSED);

+}

 
 /* Check the stats */
 
@@ -1139,10 +1224,12 @@ static int t8ReceiveDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actualPk
         int               i, j;
         unsigned int                  chan;
     int               count = 0;
+    int               ddrBounceCount=0;

         
         for (i = 0; i < 200; i++)  {
                 
         utilCycleDelay (1000);
+        testCommonRelayQueueBouncePkts (tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

                 while ((hd = t8GetRxPkt (tf)) != NULL)  {
                         
                         /* Verify swInfo0 for packet match and packet ID number */
@@ -1214,7 +1301,10 @@ static int t8ReceiveDataPkts (tFramework_t *tf, paTest_t *pat, uint8_t *actualPk
                 return (-1);
         }
         
-        return (0);
+    if(ddrBounceCount != count)

+        System_printf("t8ReceiveDataPkts: receives %d queue bounce packets and %d final packets\n", ddrBounceCount, count);

+

+    return (0);
 
 }
 
@@ -1293,6 +1383,10 @@ void paTestMultiRouting (UArg a0, UArg a1)
     
     /* Zero out the expected stats. The stats will be updated as packets are sent into PA */
     memset (&paTestExpectedStats, 0, sizeof(paTestExpectedStats));
+
+    testStatus = t8GlobalConfiguration (tf, pat, &t8GlobalCfg, l2Handles);
+    if (testStatus != PA_TEST_PASSED)
+        paTestRecoverAndExit (tf, pat, l2Handles, testStatus, TRUE);
         
         /* Add the multiple MAC entries in a burst. Take the memory from linked buffer descriptor area two
          * since the responses will come from area one. */
@@ -1325,7 +1419,7 @@ void paTestMultiRouting (UArg a0, UArg a1)
         /* Wait for the PA to generate all the responses */
         for (i = 0; i < 100; i++)  {
                 utilCycleDelay (1000);
-                tsetL2CmdRep (tf, pat, l2Handles);
+                testL2CmdRep (tf, pat, l2Handles);
                 
                 state = 1;
                 for (j = 0; j < n; j++)  {
@@ -1375,7 +1469,7 @@ void paTestMultiRouting (UArg a0, UArg a1)
         /* Wait for the PA to generate all the responses */
         for (i = 0; i < 100; i++)  {
                 utilCycleDelay (1000);
-                tsetL2CmdRep (tf, pat, l2Handles);
+                testL2CmdRep (tf, pat, l2Handles);
                 
                 state = 1;
                 for (j = 0; j < n; j++)  {
@@ -1409,7 +1503,7 @@ void paTestMultiRouting (UArg a0, UArg a1)
         /* Wait for the PA to generate all the responses */
         for (i = 0; i < 100; i++)  {
                 utilCycleDelay (1000);
-                tsetL2CmdRep (tf, pat, l2Handles);
+                testL2CmdRep (tf, pat, l2Handles);
                 if(t8CmdAck[0])break;
         }