update

2026-03-04 23:41:00 +09:00
parent 817e04cc29
commit 2244eb8e99
5 changed files with 139 additions and 103 deletions
@@ -462,92 +462,117 @@ static inline void do_txdataF(c16_t **txdataF,
                              int start_sc,
                              int txdataF_offset_per_symbol)
 {
-  NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
-  int rb = 0;
-  uint16_t subCarrier = start_sc;
-  const nfapi_nr_tx_precoding_and_beamforming_t *pb = &rel15->precodingAndBeamforming;
-  while (rb < rel15->rbSize) {
-    // get pmi info
-    const int pmi = (pb->prg_size > 0) ? (pb->prgs_list[(int)rb / pb->prg_size].pm_idx) : 0;
-    const int pmi2 = (rb < (rel15->rbSize - 1) && pb->prg_size > 0) ? (pb->prgs_list[(int)(rb + 1) / pb->prg_size].pm_idx) : -1;
-    const int pmi3 = (rb < (rel15->rbSize - 2) && pb->prg_size > 0) ? (pb->prgs_list[(int)(rb + 2) / pb->prg_size].pm_idx) : -1;
-    const int pmi4 = (rb < (rel15->rbSize - 3) && pb->prg_size > 0) ? (pb->prgs_list[(int)(rb + 3) / pb->prg_size].pm_idx) : -1;
+    NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
+    int rb = 0;
+    uint16_t subCarrier = start_sc;
+    const nfapi_nr_tx_precoding_and_beamforming_t *pb = &rel15->precodingAndBeamforming;

-    // If pmi of next RB and pmi of current RB are the same, we do 2 RB in a row
-    // if pmi differs, or current rb is the end (rel15->rbSize - 1), than we do 1 RB in a row
-    int rb_step0 = pmi == pmi2 ? 2 : 1;
-    const int rb_step = rb_step0==2 && pmi3==pmi && pmi4==pmi ? 4 : rb_step0;
-    const int re_cnt = NR_NB_SC_PER_RB * rb_step;
-    if (pmi == 0) { // unitary Precoding
-      if (subCarrier + re_cnt <= symbol_sz) { // RB does not cross DC
-        if (ant < rel15->nrOfLayers)
-          memcpy(&txdataF[ant][txdataF_offset_per_symbol + subCarrier],
-                 &txdataF_precoding[ant][subCarrier],
-                 re_cnt * sizeof(**txdataF));
-        else
-          memset(&txdataF[ant][txdataF_offset_per_symbol + subCarrier], 0, re_cnt * sizeof(**txdataF));
-      } else { // RB does cross DC
-        const int neg_length = symbol_sz - subCarrier;
-        const int pos_length = re_cnt - neg_length;
-        if (ant < rel15->nrOfLayers) {
-          memcpy(&txdataF[ant][txdataF_offset_per_symbol + subCarrier],
-                 &txdataF_precoding[ant][subCarrier],
-                 neg_length * sizeof(**txdataF));
-          memcpy(&txdataF[ant][txdataF_offset_per_symbol], &txdataF_precoding[ant], pos_length * sizeof(**txdataF));
+    // Compute which layer this antenna carries under identity precoding.
+    // Standard identity maps layer N → antenna N, but when antennas are muted
+    // we must remap layers to active antennas. Otherwise layer data sent to a
+    // muted antenna is lost (RU blanks it) while active antennas sit idle.
+    // E.g. mask=0x0D (ant 1 muted, 3 layers): ant0→L0, ant2→L1, ant3→L2.
+    int identity_layer = -1;
+    {
+        const nr_antenna_state_t *ast = &gNB->antenna_state;
+        int active_count = nr_get_active_tx_antenna_count(ast);
+        if (active_count > 0 && active_count < frame_parms->nb_antennas_tx) {
+            if (nr_is_tx_antenna_active(ast, ant)) {
+                identity_layer = 0;
+                for (int a = 0; a < ant; a++)
+                    if (nr_is_tx_antenna_active(ast, a))
+                        identity_layer++;
+                if (identity_layer >= rel15->nrOfLayers)
+                    identity_layer = -1;
+            }
        } else {
-          memset(&txdataF[ant][txdataF_offset_per_symbol + subCarrier], 0, neg_length * sizeof(**txdataF));
-          memset(&txdataF[ant][txdataF_offset_per_symbol], 0, pos_length * sizeof(**txdataF));
+            // No muting: standard identity (layer N = antenna N)
+            identity_layer = (ant < rel15->nrOfLayers) ? ant : -1;
        }
-      }
-      subCarrier += re_cnt;
-      if (subCarrier >= symbol_sz) {
-        subCarrier -= symbol_sz;
-      }
-    } else { // non-unitary Precoding
-      AssertFatal(frame_parms->nb_antennas_tx > 1, "No precoding can be done with a single antenna port\n");
-      // get the precoding matrix weights:
-      nfapi_nr_pm_pdu_t *pmi_pdu = &gNB->gNB_config.pmi_list.pmi_pdu[pmi - 1]; // pmi 0 is identity matrix
-      AssertFatal(pmi == pmi_pdu->pm_idx, "PMI %d doesn't match to the one in precoding matrix %d\n", pmi, pmi_pdu->pm_idx);
-      AssertFatal(ant < pmi_pdu->num_ant_ports,
-                  "Antenna port index %d exceeds precoding matrix AP size %d\n",
-                  ant,
-                  pmi_pdu->num_ant_ports);
-      AssertFatal(rel15->nrOfLayers == pmi_pdu->numLayers,
-                  "Number of layers %d doesn't match to the one in precoding matrix %d\n",
-                  rel15->nrOfLayers,
-                  pmi_pdu->numLayers);
-      if ((subCarrier + re_cnt) < symbol_sz) { // within ofdm_symbol_size, use SIMDe
-        nr_layer_precoder_simd(rel15->nrOfLayers,
-                               symbol_sz,
-                               txdataF_precoding,
-                               ant,
-                               pmi_pdu,
-                               subCarrier,
-                               re_cnt,
-                               &txdataF[ant][txdataF_offset_per_symbol]);
-        subCarrier += re_cnt;
-      } else { // crossing ofdm_symbol_size, use simple arithmetic operations
-        for (int i = 0; i < re_cnt; i++) {
-          txdataF[ant][txdataF_offset_per_symbol + subCarrier] =
-              nr_layer_precoder_cm(rel15->nrOfLayers, symbol_sz, txdataF_precoding, ant, pmi_pdu, subCarrier);
-#ifdef DEBUG_DLSCH_MAPPING
-          printf("antenna %d\t l %d \t subCarrier %d \t txdataF: %d %d\n",
-                 ant,
-                 l_symbol,
-                 subCarrier,
-                 txdataF[ant][l_symbol * symbol_sz + subCarrier + txdataF_offset].r,
-                 txdataF[ant][l_symbol * symbol_sz + subCarrier + txdataF_offset].i);
-#endif
-          if (++subCarrier >= symbol_sz) {
-            subCarrier -= symbol_sz;
-          }
-        }
-      } // else{ // crossing ofdm_symbol_size, use simple arithmetic operations
-    } // else { // non-unitary Precoding
+    }

-    rb += rb_step;
-  } // RB loop: while(rb < rel15->rbSize)
+    while (rb < rel15->rbSize) {
+        // get pmi info
+        const int pmi = (pb->prg_size > 0) ? (pb->prgs_list[(int)rb / pb->prg_size].pm_idx) : 0;
+        const int pmi2 = (rb < (rel15->rbSize - 1) && pb->prg_size > 0) ? (pb->prgs_list[(int)(rb + 1) / pb->prg_size].pm_idx) : -1;
+        const int pmi3 = (rb < (rel15->rbSize - 2) && pb->prg_size > 0) ? (pb->prgs_list[(int)(rb + 2) / pb->prg_size].pm_idx) : -1;
+        const int pmi4 = (rb < (rel15->rbSize - 3) && pb->prg_size > 0) ? (pb->prgs_list[(int)(rb + 3) / pb->prg_size].pm_idx) : -1;
+
+        // If pmi of next RB and pmi of current RB are the same, we do 2 RB in a row
+        // if pmi differs, or current rb is the end (rel15->rbSize - 1), than we do 1 RB in a row
+        int rb_step0 = pmi == pmi2 ? 2 : 1;
+        const int rb_step = rb_step0==2 && pmi3==pmi && pmi4==pmi ? 4 : rb_step0;
+        const int re_cnt = NR_NB_SC_PER_RB * rb_step;
+        if (pmi == 0) { // unitary Precoding
+            if (subCarrier + re_cnt <= symbol_sz) { // RB does not cross DC
+                if (identity_layer >= 0)
+                    memcpy(&txdataF[ant][txdataF_offset_per_symbol + subCarrier],
+                           &txdataF_precoding[identity_layer][subCarrier],
+                           re_cnt * sizeof(**txdataF));
+                else
+                    memset(&txdataF[ant][txdataF_offset_per_symbol + subCarrier], 0, re_cnt * sizeof(**txdataF));
+            } else { // RB does cross DC
+                const int neg_length = symbol_sz - subCarrier;
+                const int pos_length = re_cnt - neg_length;
+                if (identity_layer >= 0) {
+                    memcpy(&txdataF[ant][txdataF_offset_per_symbol + subCarrier],
+                           &txdataF_precoding[identity_layer][subCarrier],
+                           neg_length * sizeof(**txdataF));
+                    memcpy(&txdataF[ant][txdataF_offset_per_symbol], &txdataF_precoding[identity_layer], pos_length * sizeof(**txdataF));
+                } else {
+                    memset(&txdataF[ant][txdataF_offset_per_symbol + subCarrier], 0, neg_length * sizeof(**txdataF));
+                    memset(&txdataF[ant][txdataF_offset_per_symbol], 0, pos_length * sizeof(**txdataF));
+                }
+            }
+            subCarrier += re_cnt;
+            if (subCarrier >= symbol_sz) {
+                subCarrier -= symbol_sz;
+            }
+        } else { // non-unitary Precoding
+            AssertFatal(frame_parms->nb_antennas_tx > 1, "No precoding can be done with a single antenna port\n");
+            // get the precoding matrix weights:
+            nfapi_nr_pm_pdu_t *pmi_pdu = &gNB->gNB_config.pmi_list.pmi_pdu[pmi - 1]; // pmi 0 is identity matrix
+            AssertFatal(pmi == pmi_pdu->pm_idx, "PMI %d doesn't match to the one in precoding matrix %d\n", pmi, pmi_pdu->pm_idx);
+            AssertFatal(ant < pmi_pdu->num_ant_ports,
+                        "Antenna port index %d exceeds precoding matrix AP size %d\n",
+                        ant,
+                        pmi_pdu->num_ant_ports);
+            AssertFatal(rel15->nrOfLayers == pmi_pdu->numLayers,
+                        "Number of layers %d doesn't match to the one in precoding matrix %d\n",
+                        rel15->nrOfLayers,
+                        pmi_pdu->numLayers);
+            if ((subCarrier + re_cnt) < symbol_sz) { // within ofdm_symbol_size, use SIMDe
+                nr_layer_precoder_simd(rel15->nrOfLayers,
+                                       symbol_sz,
+                                       txdataF_precoding,
+                                       ant,
+                                       pmi_pdu,
+                                       subCarrier,
+                                       re_cnt,
+                                       &txdataF[ant][txdataF_offset_per_symbol]);
+                subCarrier += re_cnt;
+            } else { // crossing ofdm_symbol_size, use simple arithmetic operations
+                for (int i = 0; i < re_cnt; i++) {
+                    txdataF[ant][txdataF_offset_per_symbol + subCarrier] =
+                        nr_layer_precoder_cm(rel15->nrOfLayers, symbol_sz, txdataF_precoding, ant, pmi_pdu, subCarrier);
+#ifdef DEBUG_DLSCH_MAPPING
+                    printf("antenna %d\t l %d \t subCarrier %d \t txdataF: %d %d\n",
+                           ant,
+                           l_symbol,
+                           subCarrier,
+                           txdataF[ant][l_symbol * symbol_sz + subCarrier + txdataF_offset].r,
+                           txdataF[ant][l_symbol * symbol_sz + subCarrier + txdataF_offset].i);
+#endif
+                    if (++subCarrier >= symbol_sz) {
+                        subCarrier -= symbol_sz;
+                    }
+                }
+            } // else{ // crossing ofdm_symbol_size, use simple arithmetic operations
+        } // else { // non-unitary Precoding
+        rb += rb_step;
+    } // RB loop: while(rb < rel15->rbSize)
 }
+
 static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSCH_t *dlsch, int slot)
 {
  const int16_t amp = gNB->TX_AMP;