Code Review / o-du / l2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
PUCCH dedicated configuration fixed [Issue-ID: ODUHIGH-398]
[o-du/l2.git] / src / 5gnrsch / sch_ue_mgr.c
diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c
index 310c761..e3e01a5 100644 (file)
--- a/src/5gnrsch/sch_ue_mgr.c
+++ b/src/5gnrsch/sch_ue_mgr.c
@@ -191,30 +191,42 @@ void fillSchUlLcCtxt(SchUlLcCtxt *ueCbLcCfg, SchLcCfg *lcCfg)
  *
  * ****************************************************************/
 
-uint8_t updateDedLcInfo(Snssai *snssai, SchRrmPolicy *rrmPolicy, SchLcPrbEstimate *lcPrbEst,\
+uint8_t updateDedLcInfo(Snssai *snssai, SchLcPrbEstimate *lcPrbEst,\
                          bool *isDedicated)
 {
-   if(memcmp(snssai, &(rrmPolicy->memberList.snssai), sizeof(Snssai)) == 0)
+   uint8_t sliceCfgIdx =0;
+   SchSliceCfg sliceCfg = schCb[0].sliceCfg;
+
+   if(sliceCfg.numOfSliceConfigured)
    {
-      if(lcPrbEst->dedLcInfo == NULLP)
+      for(sliceCfgIdx = 0; sliceCfgIdx<sliceCfg.numOfSliceConfigured; sliceCfgIdx++)
       {
-         SCH_ALLOC(lcPrbEst->dedLcInfo, sizeof(DedicatedLCInfo));
-         if(lcPrbEst->dedLcInfo == NULLP)
+         if(memcmp(snssai, &(sliceCfg.listOfConfirguration[sliceCfgIdx]->snssai), sizeof(Snssai)) == 0)
          {
-            DU_LOG("\nINFO  -->  SCH : Memory Allocation Failed");
-            return RFAILED;
+            if(lcPrbEst->dedLcInfo == NULLP)
+            {
+               SCH_ALLOC(lcPrbEst->dedLcInfo, sizeof(DedicatedLCInfo));
+               if(lcPrbEst->dedLcInfo == NULLP)
+               {
+                  DU_LOG("\nINFO  -->  SCH : Memory Allocation Failed");
+                  return RFAILED;
+               }
+            }
+            if(sliceCfg.listOfConfirguration[sliceCfgIdx]->rrmPolicyRatioInfo)
+            {
+               /*Updating latest RrmPolicy*/
+               lcPrbEst->dedLcInfo->rsvdDedicatedPRB = \
+               (uint16_t)(((sliceCfg.listOfConfirguration[sliceCfgIdx]->rrmPolicyRatioInfo->policyDedicatedRatio)*(MAX_NUM_RB))/100);
+               *isDedicated = TRUE;
+               DU_LOG("\nINFO  -->  SCH : Updated RRM policy, reservedPOOL:%d",lcPrbEst->dedLcInfo->rsvdDedicatedPRB);
+            }
          }
       }
-      /*Updating latest RrmPolicy*/
-      lcPrbEst->dedLcInfo->rsvdDedicatedPRB = \
-                                              (uint16_t)(((rrmPolicy->policyDedicatedRatio)*(MAX_NUM_RB))/100);
-      *isDedicated = TRUE;
-      DU_LOG("\nINFO  -->  SCH : Updated RRM policy, reservedPOOL:%d",lcPrbEst->dedLcInfo->rsvdDedicatedPRB);
-   }
-   /*else case: This LcCtxt  is either a Default LC or this LC is part of someother RRM_MemberList*/
-   else
-   {
-      DU_LOG("\nINFO  -->  SCH : This SNSSAI is not a part of this RRMPolicy");
+      /*case: This LcCtxt  is either a Default LC or this LC is part of someother RRM_MemberList*/
+      if(*isDedicated != TRUE) 
+      {
+         DU_LOG("\nINFO  -->  SCH : This SNSSAI is not a part of this RRMPolicy");
+      }
    }
    return ROK;  
 }
@@ -316,14 +328,12 @@ uint8_t fillSchUeCb(SchUeCb *ueCb, SchUeCfg *ueCfg)
           * and Create the Dedicated LC List & Update the Reserve PRB number*/
          if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP)
          {
-            retDL = updateDedLcInfo(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai,  \
-                  ueCb->cellCb->cellCfg.rrmPolicy, &(ueCb->dlLcPrbEst),\
+            retDL = updateDedLcInfo(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlLcPrbEst),\
                   &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated));
          }
          if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP)
          {
-            retUL =  updateDedLcInfo(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai,  \
-                  ueCb->cellCb->cellCfg.rrmPolicy, &(ueCb->ulLcPrbEst),\
+            retUL =  updateDedLcInfo(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulLcPrbEst),\
                   &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated));
          }
 
