PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nr,gnb,sched: fix si softbuffer allocation. Add extra comments

This commit is contained in:
Francisco 2021-11-08 10:48:17 +00:00 committed by Francisco Paisana
parent 360f718a5e
commit 1807ba1e37
5 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h
View File

@ -54,8 +54,6 @@ struct bwp_slot_grid {
slot_coreset_list coresets; slot_coreset_list coresets;
harq_ack_list_t pending_acks; harq_ack_list_t pending_acks;
srsran::bounded_vector<uint32_t, MAX_GRANTS> sib_idxs;
srsran::unique_pool_ptr<tx_harq_softbuffer> rar_softbuffer; srsran::unique_pool_ptr<tx_harq_softbuffer> rar_softbuffer;
bwp_slot_grid() = default; bwp_slot_grid() = default;
@ -92,7 +90,11 @@ class bwp_slot_allocator
public: public:
explicit bwp_slot_allocator(bwp_res_grid& bwp_grid_, slot_point pdcch_slot_, slot_ue_map_t& ues_); explicit bwp_slot_allocator(bwp_res_grid& bwp_grid_, slot_point pdcch_slot_, slot_ue_map_t& ues_);
alloc_result alloc_si(uint32_t aggr_idx, uint32_t si_idx, uint32_t si_ntx, const prb_interval& prbs); alloc_result alloc_si(uint32_t aggr_idx,
uint32_t si_idx,
uint32_t si_ntx,
const prb_interval& prbs,
tx_harq_softbuffer& softbuffer);
alloc_result alloc_rar_and_msg3(uint16_t ra_rnti, alloc_result alloc_rar_and_msg3(uint16_t ra_rnti,
uint32_t aggr_idx, uint32_t aggr_idx,
prb_interval interv, prb_interval interv,

6
srsgnb/hdr/stack/mac/sched_nr_helpers.h
View File

@ -25,7 +25,11 @@ struct bwp_res_grid;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool fill_dci_sib(prb_interval interv, uint32_t sib_idx, const bwp_params_t& bwp_cfg, srsran_dci_dl_nr_t& dci); bool fill_dci_sib(prb_interval interv,
uint32_t sib_idx,
uint32_t si_ntx,
const bwp_params_t& bwp_cfg,
srsran_dci_dl_nr_t& dci);
bool fill_dci_rar(prb_interval interv, uint16_t ra_rnti, const bwp_params_t& bwp_cfg, srsran_dci_dl_nr_t& dci); bool fill_dci_rar(prb_interval interv, uint16_t ra_rnti, const bwp_params_t& bwp_cfg, srsran_dci_dl_nr_t& dci);

19
srsgnb/hdr/stack/mac/sched_nr_signalling.h
View File

@ -13,6 +13,7 @@
#ifndef SRSRAN_SCHED_NR_SIGNALLING_H #ifndef SRSRAN_SCHED_NR_SIGNALLING_H
#define SRSRAN_SCHED_NR_SIGNALLING_H #define SRSRAN_SCHED_NR_SIGNALLING_H
#include "harq_softbuffer.h"
#include "sched_nr_cfg.h" #include "sched_nr_cfg.h"
#include "sched_nr_interface.h" #include "sched_nr_interface.h"
#include "srsenb/hdr/stack/mac/sched_common.h" #include "srsenb/hdr/stack/mac/sched_common.h"
@ -63,13 +64,17 @@ private:
srslog::basic_logger& logger; srslog::basic_logger& logger;
struct si_msg_ctxt_t { struct si_msg_ctxt_t {
uint32_t n = 0; /// 0 for SIB1, n/index in schedulingInfoList in si-SchedulingInfo in SIB1 // args
uint32_t len = 0; uint32_t n = 0; /// 0 for SIB1, n/index in schedulingInfoList in si-SchedulingInfo in SIB1
uint32_t win_len = 0; uint32_t len = 0; /// length in bytes of SIB1 / SI message
uint32_t period = 0; uint32_t win_len = 0; /// window length in slots
uint32_t n_tx = 0; uint32_t period = 0; /// periodicity of SIB1/SI window
alloc_result result = alloc_result::invalid_coderate; /// last attempt to schedule SI
slot_point win_start; /// start of SI window, invalid if outside // state
uint32_t n_tx = 0; /// nof transmissions of the same SIB1 / SI message
alloc_result result = alloc_result::invalid_coderate; /// last attempt to schedule SI
slot_point win_start; /// start of SI window, invalid if outside
srsran::unique_pool_ptr<tx_harq_softbuffer> si_softbuffer;
}; };
srsran::bounded_vector<si_msg_ctxt_t, 10> pending_sis; /// configured SIB1 and SI messages srsran::bounded_vector<si_msg_ctxt_t, 10> pending_sis; /// configured SIB1 and SI messages
}; };

11
srsgnb/src/stack/mac/sched_nr_grant_allocator.cc
View File

@ -66,7 +66,11 @@ bwp_slot_allocator::bwp_slot_allocator(bwp_res_grid& bwp_grid_, slot_point pdcch
logger(bwp_grid_.cfg->logger), cfg(*bwp_grid_.cfg), bwp_grid(bwp_grid_), pdcch_slot(pdcch_slot_), slot_ues(ues_) logger(bwp_grid_.cfg->logger), cfg(*bwp_grid_.cfg), bwp_grid(bwp_grid_), pdcch_slot(pdcch_slot_), slot_ues(ues_)
{} {}
alloc_result bwp_slot_allocator::alloc_si(uint32_t aggr_idx, uint32_t si_idx, uint32_t si_ntx, const prb_interval& prbs) alloc_result bwp_slot_allocator::alloc_si(uint32_t aggr_idx,
uint32_t si_idx,
uint32_t si_ntx,
const prb_interval& prbs,
tx_harq_softbuffer& softbuffer)
{ {
bwp_slot_grid& bwp_pdcch_slot = bwp_grid[pdcch_slot]; bwp_slot_grid& bwp_pdcch_slot = bwp_grid[pdcch_slot];
alloc_result ret = verify_pdsch_space(bwp_pdcch_slot, bwp_pdcch_slot); alloc_result ret = verify_pdsch_space(bwp_pdcch_slot, bwp_pdcch_slot);
@ -88,7 +92,7 @@ alloc_result bwp_slot_allocator::alloc_si(uint32_t aggr_idx, uint32_t si_idx, ui
bwp_pdcch_slot.dl_prbs |= prbs; bwp_pdcch_slot.dl_prbs |= prbs;
// Generate DCI for RAR with given RA-RNTI // Generate DCI for RAR with given RA-RNTI
pdcch_dl_t& pdcch = bwp_pdcch_slot.dl.phy.pdcch_dl.back(); pdcch_dl_t& pdcch = bwp_pdcch_slot.dl.phy.pdcch_dl.back();
if (not fill_dci_sib(prbs, si_idx, *bwp_grid.cfg, pdcch.dci)) { if (not fill_dci_sib(prbs, si_idx, si_ntx, *bwp_grid.cfg, pdcch.dci)) {
// Cancel on-going PDCCH allocation // Cancel on-going PDCCH allocation
bwp_pdcch_slot.coresets[coreset_id]->rem_last_dci(); bwp_pdcch_slot.coresets[coreset_id]->rem_last_dci();
return alloc_result::invalid_coderate; return alloc_result::invalid_coderate;
@ -107,9 +111,10 @@ alloc_result bwp_slot_allocator::alloc_si(uint32_t aggr_idx, uint32_t si_idx, ui
bwp_pdcch_slot.dl.phy.pdsch.pop_back(); bwp_pdcch_slot.dl.phy.pdsch.pop_back();
return alloc_result::other_cause; return alloc_result::other_cause;
} }
pdsch.sch.grant.tb[0].softbuffer.tx = softbuffer.get();
// Store SI msg index // Store SI msg index
bwp_pdcch_slot.sib_idxs.push_back(si_idx); bwp_pdcch_slot.dl.sib_idxs.push_back(si_idx);
return alloc_result::success; return alloc_result::success;
} }

23
srsgnb/src/stack/mac/sched_nr_signalling.cc
View File

@ -103,7 +103,11 @@ void sched_dl_signalling(bwp_slot_allocator& bwp_alloc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool fill_dci_sib(prb_interval interv, uint32_t sib_id, const bwp_params_t& bwp_cfg, srsran_dci_dl_nr_t& dci) bool fill_dci_sib(prb_interval interv,
uint32_t sib_id,
uint32_t si_ntx,
const bwp_params_t& bwp_cfg,
srsran_dci_dl_nr_t& dci)
{ {
dci.mcs = 5; dci.mcs = 5;
dci.ctx.format = srsran_dci_format_nr_1_0; dci.ctx.format = srsran_dci_format_nr_1_0;
@ -117,7 +121,7 @@ bool fill_dci_sib(prb_interval interv, uint32_t sib_id, const bwp_params_t& bwp_
dci.bwp_id = bwp_cfg.bwp_id; dci.bwp_id = bwp_cfg.bwp_id;
dci.cc_id = bwp_cfg.cc; dci.cc_id = bwp_cfg.cc;
dci.rv = 0; dci.rv = 0;
dci.sii = sib_id == 1 ? 0 : 1; dci.sii = sib_id == 0 ? 0 : 1;
return true; return true;
} }
@ -127,10 +131,11 @@ si_sched::si_sched(const bwp_params_t& bwp_cfg_) :
{ {
// TODO: Get SIB1 other SI msgs config from RRC // TODO: Get SIB1 other SI msgs config from RRC
pending_sis.emplace_back(); pending_sis.emplace_back();
pending_sis[0].n = 0; pending_sis[0].n = 0;
pending_sis[0].len = 77; pending_sis[0].len = 77;
pending_sis[0].period = 160; pending_sis[0].period = 160;
pending_sis[0].win_len = 160; pending_sis[0].win_len = 160;
pending_sis[0].si_softbuffer = harq_softbuffer_pool::get_instance().get_tx(bwp_cfg->nof_prb());
} }
void si_sched::run_slot(bwp_slot_allocator& bwp_alloc) void si_sched::run_slot(bwp_slot_allocator& bwp_alloc)
@ -152,10 +157,10 @@ void si_sched::run_slot(bwp_slot_allocator& bwp_alloc)
if (not si.win_start.valid()) { if (not si.win_start.valid()) {
bool start_window; bool start_window;
if (si.n == 0) { if (si.n == 0) {
// SIB1 // SIB1 (slot index zero of even frames)
start_window = sl_pdcch.slot_idx() == 0 and sl_pdcch.sfn() % 2 == 0; start_window = sl_pdcch.slot_idx() == 0 and sl_pdcch.sfn() % 2 == 0;
} else { } else {
// SI messages // 5.2.2.3.2 - Acquisition of SI message
start_window = (sl_pdcch.sfn() % si.period == x / N) and sl_pdcch.slot_idx() == x % bwp_cfg->slots.size(); start_window = (sl_pdcch.sfn() % si.period == x / N) and sl_pdcch.slot_idx() == x % bwp_cfg->slots.size();
} }
if (start_window) { if (start_window) {
@ -194,7 +199,7 @@ void si_sched::run_slot(bwp_slot_allocator& bwp_alloc)
si.result = alloc_result::no_sch_space; si.result = alloc_result::no_sch_space;
break; break;
} }
si.result = bwp_alloc.alloc_si(si_aggr_level, si.n, si.n_tx, grant); si.result = bwp_alloc.alloc_si(si_aggr_level, si.n, si.n_tx, grant, *si.si_softbuffer.get());
if (si.result == alloc_result::success) { if (si.result == alloc_result::success) {
// SIB scheduled successfully // SIB scheduled successfully
si.win_start.clear(); si.win_start.clear();