Version 3.8.7

README.md

@@ -20,7 +20,7 @@ apt install linux-headers-$(uname -r) dkms build-essential
 
 To install the deb package run:
 ```
-dpkg -i e1000e-dkms_<x.x.x.x>_all.deb
+dpkg -i e1000e-dkms_<x.x.x>_all.deb
 ```
 
 To remove the driver run:
@@ -39,15 +39,15 @@ dpkg-deb --build e1000e-dkms
 
 If you want to use the DKMS kernel module only (works with all Linux distributions) run:
 ```
-cp -r e1000e-dkms/usr/src/e1000e-<x.x.x.x> /usr/src/
-dkms add -m e1000e -v <x.x.x.x>
-dkms build -m e1000e -v <x.x.x.x>
-dkms install -m e1000e -v <x.x.x.x>
+cp -r e1000e-dkms/usr/src/e1000e-<x.x.x> /usr/src/
+dkms add -m e1000e -v <x.x.x>
+dkms build -m e1000e -v <x.x.x>
+dkms install -m e1000e -v <x.x.x>
 ```
 
 To remove the DKMS kernel module only (works with all Linux distributions) run:
 ```
-dkms remove -m e1000e -v <x.x.x.x> --all
+dkms remove -m e1000e -v <x.x.x> --all
 ```
 
 ---
@@ -63,8 +63,12 @@ For further information visit:
 
 ## Changelog
 
-**Changelog for 3.8.4**
+**Changelog for 3.8.7**
+* Fixed compilation on latest kernels after changes in Linux OS API
+* Backport to upstream: 98942d7053 (e1000e: extend PTP gettime function to read system clock)
+* Backport to upstream: 59f58708c504 (e1000e: Exclude device from suspend direct complete optimization)
 
+**Changelog for 3.8.4**
 * Added a fix to s0ix flow to support cable connected case
 * Initial support for the following devices:
   * Ethernet Connection (13) I219-LM

e1000e-dkms/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: e1000e-dkms
-Version: 3.8.4
+Version: 3.8.7
 Section: kernel
 Priority: optional
 Architecture: all

e1000e-dkms/DEBIAN/md5sums

