diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/gsp_phys_booter.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/kernel/gsp_phys_booter.c b/kernel/gsp_phys_booter.c index ea6b1ae..10d40c6 100644 --- a/kernel/gsp_phys_booter.c +++ b/kernel/gsp_phys_booter.c @@ -18764,6 +18764,20 @@ module_param_named(sema_gl_mme_pack_carry_ms, gsp_phys_rmcall_gr_mme_pack_carry_ms, uint, 0644); MODULE_PARM_DESC(sema_gl_mme_pack_carry_ms, "Settle delay before the host-initiated pack-continuation carrier fires (clamped 20..5000 ms; default 100)"); +/* + * CONT 539: owner-channel pack continuation. The split pack lands on the + * channel that emitted the partial (c858: h=0x1000013), not always the beef + * draw channel (c848: h=0xbeef0100). The builder reads a global cursor, so + * the continuation bytes are identical on any channel; the synthetic + * windowless LOAD-ONLY launch goes through that channel's own forwarding + * candidate (the pump locates it by h_object). Off = the historical + * beef-only gate (default 0 for the A/B). + */ +static bool gsp_phys_rmcall_gr_mme_pack_carry_client; +module_param_named(sema_gl_mme_pack_carry_client, + gsp_phys_rmcall_gr_mme_pack_carry_client, bool, 0644); +MODULE_PARM_DESC(sema_gl_mme_pack_carry_client, + "Allow the pack-continuation carrier to arm/fire on the split owner channel (not only 0xbeefXXXX), still windowless LOAD-ONLY via that channel's forwarding candidate (default 0 = off)"); static void gsp_phys_gr_mme_iram_gate_fail(void); @@ -18795,7 +18809,9 @@ static void gsp_phys_gr_mme_carry_arm(bool split, u32 poff, u32 maxa, u32 ms; if (!READ_ONCE(gsp_phys_rmcall_gr_mme_pack_carry) || !split || - poff >= maxa || (h_object & 0xfffff000u) != 0xbeef0000u || + poff >= maxa || + ((h_object & 0xfffff000u) != 0xbeef0000u && + !READ_ONCE(gsp_phys_rmcall_gr_mme_pack_carry_client)) || READ_ONCE(gsp_phys_gr_mme_pack_load_h) != h_object || !gsp_phys_gr_golden_ready()) return; @@ -18873,7 +18889,8 @@ bool gsp_phys_gr_mme_carry_take(u32 h_object, u32 *gen, u32 *off, u32 *maxa) } live_off = READ_ONCE(gsp_phys_gr_mme_pack_off); if (gsp_phys_gr_mme_carry.h_object != h_object || - (h_object & 0xfffff000u) != 0xbeef0000u) + ((h_object & 0xfffff000u) != 0xbeef0000u && + !READ_ONCE(gsp_phys_rmcall_gr_mme_pack_carry_client))) reason = "h-mismatch"; else if (!gsp_phys_gr_golden_ready()) reason = "golden-lost"; |
