diff mbox

[5/5] acpi: acpidump: dump out ACPI UEFI tables

Message ID 1340975467-23977-6-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King June 29, 2012, 1:11 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Dump out the ACPI UEFI tables, mainly just the GUID and the raw
hex dump of the raw data.  We also add acpi_dump_guid() to allow
us to format up GUIDs and also add an offset argument to the raw
data hex dump to allow us to dump out sections of a table in hex
while printing the table offset address.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/acpi/acpidump/acpidump.c |   43 +++++++++++++++++++++++++++++++++++++-----
 src/lib/include/fwts_acpi.h  |    6 ++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

Comments

Alex Hung July 2, 2012, 6:22 a.m. UTC | #1 
On 06/29/2012 09:11 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Dump out the ACPI UEFI tables, mainly just the GUID and the raw
> hex dump of the raw data.  We also add acpi_dump_guid() to allow
> us to format up GUIDs and also add an offset argument to the raw
> data hex dump to allow us to dump out sections of a table in hex
> while printing the table offset address.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/acpi/acpidump/acpidump.c |   43 +++++++++++++++++++++++++++++++++++++-----
>   src/lib/include/fwts_acpi.h  |    6 ++++++
>   2 files changed, 44 insertions(+), 5 deletions(-)
>
> diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
> index 6591bc3..c475628 100644
> --- a/src/acpi/acpidump/acpidump.c
> +++ b/src/acpi/acpidump/acpidump.c
> @@ -78,6 +78,9 @@ typedef struct fwts_acpidump_field {
>   #define FIELD_BITF(text, type, field, nbits, shift)			\
>   	FIELD(text, type, field, acpi_dump_uint, nbits, shift, NULL, 0, NULL)
>
> +#define FIELD_GUID(text, type, field)			\
> +	FIELD(text, type, field, acpi_dump_guid, 0, 0, NULL, 0, NULL)
> +
>   #define FIELD_END { NULL, 0, 0, NULL, 0, 0, NULL, 0, NULL}
>
>   static char *acpi_dump_field_info(char *label, int size, int offset)
> @@ -178,6 +181,15 @@ static void acpi_dump_uints(fwts_framework *fw, fwts_acpidump_field *info, void
>   	}
>   }
>
> +static void acpi_dump_guid(fwts_framework *fw, fwts_acpidump_field *info, void *data, int offset)
> +{
> +	char guid[37];
> +
> +	fwts_guid_buf_to_str(data, guid, sizeof(guid));
> +	fwts_log_info_verbatum(fw, "%s %s",
> +		acpi_dump_field_info(info->label, info->size, info->offset + offset), guid);
> +}
> +
>   static void acpi_dump_strings(fwts_framework *fw, fwts_acpidump_field *info, void *data, int offset)
>   {
>   	int hexdigits = info->size << 1;
> @@ -215,14 +227,14 @@ static void __acpi_dump_table_fields(fwts_framework *fw, uint8_t *data, fwts_acp
>   		field->func(fw, field, data + field->offset, offset);
>   }
>
> -static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length)
> +static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length, size_t offset)
>   {
>           int n;
>
>           for (n = 0; n < length; n+=16) {
>                   int left = length - n;
>   		char buffer[128];
> -		fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n, left > 16 ? 16 : left);
> +		fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n + offset, left > 16 ? 16 : left);
>   		fwts_log_info_verbatum(fw, "%s", buffer);
>           }
>   }
> @@ -230,7 +242,7 @@ static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length)
>   static void acpi_dump_raw_table(fwts_framework *fw, fwts_acpi_table_info *table)
>   {
>   	fwts_log_nl(fw);
> -	acpi_dump_raw_data(fw, (uint8_t *)table->data, table->length);
> +	acpi_dump_raw_data(fw, (uint8_t *)table->data, table->length, 0);
>   }
>
>   static char *acpi_dump_gas_address_space_id(uint64_t index)
> @@ -387,7 +399,7 @@ static void acpidump_bert(fwts_framework *fw, fwts_acpi_table_info *table)
>
>   	acpi_dump_table_fields(fw, data, fields, length, length);
>   	fwts_log_nl(fw);
> -	acpi_dump_raw_data(fw, bert->generic_error_data, n);
> +	acpi_dump_raw_data(fw, bert->generic_error_data, n, sizeof(fwts_acpi_table_bert));
>   }
>
>   static void acpidump_cpep(fwts_framework *fw, fwts_acpi_table_info *table)
> @@ -431,7 +443,7 @@ static void acpidump_ecdt(fwts_framework *fw, fwts_acpi_table_info *table)
>
>   	fwts_log_info_verbatum(fw, "EC_ID:");
>   	fwts_log_nl(fw);
> -	acpi_dump_raw_data(fw, ecdt->ec_id, n);
> +	acpi_dump_raw_data(fw, ecdt->ec_id, n, sizeof(fwts_acpi_table_ecdt));
>   }
>
>   static void acpidump_erst(fwts_framework *fw, fwts_acpi_table_info *table)
> @@ -1405,6 +1417,26 @@ static void acpidump_slic(fwts_framework *fw, fwts_acpi_table_info *table)
>   	}
>   }
>
> +/*
> + *  acpidump_uefi()
> + *	dump out UEFI tables
> + */
> +static void acpidump_uefi(fwts_framework *fw, fwts_acpi_table_info *table)
> +{
> +	uint8_t *data = (uint8_t *)table->data;
> +	fwts_acpi_table_uefi *uefi = (fwts_acpi_table_uefi *)table->data;
> +
> +	static fwts_acpidump_field uefi_fields[] = {
> +		FIELD_GUID("UUID", 	fwts_acpi_table_uefi, uuid),
> +		FIELD_END
> +	};
> +
> +	__acpi_dump_table_fields(fw, data, uefi_fields, 0);
> +	fwts_log_nl(fw);
> +	acpi_dump_raw_data(fw, uefi->data, table->length - sizeof(fwts_acpi_table_uefi),
> +		sizeof(fwts_acpi_table_uefi));
> +}
> +
>   typedef struct {
>   	char *name;
>   	void (*func)(fwts_framework *fw, fwts_acpi_table_info *table);
> @@ -1442,6 +1474,7 @@ static acpidump_table_vec table_vec[] = {
>   	{ "SLIC", 	acpidump_slic,  1 },
>   	{ "SRAT", 	acpidump_srat,  1 },
>   	{ "TCPA",	acpidump_tcpa,	1 },
> +	{ "UEFI", 	acpidump_uefi, 	1 },
>   	{ "XSDT", 	acpidump_xsdt, 	1 },
>   	{ NULL,		NULL,		0 },
>   };
> diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
> index 3e5eda9..7fdb67f 100644
> --- a/src/lib/include/fwts_acpi.h
> +++ b/src/lib/include/fwts_acpi.h
> @@ -585,6 +585,12 @@ typedef struct {
>   	uint8_t		signature[128];
>   } __attribute__ ((packed)) fwts_acpi_table_slic_marker;
>
> +typedef struct {
> +	fwts_acpi_table_header header;
> +	uint8_t		uuid[16];
> +	uint8_t		data[0];
> +} __attribute__ ((packed)) fwts_acpi_table_uefi;
> +
>   void fwts_acpi_table_get_header(fwts_acpi_table_header *hdr, uint8_t *data);
>
>   #endif
>
Acked-by: Alex Hung <alex.hung@canonical.com>
Keng-Yu Lin July 3, 2012, 7 a.m. UTC | #2 
On Fri, Jun 29, 2012 at 9:11 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Dump out the ACPI UEFI tables, mainly just the GUID and the raw
> hex dump of the raw data.  We also add acpi_dump_guid() to allow
> us to format up GUIDs and also add an offset argument to the raw
> data hex dump to allow us to dump out sections of a table in hex
> while printing the table offset address.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/acpi/acpidump/acpidump.c |   43 +++++++++++++++++++++++++++++++++++++-----
>  src/lib/include/fwts_acpi.h  |    6 ++++++
>  2 files changed, 44 insertions(+), 5 deletions(-)
>
> diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
> index 6591bc3..c475628 100644
> --- a/src/acpi/acpidump/acpidump.c
> +++ b/src/acpi/acpidump/acpidump.c
> @@ -78,6 +78,9 @@ typedef struct fwts_acpidump_field {
>  #define FIELD_BITF(text, type, field, nbits, shift)                    \
>         FIELD(text, type, field, acpi_dump_uint, nbits, shift, NULL, 0, NULL)
>
> +#define FIELD_GUID(text, type, field)                  \
> +       FIELD(text, type, field, acpi_dump_guid, 0, 0, NULL, 0, NULL)
> +
>  #define FIELD_END { NULL, 0, 0, NULL, 0, 0, NULL, 0, NULL}
>
>  static char *acpi_dump_field_info(char *label, int size, int offset)
> @@ -178,6 +181,15 @@ static void acpi_dump_uints(fwts_framework *fw, fwts_acpidump_field *info, void
>         }
>  }
>
> +static void acpi_dump_guid(fwts_framework *fw, fwts_acpidump_field *info, void *data, int offset)
> +{
> +       char guid[37];
> +
> +       fwts_guid_buf_to_str(data, guid, sizeof(guid));
> +       fwts_log_info_verbatum(fw, "%s %s",
> +               acpi_dump_field_info(info->label, info->size, info->offset + offset), guid);
> +}
> +
>  static void acpi_dump_strings(fwts_framework *fw, fwts_acpidump_field *info, void *data, int offset)
>  {
>         int hexdigits = info->size << 1;
> @@ -215,14 +227,14 @@ static void __acpi_dump_table_fields(fwts_framework *fw, uint8_t *data, fwts_acp
>                 field->func(fw, field, data + field->offset, offset);
>  }
>
> -static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length)
> +static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length, size_t offset)
>  {
>          int n;
>
>          for (n = 0; n < length; n+=16) {
>                  int left = length - n;
>                 char buffer[128];
> -               fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n, left > 16 ? 16 : left);
> +               fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n + offset, left > 16 ? 16 : left);
>                 fwts_log_info_verbatum(fw, "%s", buffer);
>          }
>  }
> @@ -230,7 +242,7 @@ static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length)
>  static void acpi_dump_raw_table(fwts_framework *fw, fwts_acpi_table_info *table)
>  {
>         fwts_log_nl(fw);
> -       acpi_dump_raw_data(fw, (uint8_t *)table->data, table->length);
> +       acpi_dump_raw_data(fw, (uint8_t *)table->data, table->length, 0);
>  }
>
>  static char *acpi_dump_gas_address_space_id(uint64_t index)
> @@ -387,7 +399,7 @@ static void acpidump_bert(fwts_framework *fw, fwts_acpi_table_info *table)
>
>         acpi_dump_table_fields(fw, data, fields, length, length);
>         fwts_log_nl(fw);
> -       acpi_dump_raw_data(fw, bert->generic_error_data, n);
> +       acpi_dump_raw_data(fw, bert->generic_error_data, n, sizeof(fwts_acpi_table_bert));
>  }
>
>  static void acpidump_cpep(fwts_framework *fw, fwts_acpi_table_info *table)
> @@ -431,7 +443,7 @@ static void acpidump_ecdt(fwts_framework *fw, fwts_acpi_table_info *table)
>
>         fwts_log_info_verbatum(fw, "EC_ID:");
>         fwts_log_nl(fw);
> -       acpi_dump_raw_data(fw, ecdt->ec_id, n);
> +       acpi_dump_raw_data(fw, ecdt->ec_id, n, sizeof(fwts_acpi_table_ecdt));
>  }
>
>  static void acpidump_erst(fwts_framework *fw, fwts_acpi_table_info *table)
> @@ -1405,6 +1417,26 @@ static void acpidump_slic(fwts_framework *fw, fwts_acpi_table_info *table)
>         }
>  }
>
> +/*
> + *  acpidump_uefi()
> + *     dump out UEFI tables
> + */
> +static void acpidump_uefi(fwts_framework *fw, fwts_acpi_table_info *table)
> +{
> +       uint8_t *data = (uint8_t *)table->data;
> +       fwts_acpi_table_uefi *uefi = (fwts_acpi_table_uefi *)table->data;
> +
> +       static fwts_acpidump_field uefi_fields[] = {
> +               FIELD_GUID("UUID",      fwts_acpi_table_uefi, uuid),
> +               FIELD_END
> +       };
> +
> +       __acpi_dump_table_fields(fw, data, uefi_fields, 0);
> +       fwts_log_nl(fw);
> +       acpi_dump_raw_data(fw, uefi->data, table->length - sizeof(fwts_acpi_table_uefi),
> +               sizeof(fwts_acpi_table_uefi));
> +}
> +
>  typedef struct {
>         char *name;
>         void (*func)(fwts_framework *fw, fwts_acpi_table_info *table);
> @@ -1442,6 +1474,7 @@ static acpidump_table_vec table_vec[] = {
>         { "SLIC",       acpidump_slic,  1 },
>         { "SRAT",       acpidump_srat,  1 },
>         { "TCPA",       acpidump_tcpa,  1 },
> +       { "UEFI",       acpidump_uefi,  1 },
>         { "XSDT",       acpidump_xsdt,  1 },
>         { NULL,         NULL,           0 },
>  };
> diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
> index 3e5eda9..7fdb67f 100644
> --- a/src/lib/include/fwts_acpi.h
> +++ b/src/lib/include/fwts_acpi.h
> @@ -585,6 +585,12 @@ typedef struct {
>         uint8_t         signature[128];
>  } __attribute__ ((packed)) fwts_acpi_table_slic_marker;
>
> +typedef struct {
> +       fwts_acpi_table_header header;
> +       uint8_t         uuid[16];
> +       uint8_t         data[0];
> +} __attribute__ ((packed)) fwts_acpi_table_uefi;
> +
>  void fwts_acpi_table_get_header(fwts_acpi_table_header *hdr, uint8_t *data);
>
>  #endif
> --
> 1.7.10.4
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
diff mbox

Patch

diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
index 6591bc3..c475628 100644
--- a/src/acpi/acpidump/acpidump.c
+++ b/src/acpi/acpidump/acpidump.c
@@ -78,6 +78,9 @@  typedef struct fwts_acpidump_field {
 #define FIELD_BITF(text, type, field, nbits, shift)			\
 	FIELD(text, type, field, acpi_dump_uint, nbits, shift, NULL, 0, NULL)
 
+#define FIELD_GUID(text, type, field)			\
+	FIELD(text, type, field, acpi_dump_guid, 0, 0, NULL, 0, NULL)
+
 #define FIELD_END { NULL, 0, 0, NULL, 0, 0, NULL, 0, NULL}
 
 static char *acpi_dump_field_info(char *label, int size, int offset)
@@ -178,6 +181,15 @@  static void acpi_dump_uints(fwts_framework *fw, fwts_acpidump_field *info, void
 	}
 }
 
+static void acpi_dump_guid(fwts_framework *fw, fwts_acpidump_field *info, void *data, int offset)
+{
+	char guid[37];
+
+	fwts_guid_buf_to_str(data, guid, sizeof(guid));
+	fwts_log_info_verbatum(fw, "%s %s",
+		acpi_dump_field_info(info->label, info->size, info->offset + offset), guid);
+}
+
 static void acpi_dump_strings(fwts_framework *fw, fwts_acpidump_field *info, void *data, int offset)
 {
 	int hexdigits = info->size << 1;
@@ -215,14 +227,14 @@  static void __acpi_dump_table_fields(fwts_framework *fw, uint8_t *data, fwts_acp
 		field->func(fw, field, data + field->offset, offset);
 }
 
-static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length)
+static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length, size_t offset)
 {
         int n;
 
         for (n = 0; n < length; n+=16) {
                 int left = length - n;
 		char buffer[128];
-		fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n, left > 16 ? 16 : left);
+		fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n + offset, left > 16 ? 16 : left);
 		fwts_log_info_verbatum(fw, "%s", buffer);
         }
 }
