From 68a3435689e9e7d7282960643d091c0d397ea8e2 Mon Sep 17 00:00:00 2001 From: Teodora Date: Thu, 28 Nov 2024 16:56:38 +0100 Subject: [PATCH] Remove RU delay profile - xran E release (and later F) doesn't use them - update fhi_72 section in fronthaul config files by removing unnecessary RU delay parameters --- .../gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 5 ----- .../gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf | 5 ----- radio/fhi_72/oran-config.c | 9 --------- radio/fhi_72/oran-params.h | 10 ---------- .../gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf | 5 ----- ...b-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf | 10 ---------- .../CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf | 5 ----- .../CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf | 5 ----- .../CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 5 ----- .../gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf | 5 ----- .../gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf | 5 ----- .../CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf | 5 ----- .../CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf | 5 ----- 13 files changed, 79 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index b9c569b625..c9e51c352b 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -263,11 +263,6 @@ fhi_72 = { ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (285, 429); - T2a_cp_ul = (285, 429); - T2a_up = (125, 428); - Ta3 = (130, 170); T1a_cp_dl = (285, 470); T1a_cp_ul = (285, 429); T1a_up = (125, 350); diff --git a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf index de2a610371..acb000e7c3 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf @@ -271,11 +271,6 @@ fhi_72 = { ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (259, 500); - T2a_cp_ul = (25, 500); - T2a_up = (134, 375); - Ta3 = (152, 160); T1a_cp_dl = (419, 470); T1a_cp_ul = (285, 336); T1a_up = (294, 345); diff --git a/radio/fhi_72/oran-config.c b/radio/fhi_72/oran-config.c index 4f828b8a1a..7000bfd5ca 100644 --- a/radio/fhi_72/oran-config.c +++ b/radio/fhi_72/oran-config.c @@ -812,15 +812,6 @@ static bool set_fh_config(int ru_idx, int num_rus, enum xran_category xran_cat, fh_config->nULCenterFreqARFCN = 0; // center frequency for UL in NR-ARFCN; not used in xran fh_config->ttiCb = NULL; // check tti_to_phy_cb(), tx_cp_dl_cb() and tx_cp_ul_cb => first_call fh_config->ttiCbParam = NULL; // check tti_to_phy_cb(), tx_cp_dl_cb() and tx_cp_ul_cb => first_call - fh_config->Tadv_cp_dl = *gpd(fhp, nfh, ORAN_FH_CONFIG_TADV_CP_DL)->uptr; // not used in xran - if (!set_maxmin_pd(fhp, nfh, ORAN_FH_CONFIG_T2A_CP_DL, &fh_config->T2a_min_cp_dl, &fh_config->T2a_max_cp_dl)) // not used in xran - return false; - if (!set_maxmin_pd(fhp, nfh, ORAN_FH_CONFIG_T2A_CP_UL, &fh_config->T2a_min_cp_ul, &fh_config->T2a_max_cp_ul)) // not used in xran - return false; - if (!set_maxmin_pd(fhp, nfh, ORAN_FH_CONFIG_T2A_UP, &fh_config->T2a_min_up, &fh_config->T2a_max_up)) // not used in xran - return false; - if (!set_maxmin_pd(fhp, nfh, ORAN_FH_CONFIG_TA3, &fh_config->Ta3_min, &fh_config->Ta3_max)) // not used in xran - return false; if (!set_maxmin_pd(fhp, nfh, ORAN_FH_CONFIG_T1A_CP_DL, &fh_config->T1a_min_cp_dl, &fh_config->T1a_max_cp_dl)) return false; if (!set_maxmin_pd(fhp, nfh, ORAN_FH_CONFIG_T1A_CP_UL, &fh_config->T1a_min_cp_ul, &fh_config->T1a_max_cp_ul)) diff --git a/radio/fhi_72/oran-params.h b/radio/fhi_72/oran-params.h index e9de03660c..13f094232f 100644 --- a/radio/fhi_72/oran-params.h +++ b/radio/fhi_72/oran-params.h @@ -57,11 +57,6 @@ #define CONFIG_STRING_ORAN_FH "fh_config" -#define ORAN_FH_CONFIG_TADV_CP_DL "Tadv_cp_dl" -#define ORAN_FH_CONFIG_T2A_CP_DL "T2a_cp_dl" -#define ORAN_FH_CONFIG_T2A_CP_UL "T2a_cp_ul" -#define ORAN_FH_CONFIG_T2A_UP "T2a_up" -#define ORAN_FH_CONFIG_TA3 "Ta3" #define ORAN_FH_CONFIG_T1A_CP_DL "T1a_cp_dl" #define ORAN_FH_CONFIG_T1A_CP_UL "T1a_cp_ul" #define ORAN_FH_CONFIG_T1A_UP "T1a_up" @@ -73,11 +68,6 @@ // clang-format off #define ORAN_FH_DESC { \ - {ORAN_FH_CONFIG_TADV_CP_DL, "Tadv parameter of RU\n", PARAMFLAG_MANDATORY, .uptr=NULL, .defuintval=0, TYPE_UINT, 0}, \ - {ORAN_FH_CONFIG_T2A_CP_DL, "T2a_cp_dl" ORAN_FH_HLP_CPLT, PARAMFLAG_MANDATORY, .uptr=NULL, .defintarrayval=0, TYPE_UINTARRAY, 0}, \ - {ORAN_FH_CONFIG_T2A_CP_UL, "T2a_cp_ul" ORAN_FH_HLP_CPLT, PARAMFLAG_MANDATORY, .uptr=NULL, .defintarrayval=0, TYPE_UINTARRAY, 0}, \ - {ORAN_FH_CONFIG_T2A_UP, "T2a_up" ORAN_FH_HLP_CPLT, PARAMFLAG_MANDATORY, .uptr=NULL, .defintarrayval=0, TYPE_UINTARRAY, 0}, \ - {ORAN_FH_CONFIG_TA3, "Ta3" ORAN_FH_HLP_CPLT, PARAMFLAG_MANDATORY, .uptr=NULL, .defintarrayval=0, TYPE_UINTARRAY, 0}, \ {ORAN_FH_CONFIG_T1A_CP_DL, "T1a_cp_dl" ORAN_FH_HLP_CPLT, PARAMFLAG_MANDATORY, .uptr=NULL, .defintarrayval=0, TYPE_UINTARRAY, 0}, \ {ORAN_FH_CONFIG_T1A_CP_UL, "T1a_cp_ul" ORAN_FH_HLP_CPLT, PARAMFLAG_MANDATORY, .uptr=NULL, .defintarrayval=0, TYPE_UINTARRAY, 0}, \ {ORAN_FH_CONFIG_T1A_UP, "T1a_up" ORAN_FH_HLP_CPLT, PARAMFLAG_MANDATORY, .uptr=NULL, .defintarrayval=0, TYPE_UINTARRAY, 0}, \ diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf index 5072dc32bb..10decbaf1d 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf @@ -253,11 +253,6 @@ fhi_72 = { ru_addr = ("8c:1f:64:d1:10:46","8c:1f:64:d1:10:46"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (259, 500); - T2a_cp_ul = (25, 500); - T2a_up = (134, 375); - Ta3 = (152, 160); T1a_cp_dl = (419, 470); T1a_cp_ul = (285, 336); T1a_up = (294, 345); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf index fa54c07424..79c6e02f30 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf @@ -255,11 +255,6 @@ fhi_72 = { fh_config = ( # RAN650 #1 { - Tadv_cp_dl = 125; - T2a_cp_dl = (259, 500); - T2a_cp_ul = (25, 500); - T2a_up = (134, 375); - Ta3 = (152, 160); T1a_cp_dl = (419, 470); T1a_cp_ul = (285, 336); T1a_up = (294, 345); @@ -271,11 +266,6 @@ fhi_72 = { }, # RAN650 #2 { - Tadv_cp_dl = 125; - T2a_cp_dl = (259, 500); - T2a_cp_ul = (25, 500); - T2a_up = (134, 375); - Ta3 = (152, 160); T1a_cp_dl = (419, 470); T1a_cp_ul = (285, 336); T1a_up = (294, 345); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf index 8f9d6460c7..c92bf1d0ce 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf @@ -269,11 +269,6 @@ fhi_72 = { ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (285, 429); - T2a_cp_ul = (285, 429); - T2a_up = (125, 428); - Ta3 = (130, 170); T1a_cp_dl = (285, 470); T1a_cp_ul = (285, 429); T1a_up = (125, 350); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf index ab97c214e2..d4ce05b5d5 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf @@ -266,11 +266,6 @@ fhi_72 = { ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (285, 429); - T2a_cp_ul = (285, 429); - T2a_up = (125, 428); - Ta3 = (130, 170); T1a_cp_dl = (285, 470); T1a_cp_ul = (285, 429); T1a_up = (125, 350); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 2954e6e096..86079fd7c4 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -268,11 +268,6 @@ fhi_72 = { ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (285, 429); - T2a_cp_ul = (285, 429); - T2a_up = (125, 428); - Ta3 = (130, 170); T1a_cp_dl = (285, 470); T1a_cp_ul = (285, 429); T1a_up = (125, 350); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf index 2c25a63348..a159cd5f9b 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf @@ -268,11 +268,6 @@ fhi_72 = { ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (259, 500); - T2a_cp_ul = (25, 500); - T2a_up = (134, 375); - Ta3 = (152, 160); T1a_cp_dl = (419, 470); T1a_cp_ul = (285, 336); T1a_up = (294, 345); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf index ba96da73ce..23da52e1f9 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf @@ -270,11 +270,6 @@ fhi_72 = { ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81"); mtu = 9600; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (259, 500); - T2a_cp_ul = (25, 500); - T2a_up = (134, 375); - Ta3 = (152, 160); T1a_cp_dl = (419, 470); T1a_cp_ul = (285, 336); T1a_up = (294, 345); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf index f1698391a0..cd994b246a 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf @@ -266,11 +266,6 @@ fhi_72 = { worker_cores = (2); ru_addr = ("e8:c7:4f:1e:c7:11", "e8:c7:4f:1e:c7:11"); fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (285, 429); - T2a_cp_ul = (285, 429); - T2a_up = (125, 428); - Ta3 = (130, 170); T1a_cp_dl = (285, 429); T1a_cp_ul = (285, 429); T1a_up = (96, 196); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf index cf3e429709..00ca853c6d 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf @@ -252,11 +252,6 @@ fhi_72 = { ru_addr = ("00:e0:0c:00:ae:06", "00:e0:0c:00:ae:06"); mtu = 9000; fh_config = ({ - Tadv_cp_dl = 125; - T2a_cp_dl = (285, 429); - T2a_cp_ul = (285, 429); - T2a_up = (125, 428); - Ta3 = (130, 170); T1a_cp_dl = (285, 470); T1a_cp_ul = (285, 429); T1a_up = (125, 350);