b36: assert-entry to S19

qemu/run-sbl.sh

@@ -5,7 +5,7 @@
 set -e
 cd "$(dirname "$0")/.."
 QEMU=~/qemu-src/qemu-8.2.2/build/qemu-system-arm
-B=${1:-b35}
+B=${1:-b36}
 IMG=fw/img/emmc-real.img
 if [ ! -f "$IMG" ]; then
   echo "no $IMG — сначала: python3 tools/ffu_extract.py fw/dl/RM1127_059X5R5_orig.ffu --emmc-user fw/img/user-real.bin"

tools/sbl_patch.py

@@ -2049,6 +2049,128 @@ def main():
 
     save(d, 'img0_b35.elf')
 
+    # b36 = b35 + assert-entry -> S19 (0x802F9A2 ldr -> b.w S19):
+    # the sbl_mc assert-fn is entered mid-way (0x802F9A2, skipping the
+    # b35 S19-hangs at 0x802F9A0/0x802F9B2!) via pop-garbage, runs its
+    # blx-wild and faults. Route entry to S19 too (eats ldr + movw
+    # first half; dead, never fetched after jump).
+    d = bytearray(base)
+
+    for va, (a, b) in BLX2BL.items():
+
+        set4(d, va, b)
+
+    for va, exp, new in [
+
+        (0x802F664, 'e4f77efc', 'c046c046'),
+
+        (0x802F672, 'e6f7bbfa', 'c046c046'),
+
+        (0x802F678, 'e9f7fef9', 'c046c046'),
+
+        (0x801B71E, '9847fee7', 'c046c046'),
+
+        (0x8008396, 'fef780f9', 'c046c046'),
+
+        (0x8016184, 'fdf790fc', 'c046c046'),
+
+        (0x801B76C, '280b0508', '00000708'),
+
+        (0x8017AFC, 'bde8fc87', 'eef74fb8'),
+
+        (0x802F690, '9847fee7', 'c046c046'),
+
+        (0x801671C, '9847fee7', 'c046c046'),
+
+        (0x8013BAC, 'f8bd0a4a', 'f3f730b8'),
+
+        (0x801B6BE, 'bde8f081', 'ebf7c3ba'),
+
+        (0x8016720, '10bd0000', 'f0f7b2ba'),
+
+        (0x8034810, 'bde8fc87', 'd2f76eba'),
+
+        (0x8007798, 'bde8f08f', 'fff7c3ba'),
+
+        (0x8016334, 'f0f7a4ff', 'c046c046'),
+
+        (0x8016342, 'f0f79eef', 'f0f79dbf'),
+
+        (0x802F9A0, 'ffe70648', 'd7f7c4b9'),
+
+        (0x802F9B2, 'fee78817', 'd7f7bbb9'),
+
+        (0x802F9A2, '036804a0', 'd7f7c3b9'),
+
+    ]:
+
+        assert hx(d, va) == exp, (hex(va), hx(d, va))
+
+        set4(d, va, new)
+
+    # Full bl idiom at 0x8006682 (bl + pop, 6B) -> NOPs (see b18).
+    o = off(0x8006682)
+
+    assert d[o:o + 6].hex() == '00f001f807bd', hx(d, 0x8006682, 6)
+
+    d[o:o + 6] = bytes.fromhex('c046c046c046')
+
+    o = off(0x8013AA8)
+
+    assert d[o:o + 4].hex() == '07f026be', hx(d, 0x8013AA8)
+
+    d[o:o + 4] = bytes.fromhex('c046c046')
+
+    o = off(0x8013BA6)
+
+    assert d[o:o + 2].hex() == 'b888', (hex(0x8013BA6), hx(d, 0x8013BA6, 2))
+
+    d[o:o + 2] = bytes.fromhex('ff20')
+
+    # Helper-pop S16 chain (see b25).
+    o = off(0x8007B66)
+
+    assert d[o:o + 2].hex() == '10bd', hx(d, 0x8007B66, 2)
+
+    d[o:o + 2] = bytes.fromhex('6047')
+
+    # Clock S11 (see b24).
+    o = off(0x800E988)
+
+    assert d[o:o + 2].hex() == '10bd', hx(d, 0x800E988, 2)
+
+    d[o:o + 2] = bytes.fromhex('7047')
+
+    # Poll re-init skip (see b27).
+    o = off(0x8007748)
+
+    assert d[o:o + 2].hex() == '96b1', hx(d, 0x8007748, 2)
+
+    d[o:o + 2] = bytes.fromhex('14e0')
+
+    # Poll-epilogue add NOP (see b28).
+    o = off(0x8007794)
+
+    assert d[o:o + 2].hex() == '07b0', hx(d, 0x8007794, 2)
+
+    d[o:o + 2] = bytes.fromhex('c046')
+
+    # Partition wrap-check (see b33).
+    o = off(0x801844E)
+
+    assert d[o:o + 2].hex() == '04d3', hx(d, 0x801844E, 2)
+
+    d[o:o + 2] = bytes.fromhex('04e0')
+
+    # Hang-site neutralize (see b34).
+    o = off(0x8018458)
+
+    assert d[o:o + 2].hex() == 'fee7', hx(d, 0x8018458, 2)
+
+    d[o:o + 2] = bytes.fromhex('ffe7')
+
+    save(d, 'img0_b36.elf')
+