makiandClaude Opus 4.7
7cd72323af
Brings the O-RAN compliant antenna muting feature (originally introduced
on the 'new' branch) onto the latest upstream 2026.w17 tag.
Files added:
openair1/PHY/NR_TRANSPORT/nr_antenna_state.{c,h}
openair1/PHY/NR_TRANSPORT/nr_antenna_control.{c,h}
Files modified (integration hooks):
CMakeLists.txt, executables/nr-gnb.c
openair1/PHY/INIT/nr_init.c, openair1/PHY/defs_gNB.h
openair1/PHY/MODULATION/{beamforming.c,nr_modulation.h,nr_beamforming.c}
openair1/SCHED_NR/nr_ru_procedures.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_{primitives,dlsch,uci}.c
Conflicts resolved:
- defs_gNB.h: kept upstream's new headers + appended antenna_state.h
- nr_init.c: dropped reference to upstream-removed nr_srs_info init,
kept nr_init_antenna_state() call
- beamforming.c: upstream moved nr_beam_precoding into new file
nr_beamforming.c; nr_beam_precoding_with_muting added there with
upstream's signature (no slot param)
- nr_modulation.h: aligned _with_muting decl to upstream signature
- nr_ru_procedures.c: muting check applied around upstream's new
fft_shift in nr_feptx, and around per-port memcpy in nr_feptx_prec
- gNB_scheduler_uci.c: SINR-based MCS hint uses get_dl_nrOfLayers(NULL,
sched_ctrl, ...) since nrmac is not in scope at the call site
- mac_proto.h: get_dl_nrOfLayers signature updated to take gNB_MAC_INST*
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
381 lines
13 KiB
C
381 lines
13 KiB
C
/*
|
|
* SPDX-License-Identifier: LicenseRef-CSSL-1.0
|
|
*/
|
|
|
|
/*!
|
|
* \brief Implementation of RU procedures
|
|
*/
|
|
|
|
#include "PHY/defs_gNB.h"
|
|
#include "common/platform_types.h"
|
|
#include "sched_nr.h"
|
|
#include "PHY/MODULATION/modulation_common.h"
|
|
#include "PHY/MODULATION/nr_modulation.h"
|
|
#include "openair1/PHY/defs_nr_common.h"
|
|
#include "common/utils/LOG/log.h"
|
|
#include "common/utils/system.h"
|
|
|
|
#include "T.h"
|
|
|
|
#include "assertions.h"
|
|
|
|
#include <time.h>
|
|
|
|
static inline int count_nnz_c16(const c16_t *v, int n)
|
|
{
|
|
int nnz = 0;
|
|
for (int i = 0; i < n; i++)
|
|
nnz += (v[i].r != 0) || (v[i].i != 0);
|
|
return nnz;
|
|
}
|
|
|
|
// RU OFDM Modulator gNodeB
|
|
// OFDM modulation core routine, generates a first_symbol to first_symbol+num_symbols on a particular slot and TX antenna port
|
|
void nr_feptx0(RU_t *ru, int tti_tx, int first_symbol, int num_symbols, int aa)
|
|
{
|
|
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
|
|
|
|
unsigned int slot_offset,slot_offsetF;
|
|
int slot = tti_tx;
|
|
|
|
if (aa == 0 && first_symbol == 0)
|
|
start_meas(&ru->ofdm_mod_stats);
|
|
slot_offset = get_samples_slot_timestamp(fp, slot);
|
|
slot_offsetF = first_symbol * fp->ofdm_symbol_size;
|
|
|
|
int abs_first_symbol = slot * fp->symbols_per_slot;
|
|
|
|
for (int idx_sym = abs_first_symbol; idx_sym < abs_first_symbol + first_symbol; idx_sym++)
|
|
slot_offset += (idx_sym % (0x7 << fp->numerology_index)) ? fp->nb_prefix_samples : fp->nb_prefix_samples0;
|
|
|
|
slot_offset += fp->ofdm_symbol_size * first_symbol;
|
|
|
|
LOG_D(PHY,
|
|
"SFN/SF:RU:TX:%d/%d aa %d Generating slot %d (first_symbol %d num_symbols %d) slot_offset %d, slot_offsetF %d\n",
|
|
ru->proc.frame_tx,
|
|
ru->proc.tti_tx,
|
|
aa,
|
|
slot,
|
|
first_symbol,
|
|
num_symbols,
|
|
slot_offset,
|
|
slot_offsetF);
|
|
|
|
if (fp->Ncp == 1) {
|
|
PHY_ofdm_mod(&ru->common.txdataF_BF[aa][slot_offsetF],
|
|
(int*)&ru->common.txdata[aa][slot_offset],
|
|
fp->ofdm_symbol_size,
|
|
num_symbols,
|
|
fp->nb_prefix_samples,
|
|
CYCLIC_PREFIX);
|
|
} else {
|
|
if (fp->numerology_index != 0) {
|
|
|
|
if (!(slot%(fp->slots_per_subframe/2))&&(first_symbol==0)) { // case where first symbol in slot has longer prefix
|
|
PHY_ofdm_mod(&ru->common.txdataF_BF[aa][slot_offsetF],
|
|
(int*)&ru->common.txdata[aa][slot_offset],
|
|
fp->ofdm_symbol_size,
|
|
1,
|
|
fp->nb_prefix_samples0,
|
|
CYCLIC_PREFIX);
|
|
|
|
PHY_ofdm_mod(&ru->common.txdataF_BF[aa][slot_offsetF+fp->ofdm_symbol_size],
|
|
(int*)&ru->common.txdata[aa][slot_offset+fp->nb_prefix_samples0+fp->ofdm_symbol_size],
|
|
fp->ofdm_symbol_size,
|
|
num_symbols-1,
|
|
fp->nb_prefix_samples,
|
|
CYCLIC_PREFIX);
|
|
}
|
|
else { // all symbols in slot have shorter prefix
|
|
PHY_ofdm_mod(&ru->common.txdataF_BF[aa][slot_offsetF],
|
|
(int*)&ru->common.txdata[aa][slot_offset],
|
|
fp->ofdm_symbol_size,
|
|
num_symbols,
|
|
fp->nb_prefix_samples,
|
|
CYCLIC_PREFIX);
|
|
}
|
|
} // numerology_index!=0
|
|
else { //numerology_index == 0
|
|
for (int idx_sym = abs_first_symbol; idx_sym < abs_first_symbol+num_symbols; idx_sym++) {
|
|
if (idx_sym % 0x7) {
|
|
PHY_ofdm_mod(&ru->common.txdataF_BF[aa][slot_offsetF],
|
|
(int*)&ru->common.txdata[aa][slot_offset],
|
|
fp->ofdm_symbol_size,
|
|
1,
|
|
fp->nb_prefix_samples,
|
|
CYCLIC_PREFIX);
|
|
slot_offset += fp->nb_prefix_samples+fp->ofdm_symbol_size;
|
|
slot_offsetF += fp->ofdm_symbol_size;
|
|
}
|
|
else {
|
|
PHY_ofdm_mod(&ru->common.txdataF_BF[aa][slot_offsetF],
|
|
(int*)&ru->common.txdata[aa][slot_offset],
|
|
fp->ofdm_symbol_size,
|
|
1,
|
|
fp->nb_prefix_samples0,
|
|
CYCLIC_PREFIX);
|
|
slot_offset += fp->nb_prefix_samples0+fp->ofdm_symbol_size;
|
|
slot_offsetF += fp->ofdm_symbol_size;
|
|
}
|
|
} // for(idx_symbol..
|
|
} // numerology 0
|
|
}
|
|
|
|
if (aa == 0 && first_symbol == 0)
|
|
stop_meas(&ru->ofdm_mod_stats);
|
|
}
|
|
|
|
// RU FEP TX OFDM modulation, single-thread
|
|
void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx)
|
|
{
|
|
nfapi_nr_config_request_scf_t *cfg = &ru->gNB_list[0]->gNB_config;
|
|
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
|
|
|
|
unsigned int aa=0;
|
|
int slot_sizeF = fp->ofdm_symbol_size * fp->symbols_per_slot;
|
|
int slot = tti_tx;
|
|
int *txdata = &ru->common.txdata[aa][get_samples_slot_timestamp(fp, slot)];
|
|
|
|
if (nr_slot_select(cfg,frame_tx,slot) == NR_UPLINK_SLOT)
|
|
return;
|
|
|
|
nr_feptx0(ru, slot, 0, fp->symbols_per_slot, aa);
|
|
|
|
LOG_D(PHY,
|
|
"feptx_ofdm (TXPATH): frame %d, slot %d: txp (time %p) %d dB, txp (freq) %d dB\n",
|
|
frame_tx,
|
|
slot,
|
|
txdata,
|
|
dB_fixed(signal_energy((int32_t *)txdata, get_samples_per_slot(slot, fp))),
|
|
dB_fixed(signal_energy_nodc((c16_t *)ru->common.txdataF_BF[aa], 2 * slot_sizeF)));
|
|
}
|
|
|
|
void nr_feptx_prec(RU_t *ru, int frame_tx, int slot_tx)
|
|
{
|
|
PHY_VARS_gNB **gNB_list = ru->gNB_list;
|
|
AssertFatal(ru->num_gNB == 1, "Cannot handle more than 1 gNB\n");
|
|
PHY_VARS_gNB *gNB = gNB_list[0];
|
|
nfapi_nr_config_request_scf_t *cfg = &ru->gNB_list[0]->gNB_config;
|
|
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
|
|
start_meas(&ru->precoding_stats);
|
|
|
|
if (gNB->common_vars.analog_bf) {
|
|
for (int i = 0; i < ru->num_beams_period; i++) {
|
|
memcpy((void*) &ru->common.beam_id[i][slot_tx * fp->symbols_per_slot],
|
|
(void*) &gNB->common_vars.beam_id[i][slot_tx * fp->symbols_per_slot],
|
|
(fp->symbols_per_slot) * sizeof(int));
|
|
}
|
|
}
|
|
|
|
if (nr_slot_select(cfg,frame_tx,slot_tx) == NR_UPLINK_SLOT)
|
|
return;
|
|
|
|
int Ptx = cfg->carrier_config.num_tx_ant.value;
|
|
// If there is no digital beamforming we just need to copy the data to RU
|
|
if (ru->config.dbt_config.num_dig_beams == 0 || ru->gNB_list[0]->common_vars.analog_bf) {
|
|
const nr_antenna_state_t *ant_state = &gNB->antenna_state;
|
|
for (int b = 0; b < ru->num_beams_period; b++) {
|
|
for (int i = 0; i < Ptx; ++i) {
|
|
int tx_idx = i + b * ru->nb_tx;
|
|
// Check antenna muting state for energy saving
|
|
if (!nr_is_tx_antenna_active(ant_state, i)) {
|
|
// Antenna is muted - zero out the buffer (transmission blanking)
|
|
memset((void *)ru->common.txdataF_BF[tx_idx], 0, fp->samples_per_slot_wCP * sizeof(int32_t));
|
|
LOG_D(PHY, "[ANTENNA_MUTE] TX antenna %d muted in nr_feptx_prec, blanking slot %d\n", i, slot_tx);
|
|
} else {
|
|
memcpy((void *)ru->common.txdataF_BF[tx_idx],
|
|
(void *)gNB->common_vars.txdataF[b][i],
|
|
fp->samples_per_slot_wCP * sizeof(int32_t));
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
AssertFatal(false, "This needs to be fixed by using appropriate beams from config\n");
|
|
}
|
|
stop_meas(&ru->precoding_stats);
|
|
}
|
|
|
|
// core routine for FEP TX, called from threads in RU TX thread-pool
|
|
void nr_feptx(void *arg)
|
|
{
|
|
feptx_cmd_t *feptx = (feptx_cmd_t *)arg;
|
|
|
|
RU_t *ru = feptx->ru;
|
|
int slot = feptx->slot;
|
|
int aa = feptx->aid;
|
|
int bb = feptx->beam;
|
|
int startSymbol = feptx->startSymbol;
|
|
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
|
|
int numSymbols = feptx->numSymbols;
|
|
|
|
int tx_idx = aa + bb * ru->nb_tx;
|
|
|
|
if (tx_idx == 0)
|
|
start_meas(&ru->precoding_stats);
|
|
|
|
if (ru->gNB_list[0]->common_vars.analog_bf) {
|
|
memcpy(&ru->common.beam_id[bb][slot * fp->symbols_per_slot],
|
|
&ru->gNB_list[0]->common_vars.beam_id[bb][slot * fp->symbols_per_slot],
|
|
(fp->symbols_per_slot) * sizeof(int));
|
|
}
|
|
|
|
// If there is no digital beamforming we just need to copy the data to RU
|
|
if (ru->config.dbt_config.num_dig_beams == 0 || ru->gNB_list[0]->common_vars.analog_bf) {
|
|
const NR_DL_FRAME_PARMS *fp = &ru->gNB_list[0]->frame_parms;
|
|
const nr_antenna_state_t *ant_state = &ru->gNB_list[0]->antenna_state;
|
|
if (!nr_is_tx_antenna_active(ant_state, aa)) {
|
|
// Antenna is muted - zero out the FFT-shift output (transmission blanking)
|
|
memset((void *)&ru->common.txdataF_BF[tx_idx][startSymbol * fp->ofdm_symbol_size], 0,
|
|
numSymbols * fp->ofdm_symbol_size * sizeof(int32_t));
|
|
} else {
|
|
// FFT shift
|
|
fft_shift(ru->gNB_list[0]->common_vars.txdataF[bb][aa],
|
|
fp->ofdm_symbol_size,
|
|
fp->N_RB_DL,
|
|
(c16_t *)ru->common.txdataF_BF[tx_idx],
|
|
fp->ofdm_symbol_size,
|
|
startSymbol,
|
|
numSymbols);
|
|
}
|
|
} else {
|
|
AssertFatal(false, "This needs to be fixed by using appropriate beams from config\n");
|
|
}
|
|
|
|
/* const c16_t *dst = (const c16_t *)&ru->common.txdataF_BF[tx_idx][txdataF_BF_offset]; */
|
|
/* const int dst_nnz = count_nnz_c16(dst, numSamples); */
|
|
/* if (startSymbol == 0 && ru->proc.frame_tx % 10 == 0 && dst_nnz != 0) { */
|
|
/* const int dst_pwr_db = dB_fixed(signal_energy_nodc((c16_t *)dst, 2 * numSamples)); */
|
|
|
|
/* LOG_I(PHY, */
|
|
/* "[TXF_PWR] frame=%d slot=%d beam=%d aa=%d tx_idx=%d " */
|
|
/* "DST pwr=%d dB nnz=%d\n", */
|
|
/* ru->proc.frame_tx, slot, bb, aa, tx_idx, dst_pwr_db, dst_nnz); */
|
|
/* } */
|
|
|
|
|
|
if (tx_idx == 0)
|
|
stop_meas(&ru->precoding_stats);
|
|
|
|
////////////FEPTX////////////
|
|
nr_feptx0(ru, slot, startSymbol, numSymbols, tx_idx);
|
|
|
|
// Task completed in //
|
|
completed_task_ans(feptx->ans);
|
|
}
|
|
|
|
// RU FEP TX using thread-pool
|
|
void nr_feptx_tp(RU_t *ru, int frame_tx, int slot)
|
|
{
|
|
nfapi_nr_config_request_scf_t *cfg = &ru->gNB_list[0]->gNB_config;
|
|
if (nr_slot_select(cfg, frame_tx, slot) == NR_UPLINK_SLOT)
|
|
return;
|
|
start_meas(&ru->ofdm_total_stats);
|
|
|
|
int nt = ru->nb_tx * ru->num_beams_period;
|
|
size_t const sz = nt + (ru->half_slot_parallelization > 0) * nt;
|
|
feptx_cmd_t arr[sz];
|
|
task_ans_t ans;
|
|
init_task_ans(&ans, sz);
|
|
|
|
int nbfeptx = 0;
|
|
for (int beam = 0; beam < ru->num_beams_period; beam++) {
|
|
for (int aid = 0; aid < ru->nb_tx; aid++) {
|
|
feptx_cmd_t *feptx_cmd = &arr[nbfeptx];
|
|
feptx_cmd->ans = &ans;
|
|
feptx_cmd->beam = beam;
|
|
feptx_cmd->aid = aid;
|
|
feptx_cmd->ru = ru;
|
|
feptx_cmd->slot = slot;
|
|
feptx_cmd->startSymbol = 0;
|
|
feptx_cmd->numSymbols =
|
|
(ru->half_slot_parallelization > 0) ? ru->nr_frame_parms->symbols_per_slot >> 1 : ru->nr_frame_parms->symbols_per_slot;
|
|
|
|
task_t t = {.func = nr_feptx, .args = feptx_cmd};
|
|
pushTpool(ru->threadPool, t);
|
|
nbfeptx++;
|
|
if (ru->half_slot_parallelization > 0) {
|
|
feptx_cmd_t *feptx_cmd = &arr[nbfeptx];
|
|
feptx_cmd->ans = &ans;
|
|
feptx_cmd->beam = beam;
|
|
feptx_cmd->aid = aid;
|
|
feptx_cmd->ru = ru;
|
|
feptx_cmd->slot = slot;
|
|
feptx_cmd->startSymbol = ru->nr_frame_parms->symbols_per_slot >> 1;
|
|
feptx_cmd->numSymbols = ru->nr_frame_parms->symbols_per_slot >> 1;
|
|
|
|
task_t t = {.func = nr_feptx, .args = feptx_cmd};
|
|
pushTpool(ru->threadPool, t);
|
|
nbfeptx++;
|
|
}
|
|
}
|
|
}
|
|
join_task_ans(&ans);
|
|
|
|
stop_meas(&ru->ofdm_total_stats);
|
|
}
|
|
|
|
// core RX FEP routine, called by threads in RU thread-pool
|
|
void nr_fep(void *arg)
|
|
{
|
|
feprx_cmd_t *feprx_cmd = (feprx_cmd_t *)arg;
|
|
int slot = feprx_cmd->slot;
|
|
int startSymbol = feprx_cmd->startSymbol;
|
|
int endSymbol = feprx_cmd->endSymbol;
|
|
|
|
for (int l = startSymbol; l <= endSymbol; l++)
|
|
nr_symbol_fep_ul(feprx_cmd->fp,
|
|
feprx_cmd->rxdata,
|
|
&feprx_cmd->rxdataF[l * feprx_cmd->fp->ofdm_symbol_size],
|
|
l,
|
|
slot,
|
|
feprx_cmd->sample_offet);
|
|
|
|
completed_task_ans(feprx_cmd->ans);
|
|
}
|
|
|
|
// RU RX FEP using thread-pool
|
|
void nr_fep_tp(RU_t *ru, int slot)
|
|
{
|
|
int nbfeprx = 0;
|
|
start_meas(&ru->ofdm_demod_stats);
|
|
|
|
int nt = ru->nb_rx * ru->num_beams_period;
|
|
int tasks_per_slot = (ru->half_slot_parallelization > 0) ? 2 : 1;
|
|
size_t const sz = nt * tasks_per_slot;
|
|
feprx_cmd_t arr[sz];
|
|
task_ans_t ans;
|
|
init_task_ans(&ans, sz);
|
|
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
|
|
int rxdataF_offset = (slot % RU_RX_SLOT_DEPTH) * fp->symbols_per_slot * fp->ofdm_symbol_size;
|
|
|
|
int symbols_per_task = fp->symbols_per_slot / tasks_per_slot;
|
|
|
|
for (int task_idx = 0; task_idx < tasks_per_slot; task_idx++) {
|
|
int start_symbol = task_idx * symbols_per_task;
|
|
int end_symbol = (task_idx + 1) * symbols_per_task - 1;
|
|
if (task_idx == tasks_per_slot - 1)
|
|
end_symbol = fp->symbols_per_slot - 1;
|
|
|
|
for (int beam = 0; beam < ru->num_beams_period; beam++) {
|
|
for (int aid = 0; aid < ru->nb_rx; aid++) {
|
|
feprx_cmd_t *feprx_cmd = &arr[nbfeprx];
|
|
feprx_cmd->ans = &ans;
|
|
feprx_cmd->fp = fp;
|
|
feprx_cmd->slot = ru->proc.tti_rx;
|
|
feprx_cmd->startSymbol = start_symbol;
|
|
feprx_cmd->endSymbol = end_symbol;
|
|
feprx_cmd->rxdata = (const c16_t *)ru->common.rxdata[aid + beam * ru->nb_rx];
|
|
feprx_cmd->rxdataF = (c16_t *)&ru->common.rxdataF[aid + beam * ru->nb_rx][rxdataF_offset];
|
|
feprx_cmd->sample_offet = ru->N_TA_offset;
|
|
|
|
task_t t = {.func = nr_fep, .args = feprx_cmd};
|
|
pushTpool(ru->threadPool, t);
|
|
nbfeprx++;
|
|
}
|
|
}
|
|
}
|
|
join_task_ans(&ans);
|
|
|
|
stop_meas(&ru->ofdm_demod_stats);
|
|
}
|