[MATTER-1208] Allow skipping the recalibration process

Skip the recalibration process in ISR context if PDM buffers are in use.

Signed-off-by: Doru Gucea <doru-cristian.gucea@nxp.com>

Author: doru91

src/k32w0/platform/flash_pdm.c

@@ -47,6 +47,7 @@
 
 static ramBufferDescriptor *ramDescr       = NULL;
 static osaMutexId_t         pdmMutexHandle = NULL;
+static bool_t               pdmMutexTaken  = FALSE;
 
 #if PDM_SAVE_IDLE
 static bool_t settingsInitialized = FALSE;
@@ -130,11 +131,13 @@ void otPlatSettingsDeinit(otInstance *aInstance)
 
 #if ENABLE_STORAGE_DYNAMIC_MEMORY
     mutex_lock(pdmMutexHandle, osaWaitForever_c);
+    pdmMutexTaken = TRUE;
     if (ramDescr->buffer)
     {
         otPlatFree(ramDescr->buffer);
         ramDescr->buffer = NULL;
     }
+    pdmMutexTaken = FALSE;
     mutex_unlock(pdmMutexHandle);
     mutex_destroy(pdmMutexHandle);
 
@@ -148,9 +151,20 @@ otError otPlatSettingsGet(otInstance *aInstance, uint16_t aKey, int aIndex, uint
     OT_UNUSED_VARIABLE(aInstance);
     rsError ramStatus = RS_ERROR_NONE;
 
-    mutex_lock(pdmMutexHandle, osaWaitForever_c);
+    if (!OSA_InIsrContext())
+    {
+        mutex_lock(pdmMutexHandle, osaWaitForever_c);
+        pdmMutexTaken = TRUE;
+    }
+
     ramStatus = ramStorageGet(ramDescr, aKey, aIndex, aValue, aValueLength);
-    mutex_unlock(pdmMutexHandle);
+
+    if (!OSA_InIsrContext())
+    {
+        pdmMutexTaken = FALSE;
+        mutex_unlock(pdmMutexHandle);
+    }
+
     return mapRamStorageStatus(ramStatus);
 }
 
@@ -165,7 +179,11 @@ otError otPlatSettingsSet(otInstance *aInstance, uint16_t aKey, const uint8_t *a
     uint16_t lengthOfAlreadyExistingValue = 0;
 #endif
 
-    mutex_lock(pdmMutexHandle, osaWaitForever_c);
+    if (!OSA_InIsrContext())
+    {
+        mutex_lock(pdmMutexHandle, osaWaitForever_c);
+        pdmMutexTaken = TRUE;
+    }
 
 #if ENABLE_STORAGE_DYNAMIC_MEMORY
     /* avoid resizing in case ramDescr already contains aValue whose length is >= aValueLength */
@@ -183,7 +201,11 @@ otError otPlatSettingsSet(otInstance *aInstance, uint16_t aKey, const uint8_t *a
     otEXPECT_ACTION((PDM_E_STATUS_OK == pdmStatus), error = OT_ERROR_NO_BUFS);
 
 exit:
-    mutex_unlock(pdmMutexHandle);
+    if (!OSA_InIsrContext())
+    {
+        pdmMutexTaken = FALSE;
+        mutex_unlock(pdmMutexHandle);
+    }
     return error;
 }
 
@@ -194,6 +216,7 @@ otError otPlatSettingsAdd(otInstance *aInstance, uint16_t aKey, const uint8_t *a
     otError      error     = OT_ERROR_NONE;
 
     mutex_lock(pdmMutexHandle, osaWaitForever_c);
+    pdmMutexTaken = TRUE;
 
 #if ENABLE_STORAGE_DYNAMIC_MEMORY
     ramStatus = ramStorageResize(ramDescr, aKey, aValue, aValueLength);
@@ -206,6 +229,7 @@ otError otPlatSettingsAdd(otInstance *aInstance, uint16_t aKey, const uint8_t *a
     otEXPECT_ACTION((PDM_E_STATUS_OK == pdmStatus), error = OT_ERROR_NO_BUFS);
 
 exit:
+    pdmMutexTaken = FALSE;
     mutex_unlock(pdmMutexHandle);
     return error;
 }
@@ -218,13 +242,15 @@ otError otPlatSettingsDelete(otInstance *aInstance, uint16_t aKey, int aIndex)
     otError      error     = OT_ERROR_NONE;
 
     mutex_lock(pdmMutexHandle, osaWaitForever_c);
-    ramStatus = ramStorageDelete(ramDescr, aKey, aIndex);
+    pdmMutexTaken = TRUE;
+    ramStatus     = ramStorageDelete(ramDescr, aKey, aIndex);
     otEXPECT_ACTION((RS_ERROR_NONE == ramStatus), error = mapRamStorageStatus(ramStatus));
 
     pdmStatus = PDM_SaveRecord((uint16_t)kNvmIdOTConfigData, ramDescr);
     otEXPECT_ACTION((PDM_E_STATUS_OK == pdmStatus), error = OT_ERROR_NO_BUFS);
 
 exit:
+    pdmMutexTaken = FALSE;
     mutex_unlock(pdmMutexHandle);
     return error;
 }
@@ -234,13 +260,24 @@ void otPlatSettingsWipe(otInstance *aInstance)
     OT_UNUSED_VARIABLE(aInstance);
 
     mutex_lock(pdmMutexHandle, osaWaitForever_c);
+    pdmMutexTaken = TRUE;
     memset(ramDescr->buffer, 0, ramDescr->header.maxLength);
     ramDescr->header.length = 0;
     PDM_vDeleteDataRecord(kNvmIdOTConfigData);
+    pdmMutexTaken = FALSE;
     mutex_unlock(pdmMutexHandle);
 }
 
 #if gRadioUsePdm_d && PDM_SAVE_IDLE
