proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-08 10:27:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get the version number out from Intel VBIOS too

Browse Source
This commit is contained in:
Richard Hughes 2015-06-30 15:12:28 +01:00
parent 4b41e737b1
commit ffd5fdf7f2
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/fu-rom.c
View File

@ -61,6 +61,8 @@ fu_rom_kind_to_string (FuRomKind kind)
return "ati"; return "ati";
if (kind == FU_ROM_KIND_NVIDIA) if (kind == FU_ROM_KIND_NVIDIA)
return "nvidia"; return "nvidia";
if (kind == FU_ROM_KIND_INTEL)
return "intel";
return NULL; return NULL;
} }
@ -123,7 +125,8 @@ fu_rom_load_file (FuRom *rom, GFile *file, GCancellable *cancellable, GError **e
const guint block_sz = 4096; const guint block_sz = 4096;
guint8 buffer[block_sz]; guint8 buffer[block_sz];
gchar *str; gchar *str;
guint nvgi_sz = 0; guint hdr_sz = 0;
guint i;
gssize sz; gssize sz;
_cleanup_free_ gchar *fn = NULL; _cleanup_free_ gchar *fn = NULL;
_cleanup_error_free_ GError *error_local = NULL; _cleanup_error_free_ GError *error_local = NULL;
@ -163,12 +166,21 @@ fu_rom_load_file (FuRom *rom, GFile *file, GCancellable *cancellable, GError **e
/* detect signed header and skip to option ROM */ /* detect signed header and skip to option ROM */
if (memcmp (buffer, "NVGI", 4) == 0) if (memcmp (buffer, "NVGI", 4) == 0)
nvgi_sz = GUINT16_FROM_BE (buffer[0x15]); hdr_sz = GUINT16_FROM_BE (buffer[0x15]);
/* firmware magic bytes */ /* firmware magic bytes */
if (memcmp (buffer + nvgi_sz, "\x55\xaa", 2) == 0) { if (memcmp (buffer + hdr_sz, "\x55\xaa", 2) == 0) {
if (memcmp (buffer + nvgi_sz + 0x04, "K740", 4) == 0) {
/* detect intel header */
if (memcmp (buffer + 0x06, "00000000000", 11) == 0)
hdr_sz = (buffer[0x1b] << 8) + buffer[0x1a];
if (memcmp (buffer + hdr_sz + 0x04, "K740", 4) == 0) {
priv->kind = FU_ROM_KIND_NVIDIA; priv->kind = FU_ROM_KIND_NVIDIA;
} else if (memcmp (buffer + hdr_sz, "$VBT", 4) == 0) {
priv->kind = FU_ROM_KIND_INTEL;
/* see drivers/gpu/drm/i915/intel_bios.h */
hdr_sz += (buffer[hdr_sz + 23] << 8) + buffer[hdr_sz + 22];
} else if (memcmp(buffer + 0x30, " 761295520", 10) == 0) { } else if (memcmp(buffer + 0x30, " 761295520", 10) == 0) {
priv->kind = FU_ROM_KIND_ATI; priv->kind = FU_ROM_KIND_ATI;
} else { } else {
@ -192,10 +204,10 @@ fu_rom_load_file (FuRom *rom, GFile *file, GCancellable *cancellable, GError **e
case FU_ROM_KIND_NVIDIA: case FU_ROM_KIND_NVIDIA:
/* static location for some firmware */ /* static location for some firmware */
if (memcmp (buffer + nvgi_sz + 0x0d7, "Version ", 8) == 0) if (memcmp (buffer + hdr_sz + 0x0d7, "Version ", 8) == 0)
priv->version = g_strdup ((gchar *) &buffer[0x0d7 + nvgi_sz + 8]); priv->version = g_strdup ((gchar *) &buffer[0x0d7 + hdr_sz + 8]);
else if (memcmp (buffer + nvgi_sz + 0x155, "Version ", 8) == 0) else if (memcmp (buffer + hdr_sz + 0x155, "Version ", 8) == 0)
priv->version = g_strdup ((gchar *) &buffer[0x155 + nvgi_sz + 8]); priv->version = g_strdup ((gchar *) &buffer[0x155 + hdr_sz + 8]);
/* usual search string */ /* usual search string */
if (priv->version == NULL) { if (priv->version == NULL) {
@ -218,8 +230,8 @@ fu_rom_load_file (FuRom *rom, GFile *file, GCancellable *cancellable, GError **e
/* fallback to VBIOS */ /* fallback to VBIOS */
if (priv->version == NULL && if (priv->version == NULL &&
memcmp (buffer + nvgi_sz + 0xfa, "VBIOS Ver", 9) == 0) memcmp (buffer + hdr_sz + 0xfa, "VBIOS Ver", 9) == 0)
priv->version = g_strdup ((gchar *) &buffer[0xfa + nvgi_sz + 9]); priv->version = g_strdup ((gchar *) &buffer[0xfa + hdr_sz + 9]);
/* urgh */ /* urgh */
if (priv->version != NULL) { if (priv->version != NULL) {
@ -227,6 +239,20 @@ fu_rom_load_file (FuRom *rom, GFile *file, GCancellable *cancellable, GError **e
g_strdelimit (priv->version, "\r\n ", '\0'); g_strdelimit (priv->version, "\r\n ", '\0');
} }
break; break;
case FU_ROM_KIND_INTEL:
if (priv->version == NULL) {
/* 2175_RYan PC 14.34 06/06/2013 21:27:53 */
str = (gchar *) fu_rom_strstr_bin (buffer, sz, "Build Number:");
if (str != NULL) {
_cleanup_strv_free_ gchar **split = NULL;
split = g_strsplit (str + 14, " ", -1);
for (i = 0; split[i] != NULL; i++) {
if (g_strstr_len (split[i], -1, ".") == NULL)
continue;
priv->version = g_strdup (split[i]);
}
}
}
case FU_ROM_KIND_ATI: case FU_ROM_KIND_ATI:
if (priv->version == NULL) { if (priv->version == NULL) {
str = (gchar *) fu_rom_strstr_bin (buffer, sz, " VER0"); str = (gchar *) fu_rom_strstr_bin (buffer, sz, " VER0");

1
src/fu-rom.h
View File

@ -54,6 +54,7 @@ typedef enum {
FU_ROM_KIND_UNKNOWN, FU_ROM_KIND_UNKNOWN,
FU_ROM_KIND_ATI, FU_ROM_KIND_ATI,
FU_ROM_KIND_NVIDIA, FU_ROM_KIND_NVIDIA,
FU_ROM_KIND_INTEL,
FU_ROM_KIND_LAST FU_ROM_KIND_LAST
} FuRomKind; } FuRomKind;