remove hardcoded, global rx_total_gain_dB: Why is it 130?

executables/nr-softmodem.c

@@ -104,16 +104,6 @@ char *uecap_file;
 
 runmode_t mode = normal_txrx;
 
-#if MAX_NUM_CCs == 1
-double tx_gain[MAX_NUM_CCs][4] = {{20,0,0,0}};
-double rx_gain[MAX_NUM_CCs][4] = {{110,0,0,0}};
-#else
-double tx_gain[MAX_NUM_CCs][4] = {{20,0,0,0},{20,0,0,0}};
-double rx_gain[MAX_NUM_CCs][4] = {{110,0,0,0},{20,0,0,0}};
-#endif
-
-double rx_gain_off = 0.0;
-
 static int tx_max_power[MAX_NUM_CCs]; /* =  {0,0}*/;
 int chain_offset = 0;
 int emulate_rf = 0;

executables/nr-uesoftmodem.c

@@ -116,8 +116,6 @@ int oai_exit = 0;
 
 static int      tx_max_power[MAX_NUM_CCs] = {0};
 
-double          rx_gain_off = 0.0;
-
 uint64_t        downlink_frequency[MAX_NUM_CCs][4];
 int32_t         uplink_frequency_offset[MAX_NUM_CCs][4];
 uint64_t        sidelink_frequency[MAX_NUM_CCs][4];
@@ -211,7 +209,7 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
   NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
 
   // Set UE variables
-  UE->rx_total_gain_dB     = (int)nrUE_params.rx_gain + rx_gain_off;
+  UE->rx_total_gain_dB     = (int)nrUE_params.rx_gain;
   UE->tx_total_gain_dB     = (int)nrUE_params.tx_gain;
   UE->tx_power_max_dBm     = nrUE_params.tx_max_power;
   UE->rf_map.card          = 0;
@@ -286,7 +284,7 @@ void init_openair0()
 
     nr_rf_card_config_freq(&openair0_cfg[card], ul_carrier, dl_carrier, freq_off);
 
-    nr_rf_card_config_gain(&openair0_cfg[card], rx_gain_off);
+    nr_rf_card_config_gain(&openair0_cfg[card], 0);
 
     openair0_cfg[card].configFilename = get_softmodem_params()->rf_config_file;
 

openair1/PHY/INIT/nr_init.c

@@ -490,8 +490,6 @@ void init_nr_transport(PHY_VARS_gNB *gNB)
     gNB->ulsch[i] = new_gNB_ulsch(gNB->max_ldpc_iterations, fp->N_RB_UL);
   }
 
-  gNB->rx_total_gain_dB=130;
-
   //fp->pucch_config_common.deltaPUCCH_Shift = 1;
 }
 

openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c

@@ -175,7 +175,7 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
       }
       n0_subband_tot_perPRB/=frame_parms->nb_antennas_rx;
       measurements->n0_subband_power_tot_dB[rb] = dB_fixed(n0_subband_tot_perPRB);
-      measurements->n0_subband_power_tot_dBm[rb] = measurements->n0_subband_power_tot_dB[rb] - gNB->rx_total_gain_dB - dB_fixed(frame_parms->N_RB_UL);
+      measurements->n0_subband_power_tot_dBm[rb] = measurements->n0_subband_power_tot_dB[rb] - 130 /* was hardcoded in rx_total_gain_dB */ - dB_fixed(frame_parms->N_RB_UL);
       LOG_D(NR_PHY,"n0_subband_power_tot_dB[%d] => %d, over %d symbols\n",rb,measurements->n0_subband_power_tot_dB[rb],nb_symb[rb]);
       n0_subband_tot += n0_subband_tot_perPRB;
       nb_rb++;

openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h

@@ -146,9 +146,8 @@ void nr_pdsch_ptrs_processing(PHY_VARS_NR_UE *ue,
                               uint16_t rnti,
                               NR_UE_DLSCH_t dlsch[2]);
 
