maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nr_schedule_response(): make right order (222.10.0x "API message order")

Browse Source
This commit is contained in:
Robert Schmidt
2025-01-27 10:59:19 +01:00
parent 4fe8d3cd8e
commit f2229adba3
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED_NR/fapi_nr_l1.c
+21 -18
View File
@@ -166,27 +166,18 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
clear_slot_beamid(gNB, slot); // reset beam_id information for the slot to be processed clear_slot_beamid(gNB, slot); // reset beam_id information for the slot to be processed
DevAssert(NFAPI_MODE == NFAPI_MONOLITHIC); DevAssert(NFAPI_MODE == NFAPI_MONOLITHIC);
bool is_dl = slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT;
if (slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT) { processingData_L1tx_t *msgTx = gNB->msgDataTx;
processingData_L1tx_t *msgTx = gNB->msgDataTx; msgTx->num_ul_pdcch = number_ul_dci_pdu;
msgTx->num_ul_pdcch = number_ul_dci_pdu; /* store the sched_response_id for the TX thread to release it when done */
/* store the sched_response_id for the TX thread to release it when done */ msgTx->sched_response_id = Sched_INFO->sched_response_id;
msgTx->sched_response_id = Sched_INFO->sched_response_id;
DevAssert(Sched_INFO->DL_req.SFN == frame); DevAssert(Sched_INFO->DL_req.SFN == frame);
DevAssert(Sched_INFO->DL_req.Slot == slot); DevAssert(Sched_INFO->DL_req.Slot == slot);
if (is_dl) {
nr_schedule_dl_tti_req(gNB, &Sched_INFO->DL_req); nr_schedule_dl_tti_req(gNB, &Sched_INFO->DL_req);
for (int i = 0; i < number_ul_dci_pdu; i++)
msgTx->ul_pdcch_pdu[i] = UL_dci_req->ul_dci_pdu_list[i];
nr_schedule_tx_req(gNB, &Sched_INFO->TX_req);
/* Both the current thread and the TX thread will access the sched_info
* at the same time, so increase its reference counter, so that it is
* released only when both threads are done with it.
*/
inc_ref_sched_response(Sched_INFO->sched_response_id);
} }
for (int i = 0; i < number_ul_tti_pdu; i++) { for (int i = 0; i < number_ul_tti_pdu; i++) {
@@ -233,6 +224,18 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
} }
} }
if (is_dl) {
nr_schedule_tx_req(gNB, &Sched_INFO->TX_req);
for (int i = 0; i < number_ul_dci_pdu; i++)
msgTx->ul_pdcch_pdu[i] = UL_dci_req->ul_dci_pdu_list[i];
/* Both the current thread and the TX thread will access the sched_info
* at the same time, so increase its reference counter, so that it is
* released only when both threads are done with it.
*/
inc_ref_sched_response(Sched_INFO->sched_response_id);
}
/* this thread is done with the sched_info, decrease the reference counter */ /* this thread is done with the sched_info, decrease the reference counter */
if ((slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT) && NFAPI_MODE == NFAPI_MONOLITHIC) { if ((slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT) && NFAPI_MODE == NFAPI_MONOLITHIC) {
LOG_D(NR_PHY, "Calling dref_sched_response for id %d in %d.%d (sched_response)\n", Sched_INFO->sched_response_id, frame, slot); LOG_D(NR_PHY, "Calling dref_sched_response for id %d in %d.%d (sched_response)\n", Sched_INFO->sched_response_id, frame, slot);