summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/gsp_phys_booter.c21
-rw-r--r--tools/guest-diag/params-r1624.txt2
2 files changed, 20 insertions, 3 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";
diff --git a/tools/guest-diag/params-r1624.txt b/tools/guest-diag/params-r1624.txt
index efda72b..944578e 100644
--- a/tools/guest-diag/params-r1624.txt
+++ b/tools/guest-diag/params-r1624.txt
@@ -1,4 +1,4 @@
-gsp_phys_gpu=1 gsp_phys_hazard_ack=1 gsp_phys_boot=1 gsp_phys_nocat=1 gsp_phys_fw=nvidia/tu102/gsp/gsp-570.144.bin gsp_phys_guest_mem=1 gsp_phys_gr_forward=1 cuda_bridge=0 gsp_phys_rmcall_engine=1 gsp_phys_rmcall_golden=1 gsp_phys_rmcall_gr_promote=25 gsp_phys_rmcall_fwclient_mask=0x601 gsp_phys_rmcall_vas_shared=1 gsp_phys_gpu=1 gsp_phys_hazard_ack=1 gsp_phys_boot=1 gsp_phys_nocat=1 gsp_phys_fw=nvidia/tu102/gsp/gsp-570.144.bin gsp_phys_guest_mem=1 gsp_phys_gr_forward=1 cuda_bridge=0 gsp_phys_rmcall_engine=1 gsp_phys_rmcall_golden=1 gsp_phys_rmcall_gr_promote=35 gsp_phys_rmcall_fwclient_mask=0xE3F gsp_phys_rmcall_vas_shared=1 gsp_phys_gr_nowrite_retries=0 gsp_phys_gr_retry_fast=1 gsp_phys_gr_first_poll_ms=2500 gsp_sema_winfill=1 gsp_sema_gr_swrel_gate=1 gsp_phys_rmcall_srv_ctxcommit=0 gsp_phys_rmcall_gr_qmdwin=1 gsp_phys_rmcall_gr_shadow_win0=1 gsp_phys_rmcall_gr_lmem_en=1 gsp_phys_rmcall_gr_skedrec=1 gsp_phys_rmcall_gr_inst_sys=1 gsp_phys_rmcall_gr_r1_first=1 gsp_phys_gr_strict_reloc=0 gsp_phys_fault_relay=1 sema_bigcopy_log=512 sema_gl_xlate=1 gsp_phys_gr_min_data=0 gsp_phys_rmcall_gr_ptr_guest=0 sema_gr_xlate=1 sema_dbg=Y gsp_phys_gr_dec_log=32 gsp_phys_rmcall_gr_rel_mod=1 sema_vas_cand_ms=1000 sema_push_raw=64 binapi07_rep=0x0101 sema_push_raw_small=2000 sema_gr_copy_run_max=2 sema_kick_notify=Y sema_gl_idx_reloc=1 sema_gl_mme_reloc=1 sema_mme_census=1 sema_gr_setup_hold_ms=0 sema_attr_prelude_cap=1 sema_gl_attr_prelude=1 sema_gr_prelude_gate_ms=0 sema_gl_win_drop= sema_gl_attr_zero_fix=1 sema_gl_sdm_drop=1 sema_gl_miss_abort=1 sema_mme_fast_ms=2800 sema_gl_mme_sa_stub_all=N sema_gl_mme_keep_mask=0xffffffffffffffff sema_gl_mme_nop_drop=0x0 sema_gl_mme_hold_calls=1 sema_gl_mme_prelude=1 sema_gl_win_patch=124:0 sema_map_add_max=4096 sema_gl_mme_sa_rearm=0 sema_gl_sph_version=1 sema_gl_sph_bind=1 sema_gr_wedge_recover=1 sema_mme_prelude_cap=1 sema_gl_mme_track=0 sema_gl_mme_version=1 sema_gl_sph_canary=0 sema_gl_shader_exc=1 gsp_phys_rmcall_gr_pte_kind=0 gsp_phys_rmcall_ce_lane=1 sema_gl_mme_prelude_live_skip=1 sema_gl_mme_nop_pair=0 sema_mme_post_ms=20000 sema_gl_mme_seed=Y sema_gl_mme_seed_val=0x1207000 sema_gl_mme_state_seed=Y sema_mme_state_d26=0 sema_mme_state_d27=0 sema_mme_state_d28=0xffffffff sema_mme_state_d29=0 sema_mme_state_d2a=0x80000000 sema_gl_mme_prelude_pack=1 sema_gl_mme_pack_split=1 sema_gl_mme_iram_gate=1 sema_gl_mme_hold_fe_idle=0 sema_gl_mme_iram_gate_break=0 sema_gl_mme_iram_gate_build=0 sema_gl_wit_shown=1024 sema_gl_mme_keep_clamp=1 sema_gl_mme_golden=1 sema_gl_mme_golden_force=1 sema_sph_region_base=0x01500000 sema_gl_sph_8k=1 sema_mme_state_d19=0x1207000 sema_gl_mme_seed_xlat=1 sema_gl_mme_hold_strict=0 sema_gl_mme_hold_window=1 sema_gl_ps_hex=82140a0000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000aa0000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026730400ff0000001f000e0000020e0426730000ff000000a080000000620e0026730100ff000000a180020000a20e0026730200ff000000a280040000e20e0026730300ff000000a380060000220f0008730400040000000010000000641e00208200000400000000c0410000e42f08209201010400000000c0410000e44f0820a202020400000000c0410000c48f0020b203030400000000c0410000e20f014d790000000000000000800300ee0f0047790000f0ffffffffff830300c00f0018790000000000000000000000c00f0018790000000000000000000000c00f0018790000000000000000000000c00f0018790000000000000000000000c00f00 sema_gl_cb_copy_to=0x120700000 sema_gl_cb_src_va=0x0cd70000 sema_gl_sph_gs_img=1 sema_gl_sph_gs_maps=2 sema_gl_sph_gs_mode=1 sema_gl_sph_gs_addr=1 sema_gl_raster_prelude=1 sema_gl_sph_gs_ctx=3 sema_pub_adv=1 bus_gart_mb=4096 disp_caps_seed=1 disp_dbg=1 sema_gr_fb_push=1 sema_gl_draw_synth=1
+gsp_phys_gpu=1 gsp_phys_hazard_ack=1 gsp_phys_boot=1 gsp_phys_nocat=1 gsp_phys_fw=nvidia/tu102/gsp/gsp-570.144.bin gsp_phys_guest_mem=1 gsp_phys_gr_forward=1 cuda_bridge=0 gsp_phys_rmcall_engine=1 gsp_phys_rmcall_golden=1 gsp_phys_rmcall_gr_promote=25 gsp_phys_rmcall_fwclient_mask=0x601 gsp_phys_rmcall_vas_shared=1 gsp_phys_gpu=1 gsp_phys_hazard_ack=1 gsp_phys_boot=1 gsp_phys_nocat=1 gsp_phys_fw=nvidia/tu102/gsp/gsp-570.144.bin gsp_phys_guest_mem=1 gsp_phys_gr_forward=1 cuda_bridge=0 gsp_phys_rmcall_engine=1 gsp_phys_rmcall_golden=1 gsp_phys_rmcall_gr_promote=35 gsp_phys_rmcall_fwclient_mask=0xE3F gsp_phys_rmcall_vas_shared=1 gsp_phys_gr_nowrite_retries=0 gsp_phys_gr_retry_fast=1 gsp_phys_gr_first_poll_ms=2500 gsp_sema_winfill=1 gsp_sema_gr_swrel_gate=1 gsp_phys_rmcall_srv_ctxcommit=0 gsp_phys_rmcall_gr_qmdwin=1 gsp_phys_rmcall_gr_shadow_win0=1 gsp_phys_rmcall_gr_lmem_en=1 gsp_phys_rmcall_gr_skedrec=1 gsp_phys_rmcall_gr_inst_sys=1 gsp_phys_rmcall_gr_r1_first=1 gsp_phys_gr_strict_reloc=0 gsp_phys_fault_relay=1 sema_bigcopy_log=512 sema_gl_xlate=1 gsp_phys_gr_min_data=0 gsp_phys_rmcall_gr_ptr_guest=0 sema_gr_xlate=1 sema_dbg=Y gsp_phys_gr_dec_log=32 gsp_phys_rmcall_gr_rel_mod=1 sema_vas_cand_ms=1000 sema_push_raw=64 binapi07_rep=0x0101 sema_push_raw_small=2000 sema_gr_copy_run_max=2 sema_kick_notify=Y sema_gl_idx_reloc=1 sema_gl_mme_reloc=1 sema_mme_census=1 sema_gr_setup_hold_ms=0 sema_attr_prelude_cap=1 sema_gl_attr_prelude=1 sema_gr_prelude_gate_ms=0 sema_gl_win_drop= sema_gl_attr_zero_fix=1 sema_gl_sdm_drop=1 sema_gl_miss_abort=1 sema_mme_fast_ms=2800 sema_gl_mme_sa_stub_all=N sema_gl_mme_keep_mask=0xffffffffffffffff sema_gl_mme_nop_drop=0x0 sema_gl_mme_hold_calls=1 sema_gl_mme_prelude=1 sema_gl_win_patch=124:0 sema_map_add_max=4096 sema_gl_mme_sa_rearm=0 sema_gl_sph_version=1 sema_gl_sph_bind=1 sema_gr_wedge_recover=1 sema_mme_prelude_cap=1 sema_gl_mme_track=0 sema_gl_mme_version=1 sema_gl_sph_canary=0 sema_gl_shader_exc=1 gsp_phys_rmcall_gr_pte_kind=0 gsp_phys_rmcall_ce_lane=1 sema_gl_mme_prelude_live_skip=1 sema_gl_mme_nop_pair=0 sema_mme_post_ms=20000 sema_gl_mme_seed=Y sema_gl_mme_seed_val=0x1207000 sema_gl_mme_state_seed=Y sema_mme_state_d26=0 sema_mme_state_d27=0 sema_mme_state_d28=0xffffffff sema_mme_state_d29=0 sema_mme_state_d2a=0x80000000 sema_gl_mme_prelude_pack=1 sema_gl_mme_pack_split=1 sema_gl_mme_iram_gate=1 sema_gl_mme_hold_fe_idle=0 sema_gl_mme_iram_gate_break=0 sema_gl_mme_iram_gate_build=0 sema_gl_wit_shown=1024 sema_gl_mme_keep_clamp=1 sema_gl_mme_golden=1 sema_gl_mme_golden_force=1 sema_sph_region_base=0x01500000 sema_gl_sph_8k=1 sema_mme_state_d19=0x1207000 sema_gl_mme_seed_xlat=1 sema_gl_mme_hold_strict=0 sema_gl_mme_hold_window=1 sema_gl_ps_hex=82140a0000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000aa0000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026730400ff0000001f000e0000020e0426730000ff000000a080000000620e0026730100ff000000a180020000a20e0026730200ff000000a280040000e20e0026730300ff000000a380060000220f0008730400040000000010000000641e00208200000400000000c0410000e42f08209201010400000000c0410000e44f0820a202020400000000c0410000c48f0020b203030400000000c0410000e20f014d790000000000000000800300ee0f0047790000f0ffffffffff830300c00f0018790000000000000000000000c00f0018790000000000000000000000c00f0018790000000000000000000000c00f0018790000000000000000000000c00f00 sema_gl_cb_copy_to=0x120700000 sema_gl_cb_src_va=0x0cd70000 sema_gl_sph_gs_img=1 sema_gl_sph_gs_maps=2 sema_gl_sph_gs_mode=1 sema_gl_sph_gs_addr=1 sema_gl_raster_prelude=1 sema_gl_sph_gs_ctx=3 sema_pub_adv=1 bus_gart_mb=4096 disp_caps_seed=1 disp_dbg=1 sema_gr_fb_push=1 sema_gl_mme_pack_carry_client=1 sema_gl_draw_synth=1
sema_gr_grace_ms=500 sema_gl_mme_keep_done_across_recycle=1 sema_mme_prelude_cap_any=1
sema_gl_rt0_bind=1
sema_gl_mme_partial_keep_window=1 sema_gl_mme_pack_keep_gen=1 sema_gl_mme_cb_alias=1