Module Name: src
Committed By: msaitoh
Date: Wed Dec 15 09:19:35 UTC 2021
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_phy.c ixgbe_type.h
Log Message:
Match X550_PHY_ID correctly on X550.
- Sync with FreeBSD ix-3.3.18.
- phy_id's revision field is cleared, so use new X550_PHY_ID.
- Before this commit, phy_id was set to ixgbe_phy_cu_unknown on X550.
Now it's set to ixgbe_phy_aq.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/ixgbe/ixgbe_phy.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/ixgbe/ixgbe_type.h
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_phy.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.27 src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.28
--- src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.27 Fri Dec 10 11:31:22 2021
+++ src/sys/dev/pci/ixgbe/ixgbe_phy.c Wed Dec 15 09:19:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_phy.c,v 1.27 2021/12/10 11:31:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe_phy.c,v 1.28 2021/12/15 09:19:34 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -36,7 +36,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_phy.c 331224 2018-03-19 20:55:05Z erj $*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe_phy.c,v 1.27 2021/12/10 11:31:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe_phy.c,v 1.28 2021/12/15 09:19:34 msaitoh Exp $");
#include "ixgbe_api.h"
#include "ixgbe_common.h"
@@ -470,8 +470,7 @@ enum ixgbe_phy_type ixgbe_get_phy_type_f
case TN1010_PHY_ID:
phy_type = ixgbe_phy_tn;
break;
- case X550_PHY_ID2:
- case X550_PHY_ID3:
+ case X550_PHY_ID:
case X540_PHY_ID:
phy_type = ixgbe_phy_aq;
break;
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.51 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.52
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.51 Fri Dec 10 11:30:09 2021
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Wed Dec 15 09:19:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_type.h,v 1.51 2021/12/10 11:30:09 msaitoh Exp $ */
+/* $NetBSD: ixgbe_type.h,v 1.52 2021/12/15 09:19:34 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -1714,6 +1714,7 @@ struct ixgbe_dmac_config {
#define TN1010_PHY_ID 0x00A19410
#define TNX_FW_REV 0xB
#define X540_PHY_ID 0x01540200
+#define X550_PHY_ID 0x01540220
#define X550_PHY_ID2 0x01540223
#define X550_PHY_ID3 0x01540221
#define X557_PHY_ID 0x01540240
