vgsp: per-channel C597 attachment table, sema_gl_win_drop strip knob, WINPROBE; strip experiment: binds-only windows retire, full draws die in FECS switch-in (SESSION 153 r955-r958)

1 files changed, 156 insertions, 14 deletions

diff --git a/kernel/gsp_phys_booter.c b/kernel/gsp_phys_booter.c
index 5850f00..42a5186 100644
--- a/kernel/gsp_phys_booter.c
+++ b/kernel/gsp_phys_booter.c
@@ -19230,7 +19230,7 @@ gsp_phys_gr_m91_fault_cap(const struct gsp_phys_gr_submit *req,
 	fn = &gsp_phys_fault_notes[(gsp_phys_fault_note_next +
 				    GSP_PHYS_FAULT_NOTE_MAX - 1u) %
 				   GSP_PHYS_FAULT_NOTE_MAX];
-	pr_info("vgsp-m91: FAULT-CAP ok=%u faults=%u retry=%s attempts=%u qmd=0x%llx qmd64=%s prog_w48=0x%08x w49=0x%08x prog_va=0x%llx prog_pa=0x%llx code_src=%s off=0x%x code64=%s fault_et=0x%x fault_chid=%u fault_err=\"%.48s\"\n",
+	pr_info("vgsp-m91: FAULT-CAP ok=%u faults=%u retry=%s attempts=%u qmd=0x%llx qmd64=%s prog_w48=0x%08x w49=0x%08x prog_va=0x%llx prog_pa=0x%llx code_src=%s off=0x%x code64=%s fault_et=0x%x fault_chid=%u fault_err=\"%.200s\"\n",
 		ok ? 1u : 0u, faults,
 		fast ? "fast-rearm" : (rearmed ? "resched/fresh-entry" : "none"),
 		attempts, qmd_dst, qhex, qmd[48], qmd[49], pva, ppa, src, off,
@@ -19477,22 +19477,87 @@ static bool gsp_phys_rmcall_gr_3d_reloc(u32 *up_w, u32 *lo_w,
  * number of relocated pair(s). Run widths follow the service's decoder:
  * op 1/3/5 are 1+count dwords, everything else resyncs one dword.
  */
+/*
+ * SESSION 153-CONTINUED-13 (draw-window strip experiment): comma-separated
+ * hex NVC597 method byte-addresses to REMOVE from a captured 3D window
+ * before the verbatim replay (whole methods - a dropped run takes its
+ * count data words with it). Answers whether a DRAW window's non-retire
+ * lives in the draw content (BEGIN/END/immediate vertices/DRAW_ARRAY) or
+ * in the state binds/method-stream shape. Empty = off (historical
+ * behaviour); live-tunable via sysfs so one boot can sweep the variants.
+ */
+static char *gsp_phys_rmcall_gr_win_drop;
+module_param_named(sema_gl_win_drop, gsp_phys_rmcall_gr_win_drop, charp, 0644);
+MODULE_PARM_DESC(sema_gl_win_drop,
+	"Hex method byte-addresses (comma-separated) to strip from a captured 3D window before replay (draw isolation; default empty)");
+
+static bool gsp_phys_rmcall_gr_win_drop_match(u32 addr)
+{
+	const char *p = gsp_phys_rmcall_gr_win_drop;
+	u32 n = 0;
+
+	if (!p || !*p)
+		return false;
+	while (*p && n < 64) {
+		u32 v = 0;
+		u32 digits = 0;
+
+		while (*p == ' ' || *p == ',' || *p == ':' || *p == ';')
+			p++;
+		for (;;) {
+			char c = *p;
+			u32 d;
+
+			if (c >= '0' && c <= '9')
+				d = c - '0';
+			else if (c >= 'a' && c <= 'f')
+				d = c - 'a' + 10;
+			else if (c >= 'A' && c <= 'F')
+				d = c - 'A' + 10;
+			else
+				break;
+			if (v <= 0xfffffffu)
+				v = (v << 4) | d;
+			p++;
+			digits++;
+		}
+		if (!digits)
+			break;
+		n++;
+		if (v == addr)
+			return true;
+	}
+	return false;
+}
+
 static u32 gsp_phys_rmcall_gr_3d_patch_window(const u32 *in, u32 n, u32 *out,
+					      u32 *out_n, u32 *n_dropped,
 					      const struct gsp_phys_gr_submit *req,
 					      u32 *n_shadow)
 {
-	u32 off = 0, reloc = 0;
+	u32 off = 0, wout = 0, reloc = 0, dropped = 0;
 
-	memcpy(out, in, (size_t)n * 4);
+	*out_n = n;
+	*n_dropped = 0;
 	while (off < n) {
-		u32 hdr = out[off];
+		u32 hdr = in[off];
 		u32 op = (hdr >> 29) & 0x7u;
 		u32 cnt = (hdr >> 16) & 0xfffu;
 		u32 addr = (hdr & 0x1fffu) << 2;
+		u32 span = 1u;
 
 		if ((op == 1 || op == 3 || op == 5) && cnt &&
+		    off + 1u + cnt <= n)
+			span = 1u + cnt;
+		if (gsp_phys_rmcall_gr_win_drop_match(addr)) {
+			dropped++;
+			off += span;
+			continue;
+		}
+		memcpy(&out[wout], &in[off], (size_t)span * 4);
+		if ((op == 1 || op == 3 || op == 5) && cnt &&
 		    off + 1u + cnt <= n) {
-			u32 *d = &out[off + 1];
+			u32 *d = &out[wout + 1];
 			u32 lo_i = 0;
 			bool pair = false;
 
@@ -19533,15 +19598,34 @@ static u32 gsp_phys_rmcall_gr_3d_patch_window(const u32 *in, u32 n, u32 *out,
 				lo_i = 0;
 				pair = true;
 			}
-			if (pair && gsp_phys_rmcall_gr_3d_reloc(&d[lo_i],
-								&d[lo_i + 1],
-								req, n_shadow))
-				reloc++;
+			if (pair) {
+				u64 pva = ((u64)(d[lo_i] & 0xffu) << 32) |
+					  (u64)(d[lo_i + 1] & 0xfffffffcu);
+				bool ok = gsp_phys_rmcall_gr_3d_reloc(
+					&d[lo_i], &d[lo_i + 1], req,
+					n_shadow);
+				static u32 pair_log;
+
+				if (ok)
+					reloc++;
+				if (pair_log < 48) {
+					pair_log++;
+					pr_info("vgsp-gr: pair addr=0x%x va=0x%llx -> %s0x%llx\n",
+						addr, pva, ok ? "" :
+						"MISS ",
+						((u64)(d[lo_i] & 0xffu) << 32) |
+						(u64)(d[lo_i + 1] & 0xfffffffcu));
+				}
+			}
+			wout += span;
 			off += 1u + cnt;
 			continue;
 		}
 		off++;	/* header-only / resync, like the service decoder */
+		wout++;
 	}
+	*out_n = wout;
+	*n_dropped = dropped;
 	return reloc;
 }
 
@@ -20799,14 +20883,28 @@ gr_page_unmapped:
 	 * held, before the method block is built.
 	 */
 	if (stream3d) {
+		u32 win_n = req->stream_n;
+		u32 ndrop = 0;
 		u32 nrel = gsp_phys_rmcall_gr_3d_patch_window(
-			req->stream, req->stream_n, stream_patch, req,
-			&n_shadow);
+			req->stream, req->stream_n, stream_patch, &win_n,
+			&ndrop, req, &n_shadow);
 
 		win3d = stream_patch;
-		win3d_n = req->stream_n;
-		pr_info("vgsp-gr: 3D window relocated %u operand pair(s) to shadow VAs (window=%u shadow=%u)\n",
-			nrel, win3d_n, n_shadow);
+		win3d_n = win_n;
+		pr_info("vgsp-gr: 3D window relocated %u operand pair(s) to shadow VAs (window=%u shadow=%u dropped=%u)\n",
+			nrel, win3d_n, n_shadow, ndrop);
+		if (ndrop) {
+			static u32 gr3d_drop_log;
+
+			if (gr3d_drop_log < 32) {
+				gr3d_drop_log++;
+				pr_info("vgsp-gr: 3D win-drop h=0x%x push=0x%llx raw=%u kept=%u dropped=%u list=[%s]\n",
+					req->h_object, req->push_va,
+					req->stream_n, win3d_n, ndrop,
+					gsp_phys_rmcall_gr_win_drop ?
+						gsp_phys_rmcall_gr_win_drop : "");
+			}
+		}
 		/*
 		 * SESSION 153-CONTINUED-11: bounded raw window dump - the
 		 * exact C597 method stream the engine walks (program binds
@@ -21252,6 +21350,50 @@ gr_page_unmapped:
 			else
 				w0 = READ_ONCE(*(u32 *)sem_va);
 		}
+		/*
+		 * SESSION 153-CONTINUED-13: early PBDMA fetch probe for a 3D
+		 * stream launch - where is the front end while a DRAW window
+		 * does not retire? One shot per launch at ~150 ms and ~1.2 s
+		 * (5 ms poll), bounded per boot. pbfetch inside the module
+		 * pushbuffer page = the walk/exec is stuck in our block;
+		 * pbfetch past it = the whole stream was decoded and the
+		 * stall is in execution/completion.
+		 */
+		if (stream3d && bar0 &&
+		    (sked_tick == 30 || sked_tick == 240)) {
+			static u32 winprobe_log;
+			u32 pi;
+
+			if (winprobe_log < 10) {
+				winprobe_log++;
+				pr_info("vgsp-gr: WINPROBE +%ums push=0x%llx words=%u block_dma=0x%llx grfifo=%08x trapped=%08x trapped_lo=%08x\n",
+					sked_tick * GSP_PHYS_RMCALL_POLL_MS,
+					req->push_va, words, sub.pb_dma,
+					ioread32(bar0 + 0x00400504u),
+					ioread32(bar0 + 0x00400704u),
+					ioread32(bar0 + 0x00400708u));
+				for (pi = 0; pi < 12; pi++) {
+					u32 b = 0x40000u + pi * 0x2000u;
+					u32 intr0 = ioread32(bar0 + b + 0x108u);
+					u32 gpf = ioread32(bar0 + b + 0x050u);
+					u32 pbf = ioread32(bar0 + b + 0x054u);
+					u32 pbfhi = ioread32(bar0 + b + 0x058u);
+					u32 hdrsh = ioread32(bar0 + b + 0x118u);
+					u64 fetch64 =
+						((u64)(pbfhi & 0xffu) << 32) |
+						(u64)(pbf & ~3u);
+
+					if (!intr0 && !gpf && !pbf && !hdrsh)
+						continue;
+					pr_info("vgsp-gr: WINPROBE P%u intr0=%08x gp_put=%u pbfetch=0x%llx hdr=%08x(%s m=0x%x cnt=%u sub=%u)\n",
+						pi, intr0, gpf, fetch64, hdrsh,
+						gsp_phys_pbdma_type_name(hdrsh >> 29),
+						(hdrsh & 0x1fffu) << 2,
+						(hdrsh >> 16) & 0xfffu,
+						(hdrsh >> 13) & 7u);
+				}
+			}
+		}
 		if (ch_rel_hpa)
 			w1 = READ_ONCE(*(u32 *)((u8 *)__va(ch_rel_hpa) +
 						ch_rel_off));