Return const pointers to string constants.

Also update how Instance Pointers are aligned in the runlist output
to make them more easily distinguishable from other fields.

2 files changed, 10 insertions, 11 deletions

diff --git a/nvdebug.h b/nvdebug.h
index 926419d..f0662cd 100644
--- a/nvdebug.h
+++ b/nvdebug.h
@@ -67,7 +67,7 @@ struct gk20a;
 */
 enum ENTRY_TYPE {ENTRY_TYPE_CHAN = 0, ENTRY_TYPE_TSG = 1};
 enum INST_TARGET {TARGET_VID_MEM = 0, TARGET_SYS_MEM_COHERENT = 2, TARGET_SYS_MEM_NONCOHERENT = 3};
-static inline char* target_to_text(enum INST_TARGET t) {
+static inline const char *target_to_text(enum INST_TARGET t) {
         switch (t) {
                 case TARGET_VID_MEM:
                         return "VID_MEM";
@@ -76,7 +76,6 @@ static inline char* target_to_text(enum INST_TARGET t) {
                 case TARGET_SYS_MEM_NONCOHERENT:
                         return "SYS_MEM_NONCOHERENT";
                 default:
-                        printk(KERN_WARNING "[nvdebug] Invalid aperture!\n");
                         return "INVALID";
         }
 }
@@ -855,7 +854,7 @@ enum PD_TARGET {
         PTE_AND_TARGET_SYS_MEM_COHERENT = 5,  // b101
         PTE_AND_TARGET_SYS_MEM_NONCOHERENT = 7,  // b111
 };
-static inline char* pd_target_to_text(enum PD_TARGET t) {
+static inline const char *pd_target_to_text(enum PD_TARGET t) {
         switch (t) {
                 case PD_AND_TARGET_INVALID:
                         return "INVALID";
@@ -871,8 +870,7 @@ static inline char* pd_target_to_text(enum PD_TARGET t) {
                 case PTE_AND_TARGET_SYS_MEM_NONCOHERENT:
                         return "SYS_MEM_NONCOHERENT";
                 default:
-                        printk(KERN_WARNING "[nvdebug] Invalid aperture!\n");
-                        return NULL;
+                        return "UNKNOWN";
         }
 }
 
diff --git a/runlist_procfs.c b/runlist_procfs.c
index 7dedee3..e50c34a 100644
--- a/runlist_procfs.c
+++ b/runlist_procfs.c
@@ -15,8 +15,9 @@
 #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;
-        char *loc_txt;
-        u64 instance_ptr;
+        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)
@@ -34,8 +35,8 @@ static int runlist_detail_seq_show_chan(struct seq_file *s, struct nvdebug_state
         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|   %#018llx|\n", prefix, instance_ptr);
+        seq_printf(s, "%s| %20s|\n", prefix, loc_txt);
         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"
@@ -155,8 +156,8 @@ static int runlist_file_seq_show(struct seq_file *s, void *raw_rl_iter) {
                         seq_printf(s, "%s| Runqueue Selector: %d|\n", indt,
                                    ((struct gv100_runlist_chan*)entry)->runqueue_selector);
                 seq_printf(s, "%s| Instance PTR:       |\n", indt);
-                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|   %#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
         }