@@ -1,36 +1,36 @@
-5e1cc702bd86402218294bff0c1be193  usr/src/e1000e-3.8.4/dkms.conf
-e8126397603f1cb5f212a5980cac76af  usr/src/e1000e-3.8.4/e1000e.spec
-46eda7ad1024920ea41ba6cd6ce1bbba  usr/src/e1000e-3.8.4/pci.updates
-6f223fbbef4741cb218c4a2b86da2cbf  usr/src/e1000e-3.8.4/src/kcompat_overflow.h
-1dd71aac5af014f9d94ff01c2d153298  usr/src/e1000e-3.8.4/src/ich8lan.c
-5563ce49120ffa78acf5d8a51383fe9b  usr/src/e1000e-3.8.4/src/82571.c
-ebce0519d7f0d4d45c133684410d5048  usr/src/e1000e-3.8.4/src/regs.h
-3e40b854f76d79d2e2187aa95f87b36e  usr/src/e1000e-3.8.4/src/ethtool.c
-b72d6e95dbe533290889b2f97413f57d  usr/src/e1000e-3.8.4/src/mac.h
-9c137410bd35833193e447e7b05d1e09  usr/src/e1000e-3.8.4/src/80003es2lan.c
-b689b89c0cbf92745c287ea2b3afbb5e  usr/src/e1000e-3.8.4/src/mac.c
-6cedc42c0a1a8d8c6ac463d402b52a58  usr/src/e1000e-3.8.4/src/netdev.c
-bd24be95cdffb77f41ddbd306c4005fb  usr/src/e1000e-3.8.4/src/manage.c
-b100fdf52b5d74b4d402eee96ef1dd82  usr/src/e1000e-3.8.4/src/82571.h
-a98cf650dd6bea18b52f23995d4b349f  usr/src/e1000e-3.8.4/src/nvm.h
-cad129102e7615c08925df7fb42d2b1c  usr/src/e1000e-3.8.4/src/phy.c
-6e45cedabcff7d0e6f11f391ebf2ac1b  usr/src/e1000e-3.8.4/src/kcompat.h
-91744a2aefe9bc609ae08685982c500e  usr/src/e1000e-3.8.4/src/kcompat.c
-f9636991dcd9c4085c4275b1b23d5623  usr/src/e1000e-3.8.4/src/nvm.c
-d262e7d6d2df6a9fa0d7cdca79aca1d9  usr/src/e1000e-3.8.4/src/common.mk
-c948b4561143aeb220e7d8d45b603a62  usr/src/e1000e-3.8.4/src/hw.h
-7ef540ef504e8b26774e97db331019eb  usr/src/e1000e-3.8.4/src/Makefile
-d1ba4ae24e1b7cbab62f02559dcf1e64  usr/src/e1000e-3.8.4/src/ptp.c
-fe05b782788f3772eac194e84901db03  usr/src/e1000e-3.8.4/src/Module.supported
-17b45555ba9674f499d2073f496f4e9f  usr/src/e1000e-3.8.4/src/manage.h
-6f7c042827636b3858d5a425343a992b  usr/src/e1000e-3.8.4/src/phy.h
-70b208042d10df9674d7a247dc4a50f1  usr/src/e1000e-3.8.4/src/kcompat_ethtool.c
-72e868bdbd39286ba2a3c925daa55e45  usr/src/e1000e-3.8.4/src/80003es2lan.h
-a048e334dbe2f0968c37b1dbb5b7f9f1  usr/src/e1000e-3.8.4/src/param.c
-8fe985f370c5cfec865dd1ffd6a8d89e  usr/src/e1000e-3.8.4/src/defines.h
-ee49c5b4ed376b955fe912ccc5e2a207  usr/src/e1000e-3.8.4/src/ich8lan.h
-5321ed395220fc7d14ec12d52923a270  usr/src/e1000e-3.8.4/src/e1000.h
-224ec96dfabf9223710fe5a78db38304  usr/src/e1000e-3.8.4/SUMS
-78c632f25415c075053e2ddb14f3ffc9  usr/src/e1000e-3.8.4/README
-2a9862da599a5fb3eccff78e55db3097  usr/src/e1000e-3.8.4/e1000e.7
-a216b4192dc6b777b6f0db560e9a8417  usr/src/e1000e-3.8.4/COPYING
+ee4f4190e942ce75cd5c35cd2a7c105d  usr/src/e1000e-3.8.7/dkms.conf
+589531c7884a7b64178b49825753e310  usr/src/e1000e-3.8.7/e1000e.spec
+46eda7ad1024920ea41ba6cd6ce1bbba  usr/src/e1000e-3.8.7/pci.updates
+6f223fbbef4741cb218c4a2b86da2cbf  usr/src/e1000e-3.8.7/src/kcompat_overflow.h
+1dd71aac5af014f9d94ff01c2d153298  usr/src/e1000e-3.8.7/src/ich8lan.c
+5563ce49120ffa78acf5d8a51383fe9b  usr/src/e1000e-3.8.7/src/82571.c
+ebce0519d7f0d4d45c133684410d5048  usr/src/e1000e-3.8.7/src/regs.h
+3932337c650a83b845c82598d85875bf  usr/src/e1000e-3.8.7/src/ethtool.c
+b72d6e95dbe533290889b2f97413f57d  usr/src/e1000e-3.8.7/src/mac.h
+9c137410bd35833193e447e7b05d1e09  usr/src/e1000e-3.8.7/src/80003es2lan.c
+b689b89c0cbf92745c287ea2b3afbb5e  usr/src/e1000e-3.8.7/src/mac.c
+0419252ace18a6229638640fce36924e  usr/src/e1000e-3.8.7/src/netdev.c
+bd24be95cdffb77f41ddbd306c4005fb  usr/src/e1000e-3.8.7/src/manage.c
+b100fdf52b5d74b4d402eee96ef1dd82  usr/src/e1000e-3.8.7/src/82571.h
+a98cf650dd6bea18b52f23995d4b349f  usr/src/e1000e-3.8.7/src/nvm.h
+cad129102e7615c08925df7fb42d2b1c  usr/src/e1000e-3.8.7/src/phy.c
+48085a20ba7ed017cdf9a0ef9b2389dc  usr/src/e1000e-3.8.7/src/kcompat.h
+d6c0e89c8f83fdaef0021088ca80675a  usr/src/e1000e-3.8.7/src/kcompat.c
+f9636991dcd9c4085c4275b1b23d5623  usr/src/e1000e-3.8.7/src/nvm.c
+d262e7d6d2df6a9fa0d7cdca79aca1d9  usr/src/e1000e-3.8.7/src/common.mk
+e272f7d81776225cbea6c4ed32e31aa1  usr/src/e1000e-3.8.7/src/hw.h
+7ef540ef504e8b26774e97db331019eb  usr/src/e1000e-3.8.7/src/Makefile
+299ddb7e6101d771425baa56c96ac613  usr/src/e1000e-3.8.7/src/ptp.c
+fe05b782788f3772eac194e84901db03  usr/src/e1000e-3.8.7/src/Module.supported
+17b45555ba9674f499d2073f496f4e9f  usr/src/e1000e-3.8.7/src/manage.h
+6f7c042827636b3858d5a425343a992b  usr/src/e1000e-3.8.7/src/phy.h
+70b208042d10df9674d7a247dc4a50f1  usr/src/e1000e-3.8.7/src/kcompat_ethtool.c
+72e868bdbd39286ba2a3c925daa55e45  usr/src/e1000e-3.8.7/src/80003es2lan.h
+a048e334dbe2f0968c37b1dbb5b7f9f1  usr/src/e1000e-3.8.7/src/param.c
+8fe985f370c5cfec865dd1ffd6a8d89e  usr/src/e1000e-3.8.7/src/defines.h
+ee49c5b4ed376b955fe912ccc5e2a207  usr/src/e1000e-3.8.7/src/ich8lan.h
+b73388205891f42a370e92fe61cc923e  usr/src/e1000e-3.8.7/src/e1000.h
+e644c167f99aba8eb75d1c1fe6016487  usr/src/e1000e-3.8.7/SUMS
+6cf7bef87c21ab238f93502eaa043bd1  usr/src/e1000e-3.8.7/README
+804653df6754dad772099c2102521748  usr/src/e1000e-3.8.7/e1000e.7
+a216b4192dc6b777b6f0db560e9a8417  usr/src/e1000e-3.8.7/COPYING

