fix tc3xx HAL to properly handle flash writes across sector boundariese

Author: bigbrett

hal/aurix_tc3xx.c

@@ -364,52 +364,66 @@ void hal_init(void)
  */
 int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t* data, int size)
 {
-    /* base address of containing sector (TODO what if size spans sectors?)
-     */
-    const uint32_t           sectorAddress = GET_SECTOR_ADDR(address);
-    const IfxFlash_FlashType type          = getFlashTypeFromAddr(address);
+    const IfxFlash_FlashType type              = getFlashTypeFromAddr(address);
+    uint32_t                 currentAddress    = address;
+    int                      remainingSize     = size;
+    int                      bytesWrittenTotal = 0;
 
-    /* Determine the range of pages affected */
-    const uint32_t startPage = GET_PAGE_ADDR(address);
-    const uint32_t endPage   = GET_PAGE_ADDR(address + size - 1);
-    uint32_t       page;
+    LED_ON(LED_PROG);
 
-    /* Flag to check if sector read-modify-write is necessary */
-    int needsSectorRmw;
+    /* Process the data sector by sector */
+    while (remainingSize > 0) {
+        uint32_t currentSectorAddress = GET_SECTOR_ADDR(currentAddress);
+        uint32_t offsetInSector       = currentAddress - currentSectorAddress;
+        uint32_t bytesInThisSector    = WOLFBOOT_SECTOR_SIZE - offsetInSector;
 
-    LED_ON(LED_PROG);
+        /* Adjust bytes to write if this would overflow the current sector */
+        if (bytesInThisSector > remainingSize) {
+            bytesInThisSector = remainingSize;
+        }
 
-    /* Check if any page within the range is not erased */
-    needsSectorRmw = 0;
-    for (page = startPage; page <= endPage;
-         page += IFXFLASH_PFLASH_PAGE_LENGTH) {
-        if (!flashIsErased(page, IFXFLASH_PFLASH_PAGE_LENGTH, type)) {
-            needsSectorRmw = 1;
-            break;
+        /* Determine the range of pages affected in this sector */
+        const uint32_t startPage = GET_PAGE_ADDR(currentAddress);
+        const uint32_t endPage =
+            GET_PAGE_ADDR(currentAddress + bytesInThisSector - 1);
+        uint32_t page;
+        int      needsSectorRmw = 0;
+
+        /* Check if any page within the range is not erased */
+        for (page = startPage; page <= endPage;
+             page += IFXFLASH_PFLASH_PAGE_LENGTH) {
+            if (!flashIsErased(page, IFXFLASH_PFLASH_PAGE_LENGTH, type)) {
+                needsSectorRmw = 1;
+                break;
+            }
         }
-    }
 
-    /* If a page within the range is erased, we need to read-modify-write the
-     * whole sector */
-    if (needsSectorRmw) {
-        size_t offsetInSector;
+        /* If a page within the range is not erased, we need to
+         * read-modify-write the sector */
+        if (needsSectorRmw) {
+            /* Read entire sector into RAM */
+            cacheSector(currentSectorAddress, type);
 
-        /* Read entire sector into RAM */
-        cacheSector(sectorAddress, type);
+            /* Erase the entire sector */
+            hal_flash_erase(currentSectorAddress, WOLFBOOT_SECTOR_SIZE);
 
-        /* Erase the entire sector */
-        hal_flash_erase(sectorAddress, WOLFBOOT_SECTOR_SIZE);
+            /* Modify the relevant part of the RAM sector buffer */
+            memcpy((uint8_t*)sectorBuffer + offsetInSector,
+                   data + bytesWrittenTotal, bytesInThisSector);
 
-        /* Modify the relevant part of the RAM sector buffer */
-        offsetInSector = address - sectorAddress;
-        memcpy((uint8_t*)sectorBuffer + offsetInSector, data, size);
+            /* Program the modified sector back into flash */
+            programCachedSector(currentSectorAddress, type);
+        }
+        else {
+            /* All affected pages are erased, program the data directly */
+            programBytesToErasedFlash(currentAddress, data + bytesWrittenTotal,
+                                      bytesInThisSector, type);
+        }
 
-        /* Program the modified sector back into flash */
-        programCachedSector(sectorAddress, type);
-    }
-    else {
-        /* All affected pages are erased, program the data directly */
-        programBytesToErasedFlash(address, data, size, type);
+        /* Update pointers and counters */
+        bytesWrittenTotal += bytesInThisSector;
+        currentAddress += bytesInThisSector;
+        remainingSize -= bytesInThisSector;
     }
 
     LED_OFF(LED_PROG);