[src/trunk]: src/sys/dev/pci/ixgbe Match X550_PHY_ID correctly on X550.

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0551aa88ebb1
branches:  trunk
changeset: 1027670:0551aa88ebb1
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Dec 15 09:19:34 2021 +0000

description:
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.

diffstat:

 sys/dev/pci/ixgbe/ixgbe_phy.c  |  7 +++----
 sys/dev/pci/ixgbe/ixgbe_type.h |  3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 96386d8a7123 -r 0551aa88ebb1 sys/dev/pci/ixgbe/ixgbe_phy.c
--- a/sys/dev/pci/ixgbe/ixgbe_phy.c     Wed Dec 15 09:19:28 2021 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_phy.c     Wed Dec 15 09:19:34 2021 +0000
@@ -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 @@
        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;
diff -r 96386d8a7123 -r 0551aa88ebb1 sys/dev/pci/ixgbe/ixgbe_type.h
--- a/sys/dev/pci/ixgbe/ixgbe_type.h    Wed Dec 15 09:19:28 2021 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_type.h    Wed Dec 15 09:19:34 2021 +0000
@@ -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 @@
 #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