e1000e-dkms/DEBIAN/prerm

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=e1000e
-VERSION=3.8.4
+VERSION=3.8.7
 
 set -e
 

e1000e-dkms/usr/src/e1000e-3.8.4/README → e1000e-dkms/usr/src/e1000e-3.8.7/README

@@ -419,21 +419,21 @@ permanent by adding 'MTU=9000' to the following file:
       or
   /etc/sysconfig/network/<config_file> for SLES
 
-NOTE: The maximum MTU setting for Jumbo Frames is 8996. This value coincides
-with the maximum Jumbo Frames size of 9018 bytes.
+NOTE: The maximum MTU setting for jumbo frames is 8996. This corresponds to the
+maximum jumbo frame size of 9018 bytes.
 
-NOTE: Using Jumbo frames at 10 or 100 Mbps is not supported and may result in
+NOTE: Using jumbo frames at 10 or 100 Mbps is not supported and may result in
 poor performance or loss of link.
 
 NOTE: Packet loss may have a greater impact on throughput when you use jumbo
 frames. If you observe a drop in performance after enabling jumbo frames,
 enabling flow control may mitigate the issue.
 
-NOTE: The following adapters limit Jumbo Frames sized packets to a maximum of
+NOTE: The following adapters limit jumbo frames sized packets to a maximum of
 4088 bytes:
   - Intel(R) 82578DM Gigabit Network Connection
   - Intel(R) 82577LM Gigabit Network Connection
-- The following adapters do not support Jumbo Frames:
+- The following adapters do not support jumbo frames:
   - Intel(R) PRO/1000 Gigabit Server Adapter
   - Intel(R) PRO/1000 PM Network Connection
   - Intel(R) 82562G 10/100 Network Connection
@@ -450,7 +450,7 @@ NOTE: The following adapters limit Jumbo Frames sized packets to a maximum of
   - Intel(R) 82567V-3 Gigabit Network Connection
   - Intel(R) 82577LC Gigabit Network Connection
   - Intel(R) 82578DC Gigabit Network Connection
