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

cleanup of srsenb::rrc::ue::mac_controller api

Browse Source
master
Francisco Paisana 4 years ago
parent 698af97ec4
commit 1e6d902873
5 changed files with 105 additions and 79 deletions
Show Stats Download Patch File Download Diff File

8
srsenb/hdr/stack/rrc/mac_controller.h
Unescape Escape View File

@ -44,13 +44,14 @@ public:
void handle_con_reconf(const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg);
void handle_con_reconf_complete();
void handle_ho_prep(const asn1::rrc::ho_prep_info_r8_ies_s& ho_prep,
const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg);
void handle_ho_prep_complete();
void handle_target_enb_ho_cmd(const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg);
void handle_intraenb_ho_cmd(const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg);
void handle_ho_prep(const asn1::rrc::ho_prep_info_r8_ies_s& ho_prep);
const sched_interface::ue_cfg_t& get_ue_sched_cfg() const { return current_sched_ue_cfg; }
void set_scell_activation(const std::bitset<SRSLTE_MAX_CARRIERS>& scell_mask);
void set_drb_activation(bool active);
enum proc_stage_t : int8_t { config_tx, config_complete, other };
void update_mac(proc_stage_t stage);
@ -59,7 +60,6 @@ private:
void handle_con_reconf_with_mobility();
int apply_basic_conn_cfg(const asn1::rrc::rr_cfg_ded_s& rr_cfg);
void apply_current_bearers_cfg();
void apply_phy_cfg_updates_common(const asn1::rrc::phys_cfg_ded_s& phy_cfg);
void apply_scell_cfg_updates(uint32_t ue_cc_idx);
srslte::log_ref log_h;

4
srsenb/hdr/stack/rrc/rrc_cell_cfg.h
Unescape Escape View File

@ -128,6 +128,10 @@ public:
{
return (ue_cc_idx < nof_cells()) ? &cell_ded_list[ue_cc_idx] : nullptr;
}
const cell_ctxt_dedicated* get_ue_cc_idx(uint32_t ue_cc_idx) const
{
return (ue_cc_idx < nof_cells()) ? &cell_ded_list[ue_cc_idx] : nullptr;
}
cell_ctxt_dedicated* get_enb_cc_idx(uint32_t enb_cc_idx);
size_t nof_cells() const { return cell_ded_list.size(); }
bool is_allocated() const { return nof_cells() > 0; }

4
srsenb/src/stack/mac/scheduler_ue.cc
Unescape Escape View File

@ -1275,7 +1275,7 @@ void cc_sched_ue::set_cfg(const sched_interface::ue_cfg_t& cfg_)
case cc_st::active:
if (not cfg->supported_cc_list[ue_cc_idx].active) {
cc_state_ = cc_st::deactivating;
log_h->info("SCHED: rnti=0x%x SCellIndex=%d deactivated\n", rnti, ue_cc_idx);
log_h->info("SCHED: Deactivating rnti=0x%x, SCellIndex=%d...\n", rnti, ue_cc_idx);
}
break;
case cc_st::deactivating:
@ -1284,7 +1284,7 @@ void cc_sched_ue::set_cfg(const sched_interface::ue_cfg_t& cfg_)
cc_state_ = cc_st::activating;
dl_cqi_rx = false;
dl_cqi = 0;
log_h->info("SCHED: rnti=0x%x SCellIndex=%d activated\n", rnti, ue_cc_idx);
log_h->info("SCHED: Activating rnti=0x%x, SCellIndex=%d...\n", rnti, ue_cc_idx);
}
break;
default:

144
srsenb/src/stack/rrc/mac_controller.cc
Unescape Escape View File