@@ -230,7 +242,7 @@  static void acpi_dump_raw_data(fwts_framework *fw, uint8_t *data, size_t length)
 static void acpi_dump_raw_table(fwts_framework *fw, fwts_acpi_table_info *table)
 {
 	fwts_log_nl(fw);
-	acpi_dump_raw_data(fw, (uint8_t *)table->data, table->length);
+	acpi_dump_raw_data(fw, (uint8_t *)table->data, table->length, 0);
 }
 
 static char *acpi_dump_gas_address_space_id(uint64_t index)
@@ -387,7 +399,7 @@  static void acpidump_bert(fwts_framework *fw, fwts_acpi_table_info *table)
 
 	acpi_dump_table_fields(fw, data, fields, length, length);
 	fwts_log_nl(fw);
-	acpi_dump_raw_data(fw, bert->generic_error_data, n);
+	acpi_dump_raw_data(fw, bert->generic_error_data, n, sizeof(fwts_acpi_table_bert));
 }
 
 static void acpidump_cpep(fwts_framework *fw, fwts_acpi_table_info *table)
@@ -431,7 +443,7 @@  static void acpidump_ecdt(fwts_framework *fw, fwts_acpi_table_info *table)
 
 	fwts_log_info_verbatum(fw, "EC_ID:");
 	fwts_log_nl(fw);
-	acpi_dump_raw_data(fw, ecdt->ec_id, n);
+	acpi_dump_raw_data(fw, ecdt->ec_id, n, sizeof(fwts_acpi_table_ecdt));
 }
 
 static void acpidump_erst(fwts_framework *fw, fwts_acpi_table_info *table)
@@ -1405,6 +1417,26 @@  static void acpidump_slic(fwts_framework *fw, fwts_acpi_table_info *table)
 	}
 }
 
+/*
+ *  acpidump_uefi()
+ *	dump out UEFI tables
+ */
+static void acpidump_uefi(fwts_framework *fw, fwts_acpi_table_info *table)
+{
+	uint8_t *data = (uint8_t *)table->data;
+	fwts_acpi_table_uefi *uefi = (fwts_acpi_table_uefi *)table->data;
+
+	static fwts_acpidump_field uefi_fields[] = {
+		FIELD_GUID("UUID", 	fwts_acpi_table_uefi, uuid),
+		FIELD_END
+	};
+
+	__acpi_dump_table_fields(fw, data, uefi_fields, 0);
+	fwts_log_nl(fw);
+	acpi_dump_raw_data(fw, uefi->data, table->length - sizeof(fwts_acpi_table_uefi),
+		sizeof(fwts_acpi_table_uefi));
+}
+
 typedef struct {
 	char *name;
 	void (*func)(fwts_framework *fw, fwts_acpi_table_info *table);
@@ -1442,6 +1474,7 @@  static acpidump_table_vec table_vec[] = {
 	{ "SLIC", 	acpidump_slic,  1 },
 	{ "SRAT", 	acpidump_srat,  1 },
 	{ "TCPA",	acpidump_tcpa,	1 },
+	{ "UEFI", 	acpidump_uefi, 	1 },
 	{ "XSDT", 	acpidump_xsdt, 	1 },
 	{ NULL,		NULL,		0 },
 };
diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
index 3e5eda9..7fdb67f 100644
--- a/src/lib/include/fwts_acpi.h
+++ b/src/lib/include/fwts_acpi.h
@@ -585,6 +585,12 @@  typedef struct {
 	uint8_t		signature[128];
 } __attribute__ ((packed)) fwts_acpi_table_slic_marker;
 
+typedef struct {
+	fwts_acpi_table_header header;
+	uint8_t		uuid[16];
+	uint8_t		data[0];
+} __attribute__ ((packed)) fwts_acpi_table_uefi;
+
 void fwts_acpi_table_get_header(fwts_acpi_table_header *hdr, uint8_t *data);
 
 #endif