Remove support for xran E release

All the use cases we tested so far, are supported with xran F release.
Therefore, we can proceed with removing the support with E release.

In addition, our plan is to bring the support for K release which is ongoing activity in
the MR https://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/3444.

doc/ORAN_FHI7.2_Tutorial.md

@@ -69,11 +69,10 @@ Tested libxran releases:
 
 | Vendor                                  |
 |-----------------------------------------|
-| `oran_e_maintenance_release_v1.0`       |
 | `oran_f_release_v1.0`                   |
 
 
-**Note**: The libxran driver of OAI identifies the above E release version as "5.1.0" (E is fifth letter, then 1.0), and the above F release as "6.1.0".
+**Note**: The libxran driver of OAI identifies the above F release version as "6.1.0" (F is the sixth letter, then 1.0).
 
 ### Configure your server
 
@@ -375,14 +374,6 @@ cd ~/openairinterface5g/
 
 Download ORAN FHI DU library, checkout the correct version, and apply the correct patch (available in `oai_folder/cmake_targets/tools/oran_fhi_integration_patches`).
 
-#### E release
-```bash
-git clone https://gerrit.o-ran-sc.org/r/o-du/phy.git ~/phy
-cd ~/phy
-git checkout oran_e_maintenance_release_v1.0
-git apply ~/openairinterface5g/cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch
-```
-
 #### F release
 ```bash
 git clone https://gerrit.o-ran-sc.org/r/o-du/phy.git ~/phy
@@ -404,7 +395,6 @@ This feature is intended to enable experiments and future improvements on Arm sy
 ```bash
 cd ~/phy/fhi_lib/lib
 make clean
-RTE_SDK=~/dpdk-stable-20.11.9/ XRAN_DIR=~/phy/fhi_lib make XRAN_LIB_SO=1 # E release
 WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=~/dpdk-stable-20.11.9/ XRAN_DIR=~/phy/fhi_lib make XRAN_LIB_SO=1 # F release
 ...
 [AR] build/libxran.so
@@ -967,7 +957,7 @@ Sample configuration files for OAI gNB, specific to the manufacturer of the radi
 4. Benetel 550 RU:
 [`gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf)
 [`gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf)
-[`gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf) - only with E release; with F, UL U-plane fragmentation is not correct
+[`gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf) - tested successfully with E release; with F, UL U-plane fragmentation is not correct
 5. Metanoia RU:
 [`gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf`](../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf)
 

radio/fhi_72/CMakeLists.txt

@@ -16,16 +16,15 @@ add_library(oran_fhlib_5g MODULE
             oran-init.c
 )
 
-set(E_VERSION 5.1.6)
 set(F_VERSION 6.1.8)
 
 find_package(xran REQUIRED)
-if(xran_VERSION VERSION_EQUAL E_VERSION)
-  target_compile_definitions(oran_fhlib_5g PRIVATE E_RELEASE)
+if(xran_VERSION MATCHES "5.*")
+  message(FATAL_ERROR "xran E release not supported starting from tag 2026.w08.\nPlease switch to F version ${F_VERSION}")
 elseif(xran_VERSION VERSION_EQUAL F_VERSION)
   target_compile_definitions(oran_fhlib_5g PRIVATE F_RELEASE)
 else()
-  message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed ${E_VERSION} (E release) or ${F_VERSION} (F release)")
+  message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed ${F_VERSION} (F release)")
 endif()
 
 # Ignore xran-specific warning: we don't care/can't change the following warning, so suppress

radio/fhi_72/mplane/CMakeLists.txt

@@ -6,8 +6,8 @@ add_library(oran_fhlib_5g_mplane MODULE
 )
 add_dependencies(oran_fhlib_5g_mplane oran_fhlib_5g)
 
-if(xran_VERSION VERSION_EQUAL E_VERSION)
-  target_compile_definitions(oran_fhlib_5g_mplane PRIVATE E_RELEASE)
+if(xran_VERSION MATCHES "5.*")
+  message(FATAL_ERROR "xran E release not supported starting from tag 2026.w08.\nPlease switch to F version ${F_VERSION}")
 elseif(xran_VERSION VERSION_EQUAL F_VERSION)
   target_compile_definitions(oran_fhlib_5g_mplane PRIVATE F_RELEASE)
 endif()

radio/fhi_72/oaioran.c

@@ -415,22 +415,7 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot)
           uint8_t *pData;
           struct xran_section_desc *p_sec_desc = NULL;
           struct xran_prb_elm *pRbElm = &pRbMap->prbMap[idxElm];
