Skip to content

slapos
slapos
Commit e29fa531 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent 3fa4cabb
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 157 deletions
software/ors-amarisoft/config/out/enb.cfg
View file @ e29fa531
......@@ -9,7 +9,8 @@
// XXX vvv <- ru.txrx_active ? XXX how to handle txrx_active for SDR ?
// (tx_gain=-1000 does not work - it still sets tx_gain to min.possible value 14)
name: "sdr",
// _CELL_a_ru 4T2R (sdr)
// RU1 2T1R (sdr)
// RU2 2T1R (sdr)
args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
rx_antenna:"tx_rx",
tdd_tx_mod: 1,
......@@ -47,11 +48,11 @@
// LTE cells
cell_list: [
// CELL_a (_CELL_a_ru)
// CELL_a (RU1)
{
rf_port: 0,
n_antenna_dl: 4,
n_antenna_ul: 2,
n_antenna_dl: 2,
n_antenna_ul: 1,
cell_id: 0x01,
tac: 0x0001,
......@@ -63,16 +64,9 @@
// Handover
ncell_list: [
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1A2D002, // -> CELL_b
n_id_cell: 2,
dl_earfcn: 38100,
tac: 0x0001,
},
{
rat: "nr",
cell_id: 0x03, // -> CELL_c
cell_id: 0x03, // -> CELL_b
},
// Inter-ENB HO
......@@ -102,15 +96,11 @@
// Carrier Aggregation: LTE + LTE
scell_list: [
{
cell_id: 0x02, // + CELL_b
cross_carrier_scheduling: false,
},
],
// Carrier Aggregation: LTE + NR
en_dc_scg_cell_list: [
{
cell_id: 0x03, // + CELL_c
cell_id: 0x03, // + CELL_b
},
],
......@@ -122,7 +112,7 @@
si_coderate: 0.2,
pdsch_dedicated: {
p_a: -6,
p_a: -3,
p_b: -1,
},
......@@ -158,118 +148,6 @@
},
],
},
// CELL_b (_CELL_a_ru)
{
rf_port: 0,
n_antenna_dl: 4,
n_antenna_ul: 2,
cell_id: 0x02,
tac: 0x0001,
n_id_cell: 2,
dl_earfcn: 38100,
ul_earfcn: 38100,
root_sequence_index: 205,
// Handover
ncell_list: [
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1A2D001, // -> CELL_a
n_id_cell: 1,
dl_earfcn: 38050,
tac: 0x0001,
},
{
rat: "nr",
cell_id: 0x03, // -> CELL_c
},
// Inter-ENB HO
{
rat: "eutra",
cell_id: 0x12345, // -> PEER1
n_id_cell: 35,
dl_earfcn: 700,
tac: 123,
},
{
rat: "nr",
nr_cell_id: 0x77712, // -> PEER2
gnb_id_bits: 22,
n_id_cell: 75,
dl_nr_arfcn: 520000,
ssb_nr_arfcn: 519890,
ul_nr_arfcn: 520000,
tac: 321,
band: 38,
ssb_subcarrier_spacing: 30,
ssb_period: 20,
ssb_offset: 0,
ssb_duration: 1,
},
],
// Carrier Aggregation: LTE + LTE
scell_list: [
{
cell_id: 0x01, // + CELL_a
cross_carrier_scheduling: false,
},
],
// Carrier Aggregation: LTE + NR
en_dc_scg_cell_list: [
{
cell_id: 0x03, // + CELL_c
},
],
// tune LTE parameters for the cell
uldl_config: 2,
sp_config: 7,
n_rb_dl: 25,
si_coderate: 0.2,
pdsch_dedicated: {
p_a: -6,
p_b: -1,
},
pdcch_format: 2,
prach_config_index: 4,
initial_cqi: 3,
pucch_dedicated: {
n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1,
n1_pucch_an_cs_count: 8,
n3_pucch_an_n_rb: 3,
tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
},
m_ri: 8,
transmission_mode: 3,
srs_dedicated: {
srs_bandwidth_config: 3,
srs_bandwidth: 1,
srs_subframe_config: 3,
srs_period: 40,
srs_hopping_bandwidth: 0,
},
manual_ref_signal_power: true,
drb_config: "CELL_b-drb.cfg",
sib_sched_list: [
{
filename: "CELL_b-sib23.asn",
si_periodicity: 16,
},
],
},
],
cell_default: {
......@@ -366,11 +244,11 @@
// NR cells
nr_cell_list: [
// CELL_c (_CELL_a_ru)
// CELL_b (RU2)
{
rf_port: 0,
n_antenna_dl: 4,
n_antenna_ul: 2,
rf_port: 1,
n_antenna_dl: 2,
n_antenna_ul: 1,
cell_id: 0x03,
n_id_cell: 3,
......@@ -383,7 +261,7 @@
ssb_nr_arfcn: 523010,
ssb_pos_bitmap: "10000000",
root_sequence_index: 3,
root_sequence_index: 2,
// Handover
ncell_list: [
......@@ -395,13 +273,6 @@
dl_earfcn: 38050,
tac: 0x0001,
},
{
rat: "eutra",
cell_id: 0x1A2D002, // -> CELL_b
n_id_cell: 2,
dl_earfcn: 38100,
tac: 0x0001,
},
// Inter-ENB HO
{
......@@ -436,9 +307,6 @@
{
cell_id: 0x01, // + CELL_a
},
{
cell_id: 0x02, // + CELL_b
},
],
// tune NR parameters for the cell XXX -> sdr/ors ? (see lte ^^^)
......@@ -477,9 +345,9 @@
csi_rs: {
nzp_csi_rs_resource: [
{
n_ports: 4,
frequency_domain_allocation: "row4",
bitmap: "100",
n_ports: 2,
frequency_domain_allocation: "other",
bitmap: "100000",
cdm_type: "fd_cdm2",
},
{
......@@ -573,16 +441,13 @@
codebook_config: {
codebook_type: "type1",
sub_type: "typeI_SinglePanel",
n1: 2,
n2: 1,
codebook_mode: 1,
},
},
],
},
drb_config: "CELL_c-drb.cfg",
drb_config: "CELL_b-drb.cfg",
},
],
......
software/ors-amarisoft/slapos-render-config.py
View file @ e29fa531
......@@ -126,8 +126,57 @@ def iRU1_SDR_tLTE2_tNR(ienb):
})
# LTE + NR cells that use CPRI-based Lopcomm radio units
# LTE + NR cells using 2 RU each consisting of SDR.
# here we instantiate RUs separately since embedding RU into a cell is demonstrated by CELL_a above
#
# NOTE: if we would want to share the RU by LTE/tdd and NR/tdd cells, we would
# need to bring their TDD configuration to match each other exactly.
def iRU2_SDR_tLTE_tNR(ienb):
RU1 = {
'ru_type': 'sdr',
'ru_link_type': 'sdr',
'sdr_dev_list': [0],
'n_antenna_dl': 2,
'n_antenna_ul': 1,
'tx_gain': 51,
'rx_gain': 52,
}
RU2 = copy.deepcopy(RU1)
RU2['sdr_dev_list'] = [1]
ienb.ishared('RU1', RU1)
ienb.ishared('RU2', RU2)
ienb.ishared('CELL_a', {
'cell_type': 'lte',
'rf_mode': 'tdd',
'bandwidth': '5 MHz',
'dl_earfcn': 38050, # 2600 MHz
'pci': 1,
'cell_id': '0x01',
'ru': { # CELL_a links to RU1 by its reference
'ru_type': 'ru_ref',
'ru_ref': 'RU1'
}
})
ienb.ishared('CELL_b', {
'cell_type': 'nr',
'rf_mode': 'tdd',
'bandwidth': 10,
'dl_nr_arfcn': 523020, # 2615.1 MHz
'nr_band': 41,
'pci': 3,
'cell_id': '0x03',
'ru': {
'ru_type': 'ru_ref',
'ru_ref': 'RU2'
}
})
# LTE + NR cells that use CPRI-based Lopcomm radio units
def iRU2_LOPCOMM_fLTE_fNR(ienb):
RU1 = {
'ru_type': 'lopcomm',
......@@ -164,7 +213,7 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
'dl_earfcn': 3350, # 2680 MHz
'pci': 21,
'cell_id': '0x21',
'ru': { # CELL_a links to RU1 by its reference
'ru': {
'ru_type': 'ru_ref',
'ru_ref': 'RU1'
}
......@@ -188,7 +237,7 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
# ---- for tests ----
# 2 FDD cells working via shared SDR board
def iRU3_SDR1_fLTE2(ienb):
def iRU1_SDR1_fLTE2(ienb):
RU = {
'ru_type': 'sdr',
'ru_link_type': 'sdr',
......@@ -280,9 +329,10 @@ def iRU2_LOPCOMM_fLTE2(ienb):
def do_enb():
ienb = Instance('enb')
iRU1_SDR_tLTE2_tNR(ienb)
#iRU1_SDR_fLTE2_fNR(ienb)
iRU2_SDR_tLTE_tNR(ienb)
#iRU2_LOPCOMM_fLTE_fNR(ienb)
#iRU3_SDR1_fLTE2(ienb)
#iRU1_SDR1_fLTE2(ienb)
#iRU2_LOPCOMM_fLTE2(ienb)
# add 2 peer cells
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7