+
+/* in case BLE ISR tries to do a recalibration, make sure that the Ram Buffer Mutex is not
+ * taken, otherwise execution will be stuck in a FreeRtos assert.
+ */
+bool should_skip_recal()
+{
+    return (OSA_InIsrContext() && pdmMutexTaken && idleMutexIsTaken());
+}
+
 bool bRadioCB_WriteNVM(uint8_t *pu8DataBlock, uint16_t u16Len)
 {
     return (otPlatSettingsSet(NULL, PDM_ID_RADIO_SETTINGS, pu8DataBlock, u16Len) == OT_ERROR_NONE);

src/k32w0/platform/pdm_ram_storage_glue.c

@@ -66,6 +66,7 @@ static tsQueueEntry asQueue[MAX_QUEUE_SIZE];
 static uint8_t      u8QueueWritePtr;
 static uint8_t      u8QueueReadPtr;
 static osaMutexId_t asQueueMutex;
+static bool_t       asQueueMutexTaken;
 
 static uint8_t u8IncrementQueuePtr(uint8_t u8CurrentValue);
 
@@ -348,7 +349,11 @@ PDM_teStatus FS_eSaveRecordDataInIdleTask(uint16_t u16IdValue, ramBufferDescript
     }
 #endif
 
-    mutex_lock(asQueueMutex, osaWaitForever_c);
+    if (!OSA_InIsrContext())
+    {
+        mutex_lock(asQueueMutex, osaWaitForever_c);
+        asQueueMutexTaken = TRUE;
+    }
 
     /* Instead of updating PDM immediately we queue request until later. If
      * queue is full, performs first write in queue synchronously, to avoid
@@ -381,7 +386,11 @@ PDM_teStatus FS_eSaveRecordDataInIdleTask(uint16_t u16IdValue, ramBufferDescript
         u8QueueWritePtr = u8IncrementQueuePtr(u8QueueWritePtr);
     }
 
-    mutex_unlock(asQueueMutex);
+    if (!OSA_InIsrContext())
+    {
+        asQueueMutexTaken = FALSE;
+        mutex_unlock(asQueueMutex);
+    }
 
     return status;
 }
@@ -402,8 +411,10 @@ void FS_vIdleTask(uint8_t u8WritesAllowed)
     while ((u8QueueReadPtr != u8QueueWritePtr) && (u8WritesAllowed > 0))
     {
         mutex_lock(asQueueMutex, osaWaitForever_c);
+        asQueueMutexTaken = TRUE;
         memcpy(&currentEntry, &asQueue[u8QueueReadPtr], sizeof(tsQueueEntry));
-        u8QueueReadPtr = u8IncrementQueuePtr(u8QueueReadPtr);
+        u8QueueReadPtr    = u8IncrementQueuePtr(u8QueueReadPtr);
+        asQueueMutexTaken = FALSE;
         mutex_unlock(asQueueMutex);
 
         ramBuffer = currentEntry.pvDataBuffer;
@@ -446,4 +457,9 @@ void FS_vIdleTask(uint8_t u8WritesAllowed)
     }
 }
 
+bool_t idleMutexIsTaken()
+{
+    return asQueueMutexTaken;
+}
+
 #endif /* PDM_SAVE_IDLE */

src/k32w0/platform/pdm_ram_storage_glue.h

@@ -66,6 +66,7 @@ ramBufferDescriptor *getRamBuffer(uint16_t nvmId, uint16_t initialSize);
 #if PDM_SAVE_IDLE
 PDM_teStatus FS_eSaveRecordDataInIdleTask(uint16_t u16IdValue, ramBufferDescriptor *pvDataBuffer);
 void         FS_vIdleTask(uint8_t u8WritesAllowed);
+bool_t       idleMutexIsTaken();
 #endif /* PDM_SAVE_IDLE */
 
 #if PDM_SAVE_IDLE