-- Jumbo Frames cannot be configured on an 82579-based Network device if
+- Jumbo frames cannot be configured on an 82579-based Network device if
   MACSec is enabled on the system.
 
 
@@ -574,16 +574,16 @@ http://www.linuxfirmwarekit.org/ to test their BIOS, if they have interrupt or
 82573(V/L/E) TX Unit Hang Messages
 ----------------------------------
 Several adapters with the 82573 chipset display "TX unit hang" messages during
-normal operation with the e1000edriver. The issue appears both with TSO enabled
-and disabled and is caused by a power management function that is enabled in
-the EEPROM. Early releases of the chipsets to vendors had the EEPROM bit that
-enabled the feature. After the issue was discovered newer adapters were
-released with the feature disabled in the EEPROM.
+normal operation with the e1000e driver. The issue appears both with TSO
+enabled and disabled and is caused by a power management function that is
+enabled in the EEPROM. Early releases of the chipsets to vendors had the EEPROM
+bit that enabled the feature. After the issue was discovered newer adapters
+were released with the feature disabled in the EEPROM.
 
 If you encounter the problem in an adapter, and the chipset is an 82573-based
 one, you can verify that your adapter needs the fix by using ethtool:
 
- # ethtool -e eth0
+ # ethtool -e <ethX>
 
 Offset	Values
 ------	------
@@ -614,7 +614,6 @@ http://e1000.sourceforge.net/files/fixeep-82573-dspd.sh.
 
 Dropped Receive Packets on Half-duplex 10/100 Networks
 ------------------------------------------------------
-
 If you have an Intel PCI Express adapter running at 10mbps or 100mbps,
 half-duplex, you may observe occasional dropped receive packets. There are no
 workarounds for this problem in this network configuration. The network must be

e1000e-dkms/usr/src/e1000e-3.8.4/SUMS → e1000e-dkms/usr/src/e1000e-3.8.7/SUMS

@@ -5,30 +5,30 @@
 31684    55 src/82571.c
 17998     2 src/82571.h
 35408    34 src/defines.h
-34491    20 src/e1000.h
-05217    78 src/ethtool.c
-50470    19 src/hw.h
+45922    20 src/e1000.h
+40022    78 src/ethtool.c
+28923    19 src/hw.h
 15289   164 src/ich8lan.c
 16738    13 src/ich8lan.h
-18889    62 src/kcompat.c
-09226   212 src/kcompat.h
+08700    62 src/kcompat.c
+39787   217 src/kcompat.h
 30977    28 src/kcompat_ethtool.c
 23305    10 src/kcompat_overflow.h
 28647    52 src/mac.c
 64101     3 src/mac.h
 25124     9 src/manage.c
 38039     2 src/manage.h
-23803   254 src/netdev.c
+12914   255 src/netdev.c
 05862    15 src/nvm.c
 11525     1 src/nvm.h
 57707    16 src/param.c
 28872    87 src/phy.c
 05721    10 src/phy.h
-59818    11 src/ptp.c
+22542    11 src/ptp.c
 11087    14 src/regs.h
 28189     1 src/Module.supported
 12529    18 COPYING
-24898    30 README
+04178    30 README
 62533     6 pci.updates
-16861    12 e1000e.7
-39291    10 e1000e.spec
+27147    12 e1000e.7
+61506    10 e1000e.spec

e1000e-dkms/usr/src/e1000e-3.8.4/dkms.conf → e1000e-dkms/usr/src/e1000e-3.8.7/dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME="e1000e"
-PACKAGE_VERSION="3.8.4"
+PACKAGE_VERSION="3.8.7"
 MAKE[0]="cd src/ && make KVERSION=$kernelver BUILD_KERNEL=$kernelver"
 CLEAN="cd src/ && make clean"
 BUILT_MODULE_NAME[0]="e1000e"

e1000e-dkms/usr/src/e1000e-3.8.4/e1000e.7 → e1000e-dkms/usr/src/e1000e-3.8.7/e1000e.7

@@ -209,9 +209,9 @@ Alternatively, you can use the ip command as follows:
 # ip link set up dev <ethX>
 
 .LP
