Module Name: src
Committed By: msaitoh
Date: Fri Nov 24 08:36:22 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
On X540, print PHY FW Revision with %u.%x. 0x04000300 will be printed
as "Revision 4.3 ID 0x0"
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.113 src/sys/dev/pci/ixgbe/ixgbe.c:1.114
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.113 Wed Nov 22 15:15:09 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Nov 24 08:36:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.113 2017/11/22 15:15:09 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.114 2017/11/24 08:36:22 msaitoh Exp $ */
/******************************************************************************
@@ -1003,8 +1003,13 @@ ixgbe_attach(device_t parent, device_t d
high = (nvmreg >> 12) & 0x0f;
low = (nvmreg >> 4) & 0xff;
id = nvmreg & 0x000f;
- aprint_normal(" PHY FW Revision %u.%02x ID 0x%x,", high, low,
- id);
+ aprint_normal(" PHY FW Revision %u.", high);
+ if (hw->mac.type == ixgbe_mac_X540)
+ str = "%x";
+ else
+ str = "%02x";
+ aprint_normal(str, low);
+ aprint_normal(" ID 0x%x,", id);
break;
default:
break;
