5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sidekiq: configure RFIC rx_gain with user values instead of using calibrated rx_gain offsets

Browse Source
master
Ismael Gomez 3 years ago committed by Xavier Arteaga
parent 89f910e79e
commit fd2eef132d
3 changed files with 29 additions and 69 deletions
Show Stats Download Patch File Download Diff File

12
lib/src/phy/rf/rf_skiq_imp.c
Unescape Escape View File

@ -536,6 +536,7 @@ int rf_skiq_set_rx_gain(void* h_, double rx_gain)
for (uint32_t i = 0; i < h->nof_cards; i++) {
rf_skiq_card_set_rx_gain_db(&h->cards[i], h->nof_ports, rx_gain);
h->cards[i].cur_rx_gain_db = rx_gain;
}
return SRSRAN_SUCCESS;
@ -582,10 +583,7 @@ int rf_skiq_set_rx_gain_ch(void* h_, uint32_t ch, double rx_gain)
}
rx_gain = rf_skiq_card_set_rx_gain_db(&h->cards[card_idx], port_idx, rx_gain);
if (ch == 0) {
h->cur_tx_gain = rx_gain;
}
h->cards[card_idx].cur_rx_gain_db = rx_gain;
return SRSRAN_SUCCESS;
}
@ -611,12 +609,10 @@ srsran_rf_info_t* rf_skiq_get_info(void* h_)
if (h != NULL) {
ret = &h->info;
rf_skiq_card_update_gain_table(&h->cards[0]);
ret->min_tx_gain = 0.25 * (double)h->cards[0].param.tx_param->atten_quarter_db_max;
ret->max_tx_gain = 0.25 * (double)h->cards[0].param.tx_param->atten_quarter_db_min;
ret->min_rx_gain = h->cards[0].rx_gain_table_db[h->cards[0].param.rx_param[0].gain_index_min];
ret->max_rx_gain = h->cards[0].rx_gain_table_db[h->cards[0].param.rx_param[0].gain_index_max];
ret->min_rx_gain = h->cards[0].param.rx_param[0].gain_index_min;
ret->max_rx_gain = h->cards[0].param.rx_param[0].gain_index_max;
}
return ret;

82
lib/src/phy/rf/rf_skiq_imp_card.c
Unescape Escape View File

