update drb and sib23

f6e26ed8 · Lu Xu · ddbaface · f6e26ed8 · f6e26ed8
Commit f6e26ed8 authored Mar 22, 2024 by Lu Xu 👀
Showing with 136 additions and 122 deletions

software/ors-amarisoft/config/drb_lte.jinja2.cfg software/ors-amarisoft/config/drb_lte.jinja2.cfg +114 -105

software/ors-amarisoft/config/sib23.jinja2.asn software/ors-amarisoft/config/sib23.jinja2.asn +22 -17

No files found.
--- a/software/ors-amarisoft/config/drb_lte.jinja2.cfg
+++ b/software/ors-amarisoft/config/drb_lte.jinja2.cfg
@@ -10,8 +10,8 @@
    qci: 1,
    ims_dedicated_bearer: true,
    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
+      discardTimer: 300,
+      pdcp_SN_Size: 12,


    },
@@ -21,7 +21,7 @@
      pdcp_SN_SizeDL: 12,
      statusReportRequired: false,
      outOfOrderDelivery: false,
-
+      t_Reordering: 0,

      restrict_to_ng_enb: true,
    },
@@ -48,7 +48,7 @@
    qci: 2,
    ims_dedicated_bearer: true,
    pdcp_config: {
-      discardTimer: 150,
+      discardTimer: 750,
      pdcp_SN_Size: 12,
    },
    nr_pdcp_config: {
@@ -81,11 +81,11 @@
  {
    qci: 3,
    pdcp_config: {
-      discardTimer: 100,
+      discardTimer: 750,
      pdcp_SN_Size: 12,
    },
    nr_pdcp_config: {
-      discardTimer: 100,
+      discardTimer: 300,
      pdcp_SN_SizeUL: 18,
      pdcp_SN_SizeDL: 18,
      statusReportRequired: false,
@@ -114,7 +114,7 @@
  {
    qci: 4,
    pdcp_config: {
-      discardTimer: 0,
+      discardTimer: 750,
      statusReportRequired: true,
    },
    nr_pdcp_config: {
@@ -123,6 +123,7 @@
      pdcp_SN_SizeDL: 18,
      statusReportRequired: true,
      outOfOrderDelivery: false,
+      t_Reordering: 3000,
      restrict_to_ng_enb: true,
    },
    rlc_config: {
@@ -147,38 +148,34 @@
    },
  },
  {
-    qci: 65,
-    ims_dedicated_bearer: true,
+    qci: 5,
    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
-
-
+      discardTimer: 0,
+      statusReportRequired: true,
    },
    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 12,
-      pdcp_SN_SizeDL: 12,
-      statusReportRequired: false,
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
      outOfOrderDelivery: false,
-      t_Reordering: 0,
-
-
      restrict_to_ng_enb: true,
    },
    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 5,
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
      },
-      dl_um: {
-        sn_FieldLength: 5,
+      dl_am: {
        t_Reordering: {{ T_REORDERING }},
+        t_StatusProhibit: 10,
      },
    },
    logical_channel_config: {
-
-      priority: 5,
-      prioritisedBitRate: 0,
+      priority: 6,
+      prioritisedBitRate: 8,
      bucketSizeDuration: 100,
      logicalChannelGroup: 1,
      logicalChannelSR_Mask: false,
@@ -186,46 +183,46 @@
    },
  },
  {
-    qci: 66,
-    ims_dedicated_bearer: true,
+    qci: 6,
    pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_Size: 12,
+      discardTimer: 750,
+      statusReportRequired: true,
    },
    nr_pdcp_config: {
-      discardTimer: 150,
+      discardTimer: 0,
      pdcp_SN_SizeUL: 18,
      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
+      statusReportRequired: true,
      outOfOrderDelivery: false,
-      t_Reordering: 0,
+      t_Reordering: 3000,
      restrict_to_ng_enb: true,
    },
    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
      },
