From 4d289b92cc7fb62868019acfe7eccd9a8f23c02a Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Mon, 21 Mar 2022 11:59:31 +0100
Subject: [PATCH] fix xp=1 option and added RUNMODEM description for MIMO
 configuration

---
 .../gNB_SA_n78_106PRB.2x2_usrpn310.conf        |   2 +-
 .../gNB_SA_n78_133PRB.2x2_usrpn310.conf        |   2 +-
 .../gnb.band78.nsa_2x2.106PRB.usrpn310.conf    |   2 +-
 .../gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf |   2 +-
 .../gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf |   2 +-
 doc/RUNMODEM.md                                |  17 +++++++++++++++++
 doc/images/mimo_antenna_ports.png              | Bin 0 -> 18753 bytes
 openair2/LAYER2/NR_MAC_gNB/config.c            |   5 +++--
 .../LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c    |   2 +-
 .../NR_MAC_gNB/gNB_scheduler_primitives.c      |   7 ++++---
 openair2/LAYER2/NR_MAC_gNB/mac_proto.h         |   2 +-
 openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h        |   2 +-
 12 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 doc/images/mimo_antenna_ports.png

diff --git a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
index 3b08b70ecf..82d665d904 100644
--- a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -38,7 +38,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
-    pdsch_AntennaPorts_N1                                     = 2;
+    pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
 
     pdcch_ConfigSIB1 = (
diff --git a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
index 0d9abc275d..937d287d24 100644
--- a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -39,7 +39,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
-    pdsch_AntennaPorts_N1                                     = 2;
+    pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
 
     pdcch_ConfigSIB1 = (
diff --git a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
index 96bf3debd8..213c166826 100644
--- a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
@@ -20,7 +20,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 31; //0;
-    pdsch_AntennaPorts_N1                                     = 2;
+    pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
     pusch_TargetSNRx10                                        = 200;
     pucch_TargetSNRx10                                        = 200;
diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
index ff10eee268..7a3afd1127 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
@@ -38,7 +38,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
-    pdsch_AntennaPorts_N1                                     = 2;
+    pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
     ul_prbblacklist                                           = "51,52,53,54"
     do_SRS                                                    = 1;
diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
index 78b402d064..fbe7e62a23 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
@@ -38,7 +38,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
-    pdsch_AntennaPorts_N1                                     = 2;
+    pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
     #pusch_TargetSNRx10                                        = 200;
     #pucch_TargetSNRx10                                        = 200;
diff --git a/doc/RUNMODEM.md b/doc/RUNMODEM.md
index 449859b042..4cc57c2629 100644
--- a/doc/RUNMODEM.md
+++ b/doc/RUNMODEM.md
@@ -211,7 +211,24 @@ UE on machine 2:
 
 `sudo ./nr-uesoftmodem --if_freq 2169080000 --if_freq_off -400000000`
 
+# MIMO configuration
 
+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+         <img src="./images/mimo_antenna_ports.png" alt="" border=3 height=100 width=300>
+         </img>
+    </td>
+  </tr>
+</table>
+
+This image shows an example of gNB 5G MIMO logical antenna port configuration. It has to be noted that logical antenna ports might not directly correspond to physical antenna ports and each logical antenna port might consist of a sub-array of antennas.
+
+The basic element is a dual-polarized antenna, therefore the minimal DL MIMO setup with two logical antenna ports would consist of two cross-polarized antenna elements. In a single panel configuration, as the one in the picture, this element can be repeated vertiacally and/or horizontally to form an equi-spaced 1D or 2D array. The values N1 and N2 represent the number of antenna ports in the two dimensions and the supported configurations are specified in Section 5.2.2.2.1 of TS 38.214.
+
+The DL logical antenna port configuration can be selected thorugh configuration file. `pdsch_AntennaPorts_N1` can be used to set N1 parameter, `pdsch_AntennaPorts_N2` to set N2 and `pdsch_AntennaPorts_XP` to set the cross-polarization configuration (1 for single pol, 2 for cross-pol). To be noted that if XP is 1 but N1 and/or N2 are larger than 1, this would result in a non-standard configuration and the PMI selected would be the identity matrix regardless of CSI report. The default value for each of these parameters is 1.
+
+# Additional links
 
 [Selecting an alternative ldpc implementation at run time](../openair1/PHY/CODING/DOC/LDPCImplementation.md)
 
diff --git a/doc/images/mimo_antenna_ports.png b/doc/images/mimo_antenna_ports.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef91f4becc80fe6c09b55f202f9d8054368bd88c
GIT binary patch
literal 18753
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
O(x@tFD54bZ`2An65hR5G

literal 0
HcmV?d00001

diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index 2e37cc39c5..1bfb243d26 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -464,10 +464,11 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
 
     LOG_I(NR_MAC,"Configuring common parameters from NR ServingCellConfig\n");
 
-    RC.nrmac[Mod_idP]->pdsch_antenna_ports = pdsch_AntennaPorts.N1 * pdsch_AntennaPorts.N2 * pdsch_AntennaPorts.XP;
+    int num_pdsch_antenna_ports = pdsch_AntennaPorts.N1 * pdsch_AntennaPorts.N2 * pdsch_AntennaPorts.XP;
+    RC.nrmac[Mod_idP]->xp_pdsch_antenna_ports = pdsch_AntennaPorts.XP;
     config_common(Mod_idP,
                   ssb_SubcarrierOffset,
-                  RC.nrmac[Mod_idP]->pdsch_antenna_ports,
+                  num_pdsch_antenna_ports,
                   pusch_AntennaPorts,
 		  scc);
     LOG_D(NR_MAC, "%s() %s:%d RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req:%p\n", __FUNCTION__, __FILE__, __LINE__, RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index a3bf413b29..3db53ef809 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -1183,7 +1183,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
                                                                             nrOfLayers,
                                                                             csi_report->N1,
                                                                             csi_report->N2,
-                                                                            gNB_mac->pdsch_antenna_ports,
+                                                                            gNB_mac->xp_pdsch_antenna_ports,
                                                                             csi_report->codebook_mode);
     }
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 1eb54ab45c..33390ec637 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -149,12 +149,13 @@ uint8_t set_dl_nrOfLayers(NR_UE_sched_ctrl_t *sched_ctrl) {
 uint16_t set_pm_index(NR_UE_sched_ctrl_t *sched_ctrl,
                       int layers,
                       int N1, int N2,
-                      int config_file_ant_ports,
+                      int xp_pdsch_antenna_ports,
                       int codebook_mode) {
 
   int antenna_ports = (N1*N2)<<1;
-  if (antenna_ports!=config_file_ant_ports)
-    return 0; //identity matrix
+  if (xp_pdsch_antenna_ports == 1 &&
+      antenna_ports>1)
+    return 0; //identity matrix (basic 5G configuration handled by PMI report is with XP antennas)
 
   int x1 = sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.pmi_x1;
   int x2 = sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.pmi_x2;
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index 455538a361..7ab738b87c 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -458,7 +458,7 @@ void set_dl_dmrs_ports(NR_pdsch_semi_static_t *ps);
 uint16_t set_pm_index(NR_UE_sched_ctrl_t *sched_ctrl,
                       int layers,
                       int N1, int N2,
-                      int config_file_ant_ports,
+                      int xp_pdsch_antenna_ports,
                       int codebook_mode);
 
 void set_dl_mcs(NR_sched_pdsch_t *sched_pdsch,
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index 8b685fdd02..ecea3a2bd1 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -806,7 +806,7 @@ typedef struct gNB_MAC_INST_s {
   uint16_t cset0_bwp_size;
   NR_Type0_PDCCH_CSS_config_t type0_PDCCH_CSS_config[64];
 
-  int pdsch_antenna_ports;
+  int xp_pdsch_antenna_ports;
 
   bool first_MIB;
   double dl_bler_target_upper;