3 files changed, 167 insertions, 35 deletions

diff --git a/device_info_procfs.c b/device_info_procfs.c
index 5fc417f..b139c36 100644
--- a/device_info_procfs.c
+++ b/device_info_procfs.c
@@ -27,38 +27,65 @@ struct file_operations nvdebug_read_reg32_file_ops = {
         .llseek = default_llseek,
 };
 
+typedef struct {
+        int idx; // Current index in the device_info table
+        int length; // Length of device_info table (including unpopulated entries)
+        int type_of_next_entry; // Only used on Ampere+ GPUs
+        bool has_next_entry; // Only used on Ampere+ GPUs for show() idempotence
+} device_info_iter;
+
 //// ==v== PTOP_DEVICE_INFO ==v== ////
 
 // Called to start or resume a sequence. Prior to 4.19, *pos is unreliable.
-// Initializes iterator `idx` state and returns it. Ends sequence on NULL.
+// Initializes iterator `iter` state and returns it. Ends sequence on NULL.
 static void* device_info_file_seq_start(struct seq_file *s, loff_t *pos) {
-        static int idx;
-        // If start of sequence, reset `idx`
-        if (*pos == 0)
-                idx = 0;
-        // Number of possible info entries is fixed, and list is sparse
-        if (idx >= NV_PTOP_DEVICE_INFO__SIZE_1)
+        static device_info_iter iter;
+        // If freshly starting a sequence, reset the iterator
+        if (*pos == 0) {
+                struct nvdebug_state *g = &g_nvdebug_state[seq2gpuidx(s)];
+                iter.idx = 0;
+                iter.type_of_next_entry = 0;
+                iter.has_next_entry = 0;
+                // On Ampere+, the device_info table length can vary
+                if (g->chip_id >= NV_CHIP_ID_AMPERE)
+                        iter.length = NV_PTOP_DEVICE_INFO__SIZE_1_GA100(g);
+                else
+                        iter.length = NV_PTOP_DEVICE_INFO__SIZE_1_GK104;
+        }
+        // Number of possible info entries is fixed, and list is sparse, so stop
+        // iterating only when all entries have been checked, rather than on the first
+        // empty entry.
+        if (iter.idx >= iter.length)
                 return NULL;
-        return &idx;
+        return &iter;
 }
 
-// Steps to next record. Returns new value of `idx`.
+// Steps to next record. Returns `&iter` (address should not change)
 // Calls show() on non-NULL return
