lib: various tweaks

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

34 files changed, 38 insertions, 39 deletions

diff --git a/bin/nv_disp.c b/bin/nv_disp.c
index 9a6c481f8..9141bed64 100644
--- a/bin/nv_disp.c
+++ b/bin/nv_disp.c
@@ -28,7 +28,7 @@ nv_disp(struct nvif_device *device, u16 mthd, u32 data)
 	}
 }
 
-#define FMTADDR    "0x%04lx"
+#define FMTADDR    "0x%04llx"
 #define FMTDATA    "0x%08x"
 #define NAME       "nv_disp"
 #define CAST       u32
diff --git a/bin/nv_perfmon.c b/bin/nv_perfmon.c
index ddb051011..c04fd5e57 100644
--- a/bin/nv_perfmon.c
+++ b/bin/nv_perfmon.c
@@ -588,7 +588,7 @@ ui_main_redraw(struct ui_table *t)
 		set_field_userptr(f[0], item);
 		field_opts_on(f[0], O_VISIBLE | O_ACTIVE);
 
-		snprintf(b, sizeof(b), "%10u %10u %6.2f %16"PRIu64,
+		snprintf(b, sizeof(b), "%10u %10u %6.2f %16llx",
 			    item->clk, item->ctr,
 			    (float)item->ctr * 100.0 / item->clk, item->incr);
 		set_field_buffer(f[1], 0, b);
diff --git a/bin/nv_rd08.c b/bin/nv_rd08.c
index f368951fa..30196d41b 100644
--- a/bin/nv_rd08.c
+++ b/bin/nv_rd08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%06lx"
+#define FMTADDR "0x%06llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_rd08"
 #define CAST    u8
diff --git a/bin/nv_rd16.c b/bin/nv_rd16.c
index 0b48a0b4f..61079bcda 100644
--- a/bin/nv_rd16.c
+++ b/bin/nv_rd16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%06lx"
+#define FMTADDR "0x%06llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_rd16"
 #define CAST    u16
diff --git a/bin/nv_rd32.c b/bin/nv_rd32.c
index 88022a950..f03739523 100644
--- a/bin/nv_rd32.c
+++ b/bin/nv_rd32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%06lx"
+#define FMTADDR "0x%06llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_rd32"
 #define CAST    u32
diff --git a/bin/nv_rdfunc.h b/bin/nv_rdfunc.h
index 7af8cb371..4668bf497 100644
--- a/bin/nv_rdfunc.h
+++ b/bin/nv_rdfunc.h
@@ -70,10 +70,10 @@ main(int argc, char **argv)
 		return ret;
 
 	while (rstr && *rstr != '\0') {
-		unsigned long cnt = 1;
-		unsigned long reg;
+		u32 cnt = 1;
+		u64 reg;
 
-		if ((reg = strtoul(rstr, &rstr, 0)) == ULONG_MAX)
+		if ((reg = strtoull(rstr, &rstr, 0)) == ULONG_MAX)
 			return 1;
 
 		if (*rstr == '/') {
diff --git a/bin/nv_rf08.c b/bin/nv_rf08.c
index 864b98ca6..467851ed0 100644
--- a/bin/nv_rf08.c
+++ b/bin/nv_rf08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_rf08"
 #define CAST    u8
diff --git a/bin/nv_rf16.c b/bin/nv_rf16.c
index d40c6e20f..adaab2a05 100644
--- a/bin/nv_rf16.c
+++ b/bin/nv_rf16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_rf16"
 #define CAST    u16
diff --git a/bin/nv_rf32.c b/bin/nv_rf32.c
index c84c77b09..6a04a648b 100644
--- a/bin/nv_rf32.c
+++ b/bin/nv_rf32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_rf32"
 #define CAST    u32
diff --git a/bin/nv_ri08.c b/bin/nv_ri08.c
index 5cb4fe74d..4bf670ee3 100644
--- a/bin/nv_ri08.c
+++ b/bin/nv_ri08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_ri08"
 #define CAST    u8
diff --git a/bin/nv_ri16.c b/bin/nv_ri16.c
index 81aa04894..e2407638f 100644
--- a/bin/nv_ri16.c
+++ b/bin/nv_ri16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_ri16"
 #define CAST    u16
diff --git a/bin/nv_ri32.c b/bin/nv_ri32.c
index 25a98f568..ca378c1f7 100644
--- a/bin/nv_ri32.c
+++ b/bin/nv_ri32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_ri32"
 #define CAST    u32
diff --git a/bin/nv_rs08.c b/bin/nv_rs08.c
index 63ad4f206..8d872ffaa 100644
--- a/bin/nv_rs08.c
+++ b/bin/nv_rs08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_rs08"
 #define CAST    u8
diff --git a/bin/nv_rs16.c b/bin/nv_rs16.c
index 148ee85c7..79ce2748f 100644
--- a/bin/nv_rs16.c
+++ b/bin/nv_rs16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_rs16"
 #define CAST    u16
diff --git a/bin/nv_rs32.c b/bin/nv_rs32.c
index d29eb8755..d4fc63807 100644
--- a/bin/nv_rs32.c
+++ b/bin/nv_rs32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_rs32"
 #define CAST    u32
diff --git a/bin/nv_rv08.c b/bin/nv_rv08.c
index 92a5ffbf1..b3ea27e66 100644
--- a/bin/nv_rv08.c
+++ b/bin/nv_rv08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_rv08"
 #define CAST    u8
diff --git a/bin/nv_rv16.c b/bin/nv_rv16.c
index c39e02da6..4b0186b53 100644
--- a/bin/nv_rv16.c
+++ b/bin/nv_rv16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_rv16"
 #define CAST    u16
diff --git a/bin/nv_rv32.c b/bin/nv_rv32.c
index f8320bea9..02183dd2c 100644
--- a/bin/nv_rv32.c
+++ b/bin/nv_rv32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_rv32"
 #define CAST    u32
diff --git a/bin/nv_wf08.c b/bin/nv_wf08.c
index f05a7e7cd..82378e9f5 100644
--- a/bin/nv_wf08.c
+++ b/bin/nv_wf08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_wf08"
 #define CAST    u8
diff --git a/bin/nv_wf16.c b/bin/nv_wf16.c
index c1b747cc2..af30974db 100644
--- a/bin/nv_wf16.c
+++ b/bin/nv_wf16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_wf16"
 #define CAST    u16
diff --git a/bin/nv_wf32.c b/bin/nv_wf32.c
index 88140064c..892ff3f7a 100644
--- a/bin/nv_wf32.c
+++ b/bin/nv_wf32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_wf32"
 #define CAST    u32
diff --git a/bin/nv_wi08.c b/bin/nv_wi08.c
index ebd5fb530..358b94bc7 100644
--- a/bin/nv_wi08.c
+++ b/bin/nv_wi08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_wi08"
 #define CAST    u8
diff --git a/bin/nv_wi16.c b/bin/nv_wi16.c
index dc815e7e9..217afee9c 100644
--- a/bin/nv_wi16.c
+++ b/bin/nv_wi16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_wi16"
 #define CAST    u16
diff --git a/bin/nv_wi32.c b/bin/nv_wi32.c
index a2420facf..b9bba5b27 100644
--- a/bin/nv_wi32.c
+++ b/bin/nv_wi32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_wi32"
 #define CAST    u32
diff --git a/bin/nv_wr08.c b/bin/nv_wr08.c
index c81b69a79..a0be3ee60 100644
--- a/bin/nv_wr08.c
+++ b/bin/nv_wr08.c
@@ -1,4 +1,4 @@
-#define FMTADDR    "0x%06lx"
+#define FMTADDR    "0x%06llx"
 #define FMTDATA    "0x%02x"
 #define NAME       "nv_wr08"
 #define CAST       u8
diff --git a/bin/nv_wr16.c b/bin/nv_wr16.c
index 004b198a3..122bc82cb 100644
--- a/bin/nv_wr16.c
+++ b/bin/nv_wr16.c
@@ -1,4 +1,4 @@
-#define FMTADDR    "0x%06lx"
+#define FMTADDR    "0x%06llx"
 #define FMTDATA    "0x%04x"
 #define NAME       "nv_wr16"
 #define CAST       u16
diff --git a/bin/nv_wr32.c b/bin/nv_wr32.c
index 2b8b60f32..910c92823 100644
--- a/bin/nv_wr32.c
+++ b/bin/nv_wr32.c
@@ -1,4 +1,4 @@
-#define FMTADDR    "0x%06lx"
+#define FMTADDR    "0x%06llx"
 #define FMTDATA    "0x%08x"
 #define NAME       "nv_wr32"
 #define CAST       u32
diff --git a/bin/nv_wrfunc.h b/bin/nv_wrfunc.h
index 31855e1ac..fb39c460b 100644
--- a/bin/nv_wrfunc.h
+++ b/bin/nv_wrfunc.h
@@ -64,11 +64,10 @@ MAIN(int argc, char **argv)
 		return ret;
 
 	while (rstr && *rstr != '\0') {
-		unsigned long cnt = 1;
-		unsigned long reg;
-		unsigned long val;
+		u32 cnt = 1, val;
+		u64 reg;
 
-		if ((reg = strtoul(rstr, &rstr, 0)) == ULONG_MAX)
+		if ((reg = strtoull(rstr, &rstr, 0)) == ULONG_MAX)
 			return 1;
 
 		if (*rstr == '/') {
diff --git a/bin/nv_ws08.c b/bin/nv_ws08.c
index 3a301d3e8..d7d9a5979 100644
--- a/bin/nv_ws08.c
+++ b/bin/nv_ws08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_rs08"
 #define CAST    u8
diff --git a/bin/nv_ws16.c b/bin/nv_ws16.c
index d53d1f6c5..83275736c 100644
--- a/bin/nv_ws16.c
+++ b/bin/nv_ws16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_ws16"
 #define CAST    u16
diff --git a/bin/nv_ws32.c b/bin/nv_ws32.c
index 26103e064..ca108eb0e 100644
--- a/bin/nv_ws32.c
+++ b/bin/nv_ws32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_ws32"
 #define CAST    u32
diff --git a/bin/nv_wv08.c b/bin/nv_wv08.c
index 7c032b4f8..1556d8a74 100644
--- a/bin/nv_wv08.c
+++ b/bin/nv_wv08.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%02x"
 #define NAME    "nv_wv08"
 #define CAST    u8
diff --git a/bin/nv_wv16.c b/bin/nv_wv16.c
index 853330657..0d5333e85 100644
--- a/bin/nv_wv16.c
+++ b/bin/nv_wv16.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%04x"
 #define NAME    "nv_wv16"
 #define CAST    u16
diff --git a/bin/nv_wv32.c b/bin/nv_wv32.c
index e414246c6..235c666ab 100644
--- a/bin/nv_wv32.c
+++ b/bin/nv_wv32.c
@@ -1,4 +1,4 @@
-#define FMTADDR "0x%08lx"
+#define FMTADDR "0x%08llx"
 #define FMTDATA "0x%08x"
 #define NAME    "nv_wv32"
 #define CAST    u32