diff options
| -rw-r--r-- | kernel/gsp_phys_booter.c | 15 | ||||
| -rw-r--r-- | tools/guest-diag/params-r1624.txt | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/kernel/gsp_phys_booter.c b/kernel/gsp_phys_booter.c index 74b0300..e927d2d 100644 --- a/kernel/gsp_phys_booter.c +++ b/kernel/gsp_phys_booter.c @@ -32400,9 +32400,18 @@ gr_page_unmapped: * all-slots knob is off, matching the r1561 bool's * !sph_bind_all gate. */ - u32 stage_disable_mask = !sph_bind_all ? - (READ_ONCE(gsp_phys_rmcall_gr_sph_stage_disable) & - 0x3fu) : 0u; + /* + * eng65 DS A/B: the per-stage disable mask used to be + * gated on !sph_bind_all, so the current campaign's + * sema_gl_sph_bind=1 boot could not disable one stage + * (TCS/VSA) while keeping the window's own binds and + * the other synth slots. The mask defaults to 0, so + * the emitted bytes are unchanged unless a bit is set; + * the gate now allows the A/B on the all-slots boot. + */ + u32 stage_disable_mask = + READ_ONCE(gsp_phys_rmcall_gr_sph_stage_disable) & + 0x3fu; bool stage_disable = stage_disable_mask != 0u; bool emit_j2 = !(stage_disable_mask & 0x04u) && (sph_bind_all || (sph_bind_mask & 0x04u)); diff --git a/tools/guest-diag/params-r1624.txt b/tools/guest-diag/params-r1624.txt index c97f0ee..c72a4a3 100644 --- a/tools/guest-diag/params-r1624.txt +++ b/tools/guest-diag/params-r1624.txt @@ -6,3 +6,4 @@ sema_gl_mme_partial_keep_window=1 sema_gl_mme_pack_keep_gen=1 sema_gl_mme_cb_ali sema_ddx_tracker_auth=1 sema_gl_mme_pack_carry=1 sema_gl_mme_pack_carry_ms=100 sema_gl_mme_pack_release=1 sema_gl_mme_pack_release_ms=100 sema_gl_sph_bind_pair_safe=1 sema_gl_mme_sa_golden_fill=1 sema_gl_mme_release_sa_arm=1 + sema_gl_sph_stage_disable=0x04 |