@@ -343,8 +353,7 @@ uint8_t fillSchUeCb(SchUeCb *ueCb, SchUeCfg *ueCfg)
                /*Updating the RRM reserved pool PRB count*/
                if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai != NULLP)
                {
-                  retUL =  updateDedLcInfo(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai,  \
-                        ueCb->cellCb->cellCfg.rrmPolicy, &(ueCb->ulLcPrbEst),\
+                  retUL =  updateDedLcInfo(ueCb->ulInfo.ulLcCtxt[ueLcIdx].snssai, &(ueCb->ulLcPrbEst),\
                         &(ueCb->ulInfo.ulLcCtxt[ueLcIdx].isDedicated));
                }
                if(retUL == RFAILED)
@@ -387,8 +396,7 @@ uint8_t fillSchUeCb(SchUeCb *ueCb, SchUeCfg *ueCfg)
                /*Updating the RRM policy*/
                if(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai != NULLP)
                {
-                  retDL = updateDedLcInfo(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai,  \
-                        ueCb->cellCb->cellCfg.rrmPolicy, &(ueCb->dlLcPrbEst), \
+                  retDL = updateDedLcInfo(ueCb->dlInfo.dlLcCtxt[ueLcIdx].snssai, &(ueCb->dlLcPrbEst), \
                         &(ueCb->dlInfo.dlLcCtxt[ueLcIdx].isDedicated));
                }
                if(retDL == RFAILED)
@@ -571,25 +579,35 @@ uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg)
 *         RFAILED - failure
 *
 * ****************************************************************/
-uint8_t schFillPuschAlloc(SchUeCb *ueCb, SlotTimingInfo puschTime, uint32_t dataVol, uint8_t k2, uint8_t startSymb, uint8_t symbLen)
+uint8_t schFillPuschAlloc(SchUeCb *ueCb, SlotTimingInfo puschTime, uint32_t tbSize, 
+                            uint8_t startSymb, uint8_t symbLen, uint16_t startPrb)
 {
-  uint16_t startRb        = 0;
   uint8_t  numRb          = 0;
-  uint16_t tbSize         = 0;
-  uint8_t  buffer         = 5;
-  SchCellCb *cellCb       = ueCb->cellCb;
+  SchCellCb *cellCb       = NULLP;
   SchUlSlotInfo *schUlSlotInfo = NULLP;
   SchPuschInfo puschInfo;
   
-  startRb = MAX_NUM_RB;
-  tbSize  = schCalcTbSize(dataVol + buffer); /*  2 bytes header + some buffer */
+  if(ueCb == NULLP)
+  {
+    DU_LOG("\nERROR --> SCH: UE CB is empty");
+    return RFAILED;
+  }
+
+  cellCb = ueCb->cellCb;
+  if(cellCb == NULLP)
+  {
+    DU_LOG("\nERROR --> SCH: CELL CB is empty");
+    return RFAILED;
+  }
+
+  tbSize  +=  UL_TX_BUFFER_SIZE; /*  2 bytes header + some buffer */
   numRb   = schCalcNumPrb(tbSize, ueCb->ueCfg.ulModInfo.mcsIndex, symbLen);
-  allocatePrbUl(cellCb, puschTime, startSymb, symbLen, &startRb, numRb);
+  allocatePrbUl(cellCb, puschTime, startSymb, symbLen, &startPrb, numRb);
 
   puschInfo.crnti             = ueCb->crnti; 
   puschInfo.harqProcId        = SCH_HARQ_PROC_ID;
   puschInfo.resAllocType      = SCH_ALLOC_TYPE_1;
-  puschInfo.fdAlloc.startPrb  = startRb;
+  puschInfo.fdAlloc.startPrb  = startPrb;
   puschInfo.fdAlloc.numPrb    = numRb;
   puschInfo.tdAlloc.startSymb = startSymb;
   puschInfo.tdAlloc.numSymb   = symbLen;
@@ -1014,7 +1032,7 @@ uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete  *ueDelete)
        if(( cellCb->ueCb[ueId-1].crnti == ueDelete->crnti) && ( cellCb->ueCb[ueId-1].state == SCH_UE_STATE_ACTIVE))
        {
           deleteSchUeCb(&cellCb->ueCb[ueId-1]);
-
+          ueIdToDel  = ueId;
           /* Remove UE from ueToBeScheduled list */
           node = cellCb->ueToBeScheduled.first;
           while(node)
@@ -1024,7 +1042,7 @@ uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete  *ueDelete)
              if(ueId == ueIdToDel)
              {
                 SCH_FREE(node->node, sizeof(uint8_t));
-                cmLListDelFrm(&cellCb->ueToBeScheduled, node);
+                deleteNodeFromLList(&cellCb->ueToBeScheduled, node);
                 break;
              }
              node = next;
@@ -1148,15 +1166,14 @@ void deleteSchCellCb(SchCellCb *cellCb)
       SCH_FREE(cellCb->schUlSlotInfo,  cellCb->numSlots * sizeof(SchUlSlotInfo*));
    }
 
-   if(cellCb->cellCfg.snssai)
+   if(cellCb->cellCfg.plmnInfoList.snssai)
    {
-      for(sliceIdx=0; sliceIdx<cellCb->cellCfg.numSliceSupport; sliceIdx++)
+      for(sliceIdx=0; sliceIdx<cellCb->cellCfg.plmnInfoList.numSliceSupport; sliceIdx++)
       {
-         SCH_FREE(cellCb->cellCfg.snssai[sliceIdx], sizeof(Snssai));
+         SCH_FREE(cellCb->cellCfg.plmnInfoList.snssai[sliceIdx], sizeof(Snssai));
       }
-      SCH_FREE(cellCb->cellCfg.snssai, cellCb->cellCfg.numSliceSupport*sizeof(Snssai*));
+      SCH_FREE(cellCb->cellCfg.plmnInfoList.snssai, cellCb->cellCfg.plmnInfoList.numSliceSupport*sizeof(Snssai*));
    }
-   SCH_FREE(cellCb->cellCfg.rrmPolicy, sizeof(SchRrmPolicy));
 
    /* Remove all UE from ueToBeScheduled list and deallocate */
    node = cellCb->ueToBeScheduled.first;
@@ -1165,6 +1182,7 @@ void deleteSchCellCb(SchCellCb *cellCb)
       next = node->next;
       SCH_FREE(node->node, sizeof(uint8_t));
       cmLListDelFrm(&cellCb->ueToBeScheduled, node);
+      SCH_FREE(node, sizeof(CmLList));
       node = next;
    }
 
O-RAN DU Layer 2