|
|
|
|
@ -11,6 +11,7 @@
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "srsgnb/hdr/stack/mac/sched_nr_signalling.h"
|
|
|
|
|
#include "srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h"
|
|
|
|
|
|
|
|
|
|
#define POS_IN_BURST_FIRST_BIT_IDX 0
|
|
|
|
|
#define POS_IN_BURST_SECOND_BIT_IDX 1
|
|
|
|
|
@ -83,23 +84,119 @@ void sched_ssb_basic(const slot_point& sl_point, uint32_t ssb_periodicity, ssb_l
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void sched_dl_signalling(const bwp_params_t& bwp_params,
|
|
|
|
|
slot_point sl_pdcch,
|
|
|
|
|
ssb_list& ssb_list,
|
|
|
|
|
nzp_csi_rs_list& nzp_csi_rs)
|
|
|
|
|
void sched_dl_signalling(bwp_slot_allocator& bwp_alloc)
|
|
|
|
|
{
|
|
|
|
|
const bwp_params_t& bwp_params = bwp_alloc.cfg;
|
|
|
|
|
slot_point sl_pdcch = bwp_alloc.get_pdcch_tti();
|
|
|
|
|
bwp_slot_grid& sl_grid = bwp_alloc.tx_slot_grid();
|
|
|
|
|
|
|
|
|
|
srsran_slot_cfg_t cfg;
|
|
|
|
|
cfg.idx = sl_pdcch.to_uint();
|
|
|
|
|
|
|
|
|
|
// Schedule SSB
|
|
|
|
|
sched_ssb_basic(sl_pdcch, bwp_params.cell_cfg.ssb.periodicity_ms, ssb_list);
|
|
|
|
|
sched_ssb_basic(sl_pdcch, bwp_params.cell_cfg.ssb.periodicity_ms, sl_grid.dl.phy.ssb);
|
|
|
|
|
|
|
|
|
|
// Schedule NZP-CSI-RS
|
|
|
|
|
sched_nzp_csi_rs(bwp_params.cfg.pdsch.nzp_csi_rs_sets, cfg, nzp_csi_rs);
|
|
|
|
|
sched_nzp_csi_rs(bwp_params.cfg.pdsch.nzp_csi_rs_sets, cfg, sl_grid.dl.phy.nzp_csi_rs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
bool fill_dci_sib(prb_interval interv, uint32_t sib_id, const bwp_params_t& bwp_cfg, srsran_dci_dl_nr_t& dci)
|
|
|
|
|
{
|
|
|
|
|
dci.mcs = 5;
|
|
|
|
|
dci.ctx.format = srsran_dci_format_nr_1_0;
|
|
|
|
|
dci.ctx.ss_type = srsran_search_space_type_common_0;
|
|
|
|
|
dci.ctx.rnti_type = srsran_rnti_type_si;
|
|
|
|
|
dci.ctx.rnti = SRSRAN_SIRNTI;
|
|
|
|
|
dci.ctx.coreset_id = 0;
|
|
|
|
|
dci.freq_domain_assigment = srsran_ra_nr_type1_riv(bwp_cfg.cfg.rb_width, interv.start(), interv.length());
|
|
|
|
|
dci.time_domain_assigment = 0;
|
|
|
|
|
dci.tpc = 1;
|
|
|
|
|
dci.bwp_id = bwp_cfg.bwp_id;
|
|
|
|
|
dci.cc_id = bwp_cfg.cc;
|
|
|
|
|
dci.rv = 0;
|
|
|
|
|
dci.sii = sib_id == 1 ? 0 : 1;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
si_sched::si_sched(const bwp_params_t& bwp_cfg_) :
|
|
|
|
|
bwp_cfg(&bwp_cfg_), logger(srslog::fetch_basic_logger(bwp_cfg_.sched_cfg.logger_name))
|
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
void si_sched::run_slot(bwp_slot_allocator& bwp_alloc)
|
|
|
|
|
{
|
|
|
|
|
if (true) {
|
|
|
|
|
// CORESET#0 must be present, otherwise SIs are not allocated
|
|
|
|
|
// TODO: provide proper config
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const uint32_t si_aggr_level = 2;
|
|
|
|
|
slot_point sl_pdcch = bwp_alloc.get_pdcch_tti();
|
|
|
|
|
const prb_bitmap& prbs = bwp_alloc.res_grid()[sl_pdcch].dl_prbs.prbs();
|
|
|
|
|
|
|
|
|
|
// SIB1 case
|
|
|
|
|
if (sl_pdcch.to_uint() % 160 == 0) {
|
|
|
|
|
// TODO: compute if SIB1 slot based on config
|
|
|
|
|
const uint32_t aggr_lvl_idx = 2;
|
|
|
|
|
const uint32_t sib_id = 1;
|
|
|
|
|
const uint32_t sib1len = 77; // TODO: extract from config
|
|
|
|
|
alloc_result ret = bwp_alloc.alloc_si(aggr_lvl_idx, sib_id, sib1len, prb_interval{0, 7});
|
|
|
|
|
if (ret != alloc_result::success) {
|
|
|
|
|
bwp_alloc.logger.warning("SCHED: Cannot allocate SIB1.");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Update SI windows
|
|
|
|
|
uint32_t N = bwp_cfg->slots.size();
|
|
|
|
|
for (si_msg_ctxt_t& si : pending_sis) {
|
|
|
|
|
uint32_t x = (si.n - 1) * si.win_len;
|
|
|
|
|
|
|
|
|
|
if (not si.win_start.valid() and (sl_pdcch.sfn() % si.period == x / N) and
|
|
|
|
|
sl_pdcch.slot_idx() == x % bwp_cfg->slots.size()) {
|
|
|
|
|
// If start of SI message window
|
|
|
|
|
si.win_start = sl_pdcch;
|
|
|
|
|
} else if (si.win_start.valid() and si.win_start + si.win_len >= sl_pdcch) {
|
|
|
|
|
// If end of SI message window
|
|
|
|
|
logger.warning(
|
|
|
|
|
"SCHED: Could not allocate SI message idx=%d, len=%d. Cause: %s", si.n, si.len, to_string(si.result));
|
|
|
|
|
si.win_start.clear();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Schedule pending SIs
|
|
|
|
|
if (bwp_cfg->slots[sl_pdcch.slot_idx()].is_dl) {
|
|
|
|
|
for (si_msg_ctxt_t& si : pending_sis) {
|
|
|
|
|
if (not si.win_start.valid()) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Schedule SIBs
|
|
|
|
|
// TODO
|
|
|
|
|
// TODO: NOTE 2: The UE is not required to monitor PDCCH monitoring occasion(s) corresponding to each transmitted
|
|
|
|
|
// SSB in SI-window.
|
|
|
|
|
|
|
|
|
|
// Attempt grants with increasing number of PRBs (if the number of PRBs is too low, the coderate is invalid)
|
|
|
|
|
si.result = alloc_result::invalid_coderate;
|
|
|
|
|
uint32_t prb_start_idx = 0;
|
|
|
|
|
for (uint32_t nprbs = 4; nprbs < bwp_cfg->cfg.rb_width and si.result == alloc_result::invalid_coderate; ++nprbs) {
|
|
|
|
|
prb_interval grant = find_empty_interval_of_length(prbs, nprbs, prb_start_idx);
|
|
|
|
|
prb_start_idx = grant.start();
|
|
|
|
|
if (grant.length() != nprbs) {
|
|
|
|
|
si.result = alloc_result::no_sch_space;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
si.result = bwp_alloc.alloc_si(si_aggr_level, si.n, si.n_tx, grant);
|
|
|
|
|
if (si.result == alloc_result::success) {
|
|
|
|
|
// SIB scheduled successfully
|
|
|
|
|
si.win_start.clear();
|
|
|
|
|
si.n_tx++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
} // namespace sched_nr_impl
|
|
|
|
|
} // namespace srsenb
|
|
|
|
|
|
Francisco
3 years ago
committed by