Peer review fix

Author: dgarske

hal/zynq.c

@@ -58,7 +58,11 @@
 #endif
 
 /* DTB fixup for kernel command line. Override LINUX_BOOTARGS or
- * LINUX_BOOTARGS_ROOT in your config to customize. */
+ * LINUX_BOOTARGS_ROOT in your config to customize.
+ *
+ * Note: console=ttyPS0 is ZynqMP-specific (PS UART0). Versal's default
+ * (hal/versal.c) omits the console= token because Versal relies on
+ * earlycon alone plus a DT-declared stdout-path. */
 #ifndef LINUX_BOOTARGS
 #ifndef LINUX_BOOTARGS_ROOT
 #define LINUX_BOOTARGS_ROOT "/dev/mmcblk0p4"
@@ -1845,12 +1849,12 @@ int hal_dts_fixup(void* dts_addr)
     wolfBoot_printf("FDT: Version %d, Size %d\n",
         fdt_version(fdt), fdt_totalsize(fdt));
 
-    /* NOTE: We intentionally do not call fdt_set_totalsize() to "grow" the
-     * DTB here - that only edits the header field, not the backing buffer.
-     * Relies on the load-address layout leaving physical headroom after
-     * the DTB (WOLFBOOT_LOAD_DTS_ADDRESS with the kernel loaded much
-     * higher). If a future config shrinks that gap, mutation calls below
-     * will return -FDT_ERR_NOSPACE and we bail. */
+    /* Expand totalsize so fdt_setprop() has in-blob free space to place
+     * a new/larger bootargs property. Physical headroom is already
+     * guaranteed by the load-address layout (DTB at WOLFBOOT_LOAD_DTS_ADDRESS,
+     * kernel loaded much higher), so growing the header is safe. Matches
+     * the pattern used in hal/versal.c:hal_dts_fixup. */
+    fdt_set_totalsize(fdt, fdt_totalsize(fdt) + 512);
 
     /* Find /chosen node */
     off = fdt_find_node_offset(fdt, -1, "chosen");

src/boot_aarch64.c

@@ -56,8 +56,10 @@ extern void gicv2_init_secure(void);
  * EL2 startup enables MMU/caches for its own use, and the ARM64 Linux boot
  * protocol requires them OFF at entry. Only built when EL2_HYPERVISOR == 1
  * is visible to boot_aarch64_start.S (e.g. via hal/zynq.h on ZynqMP). */
+#if defined(EL2_HYPERVISOR) && EL2_HYPERVISOR == 1
 extern void el2_cleanup_and_jump_to_linux(uintptr_t entry, uintptr_t dtb)
     __attribute__((noreturn));
+#endif
 
 /* SKIP_GIC_INIT - Skip GIC initialization before booting app
  * This is needed for:
@@ -188,7 +190,8 @@ void RAMFUNCTION do_boot(const uint32_t *app_offset)
      * LINUX_BOOTARGS_ROOT being defined (supplied via CFLAGS by configs
      * that boot Linux, e.g. zynqmp_sdcard.config). Bare-metal / RTOS EL2
      * payloads fall through to the legacy direct br x4 below. */