@ -40,21 +40,6 @@ static void* reader_thread(void* arg)
switch (rx_status) {
case skiq_rx_status_success:
// Check Rx index boundary
if (p_rx_block->rfic_control >= q->param.rx_param->gain_index_min &&
p_rx_block->rfic_control <= q->param.rx_param->gain_index_max) {
double new_rx_gain = q->rx_gain_table_db[p_rx_block->rfic_control];
// If the Rx index has changed, update gain
if (new_rx_gain != q->cur_rx_gain_db) {
SKIQ_RF_DEBUG("card %d index=%d; gain=%.2f/%.2f dB;\n",
q->card,
p_rx_block->rfic_control,
q->rx_gain_table_db[p_rx_block->rfic_control],
q->cur_rx_gain_db);
q->cur_rx_gain_db = new_rx_gain;
}
}
if (curr_rx_hdl < q->nof_ports && p_rx_block != NULL && len > SKIQ_RX_HEADER_SIZE_IN_BYTES) {
// Convert number of bytes into samples
uint32_t nsamples = len / 4 - SKIQ_RX_HEADER_SIZE_IN_WORDS;
@ -94,17 +79,6 @@ static void* reader_thread(void* arg)
return NULL;
}
int rf_skiq_card_update_gain_table(rf_skiq_card_t* q)
{
for (uint8_t i = q->param.rx_param->gain_index_min; i <= q->param.rx_param->gain_index_max; i++) {
if (skiq_read_rx_cal_offset_by_gain_index(q->card, skiq_rx_hdl_A1, i, &q->rx_gain_table_db[i])) {
ERROR("Reading calibrated Rx gain index %d", i);
return SRSRAN_ERROR;
}
}
return SRSRAN_SUCCESS;
}
int rf_skiq_card_init(rf_skiq_card_t* q, uint8_t card, uint8_t nof_ports, const rf_skiq_port_opts_t* opts)
{
q->card = card;
@ -283,29 +257,33 @@ double rf_skiq_card_set_tx_gain_db(rf_skiq_card_t* q, uint32_t port_idx, double
double rf_skiq_card_set_rx_gain_db(rf_skiq_card_t* q, uint32_t port_idx, double gain_db)
{
// Find the nearest gain index in the table
int gain_idx = -1;
double gain_min_diff = INFINITY;
for (int i = q->param.rx_param->gain_index_min; i <= q->param.rx_param->gain_index_max; i++) {
double gain_diff = fabs(q->rx_gain_table_db[i] - gain_db);
if (gain_diff < gain_min_diff) {
gain_min_diff = gain_diff;
gain_idx = i;
}
// From Sidekiq API doc:
//
// For Sidekiq mPCIe (skiq_mpcie), Sidekiq M.2 (skiq_m2), Sidekiq Stretch (skiq_m2_2280), Sidekiq Z2
//(skiq_z2), and Matchstiq Z3u (skiq_z3u) each increment of the gain index value results in approxi-
// mately 1 dB of gain, with approximately 76 dB of total gain available. For details on the gain table,
// refer to p. 37 of AD9361 Reference Manual UG-570
// Check gain range
if (gain_db < q->param.rx_param->gain_index_min || gain_db > q->param.rx_param->gain_index_max) {
ERROR("Error port %d:%d the selected gain (%.2f dB) is out of range (%d to %d dB).\n",
q->card,
port_idx,
gain_db,
q->param.rx_param->gain_index_min,
q->param.rx_param->gain_index_max);
}
if (gain_idx >= 0) {
gain_db = q->rx_gain_table_db[gain_idx];
if (port_idx < q->nof_ports) {
// Set single port gain
q->issued_rx_gain_db[port_idx] = gain_db;
skiq_write_rx_gain(q->card, (skiq_rx_hdl_t)port_idx, gain_idx);
} else {
// Set all gains
for (int i = 0; i < q->nof_ports; i++) {
q->issued_rx_gain_db[i] = gain_db;
skiq_write_rx_gain(q->card, (skiq_rx_hdl_t)i, gain_idx);
}
// Calculate attenuation index
uint16_t gain_idx = (uint16_t)floor(gain_db);
if (port_idx < q->nof_ports) {
// Set single port gain
skiq_write_rx_gain(q->card, (skiq_rx_hdl_t)port_idx, gain_idx);
} else {
// Set all gains
for (int i = 0; i < q->nof_ports; i++) {
skiq_write_rx_gain(q->card, (skiq_rx_hdl_t)i, gain_idx);
}
}
@ -511,16 +489,6 @@ double rf_skiq_card_set_rx_freq_hz(rf_skiq_card_t* q, uint32_t port_idx, double
q->suspend = true;
rf_skiq_rx_port_set_lo(&q->rx_ports[port_idx], (uint64_t)freq_hz);
q->suspend = false;
// Update gains for only port 0
if (port_idx == 0) {
// Update gain table
rf_skiq_card_update_gain_table(q);
// Set previous issued gain in dB for the new tables
rf_skiq_card_set_rx_gain_db(q, q->nof_ports, q->issued_rx_gain_db[port_idx]);
}
return freq_hz;
}

4
lib/src/phy/rf/rf_skiq_imp_card.h
Unescape Escape View File

@ -23,9 +23,7 @@ typedef struct {
rf_skiq_tx_port_t tx_ports[RF_SKIQ_MAX_PORTS_CARD];
rf_skiq_rx_port_t rx_ports[RF_SKIQ_MAX_PORTS_CARD];
double rx_gain_table_db[UINT8_MAX + 1];
double cur_rx_gain_db;
double issued_rx_gain_db[SRSRAN_MAX_PORTS];
bool suspend;
uint64_t start_rx_stream_ts;
@ -40,8 +38,6 @@ int rf_skiq_card_init(rf_skiq_card_t* q, uint8_t card, uint8_t nof_ports, const
void rf_skiq_card_set_error_handler(rf_skiq_card_t* q, srsran_rf_error_handler_t error_handler, void* arg);
int rf_skiq_card_update_gain_table(rf_skiq_card_t* q);
double rf_skiq_card_set_tx_gain_db(rf_skiq_card_t* q, uint32_t port_idx, double gain_db);
double rf_skiq_card_set_rx_gain_db(rf_skiq_card_t* q, uint32_t port_idx, double gain_db);

Write Preview
Loading…
Cancel
Save