From a9b8c3fd550b134793b237c92f5d4559cbde5c38 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Mon, 27 Jan 2020 21:15:58 +0000 Subject: [PATCH] fix msg3 prb limit for prb==6. It has to collide with PUCCH --- srsenb/hdr/stack/mac/scheduler_grid.h | 2 +- srsenb/src/stack/mac/scheduler_grid.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srsenb/hdr/stack/mac/scheduler_grid.h b/srsenb/hdr/stack/mac/scheduler_grid.h index 4381b468d..3ab81c338 100644 --- a/srsenb/hdr/stack/mac/scheduler_grid.h +++ b/srsenb/hdr/stack/mac/scheduler_grid.h @@ -298,7 +298,7 @@ private: std::vector data_allocs; std::vector ul_data_allocs; std::deque pending_msg3s; - uint32_t last_msg3_prb = 0; + uint32_t last_msg3_prb = 0, max_msg3_prb = 0; }; } // namespace srsenb diff --git a/srsenb/src/stack/mac/scheduler_grid.cc b/srsenb/src/stack/mac/scheduler_grid.cc index fdd8e90f1..93b9e1dd4 100644 --- a/srsenb/src/stack/mac/scheduler_grid.cc +++ b/srsenb/src/stack/mac/scheduler_grid.cc @@ -388,6 +388,7 @@ void sf_sched::init(const sched_params_t& sched_params_, uint32_t enb_cc_idx_) enb_cc_idx = enb_cc_idx_; log_h = sched_params->log_h; tti_alloc.init(*sched_params, 0); + max_msg3_prb = std::max(6u, sched_params->cfg->cell.nof_prb - (uint32_t)sched_params->cfg->nrb_pucch); } void sf_sched::new_tti(uint32_t tti_rx_, uint32_t start_cfi) @@ -512,7 +513,7 @@ std::pair sf_sched::alloc_rar(uint32_t aggr_lvl, cons uint32_t total_msg3_size = msg3_grant_size * nof_grants; // check if there is enough space for Msg3, try again with a lower number of grants - if (last_msg3_prb + total_msg3_size > sched_params->cfg->cell.nof_prb - sched_params->cfg->nrb_pucch) { + if (last_msg3_prb + total_msg3_size > max_msg3_prb) { ret.first = alloc_outcome_t::RB_COLLISION; continue; }