Module Name: src
Committed By: msaitoh
Date: Tue Jul 2 08:32:18 UTC 2019
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_type.h
Log Message:
Sync with FreeBSD ix-3.3.10 part 1. No functional change in this part:
- "(u64)1" -> "1ULL"
- Add some not-yet-used register definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.39 -r1.40 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.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.189 src/sys/dev/pci/ixgbe/ixgbe.c:1.190
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.189 Thu Jun 27 05:55:40 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Jul 2 08:32:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.189 2019/06/27 05:55:40 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.190 2019/07/02 08:32:18 msaitoh Exp $ */
/******************************************************************************
@@ -81,7 +81,7 @@
* Driver version
************************************************************************/
static const char ixgbe_driver_version[] = "4.0.1-k";
-/* XXX NetBSD: + 3.3.8 */
+/* XXX NetBSD: + 3.3.10 */
/************************************************************************
* PCI Device ID Table
@@ -4464,7 +4464,7 @@ ixgbe_local_timer1(void *arg)
for (i = 0; i < adapter->num_queues; i++, que++) {
/* Keep track of queues with work for soft irq */
if (que->txr->busy)
- queues |= ((u64)1 << que->me);
+ queues |= 1ULL << que->me;
/*
* Each time txeof runs without cleaning, but there
* are uncleaned descriptors it increments busy. If
@@ -4473,12 +4473,12 @@ ixgbe_local_timer1(void *arg)
if (que->busy == IXGBE_QUEUE_HUNG) {
++hung;
/* Mark the queue as inactive */
- adapter->active_queues &= ~((u64)1 << que->me);
+ adapter->active_queues &= ~(1ULL << que->me);
continue;
} else {
/* Check if we've come back from hung */
- if ((adapter->active_queues & ((u64)1 << que->me)) == 0)
- adapter->active_queues |= ((u64)1 << que->me);
+ if ((adapter->active_queues & (1ULL << que->me)) == 0)
+ adapter->active_queues |= 1ULL << que->me;
}
if (que->busy >= IXGBE_MAX_TX_BUSY) {
device_printf(dev,
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.39 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.40
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.39 Thu Jun 27 05:55:40 2019
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Tue Jul 2 08:32:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_type.h,v 1.39 2019/06/27 05:55:40 msaitoh Exp $ */
+/* $NetBSD: ixgbe_type.h,v 1.40 2019/07/02 08:32:18 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -210,6 +210,10 @@
#define IXGBE_FLA_X550EM_x IXGBE_FLA
#define IXGBE_FLA_X550EM_a 0x15F68
#define IXGBE_FLA_BY_MAC(_hw) IXGBE_BY_MAC((_hw), FLA)
+#define IXGBE_FLA_FL_SIZE_SHIFT_X540 17
+#define IXGBE_FLA_FL_SIZE_SHIFT_X550 12
+#define IXGBE_FLA_FL_SIZE_MASK_X540 (0x7 << IXGBE_FLA_FL_SIZE_SHIFT_X540)
+#define IXGBE_FLA_FL_SIZE_MASK_X550 (0x7 << IXGBE_FLA_FL_SIZE_SHIFT_X550)
#define IXGBE_EEMNGCTL 0x10110
#define IXGBE_EEMNGDATA 0x10114
@@ -1448,6 +1452,7 @@ struct ixgbe_dmac_config {
#define IXGBE_BARCTRL_FLSIZE 0x0700
#define IXGBE_BARCTRL_FLSIZE_SHIFT 8
#define IXGBE_BARCTRL_CSRSIZE 0x2000
+#define IXGBE_BARCTRL_CSRSIZE_SHIFT 13
/* RSCCTL Bit Masks */
#define IXGBE_RSCCTL_RSCEN 0x01
