From a13932b67989475a4e2bbaaa2425a9f4dd432630 Mon Sep 17 00:00:00 2001
From: Alexandru Costache <alexandru@balena.io>
Date: Thu, 20 Jan 2022 16:29:17 +0100
Subject: [PATCH] tegra194-flash-dry: Avoid potential rtcpu firmware load
 failure

Patch boot blob to avoid these potential errors:

tegra-hsp-mailbox ivc-bc00000.rtcpu: IOVM setup error: 110
tegra186-cam-rtcpu bc00000.rtcpu: command: 0x00000000: empty mailbox timeout

Also, reduce verbosity level.

Signed-off-by: Alexandru Costache <alexandru@balena.io>
---
 .../files/boot0_t194_agx.bindiff              | Bin 0 -> 1536 bytes
 .../tegra194-flash-dry_32.6.1.bb              |  23 +++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 layers/meta-balena-jetson/recipes-bsp/tegra-binaries/files/boot0_t194_agx.bindiff

diff --git a/layers/meta-balena-jetson/recipes-bsp/tegra-binaries/files/boot0_t194_agx.bindiff b/layers/meta-balena-jetson/recipes-bsp/tegra-binaries/files/boot0_t194_agx.bindiff
new file mode 100644
index 0000000000000000000000000000000000000000..fb5ec9e051d2d83efc083a0b130bf8d013194fe5
GIT binary patch
literal 1536
zcmebNTC6c4$zAf)A<0O|quqV{SM;Nm|N8%4GdVf=u_t5a&i$^bw~x#4iT!x+a9!Hn
z8yrR1oMEb~mFlNn(B1YdxK@UNIKT)}R?f)q!5_>5YeKM)xXkj53=UvE3X#L6U;q+e
zW?<Y2qIr3^KokgAfCwHC0S2l{AWHBNJDA6mq2K^w@ar)!fb3%iaex47cMycfPynP8
zfVcsO9e_9kh&h0mXaF;N0azCk+^z+jAS0LvngiDl_7)3VKaxgn2wMS32$|Uc<-lmT
z985p~A_Ao#9ApyaUl<LRgN74>0J2JQ*|5OJqo0wPi3nAA48SIJT7%~~3j>1<#N<Yh
bk{!U%Y;bU9@*Yk9px_uy|A_oPqS8MAm5pGN

literal 0
HcmV?d00001

diff --git a/layers/meta-balena-jetson/recipes-bsp/tegra-binaries/tegra194-flash-dry_32.6.1.bb b/layers/meta-balena-jetson/recipes-bsp/tegra-binaries/tegra194-flash-dry_32.6.1.bb
index 5fc44eb3a..0d6f78224 100644
--- a/layers/meta-balena-jetson/recipes-bsp/tegra-binaries/tegra194-flash-dry_32.6.1.bb
+++ b/layers/meta-balena-jetson/recipes-bsp/tegra-binaries/tegra194-flash-dry_32.6.1.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://${BALENA_COREBASE}/COPYING.Apache-2.0;md5=89aea4e17d9
 
 IMAGE_ROOTFS_ALIGNMENT ?= "4"
 
+BOOT_BINDIFF="boot0_t194_agx.bindiff"
+
 DEPENDS = " \
     coreutils-native \
     virtual/bootloader \
@@ -22,6 +24,7 @@ SRC_URI = " \
     file://resinOS-flash194.xml \
     file://partition_specification194.txt \
     file://cti-rogue-32-4-3-pinmux.cfg \
+    file://${BOOT_BINDIFF} \
 "
 
 PINMUXCFG = "tegra19x-mb1-pinmux-p2888-0000-a04-p2822-0000-b01.cfg"
@@ -44,7 +47,7 @@ LNXFILE="${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin"
 IMAGE_TEGRAFLASH_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${LNXFILE}"
 BINARY_INSTALL_PATH = "/opt/tegra-binaries"
 
-OS_KERNEL_CMDLINE = "${@bb.utils.contains('DEVELOPMENT_IMAGE','1','console=ttyTHS0,115200n8 console=tty1 debug loglevel=7','console=null quiet splash vt.global_cursor_default=0 consoleblank=0',d)}"
+OS_KERNEL_CMDLINE = "${@bb.utils.contains('DEVELOPMENT_IMAGE','1','console=ttyTHS0,115200n8 console=tty1 ','console=null quiet splash vt.global_cursor_default=0 consoleblank=0',d)}"
 ROOTA_ARGS="root=LABEL=resin-rootA ro rootwait rootfstype=ext4 ${KERNEL_ARGS} ${OS_KERNEL_CMDLINE}"
 ROOTB_ARGS="root=LABEL=resin-rootB ro rootwait rootfstype=ext4 ${KERNEL_ARGS} ${OS_KERNEL_CMDLINE}"
 
@@ -253,6 +256,24 @@ do_configure() {
     dd if=${DEPLOY_DIR_IMAGE}/bootfiles/mem_coldboot_sigheader.bct.encrypt of=boot0.img seek=720896 bs=1 conv=notrunc
     dd if=${DEPLOY_DIR_IMAGE}/bootfiles/mem_coldboot_sigheader.bct.encrypt of=boot0.img seek=925696 bs=1 conv=notrunc
 
+    # Although the device will boot fine, rtcpu may not run as expected unless
+    # we patch the boot blob to resemble entirely the one created during provisioning by the flashing tools.
+    # Example dmesg logs of this failure:
+    # tegra-hsp-mailbox ivc-bc00000.rtcpu: IOVM setup error: 110
+    # tegra186-cam-rtcpu bc00000.rtcpu: command: 0x00000000: empty mailbox timeout
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=557072 bs=1 count=32 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=560096 skip=32  bs=1 count=32 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=561168 skip=64  bs=1 count=32 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=562176 skip=96  bs=1 count=320 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=563536 skip=416  bs=1 count=320 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=587152 skip=736  bs=1 count=32 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=638992 skip=768  bs=1 count=32 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=642016 skip=800  bs=1 count=32 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=643088 skip=832  bs=1 count=32 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=644096 skip=864  bs=1 count=320 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=645456 skip=1184  bs=1 count=320 conv=notrunc
+    dd if=${WORKDIR}/${BOOT_BINDIFF} of=boot0.img seek=669072 skip=1504  bs=1 count=32 conv=notrunc
+
     cp boot0.img ${DEPLOY_DIR_IMAGE}/bootfiles/
 }