1 files changed, 116 insertions, 86 deletions

diff --git a/nvdebug.h b/nvdebug.h
index 409b013..fd88b2e 100644
--- a/nvdebug.h
+++ b/nvdebug.h
@@ -10,6 +10,9 @@
  *
  * This function should not depend on any Linux-internal headers, and may be
  * included outside of nvdebug.
+ *
+ * Style: This file uses up to 82-character lines to accomodate 2-character
+ * indented quotes from open-gpu-doc without reflowing.
  */
 #include <linux/types.h>
 
@@ -53,7 +56,7 @@ struct gk20a;
                           on either runqueue.)"
 
   INST_PTR_LO           : lower 20 bits of the 4k-aligned instance block pointer
-  INST_PTR_HI           : upper 32 bit of instance block pointer
+  INST_PTR_HI           : upper 32 bits of instance block pointer
   INST_TARGET (TGI)     : aperture of the instance block
 
   USERD_PTR_LO          : upper 24 bits of the low 32 bits, of the 512-byte-aligned USERD pointer
@@ -78,14 +81,14 @@ static inline const char *target_to_text(enum INST_TARGET t) {
         }
 }
 
-// Support: Volta, Ampere, Turing, Ampere
+// Support: Volta, Ampere, Turing, Ampere, Hopper, Ada
 struct gv100_runlist_chan {
 // 0:63
         enum ENTRY_TYPE entry_type:1;
         uint32_t runqueue_selector:1;
-         uint32_t padding:2;
+         uint32_t :2;
         enum INST_TARGET inst_target:2;
-         uint32_t padding2:2;
+         uint32_t :2;
         uint32_t userd_ptr_lo:24;
         uint32_t userd_ptr_hi:32;
 // 64:128
@@ -95,15 +98,15 @@ struct gv100_runlist_chan {
 } __attribute__((packed));
 
 // Support: Fermi, Kepler*, Maxwell, Pascal
-// *In Kepler, inst fields may be unpopulated?
+// *On Kepler (and older?), inst fields are unpopulated (ex. gk104)
 struct gm107_runlist_chan {
         uint32_t chid:12;
-         uint32_t padding0:1;
+         uint32_t :1;
         enum ENTRY_TYPE entry_type:1;
-         uint32_t padding1:18;
+         uint32_t :18;
         uint32_t inst_ptr_lo:20;
         enum INST_TARGET inst_target:2;  // Totally guessing on this
-         uint32_t padding2:10;
+         uint32_t :10;
 } __attribute__((packed));
 
 #define gk110_runlist_chan gm107_runlist_chan
@@ -131,20 +134,20 @@ struct gm107_runlist_chan {
   than 1GHz."
 */
 
-// Support: Volta, Turing*, Ampere*
+// Support: Volta, Turing*, Ampere*, Hopper, Ada
 // *These treat bits 4:11 (8 bits) as GFID (unused)
 struct gv100_runlist_tsg {
 // 0:63
         enum ENTRY_TYPE entry_type:1;
-         uint64_t padding:15;
+         uint64_t :15;
         uint32_t timeslice_scale:4;
-         uint64_t padding2:4;
+         uint64_t :4;
         uint32_t timeslice_timeout:8;
         uint32_t tsg_length:8;
-         uint32_t padding3:24;
+         uint32_t :24;
 // 64:128
         uint32_t tsgid:12;
-         uint64_t padding4:52;
+         uint64_t :52;
 } __attribute__((packed));
 #define MAX_TSGID (1 << 12)
 
@@ -153,12 +156,12 @@ struct gv100_runlist_tsg {
 // Last 32 bits appear to contain an undocumented inst ptr
 struct gk110_runlist_tsg {
         uint32_t tsgid:12;
-         uint32_t padding0:1;
+         uint32_t :1;
         enum ENTRY_TYPE entry_type:1;
         uint32_t timeslice_scale:4;
         uint32_t timeslice_timeout:8;
         uint32_t tsg_length:6;
-         uint32_t padding1:32;
+         uint32_t :32;
 } __attribute__((packed));
 
 
@@ -175,11 +178,11 @@ enum PREEMPT_TYPE {PREEMPT_TYPE_CHANNEL = 0, PREEMPT_TYPE_TSG = 1};
 typedef union {
         struct {
                 uint32_t id:12;
-                 uint32_t padding:8;
+                 uint32_t :8;
                 bool is_pending:1;
-                 uint32_t padding2:3;
+                 uint32_t :3;
                 enum PREEMPT_TYPE type:2;
-                 uint32_t padding3:6;
+                 uint32_t :6;
         } __attribute__((packed));
         uint32_t raw;
 } pfifo_preempt_t;
@@ -220,7 +223,7 @@ typedef union {
                 bool runlist_11:1;
                 bool runlist_12:1;
                 bool runlist_13:1;
-                 uint32_t padding:18;
+                 uint32_t :18;
         } __attribute__((packed));
         uint32_t raw;
 } runlist_preempt_t;
@@ -313,7 +316,8 @@ typedef union {
   of this, the layout was modified to allow for larger runlist pointers (upper
   52 of 64 bits).
 
-  Support: Turing, Ampere, Lovelace?, Hopper?
+  Support: Turing, Ampere*, Hopper*, Ada*
+  *Only the register layout
 */
 // Support: Turing
 #define NV_PFIFO_RUNLIST_BASE_TU102(i) (0x00002B00+(i)*16) // Read/write
@@ -324,9 +328,9 @@ typedef union {
 typedef union {
         struct {
                 enum INST_TARGET target:2;
-                 uint32_t padding:10;
+                 uint32_t :10;
                 uint64_t ptr:28;
-                 uint32_t padding2:24;
+                 uint32_t :24;
         } __attribute__((packed));
         uint64_t raw;
 } runlist_base_tu102_t;
@@ -453,7 +457,7 @@ typedef union {
                 bool runlist_8:1;
                 bool runlist_9:1;
                 bool runlist_10:1;
-                 uint32_t padding:21;
+                 uint32_t :21;
         } __attribute__((packed));
         uint32_t raw;
 } runlist_disable_t;
@@ -546,17 +550,17 @@ typedef union {
                 uint32_t minor_revision:4;
                 uint32_t major_revision:4;
                  uint32_t reserved:4;
-                 uint32_t padding0:8;
+                 uint32_t :8;
                 uint32_t implementation:4;
                 uint32_t architecture:5;
-                 uint32_t padding1:3;
+                 uint32_t :3;
         } __attribute__((packed));
         uint32_t raw;
         // Arch << 4 + impl is also often used
         struct {
-                 uint32_t padding2:20;
+                 uint32_t :20;
                 uint32_t chip_id:9;
-                 uint32_t padding3:3;
+                 uint32_t :3;
         } __attribute__((packed));
 } mc_boot_0_t;
 
@@ -679,35 +683,35 @@ typedef union {
                 enum DEVICE_INFO_TYPE info_type:2;
                 bool fault_id_is_valid:1;
                 uint32_t fault_id:7;
-                 uint32_t padding0:2;
+                 uint32_t :2;
                 uint32_t pri_base:12;
-                 uint32_t padding1:2;
+                 uint32_t :2;
                 uint32_t inst_id:4;
                 uint32_t is_not_enum2:1;
                 bool has_next_entry:1;
         } __attribute__((packed));
         // ENUM type fields
         struct {
-                 uint32_t padding2:2;
+                 uint32_t :2;
                 bool reset_is_valid:1;
                 bool intr_is_valid:1;
                 bool runlist_is_valid:1;
                 bool engine_is_valid:1;
-                 uint32_t padding3:3;
+                 uint32_t :3;