From a06d4b13cf209c2ce74a79a5565787e2edcbf0d8 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Rasmusson Date: Mon, 16 Nov 2026 19:39:57 -0500 Subject: vgsp: eng89r - revert to the interior CALL write; carry its data word through hold/save --- kernel/gsp_phys_booter.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'kernel/gsp_phys_booter.c') diff --git a/kernel/gsp_phys_booter.c b/kernel/gsp_phys_booter.c index 4918731..36ccbe1 100644 --- a/kernel/gsp_phys_booter.c +++ b/kernel/gsp_phys_booter.c @@ -19165,17 +19165,22 @@ static bool gsp_phys_gr_mme_window_has_draw_ia(const u32 *win, u32 n) r + 1u + cnt <= n) span = 1u + cnt; /* - * eng89p: only the RUN HEADER's own method selects a CALL. - * The client's DRAW_IAB call is a distinct header - * (0xa00a0e44: op=5 ONE_INCR, cnt=10, m0=0x3910). Matching - * interior words of a wide op=1/3 run produced the c997-c1001 - * false positive (a 4353-word state run with m0=0x804 whose - * interior offset happens to be 0x3910), so a real CALL never - * reached the held-call path. + * eng89r: the DRAW CALL is an interior method of the wide + * op=1/3 run (m0 + 4*k), not a run header. c1000's header + * (off=58, m0=0x804, op=1, cnt=4352) carries 0x3910 at + * k=(0x3910-0x804)/4 with the macro data/address in the + * following word. Only count it when that data word exists + * (k + 1 < span), so a bare method mention is not a CALL. */ - if (((h & 0xfffu) << 2) == 0x3800u + 34u * 8u) - return true; - (void)k; + for (k = 0; k < span; k++) { + u32 m = ((h & 0xfffu) << 2) + 4u * k; + + if (k && op != 1u && op != 3u) + break; + if (m == 0x3800u + 34u * 8u && + k + 1u < span && r + k + 1u < n) + return true; + } r += span; } return false; @@ -19455,8 +19460,20 @@ static void gsp_phys_gr_mme_call_census(const struct gsp_phys_gr_submit *req, char abuf[12 * 10 + 1]; u32 ai, alen = min_t(u32, span - 1u, 12u), apos = 0; + u32 data = 0; slot34 = 1; + /* + * eng89r: the CALL is an interior method + * (m0 + 4*k) of a wide op=1/3 run; the word + * after the 0x3910 write is the macro + * data/address the client calls. `at` is + * the window word of the write. + */ + if (k + 1u < span) + data = req->stream[r + k + 1u]; + pr_info("vgsp-gr: MME-CALL-ARGS slot=34 data=0x%x at=%u\n", + data, r + k); for (ai = 0; ai < alen; ai++) apos += scnprintf(abuf + apos, sizeof(abuf) - apos, -- cgit v1.2.3