[src/trunk]: src/sys/dev/pci/ixgbe Sync with FreeBSD's r326022. All of the fo...

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

details:   https://anonhg.NetBSD.org/src/rev/9f6e4c743fd2
branches:  trunk
changeset: 828258:9f6e4c743fd2
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Dec 06 04:08:50 2017 +0000

description:
Sync with FreeBSD's r326022. All of the following changes have no influence
to netbsd:
- Check ETHERCAP_VLAN_HWTAGGING in ixgbe_setup_vlan_hw_support(). This change
  has no influence to netbsd because it's enabled by default and NetBSD has
  no API to disable it.
- Fix for netmap module.
- Remove never defined UDP_IPV4_EX
- Add SPDX-License-Identifier

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c           |  26 ++++++++++++++------------
 sys/dev/pci/ixgbe/ixgbe.h           |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_82598.c     |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_82598.h     |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_82599.c     |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_82599.h     |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_api.c       |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_api.h       |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_common.c    |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_common.h    |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_dcb.c       |   1 +
 sys/dev/pci/ixgbe/ixgbe_dcb.h       |   1 +
 sys/dev/pci/ixgbe/ixgbe_dcb_82598.c |   1 +
 sys/dev/pci/ixgbe/ixgbe_dcb_82598.h |   1 +
 sys/dev/pci/ixgbe/ixgbe_dcb_82599.c |   1 +
 sys/dev/pci/ixgbe/ixgbe_dcb_82599.h |   1 +
 sys/dev/pci/ixgbe/ixgbe_mbx.c       |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_mbx.h       |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_osdep.h     |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_phy.c       |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_phy.h       |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_rss.h       |   1 -
 sys/dev/pci/ixgbe/ixgbe_type.h      |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_vf.c        |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_vf.h        |   3 ++-
 sys/dev/pci/ixgbe/ixgbe_x540.c      |   1 +
 sys/dev/pci/ixgbe/ixgbe_x540.h      |   1 +
 sys/dev/pci/ixgbe/ixv.c             |   5 +----
 28 files changed, 57 insertions(+), 34 deletions(-)

diffs (truncated from 361 to 300 lines):

diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Wed Dec 06 04:08:50 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.114 2017/11/24 08:36:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.115 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -272,6 +272,9 @@
 
 MODULE_DEPEND(ix, pci, 1, 1, 1);
 MODULE_DEPEND(ix, ether, 1, 1, 1);
+#ifdef DEV_NETMAP
+MODULE_DEPEND(ix, netmap, 1, 1, 1);
+#endif
 #endif
 
 /*
@@ -498,9 +501,6 @@
                mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP;
        if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4)
                mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_UDP;
-       if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4_EX)
-               device_printf(adapter->dev, "%s: RSS_HASHTYPE_RSS_UDP_IPV4_EX defined, but not supported\n",
-                   __func__);
        if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
                mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP;
        if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX)
@@ -2185,15 +2185,17 @@
                return;
 
        /* Setup the queues for vlans */
-       for (i = 0; i < adapter->num_queues; i++) {
-               rxr = &adapter->rx_rings[i];
-               /* On 82599 the VLAN enable is per/queue in RXDCTL */
-               if (hw->mac.type != ixgbe_mac_82598EB) {
-                       ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
-                       ctrl |= IXGBE_RXDCTL_VME;
-                       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
+       if (ec->ec_capenable & ETHERCAP_VLAN_HWTAGGING) {
+               for (i = 0; i < adapter->num_queues; i++) {
+                       rxr = &adapter->rx_rings[i];
+                       /* On 82599 the VLAN enable is per/queue in RXDCTL */
+                       if (hw->mac.type != ixgbe_mac_82598EB) {
+                               ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
+                               ctrl |= IXGBE_RXDCTL_VME;
+                               IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
+                       }
+                       rxr->vtag_strip = TRUE;
                }
-               rxr->vtag_strip = TRUE;
        }
 
        if ((ec->ec_capenable & ETHERCAP_VLAN_HWFILTER) == 0)
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe.h
--- a/sys/dev/pci/ixgbe/ixgbe.h Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.h Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe.h,v 1.28 2017/11/22 15:15:09 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.29 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_82598.c
--- a/sys/dev/pci/ixgbe/ixgbe_82598.c   Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_82598.c   Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82598.c,v 1.9 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82598.c,v 1.10 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_82598.h
--- a/sys/dev/pci/ixgbe/ixgbe_82598.h   Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_82598.h   Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82598.h,v 1.6 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82598.h,v 1.7 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_82599.c
--- a/sys/dev/pci/ixgbe/ixgbe_82599.c   Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_82599.c   Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82599.c,v 1.15 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82599.c,v 1.16 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_82599.h
--- a/sys/dev/pci/ixgbe/ixgbe_82599.h   Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_82599.h   Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_82599.h,v 1.5 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82599.h,v 1.6 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_api.c
--- a/sys/dev/pci/ixgbe/ixgbe_api.c     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_api.c     Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_api.c,v 1.17 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_api.c,v 1.18 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_api.h
--- a/sys/dev/pci/ixgbe/ixgbe_api.h     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_api.h     Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_api.h,v 1.10 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_api.h,v 1.11 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_common.c
--- a/sys/dev/pci/ixgbe/ixgbe_common.c  Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_common.c  Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_common.c,v 1.15 2017/10/13 08:17:44 msaitoh Exp $ */
+/* $NetBSD: ixgbe_common.c,v 1.16 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_common.h
--- a/sys/dev/pci/ixgbe/ixgbe_common.h  Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_common.h  Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_common.h,v 1.8 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_common.h,v 1.9 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_dcb.c
--- a/sys/dev/pci/ixgbe/ixgbe_dcb.c     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_dcb.c     Wed Dec 06 04:08:50 2017 +0000
@@ -1,4 +1,5 @@
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_dcb.h
--- a/sys/dev/pci/ixgbe/ixgbe_dcb.h     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_dcb.h     Wed Dec 06 04:08:50 2017 +0000
@@ -1,4 +1,5 @@
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_dcb_82598.c
--- a/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c       Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c       Wed Dec 06 04:08:50 2017 +0000
@@ -1,4 +1,5 @@
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_dcb_82598.h
--- a/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h       Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_dcb_82598.h       Wed Dec 06 04:08:50 2017 +0000
@@ -1,4 +1,5 @@
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_dcb_82599.c
--- a/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c       Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c       Wed Dec 06 04:08:50 2017 +0000
@@ -1,4 +1,5 @@
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_dcb_82599.h
--- a/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h       Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h       Wed Dec 06 04:08:50 2017 +0000
@@ -1,4 +1,5 @@
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_mbx.c
--- a/sys/dev/pci/ixgbe/ixgbe_mbx.c     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_mbx.c     Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_mbx.c,v 1.8 2017/10/03 02:55:37 msaitoh Exp $ */
+/* $NetBSD: ixgbe_mbx.c,v 1.9 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_mbx.h
--- a/sys/dev/pci/ixgbe/ixgbe_mbx.h     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_mbx.h     Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_mbx.h,v 1.11 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_mbx.h,v 1.12 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_osdep.h
--- a/sys/dev/pci/ixgbe/ixgbe_osdep.h   Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_osdep.h   Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_osdep.h,v 1.18 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_osdep.h,v 1.19 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation 
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_phy.c
--- a/sys/dev/pci/ixgbe/ixgbe_phy.c     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_phy.c     Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_phy.c,v 1.13 2017/11/07 05:41:54 msaitoh Exp $ */
+/* $NetBSD: ixgbe_phy.c,v 1.14 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_phy.h
--- a/sys/dev/pci/ixgbe/ixgbe_phy.h     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_phy.h     Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_phy.h,v 1.9 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_phy.h,v 1.10 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_rss.h
--- a/sys/dev/pci/ixgbe/ixgbe_rss.h     Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_rss.h     Wed Dec 06 04:08:50 2017 +0000
@@ -49,7 +49,6 @@
 #define RSS_HASHTYPE_RSS_IPV6_EX       (1 << 5)
 #define RSS_HASHTYPE_RSS_TCP_IPV6_EX   (1 << 6)
 #define RSS_HASHTYPE_RSS_UDP_IPV4      (1 << 7)
-#define RSS_HASHTYPE_RSS_UDP_IPV4_EX   (1 << 8)
 #define RSS_HASHTYPE_RSS_UDP_IPV6      (1 << 9)
 #define RSS_HASHTYPE_RSS_UDP_IPV6_EX   (1 << 10)
 
diff -r 68afb379dbc5 -r 9f6e4c743fd2 sys/dev/pci/ixgbe/ixgbe_type.h
--- a/sys/dev/pci/ixgbe/ixgbe_type.h    Wed Dec 06 04:00:07 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_type.h    Wed Dec 06 04:08:50 2017 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ixgbe_type.h,v 1.29 2017/10/04 08:47:26 msaitoh Exp $ */
+/* $NetBSD: ixgbe_type.h,v 1.30 2017/12/06 04:08:50 msaitoh Exp $ */
 
 /******************************************************************************
+  SPDX-License-Identifier: BSD-3-Clause
 
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.