@ -26,6 +26,9 @@
namespace srsenb {
using namespace asn1::rrc;
using ue_cfg_t = sched_interface::ue_cfg_t;
/********* Helper Methods ********/
// TS 36.331 9.1.1.2 - CCCH configuration
sched_interface::ue_bearer_cfg_t get_bearer_default_ccch_config()
@ -52,11 +55,17 @@ sched_interface::ue_bearer_cfg_t get_bearer_default_srb2_config()
return bearer;
}
/**
* Adds to sched_interface::ue_cfg_t the changes present in the asn1 RRCReconfiguration message related to
* PHY ConfigurationDedicated
*/
void ue_cfg_apply_phy_cfg_ded(ue_cfg_t& ue_cfg, const asn1::rrc::phys_cfg_ded_s& phy_cfg, const rrc_cfg_t& rrc_cfg);
/***************************
* MAC Controller class
**************************/
rrc::ue::mac_controller::mac_controller(rrc::ue* rrc_ue_, const sched_interface::ue_cfg_t& sched_ue_cfg) :
rrc::ue::mac_controller::mac_controller(rrc::ue* rrc_ue_, const ue_cfg_t& sched_ue_cfg) :
log_h("RRC"),
rrc_ue(rrc_ue_),
rrc_cfg(&rrc_ue_->parent->cfg),
@ -91,7 +100,7 @@ void rrc::ue::mac_controller::handle_con_reject()
}
}
//! Called in case of Handover
/// Called in case of intra-eNB Handover to activate the new PCell for the reception of the RRC Reconf Complete message
int rrc::ue::mac_controller::handle_crnti_ce(uint32_t temp_crnti)
{
uint32_t target_enb_cc_idx = rrc_ue->cell_ded_list.get_ue_cc_idx(UE_PCELL_CC_IDX)->cell_common->enb_cc_idx;
@ -126,7 +135,7 @@ int rrc::ue::mac_controller::apply_basic_conn_cfg(const asn1::rrc::rr_cfg_ded_s&
// Apply common PhyConfig updates (e.g. SR/CQI resources, antenna cfg)
if (rr_cfg.phys_cfg_ded_present) {
apply_phy_cfg_updates_common(rr_cfg.phys_cfg_ded);
ue_cfg_apply_phy_cfg_ded(current_sched_ue_cfg, rr_cfg.phys_cfg_ded, *rrc_cfg);
}
// Other PUCCH params
@ -163,7 +172,7 @@ void rrc::ue::mac_controller::handle_con_reest_complete()
void rrc::ue::mac_controller::handle_con_reconf(const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg)
{
if (conn_recfg.rr_cfg_ded_present and conn_recfg.rr_cfg_ded.phys_cfg_ded_present) {
apply_phy_cfg_updates_common(conn_recfg.rr_cfg_ded.phys_cfg_ded);
ue_cfg_apply_phy_cfg_ded(current_sched_ue_cfg, conn_recfg.rr_cfg_ded.phys_cfg_ded, *rrc_cfg);
}
// Store Scells Configuration
@ -283,45 +292,40 @@ void rrc::ue::mac_controller::apply_current_bearers_cfg()
}
}
void rrc::ue::mac_controller::apply_phy_cfg_updates_common(const asn1::rrc::phys_cfg_ded_s& phy_cfg)
void rrc::ue::mac_controller::handle_target_enb_ho_cmd(const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg)
{
// Apply SR config
if (phy_cfg.sched_request_cfg_present) {
current_sched_ue_cfg.pucch_cfg.sr_configured = true;
current_sched_ue_cfg.pucch_cfg.I_sr = phy_cfg.sched_request_cfg.setup().sr_cfg_idx;
current_sched_ue_cfg.pucch_cfg.n_pucch_sr = phy_cfg.sched_request_cfg.setup().sr_pucch_res_idx;
if (conn_recfg.rr_cfg_ded_present and conn_recfg.rr_cfg_ded.phys_cfg_ded_present) {
ue_cfg_apply_phy_cfg_ded(current_sched_ue_cfg, conn_recfg.rr_cfg_ded.phys_cfg_ded, *rrc_cfg);
}
// Apply CQI config
auto& pcell_cfg = current_sched_ue_cfg.supported_cc_list[0];
if (phy_cfg.cqi_report_cfg_present) {
if (phy_cfg.cqi_report_cfg.cqi_report_periodic_present) {
auto& cqi_cfg = phy_cfg.cqi_report_cfg.cqi_report_periodic.setup();
current_sched_ue_cfg.pucch_cfg.n_pucch = cqi_cfg.cqi_pucch_res_idx;
pcell_cfg.dl_cfg.cqi_report.pmi_idx = cqi_cfg.cqi_pmi_cfg_idx;
pcell_cfg.dl_cfg.cqi_report.periodic_configured = true;
} else if (phy_cfg.cqi_report_cfg.cqi_report_mode_aperiodic_present) {
pcell_cfg.aperiodic_cqi_period = rrc_cfg->cqi_cfg.period;
pcell_cfg.dl_cfg.cqi_report.aperiodic_configured = true;
}
// Store Scells Configuration
if (conn_recfg.non_crit_ext_present and conn_recfg.non_crit_ext.non_crit_ext_present and
conn_recfg.non_crit_ext.non_crit_ext.non_crit_ext_present and
conn_recfg.non_crit_ext.non_crit_ext.non_crit_ext.scell_to_add_mod_list_r10_present) {
pending_scells_cfg.reset(new asn1::rrc::scell_to_add_mod_list_r10_l{
conn_recfg.non_crit_ext.non_crit_ext.non_crit_ext.scell_to_add_mod_list_r10});
}
// Configure 256QAM
if (phy_cfg.cqi_report_cfg_pcell_v1250.is_present() and
phy_cfg.cqi_report_cfg_pcell_v1250->alt_cqi_table_r12_present) {
current_sched_ue_cfg.use_tbs_index_alt = true;
}
// Apply changes to MAC scheduler
mac->ue_cfg(rrc_ue->rnti, &current_sched_ue_cfg);
mac->phy_config_enabled(rrc_ue->rnti, false);
}
// Apply Antenna Configuration
if (phy_cfg.ant_info_present) {
if (phy_cfg.ant_info.type().value == phys_cfg_ded_s::ant_info_c_::types_opts::explicit_value) {
current_sched_ue_cfg.dl_ant_info = srslte::make_ant_info_ded(phy_cfg.ant_info.explicit_value());
} else {
log_h->warning("No antenna configuration provided\n");
pcell_cfg.dl_cfg.tm = SRSLTE_TM1;
current_sched_ue_cfg.dl_ant_info.tx_mode = sched_interface::ant_info_ded_t::tx_mode_t::tm1;
}
}
void rrc::ue::mac_controller::handle_intraenb_ho_cmd(const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg)
{
// Freeze SCells
// NOTE: this avoids that the UE receives an HOCmd retx from target cell and do an incorrect RLC-level concatenation
set_scell_activation({0});
// Freeze all DRBs. SRBs are needed for sending the HO Cmd
set_drb_activation(false);
update_mac(mac_controller::config_tx);
}
void rrc::ue::mac_controller::handle_ho_prep(const asn1::rrc::ho_prep_info_r8_ies_s& ho_prep)
{
// TODO: Apply configuration in ho_prep as a base
}
void rrc::ue::mac_controller::apply_scell_cfg_updates(uint32_t ue_cc_idx)
@ -372,34 +376,18 @@ void rrc::ue::mac_controller::apply_scell_cfg_updates(uint32_t ue_cc_idx)
pending_scells_cfg->erase(it);
}
void rrc::ue::mac_controller::handle_ho_prep(const asn1::rrc::ho_prep_info_r8_ies_s& ho_prep,
const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg)
void rrc::ue::mac_controller::set_scell_activation(const std::bitset<SRSLTE_MAX_CARRIERS>& scell_mask)
{
// TODO: Apply configuration in ho_prep
if (conn_recfg.rr_cfg_ded_present and conn_recfg.rr_cfg_ded.phys_cfg_ded_present) {
apply_phy_cfg_updates_common(conn_recfg.rr_cfg_ded.phys_cfg_ded);
}
// Store Scells Configuration
if (conn_recfg.non_crit_ext_present and conn_recfg.non_crit_ext.non_crit_ext_present and
conn_recfg.non_crit_ext.non_crit_ext.non_crit_ext_present and
conn_recfg.non_crit_ext.non_crit_ext.non_crit_ext.scell_to_add_mod_list_r10_present) {
pending_scells_cfg.reset(new asn1::rrc::scell_to_add_mod_list_r10_l{
conn_recfg.non_crit_ext.non_crit_ext.non_crit_ext.scell_to_add_mod_list_r10});
for (uint32_t i = 1; i < current_sched_ue_cfg.supported_cc_list.size(); ++i) {
current_sched_ue_cfg.supported_cc_list[i].active = scell_mask[i];
}
// Apply changes to MAC scheduler
mac->ue_cfg(rrc_ue->rnti, &current_sched_ue_cfg);
mac->phy_config_enabled(rrc_ue->rnti, false);
}
void rrc::ue::mac_controller::handle_ho_prep_complete() {}
void rrc::ue::mac_controller::set_scell_activation(const std::bitset<SRSLTE_MAX_CARRIERS>& scell_mask)
void rrc::ue::mac_controller::set_drb_activation(bool active)
{
for (uint32_t i = 1; i < current_sched_ue_cfg.supported_cc_list.size(); ++i) {
current_sched_ue_cfg.supported_cc_list[i].active = scell_mask[i];
for (const drb_to_add_mod_s& drb : rrc_ue->bearer_list.get_established_drbs()) {
current_sched_ue_cfg.ue_bearers[drb.drb_id + rb_id_t::RB_ID_SRB2].direction =
active ? sched_interface::ue_bearer_cfg_t::BOTH : sched_interface::ue_bearer_cfg_t::IDLE;
}
}
@ -408,8 +396,44 @@ void rrc::ue::mac_controller::update_mac(proc_stage_t stage)
// Apply changes to MAC scheduler
mac->ue_cfg(rrc_ue->rnti, &current_sched_ue_cfg);
if (stage != proc_stage_t::other) {
// Acknowledge Dedicated Configuration
mac->phy_config_enabled(rrc_ue->rnti, stage == proc_stage_t::config_complete);
}
}
void ue_cfg_apply_phy_cfg_ded(ue_cfg_t& ue_cfg, const asn1::rrc::phys_cfg_ded_s& phy_cfg, const rrc_cfg_t& rrc_cfg)
{
// Apply SR config
if (phy_cfg.sched_request_cfg_present) {
ue_cfg.pucch_cfg.sr_configured = true;
ue_cfg.pucch_cfg.I_sr = phy_cfg.sched_request_cfg.setup().sr_cfg_idx;
ue_cfg.pucch_cfg.n_pucch_sr = phy_cfg.sched_request_cfg.setup().sr_pucch_res_idx;
}
// Apply CQI config
auto& pcell_cfg = ue_cfg.supported_cc_list[0];
if (phy_cfg.cqi_report_cfg_present) {
if (phy_cfg.cqi_report_cfg.cqi_report_periodic_present) {
auto& cqi_cfg = phy_cfg.cqi_report_cfg.cqi_report_periodic.setup();
ue_cfg.pucch_cfg.n_pucch = cqi_cfg.cqi_pucch_res_idx;
pcell_cfg.dl_cfg.cqi_report.pmi_idx = cqi_cfg.cqi_pmi_cfg_idx;
pcell_cfg.dl_cfg.cqi_report.periodic_configured = true;
} else if (phy_cfg.cqi_report_cfg.cqi_report_mode_aperiodic_present) {
pcell_cfg.aperiodic_cqi_period = rrc_cfg.cqi_cfg.period;
pcell_cfg.dl_cfg.cqi_report.aperiodic_configured = true;
}
}
// Apply Antenna Configuration
if (phy_cfg.ant_info_present) {
if (phy_cfg.ant_info.type().value == phys_cfg_ded_s::ant_info_c_::types_opts::explicit_value) {
ue_cfg.dl_ant_info = srslte::make_ant_info_ded(phy_cfg.ant_info.explicit_value());
} else {
srslte::logmap::get("RRC")->warning("No antenna configuration provided\n");
pcell_cfg.dl_cfg.tm = SRSLTE_TM1;
ue_cfg.dl_ant_info.tx_mode = sched_interface::ant_info_ded_t::tx_mode_t::tm1;
}
}
}
} // namespace srsenb

24
srsenb/src/stack/rrc/rrc_mobility.cc
Unescape Escape View File

@ -1042,6 +1042,10 @@ void rrc::ue::rrc_mobility::s1_source_ho_st::send_ho_cmd(wait_ho_req_ack_st& s,
return;
}
// Disable DRBs
parent_fsm()->rrc_ue->mac_ctrl->set_drb_activation(false);
parent_fsm()->rrc_ue->mac_ctrl->update_mac(mac_controller::proc_stage_t::other);
/* Send HO Command to UE */
if (not parent_fsm()->rrc_ue->send_dl_dcch(&dl_dcch_msg)) {
trigger(ho_cancel_ev{});
@ -1144,7 +1148,7 @@ void rrc::ue::rrc_mobility::handle_ho_req(idle_st& s, const ho_req_rx_ev& ho_req
rrc_ue->apply_pdcp_srb_updates();
rrc_ue->apply_rlc_rb_updates();
// Update MAC
rrc_ue->mac_ctrl->handle_ho_prep(hoprep_r8, recfg_r8);
rrc_ue->mac_ctrl->handle_target_enb_ho_cmd(recfg_r8);
// Apply PHY updates
rrc_ue->apply_reconf_phy_config(recfg_r8, true);
@ -1223,6 +1227,9 @@ bool rrc::ue::rrc_mobility::apply_ho_prep_cfg(const ho_prep_info_r8_ies_s& ho
}
}
// Save source UE MAC configuration as a base
rrc_ue->mac_ctrl->handle_ho_prep(ho_prep);
// Save measConfig
ue_var_meas = var_meas_cfg_t::make(ho_prep.as_cfg.source_meas_cfg);
rrc_log->debug_long("New rnti=0x%x varMeasConfig: %s", rrc_ue->rnti, ue_var_meas.to_string().c_str());
@ -1316,22 +1323,13 @@ void rrc::ue::rrc_mobility::intraenb_ho_st::enter(rrc_mobility* f, const ho_meas
return;
}
/* Freeze all DRBs. SRBs DL are needed for sending the HO Cmd */
f->rrc_ue->mac_ctrl->set_scell_activation({0});
f->rrc_ue->mac_ctrl->update_mac(mac_controller::config_tx);
for (const drb_to_add_mod_s& drb : f->rrc_ue->bearer_list.get_established_drbs()) {
f->rrc_enb->mac->bearer_ue_rem(f->rrc_ue->rnti, drb.drb_id + 2);
}
sched_interface::ue_bearer_cfg_t bcfg = {};
bcfg.direction = sched_interface::ue_bearer_cfg_t::DL;
for (uint32_t srb_id = 0; srb_id < 3; ++srb_id) {
f->rrc_enb->mac->bearer_ue_cfg(f->rrc_ue->rnti, srb_id, &bcfg);
}
/* Prepare RRC Reconf Message with mobility info */
dl_dcch_msg_s dl_dcch_msg;
f->fill_mobility_reconf_common(dl_dcch_msg, *target_cell, source_cell->cell_cfg.dl_earfcn);
// Apply changes to the MAC scheduler
f->rrc_ue->mac_ctrl->handle_intraenb_ho_cmd(dl_dcch_msg.msg.c1().rrc_conn_recfg().crit_exts.c1().rrc_conn_recfg_r8());
// Send DL-DCCH Message via current PCell
if (not f->rrc_ue->send_dl_dcch(&dl_dcch_msg)) {
f->trigger(srslte::failure_ev{});

Write Preview
Loading…
Cancel
Save