1 files changed, 8 insertions, 28 deletions

diff --git a/runlist_procfs.c b/runlist_procfs.c
index f569c77..986465d 100644
--- a/runlist_procfs.c
+++ b/runlist_procfs.c
@@ -6,51 +6,32 @@
 #define RUNLIST_PROCFS_NAME "runlist"
 #define DETAILED_CHANNEL_INFO
 
+#ifdef DETAILED_CHANNEL_INFO
 /* Print channel details using PCCSR (Programmable Channel Control System RAM?)
  * @param s      Pointer to state from seq_file subsystem to pass to seq_printf
  * @param g      Pointer to our internal GPU state
  * @param chid   ID of channel to print details on, range [0, 512)
  * @param prefix Text string to prefix each line with, or empty string
  */
-#ifdef DETAILED_CHANNEL_INFO
 static int runlist_detail_seq_show_chan(struct seq_file *s, struct nvdebug_state *g, uint32_t chid, char *prefix) {
         channel_ctrl_t chan;
-        const char *loc_txt;
         uint64_t instance_ptr;
 
-        chan.raw = nvdebug_readq(g, NV_PCCSR_CHANNEL_INST(chid));
-        loc_txt = target_to_text(chan.inst_target);
-        if (!loc_txt)
+        if ((chan.raw = nvdebug_readq(g, NV_PCCSR_CHANNEL_INST(chid))) == -1)
                 return -EIO;
-        instance_ptr = chan.inst_ptr;
-        instance_ptr <<= 12;
+        instance_ptr = (uint64_t)chan.inst_ptr << 12;
+        // Don't print write-only fields
         seq_printf(s, "%s+- Channel Info %-4d -+\n", prefix, chid);
         seq_printf(s, "%s| Enabled:           %d|\n", prefix, chan.enable);
         seq_printf(s, "%s| Next:              %d|\n", prefix, chan.next);
-        seq_printf(s, "%s| Force CTX Reload:  %d|\n", prefix, chan.force_ctx_reload);
-        seq_printf(s, "%s| Enable set:        %d|\n", prefix, chan.enable_set);
-        seq_printf(s, "%s| Enable clear:      %d|\n", prefix, chan.enable_clear);
         seq_printf(s, "%s| PBDMA Faulted:     %d|\n", prefix, chan.pbdma_faulted);
         seq_printf(s, "%s| ENG Faulted:       %d|\n", prefix, chan.eng_faulted);
         seq_printf(s, "%s| Status:           %2d|\n", prefix, chan.status);
         seq_printf(s, "%s| Busy:              %d|\n", prefix, chan.busy);
         seq_printf(s, "%s| Instance PTR:       |\n", prefix);
         seq_printf(s, "%s|   %#018llx|\n", prefix, instance_ptr);
-        seq_printf(s, "%s| %20s|\n", prefix, loc_txt);
+        seq_printf(s, "%s| %20s|\n", prefix, target_to_text(chan.inst_target));
         seq_printf(s, "%s| Instance bound:    %d|\n", prefix, chan.inst_bind);
-        // START TEMP
-        // "runlist_id -1 is synonym for the ENGINE_GR_GK20A runlist id"
-        // GR, GRCE, and ASYNC_CE
-        // Note that this appears to be broken??
-        // Peek into the channel instance RAM
-        if (chan.inst_target == TARGET_SYS_MEM_COHERENT) {
-                seq_printf(s, "%s| Target Engine:    %2d|\n", prefix, *(uint32_t*)phys_to_virt(instance_ptr + 4/*bytes for 32bits*/*43/*NV_RAMFC_TARGET*/) & 0x1f);
-                seq_printf(s, "%s| PDB LO:   %#08x|\n", prefix, *(uint32_t*)phys_to_virt(instance_ptr + 4/*bytes for 32bits*/*128/*NV_RAMIN_PAGE_DIR_BASE_LO*/) & 0xfffff000);
-                seq_printf(s, "%s| Num subcontexts:  %2ld|\n", prefix, hweight64(*(uint64_t*)phys_to_virt(instance_ptr + 4/*bytes for 32bits*/*166/*NV_RAMIN_SC_PDB_VALID*/)));
-                // This appears to be unset on Xavier
-                //seq_printf(s, "%s| PAS ID:     %8ld|\n", prefix, *(uint32_t*)phys_to_virt(instance_ptr + 4/*bytes for 32bits*/*135/*NV_RAMIN_PASID*/) & 0xfffff);
-        }
-        // END TEMP
         seq_printf(s, "%s+---------------------+\n", prefix);
         return 0;
 }
@@ -136,14 +117,14 @@ static int runlist_file_seq_show(struct seq_file *s, void *raw_rl_iter) {
                 seq_printf(s, "+---------------------+\n");
         } else {
                 char *indt = "";
-#ifndef DETAILED_CHANNEL_INFO
                 u64 instance_ptr = 0;
-#endif
+
                 if (rl_iter->entries_left_in_tsg)
                         indt = "  ";
 #ifdef DETAILED_CHANNEL_INFO
                 runlist_detail_seq_show_chan(s, g, chid(g, entry), indt);
-#else
+                return 0;
+#endif
                 // Reconstruct pointer to channel instance block
                 if (g->chip_id >= NV_CHIP_ID_VOLTA) {
                         instance_ptr = ((struct gv100_runlist_chan*)entry)->inst_ptr_hi;
@@ -159,7 +140,6 @@ static int runlist_file_seq_show(struct seq_file *s, void *raw_rl_iter) {
                 seq_printf(s, "%s|   %#018llx|\n", indt, instance_ptr);
                 seq_printf(s, "%s| %20s|\n", indt, target_to_text(inst_target(g, entry)));
                 seq_printf(s, "%s+---------------------+\n", indt);
-#endif
         }
         return 0;
 }