diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/gsp_phys_booter.c | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/kernel/gsp_phys_booter.c b/kernel/gsp_phys_booter.c index 424aa2c..4913401 100644 --- a/kernel/gsp_phys_booter.c +++ b/kernel/gsp_phys_booter.c @@ -23469,6 +23469,28 @@ if (gsp_phys_gr_slot_kept(j, sa_mask, if (READ_ONCE(gsp_phys_rmcall_gr_mme_prelude)) { pl = gsp_sema_mme_prelude_get(&pl_n, &pl_gen); /* + * eng89k: the beef client's MME upload is absent on + * some boots (c963: no sema-mme-prelude capture at + * all), so pl_n==0 and the old `pl_n && pl_gen` + * gates never built the golden pack and never held + * the DRAW CALL - the macro ran bare and the lane + * poisoned (badf1201/pc=513/mac=0xf1) right after a + * CLEAN DS (ds_after=80000000). With the golden + * library forced, give beef launches a synthetic + * generation so the existing golden-overlay, pack, + * CALL-hold, rearm and release machinery runs; the + * pack is built from the golden image alone (the + * capture contributes zero words). Module/X lanes + * are untouched. + */ + if (!pl_gen && pl && + (req->h_object & 0xfffff000u) == 0xbeef0000u && + READ_ONCE(gsp_phys_rmcall_gr_mme_prelude_pack) && + READ_ONCE(gsp_phys_rmcall_gr_mme_hold_calls) && + READ_ONCE(gsp_phys_rmcall_gr_mme_golden) && + READ_ONCE(gsp_phys_rmcall_gr_mme_golden_force)) + pl_gen = 0x474d4d45u; /* 'MMEG' golden gen */ + /* * r1453 PAIR-CHAIN: remember the generation this * launch was built against; the submit's success * edge promotes it to gsp_phys_gr_mme_pairs_gen @@ -23493,7 +23515,7 @@ if (gsp_phys_gr_slot_kept(j, sa_mask, * start). The latch (gsp_phys_gr_mme_prelude_gen/h) is * set only when the final part has gone out. */ - if (pl && pl_n && pl_gen) { + if (pl && pl_gen) { /* * Fixed overhead: SET_OBJECT bind (2), SA-stub * block, window, and the 4x2-word release tail. @@ -23629,7 +23651,7 @@ if (gsp_phys_gr_slot_kept(j, sa_mask, * emission (the arm-time checks already proved the pack is * partial for this channel and generation). */ - if (carrier && pl && pl_n && pl_gen) + if (carrier && pl && pl_gen) emit_prelude = true; /* * Saved-window release carrier: the packed program is already @@ -24868,7 +24890,7 @@ if (gsp_phys_gr_slot_kept(j, sa_mask, if (READ_ONCE(gsp_phys_rmcall_gr_mme_iram_gate) && READ_ONCE(gsp_phys_rmcall_gr_mme_prelude_pack) && READ_ONCE(gsp_phys_rmcall_gr_mme_hold_calls) && - pl && pl_n && pl_gen && + pl && pl_gen && !gsp_phys_gr_mme_iram_gate_giveup()) { bool latch_now = (pl_gen == @@ -24922,7 +24944,7 @@ if (gsp_phys_gr_slot_kept(j, sa_mask, * idempotent keep-forced re-emission of the prefix) runs * the real calls against the now-resident program. */ - if (pl && pl_n && pl_gen && + if (pl && pl_gen && READ_ONCE(gsp_phys_rmcall_gr_mme_prelude) && READ_ONCE(gsp_phys_rmcall_gr_mme_hold_calls)) { u32 lg = READ_ONCE(gsp_phys_gr_mme_prelude_gen); @@ -25158,7 +25180,7 @@ if (gsp_phys_gr_slot_kept(j, sa_mask, * macro entry) instead of drawing. Only meaningful on the * packed path (the pack image is the comparator). */ - if (!mme_hold_calls && pl && pl_n && pl_gen && + if (!mme_hold_calls && pl && pl_gen && READ_ONCE(gsp_phys_rmcall_gr_mme_prelude) && READ_ONCE(gsp_phys_rmcall_gr_mme_hold_calls) && READ_ONCE(gsp_phys_rmcall_gr_mme_prelude_pack) && |
