From: Grant Slater <git@firefishy.com>
Date: Sat, 16 Mar 2019 16:30:24 +0000 (+0000)
Subject: Fix power save bug against all Intel 82583/82574
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/0e491b8c74a5cf6f9ce7ebc7ba7d8482f2c3604c?ds=sidebyside

Fix power save bug against all Intel 82583/82574
---

diff --git a/cookbooks/devices/templates/default/udev.rules.erb b/cookbooks/devices/templates/default/udev.rules.erb
index a9f7f3fdf..2d58f2186 100644
--- a/cookbooks/devices/templates/default/udev.rules.erb
+++ b/cookbooks/devices/templates/default/udev.rules.erb
@@ -29,8 +29,10 @@ ACTION=="add", SUBSYSTEM=="block", ENV{ID_BUS}=="<%= device[:bus] %>", ENV{ID_SE
 # Disable scatter-gather offload for HP NC362i network controllers
 SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x8086", ATTRS{device}=="0x10c9", ATTRS{subsystem_vendor}=="0x103c", ATTRS{subsystem_device}=="0x323f", RUN+="/sbin/ethtool -K $name gso off tso off sg off gro off"
 
-# Fix Power Saving Bug on Intel 82574L network controller in Supermicro HPC machines
-SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x8086", ATTRS{device}=="0x10d3", ATTRS{subsystem_vendor}=="0x15d9", ATTRS{subsystem_device}=="0x10d3", RUN+="/usr/local/bin/fixeep-82574_83.sh $name"
+# Fix Power Saving Bug on Intel 82574L and Intel 82583 network controllers
+SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x8086", ATTRS{device}=="0x10d3", RUN+="/usr/local/bin/fixeep-82574_83.sh $name"
+SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x8086", ATTRS{device}=="0x10f6", RUN+="/usr/local/bin/fixeep-82574_83.sh $name"
+SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x8086", ATTRS{device}=="0x150c", RUN+="/usr/local/bin/fixeep-82574_83.sh $name"
 
 # Workaround unreliable Western Digital WD RE3/RE4 disks (ATA only)
 # Set sufficent Linux subsystem timeout and fix severe NCQ performance issue
diff --git a/cookbooks/hardware/templates/default/irqbalance.erb b/cookbooks/hardware/templates/default/irqbalance.erb
index e416a090c..4a10bd20d 100644
--- a/cookbooks/hardware/templates/default/irqbalance.erb
+++ b/cookbooks/hardware/templates/default/irqbalance.erb
@@ -1,11 +1,11 @@
 # DO NOT EDIT - This file is being maintained by Chef
-#Configuration for the irqbalance daemon
+# Configuration for the irqbalance daemon
 
-#Should irqbalance be enabled?
+# Should irqbalance be enabled?
 ENABLED="1"
-#Balance the IRQs only once?
+# Balance the IRQs only once?
 ONESHOT="0"
 
-#irqbalance maintainer recommends ignore hint policy
-#http://sourceforge.net/p/e1000/bugs/394/?page=1
+# irqbalance maintainer recommends ignore hint policy
+# http://sourceforge.net/p/e1000/bugs/394/?page=1
 DOPTIONS="--hintpolicy=ignore"