-float_t get_nr_RSRP(module_id_t Mod_id,uint8_t CC_id,uint8_t gNB_index);
-
-int nr_sl_psbch_rsrp_measurements(sl_nr_ue_phy_params_t *sl_phy_params,
+int nr_sl_psbch_rsrp_measurements(PHY_VARS_NR_UE *ue,
+                                  sl_nr_ue_phy_params_t *sl_phy_params,
                                   NR_DL_FRAME_PARMS *fp,
                                   c16_t rxdataF[][fp->samples_per_slot_wCP],
                                   bool use_SSS);

openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c

@@ -42,38 +42,6 @@
 #define k1 ((long long int) 1000)
 #define k2 ((long long int) (1024-k1))
 
-//#define DEBUG_MEAS_RRC
-//#define DEBUG_MEAS_UE
-//#define DEBUG_RANK_EST
-
-uint32_t get_nr_rx_total_gain_dB (module_id_t Mod_id,uint8_t CC_id)
-{
-
-  PHY_VARS_NR_UE *ue = PHY_vars_UE_g[Mod_id][CC_id];
-
-  if (ue)
-    return ue->rx_total_gain_dB;
-
-  return 0xFFFFFFFF;
-}
-
-
-float_t get_nr_RSRP(module_id_t Mod_id,uint8_t CC_id,uint8_t gNB_index)
-{
-
-  AssertFatal(PHY_vars_UE_g!=NULL,"PHY_vars_UE_g is null\n");
-  AssertFatal(PHY_vars_UE_g[Mod_id]!=NULL,"PHY_vars_UE_g[%d] is null\n",Mod_id);
-  AssertFatal(PHY_vars_UE_g[Mod_id][CC_id]!=NULL,"PHY_vars_UE_g[%d][%d] is null\n",Mod_id,CC_id);
-
-  PHY_VARS_NR_UE *ue = PHY_vars_UE_g[Mod_id][CC_id];
-
-  if (ue)
-    return (10*log10(ue->measurements.rsrp[gNB_index])-
-	    get_nr_rx_total_gain_dB(Mod_id,0) -
-	    10*log10(20*12));
-  return -140.0;
-}
-
 void nr_ue_measurements(PHY_VARS_NR_UE *ue,
                         const UE_nr_rxtx_proc_t *proc,
                         NR_UE_DLSCH_t *dlsch,
@@ -157,7 +125,7 @@ void nr_ue_measurements(PHY_VARS_NR_UE *ue,
     ue->measurements.rx_power_avg_dB[gNB_id] = dB_fixed( ue->measurements.rx_power_avg[gNB_id]);
     ue->measurements.wideband_cqi_tot[gNB_id] = ue->measurements.rx_power_tot_dB[gNB_id] - ue->measurements.n0_power_tot_dB;
     ue->measurements.wideband_cqi_avg[gNB_id] = ue->measurements.rx_power_avg_dB[gNB_id] - dB_fixed(ue->measurements.n0_power_avg);
-    ue->measurements.rx_rssi_dBm[gNB_id] = ue->measurements.rx_power_avg_dB[gNB_id] + 30 - SQ15_SQUARED_NORM_FACTOR_DB - ((int)openair0_cfg[0].rx_gain[0] - (int)openair0_cfg[0].rx_gain_offset[0]) - dB_fixed(ue->frame_parms.ofdm_symbol_size);
+    ue->measurements.rx_rssi_dBm[gNB_id] = ue->measurements.rx_power_avg_dB[gNB_id] + 30 - SQ15_SQUARED_NORM_FACTOR_DB - (int)ue->rx_total_gain_dB - dB_fixed(ue->frame_parms.ofdm_symbol_size);
 
     LOG_D(PHY, "[gNB %d] Slot %d, RSSI %d dB (%d dBm/RE), WBandCQI %d dB, rxPwrAvg %d, n0PwrAvg %d\n",
       gNB_id,
@@ -239,7 +207,7 @@ void nr_ue_ssb_rsrp_measurements(PHY_VARS_NR_UE *ue,
   openair0_config_t *cfg0 = &openair0_cfg[0];
 
   ue->measurements.ssb_rsrp_dBm[ssb_index] = rsrp_db_per_re + 30 - SQ15_SQUARED_NORM_FACTOR_DB
-                                             - ((int)cfg0->rx_gain[0] - (int)cfg0->rx_gain_offset[0])
+                                             - (int)ue->rx_total_gain_dB
                                              - dB_fixed(fp->ofdm_symbol_size);
 
   LOG_D(PHY,
@@ -266,8 +234,7 @@ void nr_ue_rrc_measurements(PHY_VARS_NR_UE *ue,
   const uint8_t k_length = 8;
   uint8_t l_sss = (ue->symbol_offset + 2) % ue->frame_parms.symbols_per_slot;
   unsigned int ssb_offset = ue->frame_parms.first_carrier_offset + ue->frame_parms.ssb_start_subcarrier;
-  double rx_gain = openair0_cfg[0].rx_gain[0];
-  double rx_gain_offset = openair0_cfg[0].rx_gain_offset[0];
+  double rx_gain = ue->rx_total_gain_dB;
 
   ue->measurements.n0_power_tot = 0;
 
@@ -315,7 +282,7 @@ void nr_ue_rrc_measurements(PHY_VARS_NR_UE *ue,
   #ifdef DEBUG_MEAS_RRC
   const int psd_awgn = -174;
   const int scs = 15000 * (1 << ue->frame_parms.numerology_index);
-  const int nf_usrp = ue->measurements.n0_power_tot_dB + 3 + 30 - ((int)rx_gain - (int)rx_gain_offset) - SQ15_SQUARED_NORM_FACTOR_DB - (psd_awgn + dB_fixed(scs) + dB_fixed(ue->frame_parms.ofdm_symbol_size));
+  const int nf_usrp = ue->measurements.n0_power_tot_dB + 3 + 30 - (int)rx_gain - SQ15_SQUARED_NORM_FACTOR_DB - (psd_awgn + dB_fixed(scs) + dB_fixed(ue->frame_parms.ofdm_symbol_size));
   LOG_D(PHY, "In [%s][slot:%d] NF USRP %d dB\n", __FUNCTION__, slot, nf_usrp);
   #endif
 
@@ -326,7 +293,7 @@ void nr_ue_rrc_measurements(PHY_VARS_NR_UE *ue,
         ue->measurements.n0_power_tot,
         ue->measurements.n0_power_tot_dB,
         ue->measurements.n0_power_tot_dB + 30 - SQ15_SQUARED_NORM_FACTOR_DB - dB_fixed(ue->frame_parms.ofdm_symbol_size)
-            - ((int)rx_gain - (int)rx_gain_offset));
+            - (int)rx_gain);
 }
 
 // This function implements:
@@ -336,7 +303,8 @@ void nr_ue_rrc_measurements(PHY_VARS_NR_UE *ue,
 // Measurement units:
 // - RSRP:    W (dBW)
 // returns RXgain to be adjusted based on target rx power (50db) - received digital power in db/RE
-int nr_sl_psbch_rsrp_measurements(sl_nr_ue_phy_params_t *sl_phy_params,
+int nr_sl_psbch_rsrp_measurements(PHY_VARS_NR_UE *ue,
+                                  sl_nr_ue_phy_params_t *sl_phy_params,
                                   NR_DL_FRAME_PARMS *fp,
                                   c16_t rxdataF[][fp->samples_per_slot_wCP],
                                   bool use_SSS)
@@ -373,7 +341,7 @@ int nr_sl_psbch_rsrp_measurements(sl_nr_ue_phy_params_t *sl_phy_params,
 
   psbch_rx->rsrp_dB_per_RE = 10 * log10(rsrp / num_re);
   psbch_rx->rsrp_dBm_per_RE = psbch_rx->rsrp_dB_per_RE + 30 - SQ15_SQUARED_NORM_FACTOR_DB
-                              - ((int)openair0_cfg[0].rx_gain[0] - (int)openair0_cfg[0].rx_gain_offset[0])
+                              - (int)ue->rx_total_gain_dB
                               - dB_fixed(fp->ofdm_symbol_size);
 
   int adjust_rxgain = TARGET_RX_POWER - psbch_rx->rsrp_dB_per_RE;

openair1/PHY/NR_UE_TRANSPORT/csi_rx.c

@@ -242,7 +242,7 @@ static int nr_get_csi_rs_signal(const PHY_VARS_NR_UE *ue,
 
   *rsrp = rsrp_sum/meas_count;
   *rsrp_dBm = dB_fixed(*rsrp) + 30 - SQ15_SQUARED_NORM_FACTOR_DB
-      - ((int)openair0_cfg[0].rx_gain[0] - (int)openair0_cfg[0].rx_gain_offset[0]) - dB_fixed(ue->frame_parms.ofdm_symbol_size);
+      - (int)ue->rx_total_gain_dB - dB_fixed(ue->frame_parms.ofdm_symbol_size);
 
 #ifdef NR_CSIRS_DEBUG
   LOG_I(NR_PHY, "RSRP = %i (%i dBm)\n", *rsrp, *rsrp_dBm);

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync_sl.c

@@ -518,7 +518,7 @@ nr_initial_sync_t sl_nr_slss_search(PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc,
                 sync_params->DFN,
                 sync_params->slot_offset);
 
-          UE->adjust_rxgain = nr_sl_psbch_rsrp_measurements(sl_ue, frame_parms, rxdataF, false);
+          UE->adjust_rxgain = nr_sl_psbch_rsrp_measurements(UE, sl_ue, frame_parms, rxdataF, false);
 
           UE->init_sync_frame = sync_params->remaining_frames;
           result.rx_offset = sync_params->rx_offset;

openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c

@@ -64,9 +64,10 @@ void nr_rf_card_config_gain(openair0_config_t *openair0_cfg,
     if (tx_gain)
       openair0_cfg->tx_gain[i] = tx_gain;
     if (rx_gain)
-      openair0_cfg->rx_gain[i] = rx_gain - rx_gain_off;
+      openair0_cfg->rx_gain[i] = rx_gain;
 
     openair0_cfg->autocal[i] = 1;
+    openair0_cfg->rx_gain_offset[i] = rx_gain_off;
 
     if (i < openair0_cfg->rx_num_channels) {
       LOG_I(PHY, "HW: Configuring channel %d (rf_chain %d): setting tx_gain %.0f, rx_gain %.0f\n",

openair1/PHY/defs_gNB.h

@@ -424,7 +424,6 @@ typedef struct PHY_VARS_gNB_s {
   eth_params_t eth_params_n;
   /// Ethernet parameters for fronthaul interface
   eth_params_t eth_params;
-  int rx_total_gain_dB;
   int (*nr_start_if)(struct RU_t_s *ru, struct PHY_VARS_gNB_s *gNB);
   nfapi_nr_config_request_scf_t gNB_config;
   NR_DL_FRAME_PARMS frame_parms;

openair1/SCHED_NR_UE/phy_procedures_nr_ue_sl.c

@@ -227,7 +227,7 @@ int psbch_pscch_processing(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, nr
       sym = (sym == 0) ? 5 : sym + 1;
     }
 
-    ue->adjust_rxgain = nr_sl_psbch_rsrp_measurements(sl_phy_params, fp, rxdataF, false);
+    ue->adjust_rxgain = nr_sl_psbch_rsrp_measurements(ue, sl_phy_params, fp, rxdataF, false);
 
     LOG_D(NR_PHY, " ------  Decode SL-MIB: frame.slot %d.%d ------  \n", frame_rx % 1024, nr_slot_rx);
 

radio/COMMON/common_lib.h

@@ -242,17 +242,14 @@ typedef struct openair0_config {
   //! index: [0..rx_num_channels[ !!! see lte-ue.c:427 FIXME iterates over rx_num_channels
   double tx_freq[8];
   double tune_offset;
-  //! \brief memory
-  //! \brief Pointer to Calibration table for RX gains
-  rx_gain_calib_table_t *rx_gain_calib_table;
   //! mode for rxgain (ExpressMIMO2)
   rx_gain_t rxg_mode[8];
   //! \brief Gain for RX in dB.
   //! index: [0..rx_num_channels]
-  double rx_gain[8];
+  double rx_gain[8]; // power we give to the radio
   //! \brief Gain offset (for calibration) in dB
   //! index: [0..rx_num_channels]
-  double rx_gain_offset[8];
+  double rx_gain_offset[8]; // additional offset
   //! gain for TX in dB
   double tx_gain[8];
   //! RX bandwidth in Hz

radio/USRP/usrp_lib.cpp

@@ -892,118 +892,6 @@ int trx_usrp_stop(openair0_device *device) {
   return(0);
 }
 
-/*! \brief USRPB210 RX calibration table */
-rx_gain_calib_table_t calib_table_b210[] = {
-  {3500000000.0,44.0},
-  {2660000000.0,49.0},
-  {2300000000.0,50.0},
-  {1880000000.0,53.0},
-  {816000000.0,58.0},
-  {-1,0}
-};
-
-/*! \brief USRPB210 RX calibration table */
-rx_gain_calib_table_t calib_table_b210_38[] = {
-  {3500000000.0,44.0},
-  {2660000000.0,49.8},
-  {2300000000.0,51.0},
-  {1880000000.0,53.0},
-  {816000000.0,57.0},
-  {-1,0}
-};
-
-/*! \brief USRPx310 RX calibration table */
-rx_gain_calib_table_t calib_table_x310[] = {
-  {3500000000.0,77.0},
-  {2660000000.0,81.0},
-  {2300000000.0,81.0},
-  {1880000000.0,82.0},
-  {816000000.0,85.0},
-  {-1,0}
-};
-
-/*! \brief USRPn3xf RX calibration table */
-rx_gain_calib_table_t calib_table_n310[] = {
-  {3500000000.0,0.0},
-  {2660000000.0,0.0},
-  {2300000000.0,0.0},
-  {1880000000.0,0.0},
-  {816000000.0, 0.0},
-  {-1,0}
-};
-
-/*! \brief Empty RX calibration table */
-rx_gain_calib_table_t calib_table_none[] = {
-  {3500000000.0,0.0},
-  {2660000000.0,0.0},
-  {2300000000.0,0.0},
-  {1880000000.0,0.0},
-  {816000000.0, 0.0},
-  {-1,0}
-};
-
-
-/*! \brief Set RX gain offset
- * \param openair0_cfg RF frontend parameters set by application
- * \param chain_index RF chain to apply settings to
- * \returns 0 in success
- */
-void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_gain_adjust) {
-  int i=0;
-  // loop through calibration table to find best adjustment factor for RX frequency
-  double min_diff = 6e9,diff,gain_adj=0.0;
-
-  if (bw_gain_adjust==1) {
-    switch ((int)openair0_cfg[0].sample_rate) {
-      case 46080000:
-        break;
-
-      case 30720000:
-        break;
-
-      case 23040000:
-        gain_adj=1.25;
-        break;
-
-      case 15360000:
-        gain_adj=3.0;
-        break;
-
-      case 7680000:
-        gain_adj=6.0;
-        break;
-
-      case 3840000:
-        gain_adj=9.0;
-        break;
-
-      case 1920000:
-        gain_adj=12.0;
-        break;
-
-      default:
-        LOG_E(HW,"unknown sampling rate %d\n",(int)openair0_cfg[0].sample_rate);
-        //exit(-1);
-        break;
-    }
-  }
-
-  while (openair0_cfg->rx_gain_calib_table[i].freq>0) {
-    diff = fabs(openair0_cfg->rx_freq[chain_index] - openair0_cfg->rx_gain_calib_table[i].freq);
-    LOG_I(HW,"cal %d: freq %f, offset %f, diff %f\n",
-          i,
-          openair0_cfg->rx_gain_calib_table[i].freq,
-          openair0_cfg->rx_gain_calib_table[i].offset,diff);
-
-    if (min_diff > diff) {
-      min_diff = diff;
-      openair0_cfg->rx_gain_offset[chain_index] = openair0_cfg->rx_gain_calib_table[i].offset+gain_adj;
-    }
-
-    i++;
-  }
-}
-
 /*! \brief print the USRP statistics
 * \param device the hardware to use
 * \returns  0 on success
@@ -1073,7 +961,6 @@ extern "C" {
     //uhd::set_thread_priority_safe(1.0);
     // Initialize USRP device
     int vers=0,subvers=0,subsubvers=0;
-    int bw_gain_adjust=0;
 
     if (device->openair0_cfg->recplay_mode == RECPLAY_RECORDMODE) {
       std::cerr << "USRP device initialized in subframes record mode" << std::endl;
@@ -1234,22 +1121,6 @@ extern "C" {
     }
   }
 
-  if (device->type==USRP_X300_DEV) {
-    openair0_cfg[0].rx_gain_calib_table = calib_table_x310;
-    std::cerr << "-- Using calibration table: calib_table_x310" << std::endl;
-  }
-
-  if (device->type==USRP_N300_DEV) {
-    openair0_cfg[0].rx_gain_calib_table = calib_table_n310;
-    std::cerr << "-- Using calibration table: calib_table_n310" << std::endl;
-  }
-
-  if (device->type == USRP_X400_DEV) {
-    openair0_cfg[0].rx_gain_calib_table = calib_table_none;
-    std::cerr << "-- Using calibration table: calib_table_none" << std::endl;
-  }
-
-
   if (device->type==USRP_N300_DEV || device->type==USRP_X300_DEV || device->type==USRP_X400_DEV) {
     LOG_I(HW,"%s() sample_rate:%u\n", __FUNCTION__, (int)openair0_cfg[0].sample_rate);
 
@@ -1345,16 +1216,6 @@ extern "C" {
   }
 
   if (device->type == USRP_B200_DEV) {
-    if ((vers == 3) && (subvers == 9) && (subsubvers>=2)) {
-      openair0_cfg[0].rx_gain_calib_table = calib_table_b210;
-      bw_gain_adjust=0;
-      std::cerr << "-- Using calibration table: calib_table_b210" << std::endl; // Bell Labs info
-    } else {
-      openair0_cfg[0].rx_gain_calib_table = calib_table_b210_38;
-      bw_gain_adjust=1;
-      std::cerr << "-- Using calibration table: calib_table_b210_38" << std::endl; // Bell Labs info
-    }
-
     switch ((int)openair0_cfg[0].sample_rate) {
       case 46080000:
         s->usrp->set_master_clock_rate(46.08e6);
@@ -1435,7 +1296,6 @@ extern "C" {
       s->usrp->set_rx_rate(cfg->sample_rate, i + choffset);
       uhd::tune_request_t rx_tune_req(cfg->rx_freq[i], cfg->tune_offset);
       s->usrp->set_rx_freq(rx_tune_req, i+choffset);
-      set_rx_gain_offset(cfg, i, bw_gain_adjust);
       ::uhd::gain_range_t gain_range = s->usrp->get_rx_gain_range(i+choffset);
       // limit to maximum gain
       double gain = cfg->rx_gain[i] - cfg->rx_gain_offset[i];