-#ifdef E_RELEASE
-          uint32_t one_rb_size =
-              (((pRbElm->iqWidth == 0) || (pRbElm->iqWidth == 16)) ? (N_SC_PER_PRB * 2 * 2) : (3 * pRbElm->iqWidth + 1));
-          if (fh_init->mtu < num_totalRB * one_rb_size)
-            pData = bufs->dst[ant_id % nb_rx_per_ru][tti % XRAN_N_FE_BUF_LEN]
-                        .pBuffers[sym_idx % XRAN_NUM_OF_SYMBOL_PER_SLOT]
-                        .pData;
-          else {
-            p_sec_desc = pRbElm->p_sec_desc[sym_idx][0];
-            pData = p_sec_desc->pData;
-          }
-          numRB = num_totalRB;
-          startRB = start_totalRB;
-          {
-            {
-#elif defined F_RELEASE
+#if defined F_RELEASE
           // UP_nRBSize & UP_nRBStart are for DL U-plane only
           LOG_D(HW, "[%d.%d] idxElm[%d] startSym[%d]:numSym[%d] UP_startRB[%d]:UP_numRB[%d] sym_idx[%d] ant_id[%d] pRbElm->nRBStart[%d]:pRbElm->nRBSize[%d]\n", *frame, *slot, idxElm, pRbElm->nStartSymb, pRbElm->numSymb, pRbElm->UP_nRBStart, pRbElm->UP_nRBSize, sym_idx, ant_id, pRbElm->nRBStart, pRbElm->nRBSize);
           for (int idxDesc = 0; idxDesc < XRAN_MAX_FRAGMENT; idxDesc++) {
@@ -578,10 +563,7 @@ int xran_fh_tx_send_slot(ru_info_t *ru, int frame, int slot, uint64_t timestamp)
         for (uint32_t idxElm = 0; idxElm < pPrbMap->nPrbElm; idxElm++) {
           struct xran_prb_elm *pRbElm = &pPrbMap->prbMap[idxElm];
           int numRB, startRB;
-#ifdef E_RELEASE
-          numRB = pRbElm->nRBSize;
-          startRB = pRbElm->nRBStart;
-#elif F_RELEASE
+#if defined F_RELEASE
           numRB = pRbElm->UP_nRBSize;
           startRB = pRbElm->UP_nRBStart;
 #endif
@@ -662,15 +644,11 @@ int xran_fh_tx_send_slot(ru_info_t *ru, int frame, int slot, uint64_t timestamp)
                 p_prbMapElm->nBeamIndex = 0;
             }
 
-            // radio-transport fragmentation is not supported in both E and F releases;
+            // radio-transport fragmentation is not supported in xran F release;
             // E-bit = 1 => each ethernet frame is considered as the last fragment;
             // a group of PRBs per each symbol is encapsulated in one ethernet frame.
             // => seems that the RUs don't check for E-bit
-#ifdef E_RELEASE
-            p_sec_desc = p_prbMapElm->p_sec_desc[sym_idx][0];
-            int16_t startRB = p_prbMapElm->nRBStart;
-            int16_t numRB = p_prbMapElm->nRBSize;
-#elif F_RELEASE
+#if defined F_RELEASE
             p_sec_desc = &p_prbMapElm->sec_desc[sym_idx][0];
             int16_t startRB = p_prbMapElm->UP_nRBStart;
             int16_t numRB = p_prbMapElm->UP_nRBSize;

radio/fhi_72/oran-config.c

@@ -512,9 +512,6 @@ static bool set_fh_io_cfg(struct xran_io_cfg *io_cfg, const paramdef_t *fhip, in
   } else {
     io_cfg->bbdev_mode = XRAN_BBDEV_NOT_USED; // DPDK for BBDev
   }
-#elif defined(E_RELEASE)
-  io_cfg->bbdev_dev[0] = NULL; // BBDev dev name; max devices = 1
-  io_cfg->bbdev_mode = XRAN_BBDEV_NOT_USED; // DPDK for BBDev
 #endif
   int dpdk_iova_mode_idx = config_paramidx_fromname((paramdef_t *)fhip, nump, ORAN_CONFIG_DPDK_IOVA_MODE);
   AssertFatal(dpdk_iova_mode_idx >= 0,"Index for dpdk_iova_mode config option not found!");

radio/fhi_72/oran-init.c

@@ -208,17 +208,6 @@ static void oran_allocate_cplane_buffers(void *instHandle,
 {
   xran_status_t status;
   uint32_t count1 = 0;
-
-#ifdef E_RELEASE
-  uint32_t count2 = 0;
-  uint32_t poolSec;
-  uint32_t numBufsSec = next_power_2(XRAN_N_FE_BUF_LEN * ant * XRAN_NUM_OF_SYMBOL_PER_SLOT * sect * XRAN_MAX_FRAGMENT);
-  uint32_t bufSizeSec = sizeof(struct xran_section_desc);
-  status = xran_bm_init(instHandle, &poolSec, numBufsSec, bufSizeSec);
-  AssertFatal(XRAN_STATUS_SUCCESS == status, "Failed at xran_bm_init(), status %d\n", status);
-  printf("xran_bm_init() hInstance %p poolIdx %u elements %u size %u\n", instHandle, poolSec, numBufsSec, bufSizeSec);
-#endif
-
   uint32_t poolPrb;
   uint32_t numBufsPrb = next_power_2(XRAN_N_FE_BUF_LEN * ant * XRAN_NUM_OF_SYMBOL_PER_SLOT) - 1;
   uint32_t bufSizePrb = size_of_prb_map;
@@ -247,34 +236,7 @@ static void oran_allocate_cplane_buffers(void *instHandle,
       // get mixed slot map if in TDD and in mixed slot
       if (prb_conf->nTddPeriod != 0 && (j % prb_conf->nTddPeriod) == prb_conf->mixed_slot_index)
         src = &prb_conf->mixedSlotMap;
-#ifdef E_RELEASE
-      /* as per E release sample app, the memory is copied up to size_of_prb_map
-        which translates to >= sizeof(struct xran_prb_map) + sizeof(struct xran_prb_elm)*5,
-        but we assume that RB allocation is done as 1 RE/UE so the total memory size is sizeof(struct xran_prb_map);
-        this is improved in F release */
-      struct xran_prb_map *p_rb_map = (struct xran_prb_map *)ptr;
-      memcpy(p_rb_map, src, sizeof(*src));
-
-      for (uint32_t elm_id = 0; elm_id < p_rb_map->nPrbElm; ++elm_id) {
-        struct xran_prb_elm *pPrbElem = &p_rb_map->prbMap[elm_id];
-        for (uint32_t k = 0; k < XRAN_NUM_OF_SYMBOL_PER_SLOT; ++k) {
-          for (uint32_t m = 0; m < XRAN_MAX_FRAGMENT; ++m) {
-            void *sd_ptr;
-            void *sd_mb;
-            status = xran_bm_allocate_buffer(instHandle, poolSec, &sd_ptr, &sd_mb);
-            AssertFatal(XRAN_STATUS_SUCCESS == status,
-                        "Failed at xran_bm_allocate_buffer(), status %d m %d k %d elm_id %d\n",
-                        status,
-                        m,
-                        k,
-                        elm_id);
-            count2++;
-            pPrbElem->p_sec_desc[k][m] = sd_ptr;
-            memset(sd_ptr, 0, sizeof(struct xran_section_desc));
-          }
-        }
-      }
-#elif defined F_RELEASE
+#if defined F_RELEASE
       if (fh_config->RunSlotPrbMapBySymbolEnable) {
         xran_init_PrbMap_by_symbol_from_cfg(src, ptr, mtu, fh_config->nDLRBs);
       } else {
@@ -284,9 +246,6 @@ static void oran_allocate_cplane_buffers(void *instHandle,
     }
   }
   printf("xran_bm_allocate_buffer() hInstance %p poolIdx %u count %u\n", instHandle, poolPrb, count1);
-#ifdef E_RELEASE
-  printf("xran_bm_allocate_buffer() hInstance %p poolIdx %u count %u\n", instHandle, poolSec, count2);
-#endif
 }
 
 /* callback not actively used */
@@ -355,9 +314,7 @@ static void oran_allocate_buffers(void *handle,
       .mixedSlotMap = ulPmMixed,
   };
 
-#ifdef E_RELEASE
-  uint32_t size_of_prb_map = sizeof(struct xran_prb_map) + sizeof(struct xran_prb_elm) * (xran_max_sections_per_slot - 1);
-#elif defined F_RELEASE
+#if defined F_RELEASE
   uint32_t size_of_prb_map;
   if (fh_config->RunSlotPrbMapBySymbolEnable) {
     // For Liteon FR2 with RunSlotPrbMapBySymbolEnable, xran_prb_map will have xran_prb_elm prbMap[14]
@@ -462,10 +419,7 @@ int *oai_oran_initialize(struct xran_fh_init *xran_fh_init, struct xran_fh_confi
     struct xran_cb_tag tag = {.cellId = sector, .oXuId = o_xu_id};
     pi->prach_tag = tag;
     pi->pusch_tag = tag;
-#ifdef E_RELEASE
-    LOG_W(HW, "Please be aware that E release support will be removed in the future. Consider switching to F release.\n");
-    oran_allocate_buffers(gxran_handle, o_xu_id, 1, pi, &xran_fh_config[o_xu_id]);
-#elif defined F_RELEASE
+#if defined F_RELEASE
     oran_allocate_buffers(gxran_handle, o_xu_id, 1, pi, xran_fh_init->mtu, &xran_fh_config[o_xu_id]);
 #endif