commit 4d75fc8e07556e624e6a2d21d082dc39c6ab8acb
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Wed Jan 03 07:39:46 2024 +0000
committer Jamie <40387179+nordicjm@users.noreply.github.com> Mon Jan 08 15:35:53 2024 +0000
tree e81b3fe9f1fb2627b1a9f25ed98bf09753ef277a
parent 35e9931c781a896d47506c67b300e0f8f61de4d0

bootutil: Fix compatible sector checking

Fixes an issue whereby slot sizes were checked but the check was
not done properly. This also adds debug log messages to show the
sector configuration including if slot sizes are not optimal

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/bootutil/src/swap_move.c

diff --git a/boot/bootutil/src/swap_move.c b/boot/bootutil/src/swap_move.c
index 61246b9..111e82f 100644
--- a/boot/bootutil/src/swap_move.c
+++ b/boot/bootutil/src/swap_move.c
@@ -234,6 +234,28 @@
     return off;
 }
 
+static int app_max_sectors(struct boot_loader_state *state)
+{
+    uint32_t sz = 0;
+    uint32_t sector_sz;
+    uint32_t trailer_sz;
+    uint32_t first_trailer_idx;
+
+    sector_sz = boot_img_sector_size(state, BOOT_PRIMARY_SLOT, 0);
+    trailer_sz = boot_trailer_sz(BOOT_WRITE_SZ(state));
+    first_trailer_idx = boot_img_num_sectors(state, BOOT_PRIMARY_SLOT) - 1;
+
+    while (1) {
+        sz += sector_sz;
+        if  (sz >= trailer_sz) {
+            break;
+        }
+        first_trailer_idx--;
+    }
+
+    return first_trailer_idx;
+}
+
 int
 boot_slots_compatible(struct boot_loader_state *state)
 {
@@ -242,18 +264,29 @@
     size_t sector_sz_pri = 0;
     size_t sector_sz_sec = 0;
     size_t i;
+    size_t num_usable_sectors_pri;
 
     num_sectors_pri = boot_img_num_sectors(state, BOOT_PRIMARY_SLOT);
     num_sectors_sec = boot_img_num_sectors(state, BOOT_SECONDARY_SLOT);
+    num_usable_sectors_pri = app_max_sectors(state);
+
     if ((num_sectors_pri != num_sectors_sec) &&
-            (num_sectors_pri != (num_sectors_sec + 1))) {
+            (num_sectors_pri != (num_sectors_sec + 1)) &&
+            (num_usable_sectors_pri != (num_sectors_sec + 1))) {
         BOOT_LOG_WRN("Cannot upgrade: not a compatible amount of sectors");
+        BOOT_LOG_DBG("slot0 sectors: %d, slot1 sectors: %d, usable slot0 sectors: %d",
+                     (int)num_sectors_pri, (int)num_sectors_sec,
+                     (int)(num_usable_sectors_pri - 1));
+        return 0;
+    } else if (num_sectors_pri > BOOT_MAX_IMG_SECTORS) {
+        BOOT_LOG_WRN("Cannot upgrade: more sectors than allowed");
         return 0;
     }
 
-    if (num_sectors_pri > BOOT_MAX_IMG_SECTORS) {
-        BOOT_LOG_WRN("Cannot upgrade: more sectors than allowed");
-        return 0;
+    if (num_usable_sectors_pri != (num_sectors_sec + 1)) {
+        BOOT_LOG_DBG("Non-optimal sector distribution, slot0 has %d usable sectors (%d assigned) "
+                     "but slot1 has %d assigned", (int)(num_usable_sectors_pri - 1),
+                     (int)num_sectors_pri, (int)num_sectors_sec);
     }
 
     for (i = 0; i < num_sectors_sec; i++) {
@@ -544,24 +577,11 @@
 
 int app_max_size(struct boot_loader_state *state)
 {
-    uint32_t sz = 0;
     uint32_t sector_sz;
-    uint32_t trailer_sz;
-    uint32_t first_trailer_idx;
 
     sector_sz = boot_img_sector_size(state, BOOT_PRIMARY_SLOT, 0);
-    trailer_sz = boot_trailer_sz(BOOT_WRITE_SZ(state));
-    first_trailer_idx = boot_img_num_sectors(state, BOOT_PRIMARY_SLOT) - 1;
 
-    while (1) {
-        sz += sector_sz;
-        if  (sz >= trailer_sz) {
-            break;
-        }
-        first_trailer_idx--;
-    }
-
-    return (first_trailer_idx * sector_sz);
+    return (app_max_sectors(state) * sector_sz);
 }
 
 #endif