Module Name: src
Committed By: msaitoh
Date: Wed Jun 12 01:54:12 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Print ICH/PCH's NVM version.
To generate a diff of this commit:
cvs rdiff -u -r1.640 -r1.641 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.640 src/sys/dev/pci/if_wm.c:1.641
--- src/sys/dev/pci/if_wm.c:1.640 Fri Jun 7 04:39:15 2019
+++ src/sys/dev/pci/if_wm.c Wed Jun 12 01:54:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.640 2019/06/07 04:39:15 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.641 2019/06/12 01:54:11 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.640 2019/06/07 04:39:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.641 2019/06/12 01:54:11 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -13475,6 +13475,15 @@ wm_nvm_version(struct wm_softc *sc)
* 82574L 0x1080 1.8.0? (the spec update notes about 2.1.4)
* 0x2013 2.1.3?
* 82583 0x10a0 1.10.0? (document says it's default value)
+ * ICH8+82567 0x0040 0.4.0?
+ * ICH9+82566 0x1040 1.4.0?
+ *ICH10+82567 0x0043 0.4.3?
+ * PCH+82577 0x00c1 0.12.1?
+ * PCH2+82579 0x00d3 0.13.3?
+ * 0x00d4 0.13.4?
+ * LPT+I218 0x0023 0.2.3?
+ * SPT+I219 0x0084 0.8.4?
+ * CNP+I219 0x0054 0.5.4?
*/
/*
@@ -13495,6 +13504,18 @@ wm_nvm_version(struct wm_softc *sc)
check_optionrom = true;
have_build = true;
break;
+ case WM_T_ICH8:
+ case WM_T_ICH9:
+ case WM_T_ICH10:
+ case WM_T_PCH:
+ case WM_T_PCH2:
+ case WM_T_PCH_LPT:
+ case WM_T_PCH_SPT:
+ case WM_T_PCH_CNP:
+ check_version = true;
+ have_build = true;
+ have_uid = false;
+ break;
case WM_T_82575:
case WM_T_82576:
case WM_T_82580:
