Re: [PATCH v2] DMI: log system, BIOS, and board information

From: Andrew Morton
Date: Mon Oct 04 2010 - 19:20:11 EST


On Thu, 30 Sep 2010 10:49:05 -0600
Bjorn Helgaas <bjorn.helgaas@xxxxxx> wrote:

>
> Put basic system information in the dmesg log. There are lots of dmesg
> logs on the web, and it would be useful if they contained this information
> for debugging platform problems.
>
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
> ---
>
> drivers/firmware/dmi_scan.c | 35 ++++++++++++++++++++++++++++++++++-
> 1 files changed, 34 insertions(+), 1 deletions(-)
>
>
> diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
> index b3d22d6..d625e53 100644
> --- a/drivers/firmware/dmi_scan.c
> +++ b/drivers/firmware/dmi_scan.c
> @@ -2,6 +2,7 @@
> #include <linux/string.h>
> #include <linux/init.h>
> #include <linux/module.h>
> +#include <linux/ctype.h>
> #include <linux/dmi.h>
> #include <linux/efi.h>
> #include <linux/bootmem.h>
> @@ -361,6 +362,36 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
> }
> }
>
> +static const char * __init dmi_printable_system_info(int field)
> +{
> + const char *info, *p;
> +
> + info = dmi_get_system_info(field);
> + if (!info)
> + return NULL;
> +
> + for (p = info; *p; p++)
> + if (!isprint(*p))
> + return "<...>";
> +
> + return info;
> +}

So if the string contains any non-printable character, we suppress the
whole string.

Is that the best thing to do? Would it be better to present the
oddball character as \xNN or such?


> +static void __init dmi_dump_ids(void)
> +{
> + const char *board;
> +
> + printk(KERN_DEBUG "DMI: system: %s %s",
> + dmi_printable_system_info(DMI_SYS_VENDOR),
> + dmi_printable_system_info(DMI_PRODUCT_NAME));
> + board = dmi_printable_system_info(DMI_BOARD_NAME);
> + if (board)
> + printk(KERN_CONT " (%s board)", board);
> + printk(KERN_CONT ", BIOS: %s %s\n",
> + dmi_printable_system_info(DMI_BIOS_VERSION),
> + dmi_printable_system_info(DMI_BIOS_DATE));
> +}
> +
> static int __init dmi_present(const char __iomem *p)
> {
> u8 buf[15];
> @@ -381,8 +412,10 @@ static int __init dmi_present(const char __iomem *p)
> buf[14] >> 4, buf[14] & 0xF);
> else
> printk(KERN_INFO "DMI present.\n");
> - if (dmi_walk_early(dmi_decode) == 0)
> + if (dmi_walk_early(dmi_decode) == 0) {
> + dmi_dump_ids();
> return 0;
> + }
> }
> return 1;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/