-      dl_um: {
-        sn_FieldLength: 10,
+      dl_am: {
        t_Reordering: {{ T_REORDERING }},
+        t_StatusProhibit: 10,
      },
    },
    logical_channel_config: {
-
-      priority: 7,
-      prioritisedBitRate: 0,
+      priority: 12,
+      prioritisedBitRate: 8,
      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
+      logicalChannelGroup: 2,
      logicalChannelSR_Mask: false,
      logicalChannelSR_Prohibit: false,
    },
  },
  {
-    qci: 67,
-    ims_dedicated_bearer: true,
+    qci: 7,
    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
+      discardTimer: 750,
+      statusReportRequired: true,
    },
    nr_pdcp_config: {
      discardTimer: 100,
@@ -237,28 +234,30 @@
      restrict_to_ng_enb: true,
    },
    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: {{ T_REORDERING }},
+      dl_am: {
+        t_Reordering: 35,
+        t_StatusProhibit: 10,
      },
    },
    logical_channel_config: {
-      priority: 6,
+      priority: 13,
      prioritisedBitRate: 0,
      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
+      logicalChannelGroup: 2,
      logicalChannelSR_Mask: false,
      logicalChannelSR_Prohibit: false,
    },
  },
-
  {
-    qci: 5,
+    qci: 8,
    pdcp_config: {
-      discardTimer: 0,
+      discardTimer: 750,
      statusReportRequired: true,
    },
    nr_pdcp_config: {
@@ -267,6 +266,7 @@
      pdcp_SN_SizeDL: 18,
      statusReportRequired: true,
      outOfOrderDelivery: false,
+      t_Reordering: 3000,
      restrict_to_ng_enb: true,
    },
    rlc_config: {
@@ -282,18 +282,18 @@
      },
    },
    logical_channel_config: {
-      priority: 6,
+      priority: 14,
      prioritisedBitRate: 8,
      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
+      logicalChannelGroup: 2,
      logicalChannelSR_Mask: false,
      logicalChannelSR_Prohibit: false,
    },
  },
  {
-    qci: 6,
+    qci: 9,
    pdcp_config: {
-      discardTimer: 0,
+      discardTimer: 750,
      statusReportRequired: true,
    },
    nr_pdcp_config: {
@@ -301,8 +301,12 @@
      pdcp_SN_SizeUL: 18,
      pdcp_SN_SizeDL: 18,
      statusReportRequired: true,
+      t_Reordering: 3000,
      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
+    },
+    en_dc_split: {
+      type: "scg",
+      ul_data_threshold: 0
    },
    rlc_config: {
      ul_am: {
@@ -317,120 +321,124 @@
      },
    },
    logical_channel_config: {
-      priority: 12,
+      priority: 15,
      prioritisedBitRate: 8,
      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
+      logicalChannelGroup: 3,
      logicalChannelSR_Mask: false,
      logicalChannelSR_Prohibit: false,
    },
  },
+XXX {if ors}
  {
-    qci: 7,
+    qci: 65,
+    ims_dedicated_bearer: true,
    pdcp_config: {
      discardTimer: 100,
-      pdcp_SN_Size: 12,
+      pdcp_SN_Size: 7,
+
+
    },
    nr_pdcp_config: {
      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
      statusReportRequired: false,
      outOfOrderDelivery: false,
      t_Reordering: 0,
+
+
      restrict_to_ng_enb: true,
    },
    rlc_config: {
      ul_um: {
-        sn_FieldLength: 10,
+        sn_FieldLength: 5,
      },
      dl_um: {
-        sn_FieldLength: 10,
+        sn_FieldLength: 5,
        t_Reordering: {{ T_REORDERING }},
      },
    },
    logical_channel_config: {
-      priority: 13,
+
+      priority: 5,
      prioritisedBitRate: 0,
      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
+      logicalChannelGroup: 1,
      logicalChannelSR_Mask: false,
      logicalChannelSR_Prohibit: false,
    },
  },
  {
-    qci: 8,
+    qci: 66,
+    ims_dedicated_bearer: true,
    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
+      discardTimer: 150,
+      pdcp_SN_Size: 12,
    },
    nr_pdcp_config: {
-      discardTimer: 0,
+      discardTimer: 150,
      pdcp_SN_SizeUL: 18,
      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
+      statusReportRequired: false,
      outOfOrderDelivery: false,
+      t_Reordering: 0,
      restrict_to_ng_enb: true,
    },
    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
+      ul_um: {
+        sn_FieldLength: 10,
      },
