Peer review cleanups

Author: dgarske

src/port/lpc54s018/fix_checksum.py

@@ -32,6 +32,18 @@ def find_vector_offset(data):
     return 0
 
 
+def is_flash_image(data, off):
+    """Decide flash vs RAM by inspecting the reset handler (vector[1]).
+    Flash-linked images have the reset handler in SPIFI XIP space
+    (0x10000000+); RAM-linked images point into SRAM (0x20000000+).
+    RAM builds have the vector table at file offset 0 too, so offset
+    alone can't be used to distinguish them. """
+    if off + 8 > len(data):
+        return False
+    reset = struct.unpack_from('<I', data, off + 4)[0]
+    return 0x10000000 <= reset < 0x20000000
+
+
 def patch_vector_checksum(f, off):
     """Patch vector[7] (offset+0x1C) so vectors[0..7] sum to 0."""
     f.seek(off)
@@ -98,7 +110,8 @@ def main():
             print("Error: file too small")
             sys.exit(1)
 
-        if off == 0:
+        flash_image = (off == 0) and is_flash_image(data, off)
+        if flash_image:
             # Flash boot build: write enhanced boot block first
             if size < 0x160 + 100:
                 print("Error: image too small for enhanced boot block")
@@ -116,7 +129,7 @@ def main():
             print("ERROR: checksum verification failed (sum=0x%08X)" % total)
             sys.exit(1)
 
-    if off == 0:
+    if flash_image:
         print("Vector checksum patched: offset=0x%X entry[7]=0x%08X "
               "(+ enhanced boot block @ 0x24/0x160)" % (off, cksum))
     else:

src/port/lpc54s018/main.c

@@ -91,13 +91,17 @@ void SysTick_Handler(void)
 }
 
 /* Atomic read of 64-bit tick_ms on 32-bit Cortex-M4.
- * Briefly disables interrupts to prevent torn reads. */
+ * Briefly disables interrupts to prevent torn reads while preserving
+ * the caller's prior interrupt mask state (save/restore PRIMASK rather
+ * than blindly re-enabling). */
 static uint64_t get_tick_ms(void)
 {
     uint64_t val;
+    uint32_t primask;
+    __asm volatile ("mrs %0, primask" : "=r" (primask) :: "memory");
     __asm volatile ("cpsid i" ::: "memory");
     val = tick_ms;
-    __asm volatile ("cpsie i" ::: "memory");
+    __asm volatile ("msr primask, %0" :: "r" (primask) : "memory");
     return val;
 }
 

src/port/lpc_enet/lpc_enet.c

@@ -526,9 +526,16 @@ int lpc_enet_init(struct wolfIP_ll_dev *ll, const uint8_t *mac)
     mac_start();
 
     /* Retry PHY detection after MAC is fully started.
-     * MDIO can be unreliable before the MAC is running on some boards. */
+     * MDIO can be unreliable before the MAC is running on some boards.
+     * On success, re-run phy_init() (resets PHY, restarts autoneg) and
+     * refresh MAC speed/duplex so the MAC isn't left at the default
+     * 100/full guess from config_mac(). */
     if (phy_addr < 0) {
         phy_addr = phy_detect_retry();
+        if (phy_addr >= 0) {
+            phy_init();
+            config_speed_duplex();
+        }
     }
 
     if (phy_addr < 0) {