-#if defined(MMU) && defined(LINUX_BOOTARGS_ROOT)
+#if defined(MMU) && defined(LINUX_BOOTARGS_ROOT) && \
+    defined(EL2_HYPERVISOR) && EL2_HYPERVISOR == 1
     if (current_el() == 2) {
         uintptr_t dts = (uintptr_t)dts_offset;
         wolfBoot_printf("do_boot: cleaning caches, disabling MMU, jumping to Linux\n");

src/boot_aarch64_start.S

@@ -1365,6 +1365,7 @@ el2_to_el1_boot:
  *
  * Clobbers x0-x11, x29, x30; never returns.
  */
+#if defined(EL2_HYPERVISOR) && EL2_HYPERVISOR == 1
 .global el2_cleanup_and_jump_to_linux
 el2_cleanup_and_jump_to_linux:
     /* Save entry/dtb out of the clobber range used by the dcache loop */
@@ -1379,15 +1380,15 @@ el2_cleanup_and_jump_to_linux:
     mrs     x0, clidr_el1
     and     x3, x0, #0x07000000     /* x3 = LoC (level of coherency) */
     lsr     x3, x3, #23             /* x3 = LoC * 2 */
-    cbz     x3, dcache_done
+    cbz     x3, .Ldcache_done
     mov     x10, #0                 /* x10 = current cache level << 1 */
 
-dcache_level_loop:
+.Ldcache_level_loop:
     add     x2, x10, x10, lsr #1    /* x2 = level * 3 */
     lsr     x1, x0, x2              /* x1 = ctype field for this level */
     and     x1, x1, #7
     cmp     x1, #2
-    b.lt    dcache_skip_level       /* No data cache at this level */
+    b.lt    .Ldcache_skip_level     /* No data cache at this level */
     msr     csselr_el1, x10         /* Select cache level (instruction = 0) */
     isb
     mrs     x1, ccsidr_el1
@@ -1399,25 +1400,25 @@ dcache_level_loop:
     mov     x7, #0x7fff
     and     x7, x7, x1, lsr #13     /* x7 = max set number */
 
-dcache_set_loop:
+.Ldcache_set_loop:
     mov     x9, x4                  /* x9 = current way */
-dcache_way_loop:
+.Ldcache_way_loop:
     lsl     x6, x9, x5
     orr     x11, x10, x6            /* level | way */
     lsl     x6, x7, x2
     orr     x11, x11, x6            /* level | way | set */
     dc      cisw, x11               /* clean & invalidate by set/way */
     subs    x9, x9, #1
-    b.ge    dcache_way_loop
+    b.ge    .Ldcache_way_loop
     subs    x7, x7, #1
-    b.ge    dcache_set_loop
+    b.ge    .Ldcache_set_loop
 
-dcache_skip_level:
+.Ldcache_skip_level:
     add     x10, x10, #2
     cmp     x3, x10
-    b.gt    dcache_level_loop
+    b.gt    .Ldcache_level_loop
 
-dcache_done:
+.Ldcache_done:
     mov     x10, #0
     msr     csselr_el1, x10
     dsb     sy
@@ -1434,12 +1435,18 @@ dcache_done:
      *   SCTLR_EL2.M (bit 0)  = MMU enable
      *   SCTLR_EL2.C (bit 2)  = D-cache enable
      *   SCTLR_EL2.I (bit 12) = I-cache enable
+     *
+     * ARM ARM (B2.7.2) requires `dsb sy` before `isb` when modifying
+     * SCTLR_ELx.M so the system register write is observable before the
+     * pipeline is re-synchronized. Matches the MMU-enable sequence used
+     * earlier in this file.
      */
     mrs     x0, SCTLR_EL2
     bic     x0, x0, #(1 << 0)       /* M  */
     bic     x0, x0, #(1 << 2)       /* C  */
     bic     x0, x0, #(1 << 12)      /* I  */
     msr     SCTLR_EL2, x0
+    dsb     sy
     isb
 
     /* ---- 4. Set up Linux ARM64 boot protocol registers and jump ----
@@ -1454,5 +1461,6 @@ dcache_done:
     mov     x2, xzr
     mov     x3, xzr
     br      x29                     /* jump to kernel entry; never returns */
+#endif /* EL2_HYPERVISOR */
 
 .end

src/sdhci.c

@@ -604,11 +604,12 @@ static int sdcard_power_init_seq(uint32_t voltage)
             break;
         udelay(10000); /* 10ms between retries */
     }
-#ifdef DEBUG_SDHCI
-    if (retries > 0 && status == 0) {
+    if (status != 0) {
+        wolfBoot_printf("SD: CMD0 failed after %d retries\n", retries);
+    }
+    else if (retries > 0) {
         wolfBoot_printf("SD: CMD0 succeeded after %d retries\n", retries);
     }
-#endif
     if (status == 0) {
         /* send the operating conditions command */
         status = sdhci_cmd(SD_CMD8_SEND_IF_COND, SD_IF_COND_27V_33V,