Module Name: src
Committed By: msaitoh
Date: Wed Feb 21 12:23:52 UTC 2024
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm(4): Fix upper 16bit of Image Unique ID(EtrackID).
Don't override uid1 variable while reading option ROM version
to print Image Unique ID correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.797 -r1.798 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.797 src/sys/dev/pci/if_wm.c:1.798
--- src/sys/dev/pci/if_wm.c:1.797 Mon Jan 29 06:24:51 2024
+++ src/sys/dev/pci/if_wm.c Wed Feb 21 12:23:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.798 2024/02/21 12:23:52 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.798 2024/02/21 12:23:52 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -15364,16 +15364,17 @@ printver:
/* Option ROM Version */
if ((off != 0x0000) && (off != 0xffff)) {
int rv;
+ uint16_t oid0, oid1;
off += NVM_COMBO_VER_OFF;
- rv = wm_nvm_read(sc, off + 1, 1, &uid1);
- rv |= wm_nvm_read(sc, off, 1, &uid0);
- if ((rv == 0) && (uid0 != 0) && (uid0 != 0xffff)
- && (uid1 != 0) && (uid1 != 0xffff)) {
+ rv = wm_nvm_read(sc, off + 1, 1, &oid1);
+ rv |= wm_nvm_read(sc, off, 1, &oid0);
+ if ((rv == 0) && (oid0 != 0) && (oid0 != 0xffff)
+ && (oid1 != 0) && (oid1 != 0xffff)) {
/* 16bits */
- major = uid0 >> 8;
- build = (uid0 << 8) | (uid1 >> 8);
- patch = uid1 & 0x00ff;
+ major = oid0 >> 8;
+ build = (oid0 << 8) | (oid1 >> 8);
+ patch = oid1 & 0x00ff;
aprint_verbose(", option ROM Version %d.%d.%d",
major, build, patch);
}