-NOTE: The maximum MTU setting for Jumbo Frames is 8996. This value coincides with the maximum Jumbo Frames size of 9018 bytes.
+NOTE: The maximum MTU setting for jumbo frames is 8996. This corresponds to the maximum jumbo frame size of 9018 bytes.
 
-NOTE: Using Jumbo frames at 10 or 100 Mbps is not supported and may result in poor performance or loss of link.
+NOTE: Using jumbo frames at 10 or 100 Mbps is not supported and may result in poor performance or loss of link.
 
 NOTE: Packet loss may have a greater impact on throughput when you use jumbo frames. If you observe a drop in performance after enabling jumbo frames, enabling flow control may mitigate the issue.
 See the section "Jumbo Frames" in the Readme.

e1000e-dkms/usr/src/e1000e-3.8.4/e1000e.spec → e1000e-dkms/usr/src/e1000e-3.8.7/e1000e.spec

@@ -1,6 +1,6 @@
 Name: e1000e
 Summary: Intel(R) Gigabit Ethernet Connection
-Version: 3.8.4
+Version: 3.8.7
 Release: 1
 Source: %{name}-%{version}.tar.gz
 Vendor: Intel Corporation

e1000e-dkms/usr/src/e1000e-3.8.4/src/e1000.h → e1000e-dkms/usr/src/e1000e-3.8.7/src/e1000.h

@@ -590,6 +590,8 @@ extern const struct e1000_info e1000_es2_info;
 #ifdef HAVE_PTP_1588_CLOCK
 void e1000e_ptp_init(struct e1000_adapter *adapter);
 void e1000e_ptp_remove(struct e1000_adapter *adapter);
+u64 e1000e_read_systim(struct e1000_adapter *adapter,
+		       struct ptp_system_timestamp *sts);
 #else
 #define e1000e_ptp_init(adapter) do {} while (0)
 #define e1000e_ptp_remove(adapter) do {} while (0)

e1000e-dkms/usr/src/e1000e-3.8.4/src/ethtool.c → e1000e-dkms/usr/src/e1000e-3.8.7/src/ethtool.c

@@ -2775,6 +2775,9 @@ static int e1000e_get_ts_info(struct net_device *netdev,
 #endif /* ETHTOOL_GET_TS_INFO */
 
 static const struct ethtool_ops e1000_ethtool_ops = {
+#ifdef ETHTOOL_COALESCE_USECS
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,
+#endif /* ETHTOOL_COALESCE_USECS */
 #ifndef HAVE_ETHTOOL_CONVERT_U32_AND_LINK_MODE
 	.get_settings		= e1000_get_settings,
 	.set_settings		= e1000_set_settings,

e1000e-dkms/usr/src/e1000e-3.8.4/src/hw.h → e1000e-dkms/usr/src/e1000e-3.8.7/src/hw.h

@@ -749,4 +749,7 @@ struct e1000_hw {
 #include "80003es2lan.h"
 #include "ich8lan.h"
 
+/* These functions must be implemented by drivers */
+s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
+
 #endif

e1000e-dkms/usr/src/e1000e-3.8.4/src/kcompat.c → e1000e-dkms/usr/src/e1000e-3.8.7/src/kcompat.c

@@ -2556,3 +2556,30 @@ int _kc_flow_block_cb_setup_simple(struct flow_block_offload *f,
 #endif /* HAVE_TC_CB_AND_SETUP_QDISC_MQPRIO */
 #endif /* !RHEL >= 8.2 */
 #endif /* 5.3.0 */
+
+/*****************************************************************************/
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,7,0))
+u64 _kc_pci_get_dsn(struct pci_dev *dev)
+{
+	u32 dword;
+	u64 dsn;
+	int pos;
+
+	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DSN);
+	if (!pos)
+		return 0;
+
+	/*
+	 * The Device Serial Number is two dwords offset 4 bytes from the
+	 * capability position. The specification says that the first dword is
+	 * the lower half, and the second dword is the upper half.
+	 */
+	pos += 4;
+	pci_read_config_dword(dev, pos, &dword);
+	dsn = (u64)dword;
+	pci_read_config_dword(dev, pos + 4, &dword);
+	dsn |= ((u64)dword) << 32;
+
+	return dsn;
+}
+#endif /* 5.7.0 */