Skip to content

O
OpenXG-RAN
Commit 0609742e authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files
Options

Merge remote-tracking branch 'origin/benetel_5g_prach_fix' into benetel_phase_rotation

parents c737ea2f 8ba0d28a
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 28 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @ 0609742e
...@@ -421,14 +421,24 @@ void nr_initiate_ra_proc(module_id_t module_idP, ...@@ -421,14 +421,24 @@ void nr_initiate_ra_proc(module_id_t module_idP,
uint8_t ul_carrier_id = 0; // 0 for NUL 1 for SUL uint8_t ul_carrier_id = 0; // 0 for NUL 1 for SUL
NR_SearchSpace_t *ss; NR_SearchSpace_t *ss;
// ra_rnti from 5.1.3 in 38.321 int UE_id = 0;
uint16_t ra_rnti=1+symbol+(slotP*14)+(freq_index*14*80)+(ul_carrier_id*14*80*8);
uint16_t msg2_frame, msg2_slot,monitoring_slot_period,monitoring_offset; uint16_t msg2_frame, msg2_slot,monitoring_slot_period,monitoring_offset;
gNB_MAC_INST *nr_mac = RC.nrmac[module_idP]; gNB_MAC_INST *nr_mac = RC.nrmac[module_idP];
NR_COMMON_channels_t *cc = &nr_mac->common_channels[CC_id]; NR_COMMON_channels_t *cc = &nr_mac->common_channels[CC_id];
NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon; NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
NR_RA_t *ra = &cc->ra[0]; NR_RA_t *ra = &cc->ra[0];
uint16_t ra_rnti;
// ra_rnti from 5.1.3 in 38.321
// FK: in case of long PRACH the phone seems to expect the subframe number instead of the slot number here.
if (scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->prach_RootSequenceIndex.present==NR_RACH_ConfigCommon__prach_RootSequenceIndex_PR_l839)
ra_rnti=1+symbol+(9/*slotP*/*14)+(freq_index*14*80)+(ul_carrier_id*14*80*8);
else
ra_rnti=1+symbol+(slotP*14)+(freq_index*14*80)+(ul_carrier_id*14*80*8);
// if the preamble received correspond to one of the listed // if the preamble received correspond to one of the listed
// the UE sent a RACH either for starting RA procedure or RA procedure failed and UE retries // the UE sent a RACH either for starting RA procedure or RA procedure failed and UE retries
int pr_found=0; int pr_found=0;
......
targets/ARCH/ETHERNET/benetel/4g/dpdk_driver.c
View file @ 0609742e
...@@ -86,10 +86,9 @@ static struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS]; ...@@ -86,10 +86,9 @@ static struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
static struct rte_eth_conf port_conf = { static struct rte_eth_conf port_conf = {
.rxmode = { .rxmode = {
.split_hdr_size = 0, .split_hdr_size = 0,
.offloads = DEV_RX_OFFLOAD_CRC_STRIP, .offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
.offloads = DEV_RX_OFFLOAD_JUMBO_FRAME, .split_hdr_size = 0,
.split_hdr_size = 0, .max_rx_pkt_len = 9500,
.max_rx_pkt_len = 9500,
}, },
.txmode = { .txmode = {
.mq_mode = ETH_MQ_TX_NONE, .mq_mode = ETH_MQ_TX_NONE,
......
targets/ARCH/ETHERNET/benetel/5g/benetel.c
View file @ 0609742e
...@@ -275,6 +275,7 @@ void benetel_fh_if4p5_south_out(RU_t *ru, ...@@ -275,6 +275,7 @@ void benetel_fh_if4p5_south_out(RU_t *ru,
int slot, int slot,
uint64_t timestamp) uint64_t timestamp)
{ {
//printf("XXX benetel_fh_if4p5_south_out %d %d %ld\n", frame, slot, timestamp); //printf("XXX benetel_fh_if4p5_south_out %d %d %ld\n", frame, slot, timestamp);
benetel_eth_state_t *s = ru->ifdevice.priv; benetel_eth_state_t *s = ru->ifdevice.priv;
NR_DL_FRAME_PARMS *fp; NR_DL_FRAME_PARMS *fp;
......
targets/ARCH/ETHERNET/benetel/5g/dpdk_driver.c
View file @ 0609742e
...@@ -86,10 +86,9 @@ static struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS]; ...@@ -86,10 +86,9 @@ static struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
static struct rte_eth_conf port_conf = { static struct rte_eth_conf port_conf = {
.rxmode = { .rxmode = {
.split_hdr_size = 0, .split_hdr_size = 0,
.offloads = DEV_RX_OFFLOAD_CRC_STRIP, .offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
.offloads = DEV_RX_OFFLOAD_JUMBO_FRAME, .split_hdr_size = 0,
.split_hdr_size = 0, .max_rx_pkt_len = 9500,
.max_rx_pkt_len = 9500,
}, },
.txmode = { .txmode = {
.mq_mode = ETH_MQ_TX_NONE, .mq_mode = ETH_MQ_TX_NONE,
...@@ -234,7 +233,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs) ...@@ -234,7 +233,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
} }
// Trigger start send DL packets // Trigger start send DL packets
if(PAYLOAD_1 == 0x13 && PAYLOAD_2 == 0xe4 && SYMBOL == 0x46 && ANT_NUM == 0x00 && SUBFRAME == 0x00 && dl_start == 0){ if(PAYLOAD_1 == 0x13 && PAYLOAD_2 == 0xe4 && SYMBOL == 0x44 && ANT_NUM == 0x00 && SUBFRAME == 0x00 && dl_start == 0){
printf("\nU-Plane Started\n"); printf("\nU-Plane Started\n");
printf("\n====================================================\n"); printf("\n====================================================\n");
...@@ -253,7 +252,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs) ...@@ -253,7 +252,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
p.antenna = 0; p.antenna = 0;
memcpy(p.iq, IQ_ptr, 5088); memcpy(p.iq, IQ_ptr, 5088);
store_ul(bs, &p); store_ul(bs, &p);
//if (p.symbol==0) printf("store ul f.sl.sy %d.%d.%d\n", p.frame, p.slot, p.symbol); // if (p.symbol==0) printf("store ul f.sl.sy %d.%d.%d\n", p.frame, p.slot, p.symbol);
} }
// U-PLANE UL ANT_0 PROCESSING // U-PLANE UL ANT_0 PROCESSING
...@@ -268,7 +267,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs) ...@@ -268,7 +267,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
int tx_frame = frame; int tx_frame = frame;
int tx_subframe = subframe; int tx_subframe = subframe;
int tx_slot = slot; int tx_slot = slot;
int tx_symbol = symbol + 8; int tx_symbol = symbol + 10;
if (tx_symbol > 13) { if (tx_symbol > 13) {
tx_symbol -= 14; tx_symbol -= 14;
...@@ -286,7 +285,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs) ...@@ -286,7 +285,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
ANT_NUM = 0x00; ANT_NUM = 0x00;
// Mask the symbol bits from UL packet received and apply the shift. // Mask the symbol bits from UL packet received and apply the shift.
SYMBOL = ((SYMBOL & 0b00111111) + 8) % 14; SYMBOL = ((SYMBOL & 0b00111111) + 10) % 14;
ANT_NUM = 0x00; ANT_NUM = 0x00;
SUBFRAME = sf; SUBFRAME = sf;
...@@ -307,6 +306,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs) ...@@ -307,6 +306,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
memcpy(IQ_ptr, bs->buffers->dl[oai_slot] + tx_symbol * 1272*4, memcpy(IQ_ptr, bs->buffers->dl[oai_slot] + tx_symbol * 1272*4,
1272*4); 1272*4);
} }
//printf("DL buffer f sf slot symbol %d %d %d %d (sf %d)\n", tx_frame, tx_subframe, tx_slot, tx_symbol, (int)sf);
bs->buffers->dl_busy[oai_slot] &= ~(1 << tx_symbol); bs->buffers->dl_busy[oai_slot] &= ~(1 << tx_symbol);
unlock_dl_buffer(bs->buffers, oai_slot); unlock_dl_buffer(bs->buffers, oai_slot);
...@@ -319,7 +319,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs) ...@@ -319,7 +319,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
{ {
// Mask the symbol bits from UL packet received and apply the shift. // Mask the symbol bits from UL packet received and apply the shift.
SYMBOL = ((SYMBOL & 0b00111111) + 8) % 14; SYMBOL = ((SYMBOL & 0b00111111) +10) % 14;
ANT_NUM = 0x01; ANT_NUM = 0x01;
SUBFRAME = sf; SUBFRAME = sf;
...@@ -348,10 +348,10 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs) ...@@ -348,10 +348,10 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
else if(PAYLOAD_1 == 0x0d && PAYLOAD_2 == 0x28){ else if(PAYLOAD_1 == 0x0d && PAYLOAD_2 == 0x28){
if (ANT_NUM == 0) { if (ANT_NUM == 0) {
int subframe = SUBFRAME >> 4; int subframe = SUBFRAME >> 4;
int slot = ((SUBFRAME & 0x0f) << 2) | ((SYMBOL >> 6) & 0x03); //int slot = ((SUBFRAME & 0x0f) << 2) | ((SYMBOL >> 6) & 0x03);
if (subframe==9) { if (subframe==9) {
//printf("store prach f.sf.sl %d.%d.%d %d\n", FRAME, subframe, slot, subframe * 2 + slot); //printf("store prach f.sf.sl %d.%d.%d %d\n", FRAME, subframe, slot, subframe * 2 + slot);
store_prach(bs, FRAME, slot /*subframe * 2 + slot*/, IQ_ptr); store_prach(bs, FRAME, subframe * 2 + 1, IQ_ptr);
} }
} }
rte_pktmbuf_free(m); rte_pktmbuf_free(m);
......
targets/ARCH/ETHERNET/benetel/5g/low.c
View file @ 0609742e
...@@ -27,17 +27,50 @@ ...@@ -27,17 +27,50 @@
void store_ul(benetel_t *bs, ul_packet_t *ul) void store_ul(benetel_t *bs, ul_packet_t *ul)
{ {
#if 0
struct timespec t;
static struct timespec old;
clock_gettime(CLOCK_REALTIME, &t);
printf("store_ul %d.%ld (%ld)\n", (int)(t.tv_sec % 60), t.tv_nsec, t.tv_nsec - old.tv_nsec);
old = t;
#endif
/* only antenna 0 for the moment */ /* only antenna 0 for the moment */
if (ul->antenna != 0) if (ul->antenna != 0)
return; return;
if (ul->slot != bs->next_slot || if (ul->slot != bs->next_slot ||
ul->symbol != bs->next_symbol) { ul->symbol != bs->next_symbol) {
printf("%s: fatal, expected frame.sl.symbol %d.%d.%d, got %d.%d.%d\n", printf("%s: error, expected frame.sl.symbol %d.%d.%d, got %d.%d.%d\n",
__FUNCTION__, __FUNCTION__,
bs->expected_benetel_frame, bs->next_slot, bs->next_symbol, bs->expected_benetel_frame, bs->next_slot, bs->next_symbol,
ul->frame, ul->slot, ul->symbol); ul->frame, ul->slot, ul->symbol);
exit(1); }
/* fill missing data with 0s */
while (ul->slot != bs->next_slot ||
ul->symbol != bs->next_symbol) {
lock_ul_buffer(bs->buffers, bs->next_slot);
if (bs->buffers->ul_busy[bs->next_slot] & (1 << bs->next_symbol)) {
printf("%s: warning, UL overflow (sl.symbol %d.%d)\n", __FUNCTION__,
bs->next_slot, bs->next_symbol);
}
memset(bs->buffers->ul[bs->next_slot] + bs->next_symbol * 1272*4,
0, 1272*4);
bs->buffers->ul_busy[bs->next_slot] |= (1 << bs->next_symbol);
signal_ul_buffer(bs->buffers, bs->next_slot);
unlock_ul_buffer(bs->buffers, bs->next_slot);
bs->next_symbol++;
if (bs->next_symbol == 14) {
bs->next_symbol = 0;
bs->next_slot = (bs->next_slot + 1) % 20;
if (bs->next_slot == 0) {
bs->expected_benetel_frame++;
bs->expected_benetel_frame &= 255;
}
}
} }
lock_ul_buffer(bs->buffers, bs->next_slot); lock_ul_buffer(bs->buffers, bs->next_slot);
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-4g.conf
View file @ 0609742e
...@@ -139,6 +139,8 @@ eNBs = ...@@ -139,6 +139,8 @@ eNBs =
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
//SSB central frequency of NR secondary cell group (for ENDC NSA)
nr_scg_ssb_freq = 640000;
} }
); );
...@@ -174,14 +176,14 @@ eNBs = ...@@ -174,14 +176,14 @@ eNBs =
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.61.195"; mme_ip_address = ( { ipv4 = "192.168.18.99";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
} }
); );
enable_measurement_reports = "no"; enable_measurement_reports = "yes";
///X2 ///X2
enable_x2 = "yes"; enable_x2 = "yes";
...@@ -193,9 +195,9 @@ eNBs = ...@@ -193,9 +195,9 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.160.46"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.196";
ENB_INTERFACE_NAME_FOR_S1U = "eth0"; ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.160.46"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.18.196";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.1"; ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.1";
ENB_PORT_FOR_X2C = 36422; # Spec 36422 ENB_PORT_FOR_X2C = 36422; # Spec 36422
...@@ -226,7 +228,7 @@ RUs = ( ...@@ -226,7 +228,7 @@ RUs = (
{ {
//local_if_name = "enp129s0f0"; //local_if_name = "enp129s0f0";
local_if_name = "dpdk"; local_if_name = "dpdk";
sdr_addrs = "softmodem -m 2048 -l 8 -n 2 -b 0000:3b:00.0 --proc-type auto --file-prefix ggg -- -p 0x1"; sdr_addrs = "softmodem -m 2048 -l 35 -n 2 -b 0000:81:00.3 --proc-type auto --file-prefix ggg -- -p 0x1";
#sdr_addrs = "softmodem -l 8 -n 2 -- -p 0x2"; #sdr_addrs = "softmodem -l 8 -n 2 -- -p 0x2";
remote_address = "127.0.0.2"; remote_address = "127.0.0.2";
local_address = "127.0.0.1"; local_address = "127.0.0.1";
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf
View file @ 0609742e
...@@ -23,6 +23,8 @@ gNBs = ...@@ -23,6 +23,8 @@ gNBs =
ssb_SubcarrierOffset = 31; //0; ssb_SubcarrierOffset = 31; //0;
pdsch_AntennaPorts = 1; pdsch_AntennaPorts = 1;
pusch_TargetSNRx10 = 200;
pucch_TargetSNRx10 = 200;
servingCellConfigCommon = ( servingCellConfigCommon = (
{ {
...@@ -203,7 +205,7 @@ gNBs = ...@@ -203,7 +205,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.61.195"; mme_ip_address = ( { ipv4 = "192.168.18.99";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -227,9 +229,9 @@ gNBs = ...@@ -227,9 +229,9 @@ gNBs =
{ {
GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; GNB_INTERFACE_NAME_FOR_S1_MME = "eth0";
GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.160.146/24"; GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.195/24";
GNB_INTERFACE_NAME_FOR_S1U = "eth0"; GNB_INTERFACE_NAME_FOR_S1U = "eth0";
GNB_IPV4_ADDRESS_FOR_S1U = "192.168.160.146/24"; GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.195/24";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
GNB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24"; GNB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24";
GNB_PORT_FOR_X2C = 36422; # Spec 36422 GNB_PORT_FOR_X2C = 36422; # Spec 36422
...@@ -267,7 +269,7 @@ RUs = ( ...@@ -267,7 +269,7 @@ RUs = (
clock_src = "external"; clock_src = "external";
local_if_name = "dpdk"; local_if_name = "dpdk";
sdr_addrs = "softmodem -m 2048 -l 6 -n 3 -b 0000:3b:00.1 --proc-type auto --file-prefix hhh -- -p 0x1"; sdr_addrs = "softmodem -m 2048 -l 34 -n 3 -b 0000:81:00.2 --proc-type auto --file-prefix hhh -- -p 0x1";
remote_address = "127.0.0.2"; remote_address = "127.0.0.2";
local_address = "127.0.0.1"; local_address = "127.0.0.1";
local_portc = 50000; local_portc = 50000;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment