Module Name: src
Committed By: msaitoh
Date: Thu Sep 16 07:08:26 UTC 2021
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
Use IXGBE_TXDCTL_WTHRESH_SHIFT macro. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/pci/ixgbe/ixv.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.290 src/sys/dev/pci/ixgbe/ixgbe.c:1.291
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.290 Thu Aug 26 09:03:47 2021
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Sep 16 07:08:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.290 2021/08/26 09:03:47 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.291 2021/09/16 07:08:26 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.290 2021/08/26 09:03:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.291 2021/09/16 07:08:26 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -4102,7 +4102,7 @@ ixgbe_init_locked(struct adapter *adapte
txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(txr->me));
txdctl |= IXGBE_TXDCTL_ENABLE;
/* Set WTHRESH to 8, burst writeback */
- txdctl |= (8 << 16);
+ txdctl |= (8 << IXGBE_TXDCTL_WTHRESH_SHIFT);
/*
* When the internal queue falls below PTHRESH (32),
* start prefetching as long as there are at least
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.166 src/sys/dev/pci/ixgbe/ixv.c:1.167
--- src/sys/dev/pci/ixgbe/ixv.c:1.166 Thu Aug 26 09:03:47 2021
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Sep 16 07:08:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.166 2021/08/26 09:03:47 msaitoh Exp $ */
+/* $NetBSD: ixv.c,v 1.167 2021/09/16 07:08:26 msaitoh Exp $ */
/******************************************************************************
@@ -35,7 +35,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.166 2021/08/26 09:03:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.167 2021/09/16 07:08:26 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1716,7 +1716,7 @@ ixv_initialize_transmit_units(struct ada
/* Set WTHRESH to 8, burst writeback */
txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j));
- txdctl |= (8 << 16);
+ txdctl |= (8 << IXGBE_TXDCTL_WTHRESH_SHIFT);
IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j), txdctl);
/* Set the HW Tx Head and Tail indices */
