diff --git a/docs/sbl-bringup.md b/docs/sbl-bringup.md index c102262..22606e3 100644 --- a/docs/sbl-bringup.md +++ b/docs/sbl-bringup.md @@ -133,3 +133,9 @@ pushed-lr + ACK + возврат) — S16 больше не нужен в цепочке (остаётся как fallback). - S12v5: +restore r7 (peripheral base, S16 dormant) прямо в S12. + +## b28: poll-epilogue march kill (2026-09-13) +- Poll-fn входит mid-way (без prologue-push), выходит через + `add sp,#0x1C + pop.w 0x14` (+0x30/проход, пушей нет) → марш вверх + через fill в IMEM-нули → fault на верху. `add sp` → NOP (2B, b28). + Pop читает helper-фреймы (pushed-lr, валидные возвраты). diff --git a/qemu/run-sbl.sh b/qemu/run-sbl.sh index 90d5e8f..4ae0971 100755 --- a/qemu/run-sbl.sh +++ b/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:-b27} +B=${1:-b28} 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" diff --git a/tools/sbl_patch.py b/tools/sbl_patch.py index e354abf..6bf1b1f 100644 --- a/tools/sbl_patch.py +++ b/tools/sbl_patch.py @@ -1215,6 +1215,96 @@ def main(): save(d, 'img0_b27.elf') + # b28 = b27 + poll-epilogue march kill (0x8007794 add sp,#0x1c NOP): + # the poll-fn is entered mid-way (no prologue push!) but exits via + # add sp,#0x1c + pop.w 0x14 (+0x30/pass, no pushes!) -> marches sp + # UP through fill into IMEM zeros -> top fault. NOP the add (2B); + # the pop then reads helper frames (pushed-lrs, valid returns). + # Slow helper-leak-down (0x8/call, B66 skips pop) remains, harmless. + 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'), + + ]: + + 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-epilogue march kill: add sp,#0x1c (2B 07b0) -> NOP (2B c046). + o = off(0x8007794) + + assert d[o:o + 2].hex() == '07b0', hx(d, 0x8007794, 2) + + d[o:o + 2] = bytes.fromhex('c046') + + save(d, 'img0_b28.elf') +