Skip to contentSkip to conversation

intel_bios_reader: add more structured printout of headers

PATCH New Jani Nikula 2 participants 12 messages Jan 24, 2017 – Jan 31, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 intel_bios_reader: add more structured printout of headers

Make the different parts of the VBT stand out better in the output.

---
 tools/intel_bios_reader.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
tools/intel_bios_reader.c +10 -4
index 3455296bc008..c7572bde8c7e 100644
@@ -1648,13 +1648,19 @@ static void dump_headers(struct context *context)
 	const struct bdb_header *bdb = context->bdb;
 	int i, j = 0;
 
-	printf("VBT signature:\t\"%.*s\"\n",
+	printf("VBT header:\n");
+
+	printf("\tVBT signature:\t\"%.*s\"\n",
 	       (int)sizeof(vbt->signature), vbt->signature);
-	printf("VBT version:\t%d.%d\n", vbt->version / 100, vbt->version % 100);
+	printf("\tVBT version:\t%d.%d\n", vbt->version / 100, vbt->version % 100);
+	printf("\n");
 
-	printf("BDB signature:\t\"%.*s\"\n",
+	printf("BDB header:\n");
+
+	printf("\tBDB signature:\t\"%.*s\"\n",
 	       (int)sizeof(bdb->signature), bdb->signature);
-	printf("BDB version:\t%d\n", bdb->version);
+	printf("\tBDB version:\t%d\n", bdb->version);
+	printf("\n");
 
 	printf("BDB blocks present:");
 	for (i = 0; i < 256; i++) {
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/6 intel_bios_reader: abstract a more generic hex dumper

Let us reuse the dumper for headers.

---
 tools/intel_bios_reader.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
tools/intel_bios_reader.c +10 -5
index c7572bde8c7e..83fc819b6cdc 100644
@@ -1588,17 +1588,17 @@ struct dumper dumpers[] = {
 	},
 };
 
-static void hex_dump(const struct bdb_block *block)
+static void hex_dump(const void *data, uint32_t size)
 {
 	int i;
-	const uint8_t *p = block->data;
+	const uint8_t *p = data;
 
-	for (i = 0; i < block->size; i++) {
+	for (i = 0; i < size; i++) {
 		if (i % 16 == 0)
 			printf("\t%04x: ", i);
 		printf("%02x", p[i]);
 		if (i % 16 == 15) {
-			if (i + 1 < block->size)
+			if (i + 1 < size)
 				printf("\n");
 		} else if (i % 8 == 7) {
 			printf("  ");
@@ -1609,6 +1609,11 @@ static void hex_dump(const struct bdb_block *block)
 	printf("\n\n");
 }
 
+static void hex_dump_block(const struct bdb_block *block)
+{
+	hex_dump(block->data, block->size);
+}
+
 static bool dump_section(struct context *context, int section_id)
 {
 	struct dumper *dumper = NULL;
@@ -1632,7 +1637,7 @@ static bool dump_section(struct context *context, int section_id)
 		printf("BDB block %d:\n", block->id);
 
 	if (context->hexdump)
-		hex_dump(block);
+		hex_dump_block(block);
 	if (dumper && dumper->dump)
 		dumper->dump(context, block);
 	printf("\n");
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 3/6 intel_bios_reader: add hex dumping of headers

In reply to Jani Nikula
---
 tools/intel_bios_reader.c | 4 ++++
 1 file changed, 4 insertions(+)
tools/intel_bios_reader.c +4 -0
index 83fc819b6cdc..9f75d850d3fb 100644
@@ -1654,6 +1654,8 @@ static void dump_headers(struct context *context)
 	int i, j = 0;
 
 	printf("VBT header:\n");
+	if (context->hexdump)
+		hex_dump(vbt, vbt->header_size);
 
 	printf("\tVBT signature:\t\"%.*s\"\n",
 	       (int)sizeof(vbt->signature), vbt->signature);
@@ -1661,6 +1663,8 @@ static void dump_headers(struct context *context)
 	printf("\n");
 
 	printf("BDB header:\n");
+	if (context->hexdump)
+		hex_dump(bdb, bdb->header_size);
 
 	printf("\tBDB signature:\t\"%.*s\"\n",
 	       (int)sizeof(bdb->signature), bdb->signature);
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH 4/6 intel_bios_reader: be more informative about unknown blocks

In reply to Jani Nikula

We don't know how to decode all blocks, make it clear this is not an error.

---
 tools/intel_bios_reader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/intel_bios_reader.c +2 -1
index 9f75d850d3fb..6581abf51472 100644
@@ -1634,7 +1634,8 @@ static bool dump_section(struct context *context, int section_id)
 	if (dumper && dumper->name)
 		printf("BDB block %d - %s:\n", block->id, dumper->name);
 	else
-		printf("BDB block %d:\n", block->id);
+		printf("BDB block %d - Unknown, no decoding available:\n",
+		       block->id);
 
 	if (context->hexdump)
 		hex_dump_block(block);
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH 5/6 intel_bios_reader: print more VBT and BDB header info

In reply to Jani Nikula

Add more info and realign accordingly.

---
 tools/intel_bios_reader.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
tools/intel_bios_reader.c +14 -4
index 6581abf51472..301cd1ccdcf0 100644
@@ -1658,18 +1658,28 @@ static void dump_headers(struct context *context)
 	if (context->hexdump)
 		hex_dump(vbt, vbt->header_size);
 
-	printf("\tVBT signature:\t\"%.*s\"\n",
+	printf("\tVBT signature:\t\t\"%.*s\"\n",
 	       (int)sizeof(vbt->signature), vbt->signature);
-	printf("\tVBT version:\t%d.%d\n", vbt->version / 100, vbt->version % 100);
+	printf("\tVBT version:\t\t0x%04x (%d.%d)\n", vbt->version,
+	       vbt->version / 100, vbt->version % 100);
+	printf("\tVBT header size:\t0x%04x (%u)\n",
+	       vbt->header_size, vbt->header_size);
+	printf("\tVBT size:\t\t0x%04x (%u)\n", vbt->vbt_size, vbt->vbt_size);
+	printf("\tVBT checksum:\t\t0x%02x\n", vbt->vbt_checksum);
+	printf("\tBDB offset:\t\t0x%08x (%u)\n", vbt->bdb_offset, vbt->bdb_offset);
+
 	printf("\n");
 
 	printf("BDB header:\n");
 	if (context->hexdump)
 		hex_dump(bdb, bdb->header_size);
 
-	printf("\tBDB signature:\t\"%.*s\"\n",
+	printf("\tBDB signature:\t\t\"%.*s\"\n",
 	       (int)sizeof(bdb->signature), bdb->signature);
-	printf("\tBDB version:\t%d\n", bdb->version);
+	printf("\tBDB version:\t\t%d\n", bdb->version);
+	printf("\tBDB header size:\t0x%04x (%u)\n",
+	       bdb->header_size, bdb->header_size);
+	printf("\tBDB size:\t\t0x%04x (%u)\n", bdb->bdb_size, bdb->bdb_size);
 	printf("\n");
 
 	printf("BDB blocks present:");
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

PATCH 6/6 tools: rename intel_bios_reader to intel_vbt_decode

In reply to Jani Nikula

After all these years intel_bios_reader and intel_bios_dumper still manage to confuse me. Read or dump, which one decodes. Rename intel_bios_reader to intel_vbt_decode to be in line with the naming of all the other tools (particularly the closely related intel_opregion_decode tool) that decode previously gathered or dumped information.

---
 man/Makefile.am               |    4 +-
 man/intel_bios_dumper.rst     |    2 +-
 man/intel_bios_reader.rst     |   69 --
 man/intel_vbt_decode.rst      |   69 ++
 tools/.gitignore              |    2 +-
 tools/Makefile.sources        |    6 +-
 tools/intel_bios_reader.c     | 1910 -----------------------------------------
 tools/intel_opregion_decode.c |    2 +-
 tools/intel_vbt_decode.c      | 1910 +++++++++++++++++++++++++++++++++++++++++
 9 files changed, 1987 insertions(+), 1987 deletions(-)
 delete mode 100644 man/intel_bios_reader.rst
 create mode 100644 man/intel_vbt_decode.rst
 delete mode 100644 tools/intel_bios_reader.c
 create mode 100644 tools/intel_vbt_decode.c
man/Makefile.am +2 -2
index e40e2e931ada..0098fa45a618 100644
@@ -3,7 +3,6 @@ appman_RST = 				\
 	intel_aubdump.rst		\
 	intel_audio_dump.rst		\
 	intel_bios_dumper.rst		\
-	intel_bios_reader.rst		\
 	intel_error_decode.rst		\
 	intel_gpu_frequency.rst		\
 	intel_gpu_top.rst		\
@@ -16,7 +15,8 @@ appman_RST = 				\
 	intel_upload_blit_large.rst	\
 	intel_upload_blit_large_gtt.rst \
 	intel_upload_blit_large_map.rst \
-	intel_upload_blit_small.rst
+	intel_upload_blit_small.rst	\
+	intel_vbt_decode.rst
 
 if HAVE_RST2MAN
 appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
man/intel_bios_dumper.rst +1 -1
index 89e0001a70f7..b271b9b1afef 100644
@@ -33,4 +33,4 @@ Report bugs to https://bugs.freedesktop.org.
 SEE ALSO
 ========
 
-**intel_bios_reader(1)**
+**intel_vbt_decode(1)**
man/intel_bios_reader.rst deleted +0 -69

69 lines not on this page · raw message

man/intel_vbt_decode.rst new file +69 -0

69 lines not on this page · raw message

tools/.gitignore +1 -1
index 13825a3c9a74..7f5de26f1d07 100644
@@ -5,7 +5,7 @@ intel_aubdump
 intel_audio_dump
 intel_backlight
 intel_bios_dumper
-intel_bios_reader
+intel_vbt_decode
 intel_display_crc
 intel_display_poller
 intel_dump_decode
tools/Makefile.sources +3 -3
index e2451ea1272c..2c41afffea39 100644
@@ -10,7 +10,6 @@ tools_prog_lists =		\
 	intel_reg		\
 	intel_backlight		\
 	intel_bios_dumper	\
-	intel_bios_reader	\
 	intel_display_crc	\
 	intel_display_poller	\
 	intel_forcewaked	\
@@ -28,6 +27,7 @@ tools_prog_lists =		\
 	intel_reg_checker	\
 	intel_residency		\
 	intel_stepping		\
+	intel_vbt_decode	\
 	intel_watermark		\
 	intel_gem_info		\
 	$(NULL)
@@ -47,8 +47,8 @@ intel_reg_SOURCES =		\
 	intel_reg_spec.c	\
 	intel_reg_spec.h
 
-intel_bios_reader_SOURCES =	\
-	intel_bios_reader.c	\
+intel_vbt_decode_SOURCES =	\
+	intel_vbt_decode.c	\
 	intel_bios.h
 
 intel_l3_parity_SOURCES =	\
tools/intel_bios_reader.c deleted +0 -1910

1,910 lines not on this page · raw message

tools/intel_opregion_decode.c +1 -1
index c65828ae2900..f532c1e2952b 100644
@@ -327,7 +327,7 @@ static void decode_vbt(const void *buffer)
 	printf("\tproduct string:\t%s\n", s);
 	free(s);
 
-	printf("\t(use intel_bios_reader to decode the VBT)\n");
+	printf("\t(use intel_vbt_decode to decode the VBT)\n");
 
 	printf("\n");
 }
tools/intel_vbt_decode.c new file +1910 -0

891 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Part of the diff is not shown here. View the raw message.

#6 lore raw

PATCH 1/1 tools: rename intel_bios_reader to intel_vbt_decode

After all these years intel_bios_reader and intel_bios_dumper still manage to confuse me. Read or dump, which one decodes. Rename intel_bios_reader to intel_vbt_decode to be in line with the naming of all the other tools (particularly the closely related intel_opregion_decode tool) that decode previously gathered or dumped information.

---

Patch 6/6 with -M option.

---
 man/Makefile.am                                     |  4 ++--
 man/intel_bios_dumper.rst                           |  2 +-
 man/{intel_bios_reader.rst => intel_vbt_decode.rst} | 10 +++++-----
 tools/.gitignore                                    |  2 +-
 tools/Makefile.sources                              |  6 +++---
 tools/intel_opregion_decode.c                       |  2 +-
 tools/{intel_bios_reader.c => intel_vbt_decode.c}   |  0
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename man/{intel_bios_reader.rst => intel_vbt_decode.rst} (89%)
 rename tools/{intel_bios_reader.c => intel_vbt_decode.c} (100%)
man/Makefile.am +2 -2
index e40e2e931ada..0098fa45a618 100644
@@ -3,7 +3,6 @@ appman_RST = 				\
 	intel_aubdump.rst		\
 	intel_audio_dump.rst		\
 	intel_bios_dumper.rst		\
-	intel_bios_reader.rst		\
 	intel_error_decode.rst		\
 	intel_gpu_frequency.rst		\
 	intel_gpu_top.rst		\
@@ -16,7 +15,8 @@ appman_RST = 				\
 	intel_upload_blit_large.rst	\
 	intel_upload_blit_large_gtt.rst \
 	intel_upload_blit_large_map.rst \
-	intel_upload_blit_small.rst
+	intel_upload_blit_small.rst	\
+	intel_vbt_decode.rst
 
 if HAVE_RST2MAN
 appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
man/intel_bios_dumper.rst +1 -1
index 89e0001a70f7..b271b9b1afef 100644
@@ -33,4 +33,4 @@ Report bugs to https://bugs.freedesktop.org.
 SEE ALSO
 ========
 
-**intel_bios_reader(1)**
+**intel_vbt_decode(1)**
man/intel_vbt_decode.rst renamed from man/intel_bios_reader.rst +5 -5
similarity index 89%
rename from man/intel_bios_reader.rst
rename to man/intel_vbt_decode.rst
index 0e935904bcfb..a8d36d500b6d 100644
@@ -1,6 +1,6 @@
-=================
-intel_bios_reader
-=================
+================
+intel_vbt_decode
+================
 
 -----------------------------
 Intel Video BIOS Table parser
@@ -16,12 +16,12 @@ Intel Video BIOS Table parser
 SYNOPSIS
 ========
 
-**intel_bios_reader** [*OPTIONS*]
+**intel_vbt_decode** [*OPTIONS*]
 
 DESCRIPTION
 ===========
 
-**intel_bios_reader** is a tool to parse the Intel Video BIOS Tables (VBT) and
+**intel_vbt_decode** is a tool to parse the Intel Video BIOS Tables (VBT) and
 present the information in a human readable format.
 
 The preferred ways of getting the binary VBT to parse are:
tools/.gitignore +1 -1
index 13825a3c9a74..7f5de26f1d07 100644
@@ -5,7 +5,7 @@ intel_aubdump
 intel_audio_dump
 intel_backlight
 intel_bios_dumper
-intel_bios_reader
+intel_vbt_decode
 intel_display_crc
 intel_display_poller
 intel_dump_decode
tools/Makefile.sources +3 -3
index e2451ea1272c..2c41afffea39 100644
@@ -10,7 +10,6 @@ tools_prog_lists =		\
 	intel_reg		\
 	intel_backlight		\
 	intel_bios_dumper	\
-	intel_bios_reader	\
 	intel_display_crc	\
 	intel_display_poller	\
 	intel_forcewaked	\
@@ -28,6 +27,7 @@ tools_prog_lists =		\
 	intel_reg_checker	\
 	intel_residency		\
 	intel_stepping		\
+	intel_vbt_decode	\
 	intel_watermark		\
 	intel_gem_info		\
 	$(NULL)
@@ -47,8 +47,8 @@ intel_reg_SOURCES =		\
 	intel_reg_spec.c	\
 	intel_reg_spec.h
 
-intel_bios_reader_SOURCES =	\
-	intel_bios_reader.c	\
+intel_vbt_decode_SOURCES =	\
+	intel_vbt_decode.c	\
 	intel_bios.h
 
 intel_l3_parity_SOURCES =	\
tools/intel_opregion_decode.c +1 -1
index c65828ae2900..f532c1e2952b 100644
@@ -327,7 +327,7 @@ static void decode_vbt(const void *buffer)
 	printf("\tproduct string:\t%s\n", s);
 	free(s);
 
-	printf("\t(use intel_bios_reader to decode the VBT)\n");
+	printf("\t(use intel_vbt_decode to decode the VBT)\n");
 
 	printf("\n");
 }
tools/intel_vbt_decode.c renamed from tools/intel_bios_reader.c +0 -0
similarity index 100%
rename from tools/intel_bios_reader.c
rename to tools/intel_vbt_decode.c
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

PATCH v2 1/1 tools: rename intel_bios_reader to intel_vbt_decode

After all these years intel_bios_reader and intel_bios_dumper still manage to confuse me. Read or dump, which one decodes. Rename intel_bios_reader to intel_vbt_decode to be in line with the naming of all the other tools (particularly the closely related intel_opregion_decode tool) that decode previously gathered or dumped information.

---

Patch 6/6 with -M option.

---
 man/Makefile.am               |    4 +-
 man/intel_bios_dumper.rst     |    2 +-
 man/intel_bios_reader.rst     |   69 --
 man/intel_vbt_decode.rst      |   69 ++
 tools/.gitignore              |    2 +-
 tools/Makefile.sources        |    6 +-
 tools/intel_bios_reader.c     | 1910 -----------------------------------------
 tools/intel_opregion_decode.c |    2 +-
 tools/intel_vbt_decode.c      | 1910 +++++++++++++++++++++++++++++++++++++++++
 9 files changed, 1987 insertions(+), 1987 deletions(-)
 delete mode 100644 man/intel_bios_reader.rst
 create mode 100644 man/intel_vbt_decode.rst
 delete mode 100644 tools/intel_bios_reader.c
 create mode 100644 tools/intel_vbt_decode.c
man/Makefile.am +2 -2
index e40e2e931ada..0098fa45a618 100644
@@ -3,7 +3,6 @@ appman_RST = 				\
 	intel_aubdump.rst		\
 	intel_audio_dump.rst		\
 	intel_bios_dumper.rst		\
-	intel_bios_reader.rst		\
 	intel_error_decode.rst		\
 	intel_gpu_frequency.rst		\
 	intel_gpu_top.rst		\
@@ -16,7 +15,8 @@ appman_RST = 				\
 	intel_upload_blit_large.rst	\
 	intel_upload_blit_large_gtt.rst \
 	intel_upload_blit_large_map.rst \
-	intel_upload_blit_small.rst
+	intel_upload_blit_small.rst	\
+	intel_vbt_decode.rst
 
 if HAVE_RST2MAN
 appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
man/intel_bios_dumper.rst +1 -1
index 89e0001a70f7..b271b9b1afef 100644
@@ -33,4 +33,4 @@ Report bugs to https://bugs.freedesktop.org.
 SEE ALSO
 ========
 
-**intel_bios_reader(1)**
+**intel_vbt_decode(1)**
man/intel_bios_reader.rst deleted +0 -69

69 lines not on this page · raw message

man/intel_vbt_decode.rst new file +69 -0

69 lines not on this page · raw message

tools/.gitignore +1 -1
index 13825a3c9a74..7f5de26f1d07 100644
@@ -5,7 +5,7 @@ intel_aubdump
 intel_audio_dump
 intel_backlight
 intel_bios_dumper
-intel_bios_reader
+intel_vbt_decode
 intel_display_crc
 intel_display_poller
 intel_dump_decode
tools/Makefile.sources +3 -3
index e2451ea1272c..2c41afffea39 100644
@@ -10,7 +10,6 @@ tools_prog_lists =		\
 	intel_reg		\
 	intel_backlight		\
 	intel_bios_dumper	\
-	intel_bios_reader	\
 	intel_display_crc	\
 	intel_display_poller	\
 	intel_forcewaked	\
@@ -28,6 +27,7 @@ tools_prog_lists =		\
 	intel_reg_checker	\
 	intel_residency		\
 	intel_stepping		\
+	intel_vbt_decode	\
 	intel_watermark		\
 	intel_gem_info		\
 	$(NULL)
@@ -47,8 +47,8 @@ intel_reg_SOURCES =		\
 	intel_reg_spec.c	\
 	intel_reg_spec.h
 
-intel_bios_reader_SOURCES =	\
-	intel_bios_reader.c	\
+intel_vbt_decode_SOURCES =	\
+	intel_vbt_decode.c	\
 	intel_bios.h
 
 intel_l3_parity_SOURCES =	\
tools/intel_bios_reader.c deleted +0 -1910

1,910 lines not on this page · raw message

tools/intel_opregion_decode.c +1 -1
index c65828ae2900..f532c1e2952b 100644
@@ -327,7 +327,7 @@ static void decode_vbt(const void *buffer)
 	printf("\tproduct string:\t%s\n", s);
 	free(s);
 
-	printf("\t(use intel_bios_reader to decode the VBT)\n");
+	printf("\t(use intel_vbt_decode to decode the VBT)\n");
 
 	printf("\n");
 }
tools/intel_vbt_decode.c new file +1910 -0

891 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Part of the diff is not shown here. View the raw message.

#8 lore raw

Re: [PATCH v2] tools: rename intel_bios_reader to intel_vbt_decode

Quoted 7 lines · Jani Nikula

After all these years intel_bios_reader and intel_bios_dumper still manage to confuse me. Read or dump, which one decodes. Rename intel_bios_reader to intel_vbt_decode to be in line with the naming of all the other tools (particularly the closely related intel_opregion_decode tool) that decode previously gathered or dumped information.

Quoted 5 lines

---

Patch 6/6 with -M option.

*sigh*, fumbles with git send-email. All the three copies of 6/6 should have identical effect, but just one of them was sent with rename detection.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

Re: [PATCH] tools: rename intel_bios_reader to intel_vbt_decode

In reply to Jani Nikula
Quoted 8 lines · Jani Nikula

After all these years intel_bios_reader and intel_bios_dumper still manage to confuse me. Read or dump, which one decodes. Rename intel_bios_reader to intel_vbt_decode to be in line with the naming of all the other tools (particularly the closely related intel_opregion_decode tool) that decode previously gathered or dumped information.

Pushed patches 1-5 because they were trivial and I don't expect anyone to care.

How about this one? I don't dare push without acks on the change.

BR,
Jani.

Quoted 141 lines

---

Patch 6/6 with -M option.

---
 man/Makefile.am                                     |  4 ++--
 man/intel_bios_dumper.rst                           |  2 +-
 man/{intel_bios_reader.rst => intel_vbt_decode.rst} | 10 +++++-----
 tools/.gitignore                                    |  2 +-
 tools/Makefile.sources                              |  6 +++---
 tools/intel_opregion_decode.c                       |  2 +-
 tools/{intel_bios_reader.c => intel_vbt_decode.c}   |  0
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename man/{intel_bios_reader.rst => intel_vbt_decode.rst} (89%)
 rename tools/{intel_bios_reader.c => intel_vbt_decode.c} (100%)
man/Makefile.am +2 -2
index e40e2e931ada..0098fa45a618 100644
@@ -3,7 +3,6 @@ appman_RST = 				\
 	intel_aubdump.rst		\
 	intel_audio_dump.rst		\
 	intel_bios_dumper.rst		\
-	intel_bios_reader.rst		\
 	intel_error_decode.rst		\
 	intel_gpu_frequency.rst		\
 	intel_gpu_top.rst		\
@@ -16,7 +15,8 @@ appman_RST = 				\
 	intel_upload_blit_large.rst	\
 	intel_upload_blit_large_gtt.rst \
 	intel_upload_blit_large_map.rst \
-	intel_upload_blit_small.rst
+	intel_upload_blit_small.rst	\
+	intel_vbt_decode.rst
 
 if HAVE_RST2MAN
 appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
man/intel_bios_dumper.rst +1 -1
index 89e0001a70f7..b271b9b1afef 100644
@@ -33,4 +33,4 @@ Report bugs to https://bugs.freedesktop.org.
 SEE ALSO
 ========
 
-**intel_bios_reader(1)**
+**intel_vbt_decode(1)**
man/intel_vbt_decode.rst renamed from man/intel_bios_reader.rst +5 -5
similarity index 89%
rename from man/intel_bios_reader.rst
rename to man/intel_vbt_decode.rst
index 0e935904bcfb..a8d36d500b6d 100644
@@ -1,6 +1,6 @@
-=================
-intel_bios_reader
-=================
+================
+intel_vbt_decode
+================
 
 -----------------------------
 Intel Video BIOS Table parser
@@ -16,12 +16,12 @@ Intel Video BIOS Table parser
 SYNOPSIS
 ========
 
-**intel_bios_reader** [*OPTIONS*]
+**intel_vbt_decode** [*OPTIONS*]
 
 DESCRIPTION
 ===========
 
-**intel_bios_reader** is a tool to parse the Intel Video BIOS Tables (VBT) and
+**intel_vbt_decode** is a tool to parse the Intel Video BIOS Tables (VBT) and
 present the information in a human readable format.
 
 The preferred ways of getting the binary VBT to parse are:
tools/.gitignore +1 -1
index 13825a3c9a74..7f5de26f1d07 100644
@@ -5,7 +5,7 @@ intel_aubdump
 intel_audio_dump
 intel_backlight
 intel_bios_dumper
-intel_bios_reader
+intel_vbt_decode
 intel_display_crc
 intel_display_poller
 intel_dump_decode
tools/Makefile.sources +3 -3
index e2451ea1272c..2c41afffea39 100644
@@ -10,7 +10,6 @@ tools_prog_lists =		\
 	intel_reg		\
 	intel_backlight		\
 	intel_bios_dumper	\
-	intel_bios_reader	\
 	intel_display_crc	\
 	intel_display_poller	\
 	intel_forcewaked	\
@@ -28,6 +27,7 @@ tools_prog_lists =		\
 	intel_reg_checker	\
 	intel_residency		\
 	intel_stepping		\
+	intel_vbt_decode	\
 	intel_watermark		\
 	intel_gem_info		\
 	$(NULL)
@@ -47,8 +47,8 @@ intel_reg_SOURCES =		\
 	intel_reg_spec.c	\
 	intel_reg_spec.h
 
-intel_bios_reader_SOURCES =	\
-	intel_bios_reader.c	\
+intel_vbt_decode_SOURCES =	\
+	intel_vbt_decode.c	\
 	intel_bios.h
 
 intel_l3_parity_SOURCES =	\
tools/intel_opregion_decode.c +1 -1
index c65828ae2900..f532c1e2952b 100644
@@ -327,7 +327,7 @@ static void decode_vbt(const void *buffer)
 	printf("\tproduct string:\t%s\n", s);
 	free(s);
 
-	printf("\t(use intel_bios_reader to decode the VBT)\n");
+	printf("\t(use intel_vbt_decode to decode the VBT)\n");
 
 	printf("\n");
 }
tools/intel_vbt_decode.c renamed from tools/intel_bios_reader.c +0 -0
similarity index 100%
rename from tools/intel_bios_reader.c
rename to tools/intel_vbt_decode.c
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

Re: [PATCH] tools: rename intel_bios_reader to intel_vbt_decode

Quoted 8 lines · Jani Nikula
Quoted 7 lines · Jani Nikula

After all these years intel_bios_reader and intel_bios_dumper still manage to confuse me. Read or dump, which one decodes. Rename intel_bios_reader to intel_vbt_decode to be in line with the naming of all the other tools (particularly the closely related intel_opregion_decode tool) that decode previously gathered or dumped information.

Quoted 6 lines
Quoted 1 line

Pushed patches 1-5 because they were trivial and I don't expect anyone to care.

How about this one? I don't dare push without acks on the change.

You're not alone in your confusion. I routinely end up trying to use the wrong tool. So I for one welcome this change.

Quoted 152 lines

BR,
Jani.

Quoted 141 lines

---

Patch 6/6 with -M option.

---
 man/Makefile.am                                     |  4 ++--
 man/intel_bios_dumper.rst                           |  2 +-
 man/{intel_bios_reader.rst => intel_vbt_decode.rst} | 10 +++++-----
 tools/.gitignore                                    |  2 +-
 tools/Makefile.sources                              |  6 +++---
 tools/intel_opregion_decode.c                       |  2 +-
 tools/{intel_bios_reader.c => intel_vbt_decode.c}   |  0
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename man/{intel_bios_reader.rst => intel_vbt_decode.rst} (89%)
 rename tools/{intel_bios_reader.c => intel_vbt_decode.c} (100%)
man/Makefile.am +2 -2
index e40e2e931ada..0098fa45a618 100644
@@ -3,7 +3,6 @@ appman_RST = 				\
 	intel_aubdump.rst		\
 	intel_audio_dump.rst		\
 	intel_bios_dumper.rst		\
-	intel_bios_reader.rst		\
 	intel_error_decode.rst		\
 	intel_gpu_frequency.rst		\
 	intel_gpu_top.rst		\
@@ -16,7 +15,8 @@ appman_RST = 				\
 	intel_upload_blit_large.rst	\
 	intel_upload_blit_large_gtt.rst \
 	intel_upload_blit_large_map.rst \
-	intel_upload_blit_small.rst
+	intel_upload_blit_small.rst	\
+	intel_vbt_decode.rst
 
 if HAVE_RST2MAN
 appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
man/intel_bios_dumper.rst +1 -1
index 89e0001a70f7..b271b9b1afef 100644
@@ -33,4 +33,4 @@ Report bugs to https://bugs.freedesktop.org.
 SEE ALSO
 ========
 
-**intel_bios_reader(1)**
+**intel_vbt_decode(1)**
man/intel_vbt_decode.rst renamed from man/intel_bios_reader.rst +5 -5
similarity index 89%
rename from man/intel_bios_reader.rst
rename to man/intel_vbt_decode.rst
index 0e935904bcfb..a8d36d500b6d 100644
@@ -1,6 +1,6 @@
-=================
-intel_bios_reader
-=================
+================
+intel_vbt_decode
+================
 
 -----------------------------
 Intel Video BIOS Table parser
@@ -16,12 +16,12 @@ Intel Video BIOS Table parser
 SYNOPSIS
 ========
 
-**intel_bios_reader** [*OPTIONS*]
+**intel_vbt_decode** [*OPTIONS*]
 
 DESCRIPTION
 ===========
 
-**intel_bios_reader** is a tool to parse the Intel Video BIOS Tables (VBT) and
+**intel_vbt_decode** is a tool to parse the Intel Video BIOS Tables (VBT) and
 present the information in a human readable format.
 
 The preferred ways of getting the binary VBT to parse are:
tools/.gitignore +1 -1
index 13825a3c9a74..7f5de26f1d07 100644
@@ -5,7 +5,7 @@ intel_aubdump
 intel_audio_dump
 intel_backlight
 intel_bios_dumper
-intel_bios_reader
+intel_vbt_decode
 intel_display_crc
 intel_display_poller
 intel_dump_decode
tools/Makefile.sources +3 -3
index e2451ea1272c..2c41afffea39 100644
@@ -10,7 +10,6 @@ tools_prog_lists =		\
 	intel_reg		\
 	intel_backlight		\
 	intel_bios_dumper	\
-	intel_bios_reader	\
 	intel_display_crc	\
 	intel_display_poller	\
 	intel_forcewaked	\
@@ -28,6 +27,7 @@ tools_prog_lists =		\
 	intel_reg_checker	\
 	intel_residency		\
 	intel_stepping		\
+	intel_vbt_decode	\
 	intel_watermark		\
 	intel_gem_info		\
 	$(NULL)
@@ -47,8 +47,8 @@ intel_reg_SOURCES =		\
 	intel_reg_spec.c	\
 	intel_reg_spec.h
 
-intel_bios_reader_SOURCES =	\
-	intel_bios_reader.c	\
+intel_vbt_decode_SOURCES =	\
+	intel_vbt_decode.c	\
 	intel_bios.h
 
 intel_l3_parity_SOURCES =	\
tools/intel_opregion_decode.c +1 -1
index c65828ae2900..f532c1e2952b 100644
@@ -327,7 +327,7 @@ static void decode_vbt(const void *buffer)
 	printf("\tproduct string:\t%s\n", s);
 	free(s);
 
-	printf("\t(use intel_bios_reader to decode the VBT)\n");
+	printf("\t(use intel_vbt_decode to decode the VBT)\n");
 
 	printf("\n");
 }
tools/intel_vbt_decode.c renamed from tools/intel_bios_reader.c +0 -0
similarity index 100%
rename from tools/intel_bios_reader.c
rename to tools/intel_vbt_decode.c
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

Re: [PATCH] tools: rename intel_bios_reader to intel_vbt_decode

Quoted 14 lines · Ville Syrjälä
Quoted 13 lines · Jani Nikula
Quoted 8 lines · Jani Nikula

After all these years intel_bios_reader and intel_bios_dumper still manage to confuse me. Read or dump, which one decodes. Rename intel_bios_reader to intel_vbt_decode to be in line with the naming of all the other tools (particularly the closely related intel_opregion_decode tool) that decode previously gathered or dumped information.

Pushed patches 1-5 because they were trivial and I don't expect anyone to care.

Quoted 6 lines
Quoted 1 line

How about this one? I don't dare push without acks on the change.

You're not alone in your confusion. I routinely end up trying to use the wrong tool. So I for one welcome this change.

Thanks, pushed with that and Petri's IRC ack.

BR,
Jani.

Quoted 153 lines
Quoted 153 lines

BR,
Jani.

Quoted 141 lines

---

Patch 6/6 with -M option.

---
 man/Makefile.am                                     |  4 ++--
 man/intel_bios_dumper.rst                           |  2 +-
 man/{intel_bios_reader.rst => intel_vbt_decode.rst} | 10 +++++-----
 tools/.gitignore                                    |  2 +-
 tools/Makefile.sources                              |  6 +++---
 tools/intel_opregion_decode.c                       |  2 +-
 tools/{intel_bios_reader.c => intel_vbt_decode.c}   |  0
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename man/{intel_bios_reader.rst => intel_vbt_decode.rst} (89%)
 rename tools/{intel_bios_reader.c => intel_vbt_decode.c} (100%)
man/Makefile.am +2 -2
index e40e2e931ada..0098fa45a618 100644
@@ -3,7 +3,6 @@ appman_RST = 				\
 	intel_aubdump.rst		\
 	intel_audio_dump.rst		\
 	intel_bios_dumper.rst		\
-	intel_bios_reader.rst		\
 	intel_error_decode.rst		\
 	intel_gpu_frequency.rst		\
 	intel_gpu_top.rst		\
@@ -16,7 +15,8 @@ appman_RST = 				\
 	intel_upload_blit_large.rst	\
 	intel_upload_blit_large_gtt.rst \
 	intel_upload_blit_large_map.rst \
-	intel_upload_blit_small.rst
+	intel_upload_blit_small.rst	\
+	intel_vbt_decode.rst
 
 if HAVE_RST2MAN
 appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
man/intel_bios_dumper.rst +1 -1
index 89e0001a70f7..b271b9b1afef 100644
@@ -33,4 +33,4 @@ Report bugs to https://bugs.freedesktop.org.
 SEE ALSO
 ========
 
-**intel_bios_reader(1)**
+**intel_vbt_decode(1)**
man/intel_vbt_decode.rst renamed from man/intel_bios_reader.rst +5 -5
similarity index 89%
rename from man/intel_bios_reader.rst
rename to man/intel_vbt_decode.rst
index 0e935904bcfb..a8d36d500b6d 100644
@@ -1,6 +1,6 @@
-=================
-intel_bios_reader
-=================
+================
+intel_vbt_decode
+================
 
 -----------------------------
 Intel Video BIOS Table parser
@@ -16,12 +16,12 @@ Intel Video BIOS Table parser
 SYNOPSIS
 ========
 
-**intel_bios_reader** [*OPTIONS*]
+**intel_vbt_decode** [*OPTIONS*]
 
 DESCRIPTION
 ===========
 
-**intel_bios_reader** is a tool to parse the Intel Video BIOS Tables (VBT) and
+**intel_vbt_decode** is a tool to parse the Intel Video BIOS Tables (VBT) and
 present the information in a human readable format.
 
 The preferred ways of getting the binary VBT to parse are:
tools/.gitignore +1 -1
index 13825a3c9a74..7f5de26f1d07 100644
@@ -5,7 +5,7 @@ intel_aubdump
 intel_audio_dump
 intel_backlight
 intel_bios_dumper
-intel_bios_reader
+intel_vbt_decode
 intel_display_crc
 intel_display_poller
 intel_dump_decode
tools/Makefile.sources +3 -3
index e2451ea1272c..2c41afffea39 100644
@@ -10,7 +10,6 @@ tools_prog_lists =		\
 	intel_reg		\
 	intel_backlight		\
 	intel_bios_dumper	\
-	intel_bios_reader	\
 	intel_display_crc	\
 	intel_display_poller	\
 	intel_forcewaked	\
@@ -28,6 +27,7 @@ tools_prog_lists =		\
 	intel_reg_checker	\
 	intel_residency		\
 	intel_stepping		\
+	intel_vbt_decode	\
 	intel_watermark		\
 	intel_gem_info		\
 	$(NULL)
@@ -47,8 +47,8 @@ intel_reg_SOURCES =		\
 	intel_reg_spec.c	\
 	intel_reg_spec.h
 
-intel_bios_reader_SOURCES =	\
-	intel_bios_reader.c	\
+intel_vbt_decode_SOURCES =	\
+	intel_vbt_decode.c	\
 	intel_bios.h
 
 intel_l3_parity_SOURCES =	\
tools/intel_opregion_decode.c +1 -1
index c65828ae2900..f532c1e2952b 100644
@@ -327,7 +327,7 @@ static void decode_vbt(const void *buffer)
 	printf("\tproduct string:\t%s\n", s);
 	free(s);
 
-	printf("\t(use intel_bios_reader to decode the VBT)\n");
+	printf("\t(use intel_vbt_decode to decode the VBT)\n");
 
 	printf("\n");
 }
tools/intel_vbt_decode.c renamed from tools/intel_bios_reader.c +0 -0
similarity index 100%
rename from tools/intel_bios_reader.c
rename to tools/intel_vbt_decode.c
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx