From 5fefa11234d55881f1de841d0005d88c3979155d Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Fri, 20 Oct 2017 15:02:25 +0200
Subject: [PATCH] TDD for RRU IF4p5, modifications and testing.
---
openair1/PHY/LTE_TRANSPORT/if4_tools.c | 11 +++--
openair1/PHY/defs.h | 4 ++
openair1/SCHED/ru_procedures.c | 17 ++++++-
targets/RT/USER/lte-ru.c | 62 ++++++++++++++------------
4 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.c b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
index c3cd8d48b78..e5fe6e7591d 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
@@ -67,7 +67,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
if (ru->idx==0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 1 );
if (packet_type == IF4p5_PDLFFT) {
- LOG_D(PHY,"send DL_IF4p5: RU %d frame %d, subframe %d\n",ru->idx,frame,subframe);
+ //LOG_D(PHY,"send DL_IF4p5: RU %d frame %d, subframe %d\n",ru->idx,frame,subframe);
if (subframe_select(fp,subframe)==SF_S)
nsym=fp->dl_symbols_in_S_subframe;
@@ -138,10 +138,9 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
if (packet_type == IF4p5_PULFFT) {
- for (symbol_id=fp->symbols_per_tti-nsym; symbol_id<fp->symbols_per_tti; symbol_id++) { VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SEND_IF4_SYMBOL, symbol_id );
+ for (symbol_id=fp->symbols_per_tti-nsym; symbol_id<fp->symbols_per_tti; symbol_id++) {
+ VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SEND_IF4_SYMBOL, symbol_id );
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_COMPR_IF, 1 );
- LOG_D(PHY,"IF4p5_PULFFT: frame %d, subframe %d, symbol %d: %d dB\n",frame,subframe,symbol_id,
- dB_fixed(signal_energy((int32_t*)&rxdataF[0][blockoffsetF],db_halflength)));
for (element_id=0; element_id<db_halflength; element_id++) {
i = (uint16_t*) &rxdataF[0][blockoffsetF+element_id];
@@ -354,8 +353,8 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
PRACH_BLOCK_SIZE_BYTES);
}
- LOG_D(PHY,"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB\n",ru->idx,*frame,*subframe,
- dB_fixed(signal_energy((int*)&prach_rxsigF[0][0],839)));
+ //LOG_D(PHY,"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB\n",ru->idx,*frame,*subframe,
+ // dB_fixed(signal_energy((int*)&prach_rxsigF[0][0],839)));
for (idx=0;idx<ru->num_eNB;idx++) ru->wakeup_prach_eNB(ru->eNB_list[idx],ru,*frame,*subframe);
} else if (*packet_type == IF4p5_PULTICK) {
diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h
index 446c1f1575f..12ddcdeb704 100644
--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -752,6 +752,10 @@ typedef struct RU_t_s{
time_stats_t ofdm_demod_stats;
/// Timing statistics (TX)
time_stats_t ofdm_mod_stats;
+ /// Timing statistics (RX Fronthaul + Compression)
+ time_stats_t rx_fhaul;
+ /// Timing statistics (TX Fronthaul + Compression)
+ time_stats_t tx_fhaul;
/// RX and TX buffers for precoder output
RU_COMMON common;
/// beamforming weight vectors per eNB
diff --git a/openair1/SCHED/ru_procedures.c b/openair1/SCHED/ru_procedures.c
index 7e0ca4e76a1..825caac3254 100644
--- a/openair1/SCHED/ru_procedures.c
+++ b/openair1/SCHED/ru_procedures.c
@@ -175,6 +175,8 @@ void feptx_ofdm_2thread(RU_t *ru) {
if (subframe_select(fp,subframe) == SF_UL) return;
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 1 );
+
if (subframe_select(fp,subframe)==SF_DL) {
// If this is not an S-subframe
if (pthread_mutex_timedlock(&proc->mutex_feptx,&wait) != 0) {
@@ -206,6 +208,8 @@ void feptx_ofdm_2thread(RU_t *ru) {
feptx0(ru,0);
wait_on_busy_condition(&proc->mutex_feptx,&proc->cond_feptx,&proc->instance_cnt_feptx,"feptx thread");
+ VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 0 );
+
stop_meas(&ru->ofdm_mod_stats);
}
@@ -468,6 +472,13 @@ void ru_fep_full_2thread(RU_t *ru) {
struct timespec wait;
+ LTE_DL_FRAME_PARMS *fp=&ru->frame_parms;
+
+ if ((fp->frame_type == TDD) &&
+ (subframe_select(fp,proc->subframe_rx) != SF_UL)) return;
+
+ if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
+
wait.tv_sec=0;
wait.tv_nsec=5000000L;
@@ -513,8 +524,11 @@ void fep_full(RU_t *ru) {
int l;
LTE_DL_FRAME_PARMS *fp=&ru->frame_parms;
- start_meas(&ru->ofdm_demod_stats);
+ if ((fp->frame_type == TDD) &&
+ (subframe_select(fp,proc->subframe_rx) != SF_UL)) return;
+ start_meas(&ru->ofdm_demod_stats);
+ if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
remove_7_5_kHz(ru,proc->subframe_rx<<1);
remove_7_5_kHz(ru,1+(proc->subframe_rx<<1));
@@ -530,6 +544,7 @@ void fep_full(RU_t *ru) {
0
);
}
+ if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 0 );
stop_meas(&ru->ofdm_demod_stats);
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index 4fa23523682..33dcf425cab 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -595,6 +595,7 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *subframe) {
symbol_mask_full = ((subframe_select(fp,*subframe) == SF_S) ? (1<<fp->dl_symbols_in_S_subframe) : (1<<fp->symbols_per_tti))-1;
do {
recv_IF4p5(ru, &frame_tx, &subframe_tx, &packet_type, &symbol_number);
+ if ((subframe_select(fp,*subframe) == SF_DL) && (symbol_number == 0)) start_meas(&ru->rx_fhaul);
LOG_D(PHY,"subframe %d (%d): frame %d, subframe %d, symbol %d\n",
*subframe,subframe_select(fp,*subframe),frame_tx,subframe_tx,symbol_number);
if (proc->first_tx != 0) {
@@ -614,6 +615,8 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *subframe) {
else AssertFatal(1==0,"Illegal IF4p5 packet type (should only be IF4p5_PDLFFT%d\n",packet_type);
} while (symbol_mask != symbol_mask_full);
+ if (subframe_select(fp,*subframe) == SF_DL) stop_meas(&ru->rx_fhaul);
+
proc->subframe_tx = subframe_tx;
proc->frame_tx = frame_tx;
@@ -656,16 +659,11 @@ void fh_if4p5_north_out(RU_t *ru) {
send_IF4p5(ru, proc->frame_rx, proc->subframe_rx, IF4p5_PULTICK);
return;
}
- if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
- AssertFatal(ru->feprx!=NULL,"No northbound FEP function, exiting\n");
- if (ru->feprx) {
- LOG_D(PHY,"Doing FEP/IF4p5 for frame %d, subframe %d\n",proc->frame_rx,proc->subframe_rx);
- ru->feprx(ru);
- send_IF4p5(ru, proc->frame_rx, proc->subframe_rx, IF4p5_PULFFT);
- }
+ start_meas(&ru->tx_fhaul);
+ send_IF4p5(ru, proc->frame_rx, proc->subframe_rx, IF4p5_PULFFT);
+ stop_meas(&ru->tx_fhaul);
- if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 0 );
}
void rx_rf(RU_t *ru,int *frame,int *subframe) {
@@ -772,11 +770,11 @@ void tx_rf(RU_t *ru) {
lte_subframe_t SF_type = subframe_select(fp,proc->subframe_tx%10);
lte_subframe_t prevSF_type = subframe_select(fp,(proc->subframe_tx+9)%10);
lte_subframe_t nextSF_type = subframe_select(fp,(proc->subframe_tx+1)%10);
+ int sf_extension = 0;
+
if ((SF_type == SF_DL) ||
(SF_type == SF_S)) {
- for (i=0; i<ru->nb_tx; i++)
- txp[i] = (void*)&ru->common.txdata[i][proc->subframe_tx*fp->samples_per_tti];
int siglen=fp->samples_per_tti,flags=1;
@@ -787,24 +785,31 @@ void tx_rf(RU_t *ru) {
if ((fp->frame_type == TDD) &&
(SF_type == SF_DL)&&
(prevSF_type == SF_UL) &&
- (nextSF_type == SF_DL))
+ (nextSF_type == SF_DL)) {
flags = 2; // start of burst
+ sf_extension = ru->N_TA_offset<<1;
+ }
if ((fp->frame_type == TDD) &&
(SF_type == SF_DL)&&
(prevSF_type == SF_UL) &&
- (nextSF_type == SF_UL))
+ (nextSF_type == SF_UL)) {
flags = 4; // start of burst and end of burst (only one DL SF between two UL)
-
+ sf_extension = ru->N_TA_offset<<1;
+ }
+
+ for (i=0; i<ru->nb_tx; i++)
+ txp[i] = (void*)&ru->common.txdata[i][(proc->subframe_tx*fp->samples_per_tti)-sf_extension];
+
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, (proc->timestamp_tx-ru->openair0_cfg.tx_sample_advance)&0xffffffff );
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
// prepare tx buffer pointers
txs = ru->rfdevice.trx_write_func(&ru->rfdevice,
- proc->timestamp_tx+ru->ts_offset-ru->openair0_cfg.tx_sample_advance,
+ proc->timestamp_tx+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension,
txp,
- siglen,
+ siglen+sf_extension,
ru->nb_tx,
flags);
@@ -813,7 +818,7 @@ void tx_rf(RU_t *ru) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
- AssertFatal(txs == siglen,"TX : Timeout (sent %d/%d)\n",txs, siglen);
+ AssertFatal(txs == siglen+sf_extension,"TX : Timeout (sent %d/%d)\n",txs, siglen);
}
}
@@ -1260,18 +1265,12 @@ int setup_RU_buffers(RU_t *ru) {
return(-1);
}
- /*
- if (frame_parms->frame_type == TDD) {
- if (frame_parms->N_RB_DL == 100)
- N_TA_offset = 624;
- else if (frame_parms->N_RB_DL == 50)
- N_TA_offset = 624/2;
- else if (frame_parms->N_RB_DL == 25)
- N_TA_offset = 624/4;
- }
- */
-
+ if (frame_parms->frame_type == TDD) {
+ if (frame_parms->N_RB_DL == 100) ru->N_TA_offset = 624;
+ else if (frame_parms->N_RB_DL == 50) ru->N_TA_offset = 624/2;
+ else if (frame_parms->N_RB_DL == 25) ru->N_TA_offset = 624/4;
+ }
if (ru->openair0_cfg.mmapped_dma == 1) {
// replace RX signal buffers with mmaped HW versions
@@ -1321,6 +1320,9 @@ static void* ru_stats_thread(void* param) {
if (opp_enabled == 1) {
if (ru->feprx) print_meas(&ru->ofdm_demod_stats,"feprx",NULL,NULL);
if (ru->feptx_ofdm) print_meas(&ru->ofdm_mod_stats,"feptx_ofdm",NULL,NULL);
+ if (ru->fh_north_asynch_in) print_meas(&ru->rx_fhaul,"rx_fhaul",NULL,NULL);
+ if (ru->fh_north_out) print_meas(&ru->tx_fhaul,"tx_fhaul",NULL,NULL);
+
}
}
return(NULL);
@@ -1440,9 +1442,7 @@ static void* ru_thread( void* param ) {
// do RX front-end processing (frequency-shift, dft) if needed
- if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
if (ru->feprx) ru->feprx(ru);
- if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 0 );
// At this point, all information for subframe has been received on FH interface
// If this proc is to provide synchronization, do so
@@ -1908,6 +1908,8 @@ void init_RU(char *rf_config_file) {
ru->ifdevice.host_type = RRU_HOST;
ru->rfdevice.host_type = RRU_HOST;
ru->ifdevice.eth_params = &ru->eth_params;
+ reset_meas(&ru->rx_fhaul);
+ reset_meas(&ru->tx_fhaul);
ret = openair0_transport_load(&ru->ifdevice,&ru->openair0_cfg,&ru->eth_params);
printf("openair0_transport_init returns %d for ru_id %d\n",ret,ru_id);
@@ -1929,6 +1931,8 @@ void init_RU(char *rf_config_file) {
ru->ifdevice.host_type = RRU_HOST;
ru->rfdevice.host_type = RRU_HOST;
ru->ifdevice.eth_params = &ru->eth_params;
+ reset_meas(&ru->rx_fhaul);
+ reset_meas(&ru->tx_fhaul);
ret = openair0_transport_load(&ru->ifdevice,&ru->openair0_cfg,&ru->eth_params);
printf("openair0_transport_init returns %d for ru_id %d\n",ret,ru_id);
--
GitLab