-      dl_am: {
+      dl_um: {
+        sn_FieldLength: 10,
        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
      },
    },
    logical_channel_config: {
-      priority: 14,
-      prioritisedBitRate: 8,
+
+      priority: 7,
+      prioritisedBitRate: 0,
      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
+      logicalChannelGroup: 1,
      logicalChannelSR_Mask: false,
      logicalChannelSR_Prohibit: false,
    },
  },
  {
-    qci: 9,
+    qci: 67,
+    ims_dedicated_bearer: true,
    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
    },
    nr_pdcp_config: {
-      discardTimer: 0,
+      discardTimer: 100,
      pdcp_SN_SizeUL: 18,
      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
+      statusReportRequired: false,
      outOfOrderDelivery: false,
-    },
-    en_dc_split: {
-      type: "scg",
-      ul_data_threshold: 0
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
    },
    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
+      ul_um: {
+        sn_FieldLength: 10,
      },
-      dl_am: {
+      dl_um: {
+        sn_FieldLength: 10,
        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
      },
    },
    logical_channel_config: {
-      priority: 15,
-      prioritisedBitRate: 8,
+      priority: 6,
+      prioritisedBitRate: 0,
      bucketSizeDuration: 100,
-      logicalChannelGroup: 3,
+      logicalChannelGroup: 1,
      logicalChannelSR_Mask: false,
      logicalChannelSR_Prohibit: false,
    },
  },
+
  {
    qci: 69,
    pdcp_config: {
@@ -501,4 +509,5 @@
      logicalChannelSR_Prohibit: false,
    },
  },
+XXX {endif}
 ]
--- a/software/ors-amarisoft/config/sib23.jinja2.asn
+++ b/software/ors-amarisoft/config/sib23.jinja2.asn
@@ -8,7 +8,12 @@
          radioResourceConfigCommon {
            rach-ConfigCommon {
              preambleInfo {
-                numberOfRA-Preambles n52
+                numberOfRA-Preambles n52,
+                preamblesGroupAConfig{
+                  sizeOfRA-PreamblesGroupA n28,
+                  messageSizeGroupA b56,
+                  messagePowerOffsetGroupB dB10
+                }
              },
              powerRampingParameters {
                powerRampingStep dB2,
@@ -17,24 +22,24 @@
              ra-SupervisionInfo {
                preambleTransMax n10,
                ra-ResponseWindowSize sf10,
-                mac-ContentionResolutionTimer sf40
+                mac-ContentionResolutionTimer sf64
              },
              maxHARQ-Msg3Tx 5
            },
            bcch-Config {
-              modificationPeriodCoeff n4
+              modificationPeriodCoeff n2
            },
            pcch-Config {
-              defaultPagingCycle rf128,
+              defaultPagingCycle rf64,
              nB oneT
            },
            prach-Config {
              rootSequenceIndex 0, /* patched by eNB */
              prach-ConfigInfo {
-                prach-ConfigIndex 4, /* patched by eNB */
+                prach-ConfigIndex 3, /* patched by eNB */
                highSpeedFlag FALSE,
-                zeroCorrelationZoneConfig 11,
-                prach-FreqOffset 4 /* patched by eNB */
+                zeroCorrelationZoneConfig 12,
+                prach-FreqOffset 17 /* patched by eNB */
              }
            },
            pdsch-ConfigCommon {
@@ -90,12 +95,12 @@
            ul-CyclicPrefixLength len1
          },
          ue-TimersAndConstants {
-            t300 ms200,
-            t301 ms200,
-            t310 ms200,
-            n310 n6,
-            t311 ms10000,
-            n311 n5
+            t300 ms600,
+            t301 ms600,
+            t310 ms2000,
+            n310 n10,
+            t311 ms5000,
+            n311 n1
          },
          freqInfo {
            additionalSpectrumEmission 1
@@ -104,17 +109,17 @@
        },
        sib3: {
          cellReselectionInfoCommon {
-            q-Hyst dB2
+            q-Hyst dB3
          },
          cellReselectionServingFreqInfo {
-            s-NonIntraSearch 3,
-            threshServingLow 2,
+            s-NonIntraSearch 21,
+            threshServingLow 4,
            cellReselectionPriority 6
          },
          intraFreqCellReselectionInfo {
            q-RxLevMin -61,
            p-Max 23,
-            s-IntraSearch 5,
+            s-IntraSearch 26,
            presenceAntennaPort1 TRUE,
            neighCellConfig '01'B,
            t-ReselectionEUTRA 1