-static void* device_info_file_seq_next(struct seq_file *s, void *idx,
+static void* device_info_file_seq_next(struct seq_file *s, void *iter_raw,
                                        loff_t *pos) {
+        device_info_iter *iter = (device_info_iter*)iter_raw;
         (*pos)++; // Required by seq interface
-        // Number of possible info entries is fixed, and list is sparse
-        if ((*(int*)idx)++ >= NV_PTOP_DEVICE_INFO__SIZE_1)
+        // Number of possible info entries is fixed, and list is sparse, so stop
+        // iterating only when all entries have been checked, rather than on the first
+        // empty entry.
+        if (++iter->idx >= iter->length)
                 return NULL;
-        return idx;
+        // The info_type field is not available in the Ampere device_info data, so
+        // it must be inferred. NOP for older devices (cheaper than another branch).
+        // This has to be here (rather than in the show function) to support the
+        // idempotence requirements of show() in the seq_file interface.
+        iter->type_of_next_entry = iter->has_next_entry ? iter->type_of_next_entry + 1 : 0;
+        return iter;
 }
 
-// Print info at index *idx. Returns non-zero on error.
-static int device_info_file_seq_show(struct seq_file *s, void *idx) {
-        ptop_device_info_t curr_info;
+// Print info at iter->idx for Kepler--Turing GPUs. Returns non-zero on error.
+// Implementation of this function must be idempotent
+static int device_info_file_seq_show_gk104(struct seq_file *s, void *iter_raw) {
+        device_info_iter *iter = (device_info_iter*)iter_raw;
+        ptop_device_info_gk104_t curr_info;
         struct nvdebug_state *g = &g_nvdebug_state[seq2gpuidx(s)];
-
-        curr_info.raw = nvdebug_readl(g, NV_PTOP_DEVICE_INFO(*(int*)idx));
+        curr_info.raw = nvdebug_readl(g, NV_PTOP_DEVICE_INFO_GK104(iter->idx));
         // Check for read errors
         if (curr_info.raw == -1)
                 return -EIO;
@@ -90,7 +117,7 @@ static int device_info_file_seq_show(struct seq_file *s, void *idx) {
                 if (curr_info.engine_type < ENGINE_TYPES_LEN)
                         seq_printf(s, "%s)\n", ENGINE_TYPES_NAMES[curr_info.engine_type]);
                 else
-                        seq_printf(s, "Unknown Engine, introduced post-Ampere)\n");
+                        seq_printf(s, "Unknown Historical)\n");
                 break;
         case INFO_TYPE_NOT_VALID:
         default:
@@ -104,18 +131,81 @@ static int device_info_file_seq_show(struct seq_file *s, void *idx) {
         return 0;
 }
 
+// Print info at iter->idx for Ampere+ GPUs. Returns non-zero on error.
+// Implementation of this function must be idempotent
+static int device_info_file_seq_show_ga100(struct seq_file *s, void *iter_raw) {
+        device_info_iter *iter = (device_info_iter*)iter_raw;
+        ptop_device_info_ga100_t curr_info;
+        struct nvdebug_state *g = &g_nvdebug_state[seq2gpuidx(s)];
+        curr_info.raw = nvdebug_readl(g, NV_PTOP_DEVICE_INFO_GA100(iter->idx));
+        // Check for read errors
+        if (curr_info.raw == -1)
+                return -EIO;
+
+        // Update tracking data only used by next(); allows preserving idempotence
+        iter->has_next_entry = curr_info.has_next_entry;
+        // Silently skip empty entries
+        if (curr_info.raw == 0)
+                return 0;
+        // In nvdebug, an entry is considered invalid if it does not consist of at
+        // least two rows. So, if this is the first row of an entry, but another row
+        // is not indicated, this entry is invalid and should be skipped.
+        if (iter->type_of_next_entry == 0 && !curr_info.has_next_entry) {
+                printk(KERN_WARNING "[nvdebug] Skipping seemingly-invalid device_info entry (idx: %d, raw: %#0x)\n", iter->idx, curr_info.raw);
+                return 0;
+        }
+
+        // Parse and print the data
+        // Note: The goal of this interface is to present useful information to
+        // a human user, NOT to provide a stable format for scripts to parse.
+        // Because of this, we favor accurately printing the data in each entry,
+        // rather than providing stable (if imperfectly correct) field names
+        switch(iter->type_of_next_entry) {
+        case 0:
+                seq_printf(s, "| Engine Type:     %3d (", curr_info.engine_type);
+                if (curr_info.engine_type < ENGINE_TYPES_LEN)
+                        seq_printf(s, "%s)\n", ENGINE_TYPES_NAMES[curr_info.engine_type]);
+                else
+                        seq_printf(s, "Unknown, introduced post-Lovelace)\n");
+                seq_printf(s, "|           instance %d\n", curr_info.inst_id);
+                seq_printf(s, "| Fault ID:       %4d\n", curr_info.fault_id);
+                break;
+        case 1:
+                seq_printf(s, "| BAR0 Base %#.8x\n", curr_info.pri_base << 8);
+                seq_printf(s, "| Reset ID:        %3d\n", curr_info.reset_id);
+                seq_printf(s, "| Is Engine:         %1d\n", curr_info.is_engine);
+
+                break;
+        case 2:
+                seq_printf(s, "| Runlist Eng. ID:   %1d\n", curr_info.rleng_id);
+                // Theoretically, we could extract an ID from the runlist RAM
+                seq_printf(s, "| RL Base:  %#.8x\n", curr_info.runlist_pri_base << 10);
+                break;
+        default:
+                printk(KERN_WARNING "[nvdebug] Skipping unexpected continuation of device_info entry (idx: %d, raw: %#0x)\n", iter->idx, curr_info.raw);
+        }
+
+        // Draw a line between each device entry
+        if (!curr_info.has_next_entry)
+                seq_printf(s, "+---------------------+\n");
+        return 0;
+}
+
 static void device_info_file_seq_stop(struct seq_file *s, void *idx) {
-        // No cleanup needed
+        // No cleanup needed
 }
 
-static const struct seq_operations device_info_file_seq_ops = {
+static struct seq_operations device_info_file_seq_ops = {
         .start = device_info_file_seq_start,
         .next = device_info_file_seq_next,
         .stop = device_info_file_seq_stop,
-        .show = device_info_file_seq_show,
 };
 
 static int device_info_file_open(struct inode *inode, struct file *f) {
+        if (g_nvdebug_state[file2parentgpuidx(f)].chip_id >= NV_CHIP_ID_AMPERE)
+                device_info_file_seq_ops.show = device_info_file_seq_show_ga100;
+        else
+                device_info_file_seq_ops.show = device_info_file_seq_show_gk104;
         return seq_open(f, &device_info_file_seq_ops);
 }
 
diff --git a/nvdebug.h b/nvdebug.h
index 3860c2e..b79ede1 100644
--- a/nvdebug.h
+++ b/nvdebug.h
@@ -390,6 +390,7 @@ typedef union {
 #define NV_CHIP_ID_GV11B 0x15B // Jetson Xavier embedded GPU
 #define NV_CHIP_ID_KEPLER 0x0E0
 #define NV_CHIP_ID_VOLTA 0x140
+#define NV_CHIP_ID_AMPERE 0x170
 
 inline static const char* ARCH2NAME(uint32_t arch) {
         switch (arch) {
@@ -461,8 +462,7 @@ typedef union {
         } __attribute__((packed));
 } mc_boot_0_t;
 
-
-/* GPU engine information and control register offsets
+/* GPU engine information and control register offsets (GPU TOPology)
   Each engine is described by one or more entries (terminated by an entry with
   the `has_next_entry` flag unset) in the fixed-size PTOP_DEVICE_INFO table. A
   typical device, such as the graphics/compute engine and any copy engines, are
@@ -473,6 +473,12 @@ typedef union {