added nr mac
This commit is contained in:
Francisco Paisana
Francisco Paisana
parent
a0e4b18507
commit
d7b35ba7d1
|
|
@ -22,6 +22,7 @@
|
|||
#ifndef SRSLTE_ENB_STACK_BASE_H
|
||||
#define SRSLTE_ENB_STACK_BASE_H
|
||||
|
||||
#include "srslte/interfaces/enb_interfaces.h"
|
||||
#include <string>
|
||||
|
||||
namespace srsenb {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
/*
|
||||
* Copyright 2013-2019 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef SRSGNB_MAC_NR_H
|
||||
#define SRSGNB_MAC_NR_H
|
||||
|
||||
#include "srslte/common/logmap.h"
|
||||
#include "srslte/common/mac_nr_pcap.h"
|
||||
#include "srslte/common/mac_nr_pdu.h"
|
||||
|
||||
#include "srsenb/hdr/stack/enb_stack_base.h"
|
||||
#include "srslte/interfaces/enb_metrics_interface.h"
|
||||
#include "srslte/interfaces/gnb_interfaces.h"
|
||||
|
||||
namespace srsenb {
|
||||
|
||||
struct mac_nr_args_t {
|
||||
srsenb::pcap_args_t pcap;
|
||||
|
||||
// params for the dummy user
|
||||
srsenb::sched_interface::sched_args_t sched;
|
||||
uint16_t rnti;
|
||||
|
||||
// Add args
|
||||
std::string log_level;
|
||||
uint32_t log_hex_limit;
|
||||
uint32_t tb_size = 64;
|
||||
};
|
||||
|
||||
class mac_nr : public mac_interface_phy_nr, public mac_interface_rrc_nr, public mac_interface_rlc_nr
|
||||
{
|
||||
public:
|
||||
mac_nr(srslte::logger* logger_);
|
||||
~mac_nr();
|
||||
|
||||
int init(const mac_nr_args_t& args_,
|
||||
phy_interface_stack_nr* phy,
|
||||
rlc_interface_mac_nr* rlc_,
|
||||
rrc_interface_mac_nr* rrc_);
|
||||
void stop();
|
||||
|
||||
void get_metrics(srsenb::mac_metrics_t* metrics);
|
||||
|
||||
// MAC interface for RRC
|
||||
int cell_cfg(srsenb::sched_interface::cell_cfg_t* cell_cfg);
|
||||
int read_pdu_bcch_bch(uint8_t* payload);
|
||||
|
||||
// MAC interface for RLC
|
||||
// TODO:
|
||||
int rlc_buffer_state(uint16_t rnti, uint32_t lc_id, uint32_t tx_queue, uint32_t retx_queue) { return 0; }
|
||||
|
||||
// Interface for PHY
|
||||
int sf_indication(const uint32_t tti);
|
||||
|
||||
private:
|
||||
void get_dl_config(const uint32_t tti,
|
||||
phy_interface_stack_nr::dl_config_request_t& config_request,
|
||||
phy_interface_stack_nr::tx_request_t& tx_request);
|
||||
|
||||
// Interaction with PHY
|
||||
phy_interface_stack_nr* phy_h = nullptr;
|
||||
rlc_interface_mac_nr* rlc_h = nullptr;
|
||||
rrc_interface_mac_nr* rrc_h = nullptr;
|
||||
|
||||
std::unique_ptr<srslte::mac_nr_pcap> pcap = nullptr;
|
||||
srslte::log_ref log_h;
|
||||
srslte::byte_buffer_pool* pool = nullptr;
|
||||
mac_nr_args_t args = {};
|
||||
|
||||
bool started = false;
|
||||
|
||||
srsenb::sched_interface::cell_cfg_t cfg = {};
|
||||
|
||||
// BCH buffers
|
||||
struct sib_info_t {
|
||||
uint32_t index;
|
||||
uint32_t periodicity;
|
||||
srslte::unique_byte_buffer_t payload;
|
||||
};
|
||||
std::vector<sib_info_t> bcch_dlsch_payload;
|
||||
srslte::unique_byte_buffer_t bcch_bch_payload = nullptr;
|
||||
|
||||
// UE-specific buffer
|
||||
srslte::mac_nr_sch_pdu ue_tx_pdu;
|
||||
std::vector<srslte::unique_byte_buffer_t> ue_tx_buffer;
|
||||
|
||||
srslte::unique_byte_buffer_t ue_rlc_buffer;
|
||||
};
|
||||
|
||||
} // namespace srsenb
|
||||
|
||||
#endif // SRSGNB_MAC_NR_H
|
||||
|
|
@ -18,5 +18,10 @@
|
|||
# and at http://www.gnu.org/licenses/.
|
||||
#
|
||||
|
||||
file(GLOB SOURCES "*.cc")
|
||||
add_library(srsenb_mac STATIC ${SOURCES})
|
||||
set(SOURCES mac.cc ue.cc scheduler.cc scheduler_carrier.cc scheduler_grid.cc scheduler_harq.cc scheduler_metric.cc scheduler_ue.cc)
|
||||
add_library(srsenb_mac STATIC ${SOURCES})
|
||||
|
||||
if(ENABLE_5GNR)
|
||||
set(SOURCES mac_nr.cc)
|
||||
add_library(srsgnb_mac STATIC ${SOURCES})
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,218 @@
|
|||
/*
|
||||
* Copyright 2013-2019 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__)
|
||||
#define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
|
||||
#define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__)
|
||||
#define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__)
|
||||
|
||||
#include "srsenb/hdr/stack/mac/mac_nr.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include <pthread.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <unistd.h>
|
||||
|
||||
namespace srsenb {
|
||||
|
||||
mac_nr::mac_nr(srslte::logger* logger_) : pool(srslte::byte_buffer_pool::get_instance()), log_h("MAC")
|
||||
{
|
||||
bcch_bch_payload = srslte::allocate_unique_buffer(*pool);
|
||||
|
||||
// allocate 8 tx buffers for UE (TODO: as we don't handle softbuffers why do we need so many buffers)
|
||||
for (int i = 0; i < SRSLTE_FDD_NOF_HARQ; i++) {
|
||||
ue_tx_buffer.emplace_back(srslte::allocate_unique_buffer(*pool));
|
||||
}
|
||||
|
||||
ue_rlc_buffer = srslte::allocate_unique_buffer(*pool);
|
||||
}
|
||||
|
||||
mac_nr::~mac_nr()
|
||||
{
|
||||
stop();
|
||||
}
|
||||
|
||||
int mac_nr::init(const mac_nr_args_t& args_,
|
||||
phy_interface_stack_nr* phy_,
|
||||
rlc_interface_mac_nr* rlc_,
|
||||
rrc_interface_mac_nr* rrc_)
|
||||
{
|
||||
args = args_;
|
||||
|
||||
phy_h = phy_;
|
||||
rlc_h = rlc_;
|
||||
rrc_h = rrc_;
|
||||
|
||||
log_h->set_level(args.log_level);
|
||||
log_h->set_hex_limit(args.log_hex_limit);
|
||||
|
||||
if (args.pcap.enable) {
|
||||
pcap = std::unique_ptr<srslte::mac_nr_pcap>(new srslte::mac_nr_pcap());
|
||||
pcap->open(args.pcap.filename);
|
||||
}
|
||||
|
||||
log_h->info("Started\n");
|
||||
|
||||
started = true;
|
||||
|
||||
return SRSLTE_SUCCESS;
|
||||
}
|
||||
|
||||
void mac_nr::stop()
|
||||
{
|
||||
if (started) {
|
||||
if (pcap != nullptr) {
|
||||
pcap->close();
|
||||
}
|
||||
|
||||
started = false;
|
||||
}
|
||||
}
|
||||
|
||||
void mac_nr::get_metrics(srsenb::mac_metrics_t* metrics) {}
|
||||
|
||||
// Fills both, DL_CONFIG.request and TX.request structs
|
||||
void mac_nr::get_dl_config(const uint32_t tti,
|
||||
phy_interface_stack_nr::dl_config_request_t& config_request,
|
||||
phy_interface_stack_nr::tx_request_t& tx_request)
|
||||
{
|
||||
// send MIB over BCH every 80ms
|
||||
if (tti % 80 == 0) {
|
||||
// try to read BCH PDU from RRC
|
||||
if (rrc_h->read_pdu_bcch_bch(tti, bcch_bch_payload) == SRSLTE_SUCCESS) {
|
||||
log_h->info("Adding BCH in TTI=%d\n", tti);
|
||||
tx_request.pdus[tx_request.nof_pdus].pbch.mib_present = true;
|
||||
tx_request.pdus[tx_request.nof_pdus].data[0] = bcch_bch_payload->msg;
|
||||
tx_request.pdus[tx_request.nof_pdus].length = bcch_bch_payload->N_bytes;
|
||||
tx_request.pdus[tx_request.nof_pdus].index = tx_request.nof_pdus;
|
||||
tx_request.nof_pdus++;
|
||||
|
||||
if (pcap) {
|
||||
pcap->write_dl_bch(bcch_bch_payload->msg, bcch_bch_payload->N_bytes, 0xffff, 0, tti);
|
||||
}
|
||||
} else {
|
||||
log_h->error("Couldn't read BCH payload from RRC\n");
|
||||
}
|
||||
}
|
||||
|
||||
// Schedule SIBs
|
||||
for (auto& sib : bcch_dlsch_payload) {
|
||||
if (sib.payload->N_bytes > 0) {
|
||||
if (tti % (sib.periodicity * 10) == 0) {
|
||||
log_h->info("Adding SIB %d in TTI=%d\n", sib.index, tti);
|
||||
|
||||
tx_request.pdus[tx_request.nof_pdus].data[0] = sib.payload->msg;
|
||||
tx_request.pdus[tx_request.nof_pdus].length = sib.payload->N_bytes;
|
||||
tx_request.pdus[tx_request.nof_pdus].index = tx_request.nof_pdus;
|
||||
|
||||
if (pcap) {
|
||||
pcap->write_dl_si_rnti(sib.payload->msg, sib.payload->N_bytes, 0xffff, 0, tti);
|
||||
}
|
||||
|
||||
tx_request.nof_pdus++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Add MAC padding if TTI is empty
|
||||
if (tx_request.nof_pdus == 0) {
|
||||
uint32_t buffer_index = tti % SRSLTE_FDD_NOF_HARQ;
|
||||
|
||||
ue_tx_buffer.at(buffer_index)->clear();
|
||||
ue_tx_pdu.init_tx(ue_tx_buffer.at(buffer_index).get(), args.tb_size);
|
||||
|
||||
// read RLC PDU
|
||||
ue_rlc_buffer->clear();
|
||||
int pdu_len = rlc_h->read_pdu(args.rnti, 4, ue_rlc_buffer->msg, args.tb_size - 2);
|
||||
|
||||
// Only create PDU if RLC has something to tx
|
||||
if (pdu_len > 0) {
|
||||
log_h->info("Adding MAC PDU for RNTI=%d\n", args.rnti);
|
||||
ue_rlc_buffer->N_bytes = pdu_len;
|
||||
log_h->info_hex(ue_rlc_buffer->msg, ue_rlc_buffer->N_bytes, "Read %d B from RLC\n", ue_rlc_buffer->N_bytes);
|
||||
|
||||
// add to MAC PDU and pack
|
||||
ue_tx_pdu.add_sdu(4, ue_rlc_buffer->msg, ue_rlc_buffer->N_bytes);
|
||||
ue_tx_pdu.pack();
|
||||
|
||||
tx_request.pdus[tx_request.nof_pdus].data[0] = ue_tx_buffer.at(buffer_index)->msg;
|
||||
tx_request.pdus[tx_request.nof_pdus].length = ue_tx_buffer.at(buffer_index)->N_bytes;
|
||||
tx_request.pdus[tx_request.nof_pdus].index = tx_request.nof_pdus;
|
||||
|
||||
if (pcap) {
|
||||
pcap->write_dl_crnti(tx_request.pdus[tx_request.nof_pdus].data[0],
|
||||
tx_request.pdus[tx_request.nof_pdus].length,
|
||||
args.rnti,
|
||||
buffer_index,
|
||||
tti);
|
||||
}
|
||||
|
||||
tx_request.nof_pdus++;
|
||||
}
|
||||
}
|
||||
|
||||
config_request.tti = tti;
|
||||
tx_request.tti = tti;
|
||||
}
|
||||
|
||||
int mac_nr::sf_indication(const uint32_t tti)
|
||||
{
|
||||
phy_interface_stack_nr::dl_config_request_t config_request = {};
|
||||
phy_interface_stack_nr::tx_request_t tx_request = {};
|
||||
|
||||
// step MAC TTI
|
||||
log_h->step(tti);
|
||||
|
||||
get_dl_config(tti, config_request, tx_request);
|
||||
|
||||
// send DL_CONFIG.request
|
||||
phy_h->dl_config_request(config_request);
|
||||
|
||||
// send TX.request
|
||||
phy_h->tx_request(tx_request);
|
||||
|
||||
return SRSLTE_SUCCESS;
|
||||
}
|
||||
|
||||
int mac_nr::cell_cfg(srsenb::sched_interface::cell_cfg_t* cell_cfg)
|
||||
{
|
||||
cfg = *cell_cfg;
|
||||
|
||||
// read SIBs from RRC (SIB1 for now only)
|
||||
for (int i = 0; i < srsenb::sched_interface::MAX_SIBS; i++) {
|
||||
if (cell_cfg->sibs->len > 0) {
|
||||
sib_info_t sib = {};
|
||||
sib.index = i;
|
||||
sib.periodicity = cell_cfg->sibs->period_rf;
|
||||
sib.payload = srslte::allocate_unique_buffer(*pool);
|
||||
if (rrc_h->read_pdu_bcch_dlsch(sib.index, sib.payload) != SRSLTE_SUCCESS) {
|
||||
log_h->error("Couldn't read SIB %d from RRC\n", sib.index);
|
||||
}
|
||||
|
||||
log_h->info("Including SIB %d into SI scheduling\n", sib.index);
|
||||
bcch_dlsch_payload.push_back(std::move(sib));
|
||||
}
|
||||
}
|
||||
|
||||
return SRSLTE_SUCCESS;
|
||||
}
|
||||
|
||||
} // namespace srsenb
|
||||
Loading…
Reference in New Issue