From d0f36fb0ca04856a8bf9493360e5af9c1d5e0636 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 06:45:54 +0000
Subject: [PATCH 1/8] fanctrlplus2: warn when MSI nct6687 system fans need
 msi_fan_brute_force

On MSI boards using the nct6687 msi_alt1 register layout, writes to the
system-fan channels are accepted but ignored unless the driver's
msi_fan_brute_force option is set, leaving those fans at about 60%
(#13). Show a notice on the settings page with the documented
workaround when a configured fan uses such a channel and the option is
not detected.
---
 README.md                                     | 18 +++++
 .../plugins/fanctrlplus2/css/fcp.base.css     |  2 +
 .../plugins/fanctrlplus2/fanctrlplus2.page    | 13 ++++
 .../plugins/fanctrlplus2/include/Common.php   | 34 ++++++++++
 tests/nct6687_notice_test.php                 | 65 +++++++++++++++++++
 5 files changed, 132 insertions(+)
 create mode 100644 tests/nct6687_notice_test.php

diff --git a/README.md b/README.md
index 8c2379b..39f5d0b 100644
--- a/README.md
+++ b/README.md
@@ -146,6 +146,24 @@ reappear after serial ambiguity is resolved.
 The identity identifies the controller's header, not the physical fan attached
 to it; replacing the fan does not change the saved assignment.
 
+## MSI boards with the nct6687 driver
+
+On some MSI boards the nct6687 driver accepts speed changes for the system
+fans (`pwm3` and up) but does not apply them, so those fans stay at about 60%.
+The driver documents this and fixes it with its `msi_fan_brute_force` module
+option. When a configured fan uses one of those channels and the option is not
+detected, the settings page shows a notice with the workaround. On Unraid, set
+the option on the flash drive and reboot:
+
+```bash
+mkdir -p /boot/config/modprobe.d
+echo "options nct6687 msi_fan_brute_force=1" > /boot/config/modprobe.d/nct6687.conf
+```
+
+The option was added to the driver in December 2025; `modinfo nct6687` lists
+it when the installed build supports it. See the
+[driver documentation](https://github.com/Fred78290/nct6687d#loading-msi_fan_brute_force-parameter-fails).
+
 Support / Issues
 - https://github.com/andrebrait/fanctrlplus/issues
 
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/css/fcp.base.css b/src/usr/local/emhttp/plugins/fanctrlplus2/css/fcp.base.css
index ef97674..29162bd 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/css/fcp.base.css
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/css/fcp.base.css
@@ -296,6 +296,8 @@
   margin: 0;
   white-space: nowrap;
 }
+.fcp-nct6687-notice { justify-content: flex-start; }
+.fcp-nct6687-notice code.fcp-cmd { display: block; margin: 4px 0; user-select: all; }
 
 /* ===== Sort toggle ===== */
 .fanctrl-sort-toggle {
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page b/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page
index 4b4a76c..4c26d2f 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page
@@ -156,6 +156,7 @@ flock($page_config_lock, LOCK_UN);
 fclose($page_config_lock);
 $cpu_sensors = detect_cpu_sensors();
 $aux_sensors = detect_aux_sensors();
+$fcp_nct6687_notice = fcp_nct6687_brute_force_missing(array_column($all_cfg, 'controller'));
 ?>
 
 <div class="fanctrl-header">
@@ -173,6 +174,18 @@ $aux_sensors = detect_aux_sensors();
   <span>FanCtrl Plus 2 files changed on the server. Reload to use matching interface resources.</span>
   <button type="button" id="fcp-asset-reload">Reload page</button>
 </div>
+<?php if ($fcp_nct6687_notice): ?>
+<div class="fcp-asset-update-notice fcp-nct6687-notice">
+  <span>
+    <strong>MSI board detected:</strong> the nct6687 driver may ignore speed changes on system fans, which then stay at about 60%.
+    The driver's documented workaround is its <code>msi_fan_brute_force</code> option. Run the commands below from an Unraid terminal, then reboot:
+    <code class="fcp-cmd">mkdir -p /boot/config/modprobe.d</code>
+    <code class="fcp-cmd">echo "options nct6687 msi_fan_brute_force=1" &gt; /boot/config/modprobe.d/nct6687.conf</code>
+    If <code>modinfo nct6687 | grep msi_fan_brute_force</code> prints nothing, the installed driver predates the option and needs an update.
+    <a href="https://github.com/Fred78290/nct6687d#loading-msi_fan_brute_force-parameter-fails" target="_blank" rel="noopener">Driver documentation</a>
+  </span>
+</div>
+<?php endif; ?>
 
 <script>
 const DEBUG = false; // Enables diagnostic console output.
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
index 0392c57..cb9ec48 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
@@ -354,6 +354,40 @@ function list_pwm(string $hwmon_glob = '/sys/class/hwmon/hwmon*') {
   return $out;
 }
 
+// On MSI boards the nct6687 driver uses its msi_alt1 register layout, where
+// writes to the system-fan channels (pwm3 and up) are accepted but ignored
+// unless the msi_fan_brute_force module option is set; those fans then stay
+// at about 60%. The option is not readable from sysfs, so it counts as set
+// when the driver exposes fan_control_watchdog (created only in that mode,
+// by newer builds) or when the modprobe configuration sets it.
+// https://github.com/Fred78290/nct6687d#loading-msi_fan_brute_force-parameter-fails
+function fcp_nct6687_brute_force_missing(
+  array $controllers,
+  string $module_dir = '/sys/module/nct6687',
+  string $modprobe_glob = '/etc/modprobe.d/*.conf'
+): bool {
+  $fan_config = @file_get_contents("$module_dir/parameters/fan_config");
+  if ($fan_config === false || trim($fan_config) !== 'msi_alt1') return false;
+
+  $hwmon = null;
+  foreach ($controllers as $controller) {
+    if (!preg_match('/^pwm(\d+)$/', basename((string)$controller), $m) || (int)$m[1] < 3) continue;
+    $dir = dirname($controller);
+    if (trim((string)@file_get_contents("$dir/name")) === 'nct6687') {
+      $hwmon = $dir;
+      break;
+    }
+  }
+  if ($hwmon === null || file_exists("$hwmon/fan_control_watchdog")) return false;
+
+  // Kernel bools accept 1/y/t/on, or the bare name; '-' and '_' are interchangeable.
+  $set = '/^\s*options\s+nct6687\s+(?:.*\s)?msi[-_]fan[-_]brute[-_]force(?:=(?:[1yYtT]\S*|[oO][nN]))?(?:\s|$)/m';
+  foreach (glob($modprobe_glob) ?: [] as $conf) {
+    if (preg_match($set, (string)@file_get_contents($conf))) return false;
+  }
+  return true;
+}
+
 // Find storcli binary (storcli64, storcli2, storcli) in common paths
 function find_storcli(): ?string {
   $candidates = [
diff --git a/tests/nct6687_notice_test.php b/tests/nct6687_notice_test.php
new file mode 100644
index 0000000..8a52ef6
--- /dev/null
+++ b/tests/nct6687_notice_test.php
@@ -0,0 +1,65 @@
+<?php
+
+require_once __DIR__ . '/../src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php';
+
+$failures = [];
+$root = sys_get_temp_dir() . '/fcp_nct6687_notice_' . getmypid();
+$module = "$root/module";
+$hwmon = "$root/devices/platform/nct6687.2592/hwmon/hwmon7";
+$other = "$root/devices/platform/it87.552/hwmon/hwmon3";
+$modprobe = "$root/modprobe.d";
+
+@mkdir("$module/parameters", 0777, true);
+@mkdir($hwmon, 0777, true);
+@mkdir($other, 0777, true);
+@mkdir($modprobe, 0777, true);
+file_put_contents("$hwmon/name", "nct6687\n");
+file_put_contents("$other/name", "it8728\n");
+file_put_contents("$modprobe/nct6683.conf", "blacklist nct6683\ninstall nct6683 /bin/false\n");
+
+$check = function (string $label, bool $expected, array $controllers) use (&$failures, $module, $modprobe): void {
+    $actual = fcp_nct6687_brute_force_missing($controllers, $module, "$modprobe/*.conf");
+    if ($actual !== $expected) {
+        $failures[] = "$label: expected " . var_export($expected, true) . ', got ' . var_export($actual, true);
+    }
+};
+
+$sys_fan = ["$other/pwm3", "$hwmon/pwm5"];
+
+$check('driver not loaded', false, $sys_fan);
+
+file_put_contents("$module/parameters/fan_config", "default\n");
+$check('default register layout', false, $sys_fan);
+
+file_put_contents("$module/parameters/fan_config", "msi_alt1\n");
+$check('msi_alt1 without the option', true, $sys_fan);
+$check('only CPU and pump channels', false, ["$hwmon/pwm1", "$hwmon/pwm2", "$hwmon/pwm1_enable"]);
+$check('system channel on another chip', false, ["$other/pwm5"]);
+$check('no fans configured', false, []);
+
+foreach ([
+    'options nct6687 msi_fan_brute_force=0' => true,
+    'options nct6687 msi_fan_brute_force=n' => true,
+    '# options nct6687 msi_fan_brute_force=1' => true,
+    'options nct6683 msi_fan_brute_force=1' => true,
+    'options nct6687 not_msi_fan_brute_force=1' => true,
+    'options nct6687 msi_fan_brute_force=1' => false,
+    "options nct6687 fan_config=msi_alt1 msi-fan-brute-force=Y\n" => false,
+    'options  nct6687 msi_fan_brute_force' => false,
+    'options nct6687 msi_fan_brute_force=on' => false,
+] as $line => $expected) {
+    file_put_contents("$modprobe/nct6687.conf", "$line\n");
+    $check("modprobe line '$line'", $expected, $sys_fan);
+}
+unlink("$modprobe/nct6687.conf");
+
+touch("$hwmon/fan_control_watchdog");
+$check('watchdog attribute present', false, $sys_fan);
+
+exec('rm -rf ' . escapeshellarg($root));
+
+if ($failures) {
+    fwrite(STDERR, implode("\n", $failures) . "\n");
+    exit(1);
+}
+echo "nct6687 notice: OK\n";

From 23c730cf388736514c88558193e7723ef7fe5cc3 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 06:49:16 +0000
Subject: [PATCH 2/8] fanctrlplus2: append the option, cover nct6686 and quoted
 values

---
 README.md                                              |  2 +-
 .../emhttp/plugins/fanctrlplus2/include/Common.php     |  8 +++++---
 tests/nct6687_notice_test.php                          | 10 +++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 39f5d0b..e7f2721 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ the option on the flash drive and reboot:
 
 ```bash
 mkdir -p /boot/config/modprobe.d
-echo "options nct6687 msi_fan_brute_force=1" > /boot/config/modprobe.d/nct6687.conf
+echo "options nct6687 msi_fan_brute_force=1" >> /boot/config/modprobe.d/nct6687.conf
 ```
 
 The option was added to the driver in December 2025; `modinfo nct6687` lists
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
index cb9ec48..3490cfb 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
@@ -373,15 +373,17 @@ function fcp_nct6687_brute_force_missing(
   foreach ($controllers as $controller) {
     if (!preg_match('/^pwm(\d+)$/', basename((string)$controller), $m) || (int)$m[1] < 3) continue;
     $dir = dirname($controller);
-    if (trim((string)@file_get_contents("$dir/name")) === 'nct6687') {
+    // The driver names its hwmon device after the chip it found.
+    if (preg_match('/^nct668[367]$/', trim((string)@file_get_contents("$dir/name")))) {
       $hwmon = $dir;
       break;
     }
   }
   if ($hwmon === null || file_exists("$hwmon/fan_control_watchdog")) return false;
 
-  // Kernel bools accept 1/y/t/on, or the bare name; '-' and '_' are interchangeable.
-  $set = '/^\s*options\s+nct6687\s+(?:.*\s)?msi[-_]fan[-_]brute[-_]force(?:=(?:[1yYtT]\S*|[oO][nN]))?(?:\s|$)/m';
+  // Kernel bools accept 1/y/t/on (optionally quoted), or the bare name;
+  // '-' and '_' are interchangeable.
+  $set = '/^\s*options\s+nct6687\s+(?:.*\s)?msi[-_]fan[-_]brute[-_]force(?:="?(?:[1yYtT][^\s"]*|[oO][nN]))?(?:[\s"]|$)/m';
   foreach (glob($modprobe_glob) ?: [] as $conf) {
     if (preg_match($set, (string)@file_get_contents($conf))) return false;
   }
diff --git a/tests/nct6687_notice_test.php b/tests/nct6687_notice_test.php
index 8a52ef6..4258648 100644
--- a/tests/nct6687_notice_test.php
+++ b/tests/nct6687_notice_test.php
@@ -33,7 +33,12 @@
 
 file_put_contents("$module/parameters/fan_config", "msi_alt1\n");
 $check('msi_alt1 without the option', true, $sys_fan);
-$check('only CPU and pump channels', false, ["$hwmon/pwm1", "$hwmon/pwm2", "$hwmon/pwm1_enable"]);
+$check('first system channel', true, ["$hwmon/pwm3"]);
+$nct6686 = "$root/devices/platform/nct6687.2593/hwmon/hwmon8";
+@mkdir($nct6686, 0777, true);
+file_put_contents("$nct6686/name", "nct6686\n");
+$check('nct6686 chip', true, ["$other/pwm3", "$nct6686/pwm3"]);
+$check('only CPU and pump channels', false, ["$hwmon/pwm1", "$hwmon/pwm2", "$hwmon/pwm1_enable", "$hwmon/pwm3_enable"]);
 $check('system channel on another chip', false, ["$other/pwm5"]);
 $check('no fans configured', false, []);
 
@@ -42,11 +47,14 @@
     'options nct6687 msi_fan_brute_force=n' => true,
     '# options nct6687 msi_fan_brute_force=1' => true,
     'options nct6683 msi_fan_brute_force=1' => true,
+    'options nct6687x msi_fan_brute_force=1' => true,
     'options nct6687 not_msi_fan_brute_force=1' => true,
     'options nct6687 msi_fan_brute_force=1' => false,
+    "# Set by hand\noptions nct6687 msi_fan_brute_force=1" => false,
     "options nct6687 fan_config=msi_alt1 msi-fan-brute-force=Y\n" => false,
     'options  nct6687 msi_fan_brute_force' => false,
     'options nct6687 msi_fan_brute_force=on' => false,
+    'options nct6687 msi_fan_brute_force="true"' => false,
 ] as $line => $expected) {
     file_put_contents("$modprobe/nct6687.conf", "$line\n");
     $check("modprobe line '$line'", $expected, $sys_fan);

From 8ee08d4491c1899cf8c89c7717085496ab24c1ed Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 06:53:55 +0000
Subject: [PATCH 3/8] fanctrlplus2: append the option in the settings notice
 too

---
 src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page b/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page
index 4c26d2f..f3e8d88 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/fanctrlplus2.page
@@ -180,7 +180,7 @@ $fcp_nct6687_notice = fcp_nct6687_brute_force_missing(array_column($all_cfg, 'co
     <strong>MSI board detected:</strong> the nct6687 driver may ignore speed changes on system fans, which then stay at about 60%.
     The driver's documented workaround is its <code>msi_fan_brute_force</code> option. Run the commands below from an Unraid terminal, then reboot:
     <code class="fcp-cmd">mkdir -p /boot/config/modprobe.d</code>
-    <code class="fcp-cmd">echo "options nct6687 msi_fan_brute_force=1" &gt; /boot/config/modprobe.d/nct6687.conf</code>
+    <code class="fcp-cmd">echo "options nct6687 msi_fan_brute_force=1" &gt;&gt; /boot/config/modprobe.d/nct6687.conf</code>
     If <code>modinfo nct6687 | grep msi_fan_brute_force</code> prints nothing, the installed driver predates the option and needs an update.
     <a href="https://github.com/Fred78290/nct6687d#loading-msi_fan_brute_force-parameter-fails" target="_blank" rel="noopener">Driver documentation</a>
   </span>

From ede327425d76b72c657db7381c181eb90f6033ce Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 07:54:15 +0000
Subject: [PATCH 4/8] fanctrlplus2: read the loaded brute-force state from the
 kernel log, notify on stuck fans

The notice now takes msi_fan_brute_force from the driver's kernel log
line when present, so options passed outside modprobe.d are honoured
and an unapplied modprobe.d edit is not.

The fan loop also reads back nct6687 MSI system-fan channels. When a
fan set above 60% reads back lower on two ticks in a row, it sends one
Unraid notification per fan per boot.
---
 README.md                                     |  9 ++-
 .../plugins/fanctrlplus2/include/Common.php   | 18 ++++--
 .../scripts/disk_group_control.sh             | 38 ++++++++++++
 .../fanctrlplus2/scripts/fanctrlplus2_loop.sh | 13 ++++
 tests/nct6687_notice_test.php                 | 20 ++++++-
 tests/nct6687_stuck_test.sh                   | 59 +++++++++++++++++++
 6 files changed, 149 insertions(+), 8 deletions(-)
 create mode 100755 tests/nct6687_stuck_test.sh

diff --git a/README.md b/README.md
index e7f2721..8335f55 100644
--- a/README.md
+++ b/README.md
@@ -152,8 +152,13 @@ On some MSI boards the nct6687 driver accepts speed changes for the system
 fans (`pwm3` and up) but does not apply them, so those fans stay at about 60%.
 The driver documents this and fixes it with its `msi_fan_brute_force` module
 option. When a configured fan uses one of those channels and the option is not
-detected, the settings page shows a notice with the workaround. On Unraid, set
-the option on the flash drive and reboot:
+detected, the settings page shows a notice with the workaround. The option's
+loaded state is read from the driver's `fan_control_watchdog` attribute or its
+"MSI fan brute force mode" kernel log line, falling back to the modprobe
+configuration. While a fan on one of those channels is set above 60% but reads
+back lower on two checks in a row, the plugin also sends one Unraid
+notification per fan per boot. On Unraid, set the option on the flash drive and
+reboot:
 
 ```bash
 mkdir -p /boot/config/modprobe.d
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
index 3490cfb..47e05ac 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
@@ -357,14 +357,17 @@ function list_pwm(string $hwmon_glob = '/sys/class/hwmon/hwmon*') {
 // On MSI boards the nct6687 driver uses its msi_alt1 register layout, where
 // writes to the system-fan channels (pwm3 and up) are accepted but ignored
 // unless the msi_fan_brute_force module option is set; those fans then stay
-// at about 60%. The option is not readable from sysfs, so it counts as set
-// when the driver exposes fan_control_watchdog (created only in that mode,
-// by newer builds) or when the modprobe configuration sets it.
+// at about 60%. The option is not readable from sysfs, so its state is taken,
+// in order, from the fan_control_watchdog attribute (created only in that
+// mode, by newer builds), the driver's "MSI fan brute force mode" line in the
+// kernel log (printed on auto-detected MSI boards; the latest load wins), and
+// finally the modprobe configuration.
 // https://github.com/Fred78290/nct6687d#loading-msi_fan_brute_force-parameter-fails
 function fcp_nct6687_brute_force_missing(
   array $controllers,
   string $module_dir = '/sys/module/nct6687',
-  string $modprobe_glob = '/etc/modprobe.d/*.conf'
+  string $modprobe_glob = '/etc/modprobe.d/*.conf',
+  ?string $kernel_log = null
 ): bool {
   $fan_config = @file_get_contents("$module_dir/parameters/fan_config");
   if ($fan_config === false || trim($fan_config) !== 'msi_alt1') return false;
@@ -381,6 +384,13 @@ function fcp_nct6687_brute_force_missing(
   }
   if ($hwmon === null || file_exists("$hwmon/fan_control_watchdog")) return false;
 
+  // syslog first, dmesg last: dmesg holds the most recent load, but its ring
+  // buffer may have dropped the line on a long uptime.
+  $kernel_log ??= (string)@file_get_contents('/var/log/syslog') . "\n" . (string)@shell_exec('dmesg 2>/dev/null');
+  if (preg_match_all('/nct668\d[^\n]*MSI fan brute force mode: (enabled|disabled)/', $kernel_log, $m)) {
+    return end($m[1]) === 'disabled';
+  }
+
   // Kernel bools accept 1/y/t/on (optionally quoted), or the bare name;
   // '-' and '_' are interchangeable.
   $set = '/^\s*options\s+nct6687\s+(?:.*\s)?msi[-_]fan[-_]brute[-_]force(?:="?(?:[1yYtT][^\s"]*|[oO][nN]))?(?:[\s"]|$)/m';
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
index a647e8e..e2c5f1f 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
@@ -253,3 +253,41 @@ interval_seconds() {
   (( secs > fcp_interval_max_seconds )) && secs=$fcp_interval_max_seconds
   printf '%s' "$secs"
 }
+
+# ===== MSI nct6687 stuck-fan check (#13) =====
+# On MSI boards in the driver's msi_alt1 layout, system-fan channels (pwm3 and
+# up) ignore speed changes unless the msi_fan_brute_force option is set, and
+# stay at about 60%. Reading pwmN back returns the chip's actual output, so a
+# fan driven above 60% that keeps reading back lower is caught here.
+fcp_notify_bin="${fcp_notify_bin:-/usr/local/emhttp/webGui/scripts/notify}"
+fcp_nct6687_module="${fcp_nct6687_module:-/sys/module/nct6687}"
+
+fcp_nct6687_msi_channel() {
+  local controller="$1" chip
+  [[ "$controller" =~ /pwm([0-9]+)$ ]] && (( BASH_REMATCH[1] >= 3 )) || return 1
+  chip=$(cat "$(dirname "$controller")/name" 2>/dev/null)
+  [[ "$chip" =~ ^nct668[367]$ ]] || return 1
+  [[ "$(cat "$fcp_nct6687_module/parameters/fan_config" 2>/dev/null)" == "msi_alt1" ]]
+}
+
+# Echoes the updated count of consecutive ticks where the fan was set above
+# 60% (PWM 153) and read back lower than the target. A single tick may only
+# be the chip still ramping, so the caller acts on two in a row.
+fcp_stuck_ticks() {
+  local count="$1" target="$2" actual="$3"
+  if [[ "$actual" =~ ^[0-9]+$ ]] && (( target > 153 && actual + 5 < target )); then
+    echo $((count + 1))
+  else
+    echo 0
+  fi
+}
+
+# One Unraid notification per fan per boot; the flag lives on tmpfs.
+fcp_notify_stuck() {
+  local name="$1" target="$2" actual="$3" flag="$4"
+  [[ -e "$flag" ]] && return 0
+  touch "$flag"
+  "$fcp_notify_bin" -e "FanCtrl Plus 2" -i warning -l "/Settings/fanctrlplus2" \
+    -s "Fan $name is not reaching its set speed" \
+    -d "Set to $(( (target * 100 + 127) / 255 ))% but the nct6687 controller reports $(( (actual * 100 + 127) / 255 ))%. On MSI boards this driver ignores system-fan speed changes unless its msi_fan_brute_force option is set. See the FanCtrl Plus 2 settings page."
+}
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
index 2d6836c..d8ddad1 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
@@ -44,6 +44,10 @@ else
   fan_path=""
 fi
 
+stuck_ticks=0
+nct6687_watch=0
+fcp_nct6687_msi_channel "$controller" && nct6687_watch=1
+
 prev_pwm=-1
 hist_file="/var/tmp/${plugin}/history_${plugin}_${custom}"
 
@@ -184,5 +188,14 @@ while true; do
     fi
   fi
 
+  # Fans the nct6687 MSI layout may ignore: warn when one stays below its target.
+  if (( nct6687_watch )); then
+    actual_pwm=$(cat "$controller" 2>/dev/null)
+    stuck_ticks=$(fcp_stuck_ticks "$stuck_ticks" "$pwm_val" "$actual_pwm")
+    if (( stuck_ticks >= 2 )); then
+      fcp_notify_stuck "$custom" "$pwm_val" "$actual_pwm" "/var/tmp/${plugin}/nct6687_stuck_${custom}"
+    fi
+  fi
+
   sleep "$(interval_seconds)"
 done
diff --git a/tests/nct6687_notice_test.php b/tests/nct6687_notice_test.php
index 4258648..511c64e 100644
--- a/tests/nct6687_notice_test.php
+++ b/tests/nct6687_notice_test.php
@@ -17,8 +17,9 @@
 file_put_contents("$other/name", "it8728\n");
 file_put_contents("$modprobe/nct6683.conf", "blacklist nct6683\ninstall nct6683 /bin/false\n");
 
-$check = function (string $label, bool $expected, array $controllers) use (&$failures, $module, $modprobe): void {
-    $actual = fcp_nct6687_brute_force_missing($controllers, $module, "$modprobe/*.conf");
+$log = '';
+$check = function (string $label, bool $expected, array $controllers) use (&$failures, &$log, $module, $modprobe): void {
+    $actual = fcp_nct6687_brute_force_missing($controllers, $module, "$modprobe/*.conf", $log);
     if ($actual !== $expected) {
         $failures[] = "$label: expected " . var_export($expected, true) . ', got ' . var_export($actual, true);
     }
@@ -59,6 +60,21 @@
     file_put_contents("$modprobe/nct6687.conf", "$line\n");
     $check("modprobe line '$line'", $expected, $sys_fan);
 }
+
+// The kernel log reports the loaded value, so it overrides the modprobe files
+// (which the loop above left setting the option).
+$enabled = "Oct  6 06:20:01 Tower kernel: nct6687 nct6687.2592: MSI fan brute force mode: enabled\n";
+$disabled = "[    7.912345] nct6687 nct6687.2592: MSI fan brute force mode: disabled\n";
+$log = $disabled;
+$check('kernel log: disabled, modprobe option set after boot', true, $sys_fan);
+$log = "$disabled$enabled";
+$check('kernel log: latest load enabled', false, $sys_fan);
+$log = "$enabled$disabled";
+$check('kernel log: latest load disabled', true, $sys_fan);
+file_put_contents("$modprobe/nct6687.conf", "options nct6687 msi_fan_brute_force=0\n");
+$log = $enabled;
+$check('kernel log: enabled, option passed outside modprobe.d', false, $sys_fan);
+$log = '';
 unlink("$modprobe/nct6687.conf");
 
 touch("$hwmon/fan_control_watchdog");
diff --git a/tests/nct6687_stuck_test.sh b/tests/nct6687_stuck_test.sh
new file mode 100755
index 0000000..702c64c
--- /dev/null
+++ b/tests/nct6687_stuck_test.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -u
+
+root=$(cd "$(dirname "$0")/.." && pwd)
+tmp=$(mktemp -d)
+trap 'rm -rf "$tmp"' EXIT
+
+fcp_nct6687_module="$tmp/module"
+fcp_notify_bin="$tmp/notify"
+source "$root/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/aux_sensors.sh"
+source "$root/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh"
+
+failures=0
+expect_equal() {
+  local expected="$1" actual="$2" message="$3"
+  if [[ "$expected" == "$actual" ]]; then
+    return
+  fi
+  printf '%s\nExpected: %s\nActual: %s\n' "$message" "$expected" "$actual" >&2
+  failures=$((failures + 1))
+}
+
+# ===== fcp_nct6687_msi_channel =====
+nct="$tmp/hwmon7" other="$tmp/hwmon3"
+mkdir -p "$nct" "$other" "$fcp_nct6687_module/parameters"
+echo nct6687 > "$nct/name"
+echo it8728 > "$other/name"
+channel() { fcp_nct6687_msi_channel "$1" && echo yes || echo no; }
+
+expect_equal no "$(channel "$nct/pwm5")" "Without the driver loaded, no channel is watched."
+echo default > "$fcp_nct6687_module/parameters/fan_config"
+expect_equal no "$(channel "$nct/pwm5")" "The default register layout applies speed changes."
+echo msi_alt1 > "$fcp_nct6687_module/parameters/fan_config"
+expect_equal yes "$(channel "$nct/pwm3")" "The first system-fan channel is watched."
+expect_equal no "$(channel "$nct/pwm2")" "The pump channel is not affected."
+expect_equal no "$(channel "$other/pwm5")" "Another chip's channel is not watched."
+
+# ===== fcp_stuck_ticks =====
+expect_equal 1 "$(fcp_stuck_ticks 0 255 154)" "Set to 100%, stuck at 60%: one stuck tick."
+expect_equal 2 "$(fcp_stuck_ticks 1 255 154)" "A second stuck tick in a row counts up."
+expect_equal 0 "$(fcp_stuck_ticks 1 153 120)" "A target of 60% or less is not checked."
+expect_equal 0 "$(fcp_stuck_ticks 1 200 196)" "Within 5 of the target counts as reached."
+expect_equal 0 "$(fcp_stuck_ticks 1 200 '')" "An unreadable value resets the count."
+
+# ===== fcp_notify_stuck =====
+printf '#!/bin/bash\nprintf "%%s\\n" "$@" >> "%s/calls"\n' "$tmp" > "$fcp_notify_bin"
+chmod +x "$fcp_notify_bin"
+fcp_notify_stuck HardDriveFans 255 154 "$tmp/flag"
+fcp_notify_stuck HardDriveFans 255 154 "$tmp/flag"
+expect_equal 1 "$(grep -c '^-s$' "$tmp/calls")" "One notification per fan until the flag is cleared at boot."
+expect_equal 1 "$(grep -c '^Set to 100% but the nct6687 controller reports 60%' "$tmp/calls")" \
+  "The notification reports the set and actual speeds as percentages."
+
+if (( failures > 0 )); then
+  exit 1
+fi
+
+echo "nct6687 stuck-fan tests passed"

From 3c9f4fa22b69f707be975d17cf0e6b9393ef702e Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 08:00:13 +0000
Subject: [PATCH 5/8] fanctrlplus2: harden the stuck-fan check after review

Count only ticks that wrote nothing, skip drivers that already run in
brute-force mode, never notify without a flag file, and read only the
tail of syslog.
---
 .../emhttp/plugins/fanctrlplus2/include/Common.php |  7 +++++--
 .../fanctrlplus2/scripts/disk_group_control.sh     | 14 +++++++++-----
 .../fanctrlplus2/scripts/fanctrlplus2_loop.sh      | 12 ++++++++++--
 tests/nct6687_notice_test.php                      |  2 ++
 tests/nct6687_stuck_test.sh                        | 11 ++++++++++-
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
index 47e05ac..cfde741 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
@@ -385,8 +385,11 @@ function fcp_nct6687_brute_force_missing(
   if ($hwmon === null || file_exists("$hwmon/fan_control_watchdog")) return false;
 
   // syslog first, dmesg last: dmesg holds the most recent load, but its ring
-  // buffer may have dropped the line on a long uptime.
-  $kernel_log ??= (string)@file_get_contents('/var/log/syslog') . "\n" . (string)@shell_exec('dmesg 2>/dev/null');
+  // buffer may have dropped the line on a long uptime. Only the last 4 MiB of
+  // syslog are read, so a huge log cannot exhaust PHP's memory limit.
+  $syslog = '/var/log/syslog';
+  $kernel_log ??= (string)@file_get_contents($syslog, false, null, -min(4 << 20, (int)@filesize($syslog)))
+    . "\n" . (string)@shell_exec('dmesg 2>/dev/null');
   if (preg_match_all('/nct668\d[^\n]*MSI fan brute force mode: (enabled|disabled)/', $kernel_log, $m)) {
     return end($m[1]) === 'disabled';
   }
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
index e2c5f1f..e461fc6 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
@@ -258,7 +258,8 @@ interval_seconds() {
 # On MSI boards in the driver's msi_alt1 layout, system-fan channels (pwm3 and
 # up) ignore speed changes unless the msi_fan_brute_force option is set, and
 # stay at about 60%. Reading pwmN back returns the chip's actual output, so a
-# fan driven above 60% that keeps reading back lower is caught here.
+# fan driven above 60% that keeps reading back lower is caught here. Drivers
+# that expose fan_control_watchdog run with the option set and are skipped.
 fcp_notify_bin="${fcp_notify_bin:-/usr/local/emhttp/webGui/scripts/notify}"
 fcp_nct6687_module="${fcp_nct6687_module:-/sys/module/nct6687}"
 
@@ -267,12 +268,14 @@ fcp_nct6687_msi_channel() {
   [[ "$controller" =~ /pwm([0-9]+)$ ]] && (( BASH_REMATCH[1] >= 3 )) || return 1
   chip=$(cat "$(dirname "$controller")/name" 2>/dev/null)
   [[ "$chip" =~ ^nct668[367]$ ]] || return 1
+  [[ ! -e "$(dirname "$controller")/fan_control_watchdog" ]] || return 1
   [[ "$(cat "$fcp_nct6687_module/parameters/fan_config" 2>/dev/null)" == "msi_alt1" ]]
 }
 
 # Echoes the updated count of consecutive ticks where the fan was set above
-# 60% (PWM 153) and read back lower than the target. A single tick may only
-# be the chip still ramping, so the caller acts on two in a row.
+# 60% (PWM 153) and read back lower than the target. The caller counts only
+# ticks that wrote nothing, so a chip still ramping to a new value is not
+# mistaken for a stuck one, and acts on two in a row.
 fcp_stuck_ticks() {
   local count="$1" target="$2" actual="$3"
   if [[ "$actual" =~ ^[0-9]+$ ]] && (( target > 153 && actual + 5 < target )); then
@@ -282,11 +285,12 @@ fcp_stuck_ticks() {
   fi
 }
 
-# One Unraid notification per fan per boot; the flag lives on tmpfs.
+# One Unraid notification per fan per boot; the flag lives on tmpfs. Without
+# a flag every tick would notify again, so no flag means no notification.
 fcp_notify_stuck() {
   local name="$1" target="$2" actual="$3" flag="$4"
   [[ -e "$flag" ]] && return 0
-  touch "$flag"
+  touch "$flag" 2>/dev/null || return 0
   "$fcp_notify_bin" -e "FanCtrl Plus 2" -i warning -l "/Settings/fanctrlplus2" \
     -s "Fan $name is not reaching its set speed" \
     -d "Set to $(( (target * 100 + 127) / 255 ))% but the nct6687 controller reports $(( (actual * 100 + 127) / 255 ))%. On MSI boards this driver ignores system-fan speed changes unless its msi_fan_brute_force option is set. See the FanCtrl Plus 2 settings page."
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
index d8ddad1..92d7f02 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
@@ -153,7 +153,9 @@ while true; do
   prev_hist_src="$hist_src"
 
   # === Write when PWM changes materially or on the first iteration ===
+  wrote=0
   if [[ "$prev_pwm" == -1 ]]; then
+    wrote=1
     [[ -f "$controller_enable" ]] && echo 1 > "$controller_enable"
     echo "$pwm_val" > "$controller"
     sleep 4
@@ -169,6 +171,7 @@ while true; do
     prev_pwm=$pwm_val
   else
     if (( pwm_val - prev_pwm >= 5 || prev_pwm - pwm_val >= 5 )); then
+      wrote=1
       [[ -f "$controller_enable" ]] && echo 1 > "$controller_enable"
       echo "$pwm_val" > "$controller"
       sleep 4
@@ -188,10 +191,15 @@ while true; do
     fi
   fi
 
-  # Fans the nct6687 MSI layout may ignore: warn when one stays below its target.
+  # Fans the nct6687 MSI layout may ignore: warn when one stays below its
+  # target. A tick that wrote restarts the count while the chip ramps.
   if (( nct6687_watch )); then
     actual_pwm=$(cat "$controller" 2>/dev/null)
-    stuck_ticks=$(fcp_stuck_ticks "$stuck_ticks" "$pwm_val" "$actual_pwm")
+    if (( wrote )); then
+      stuck_ticks=0
+    else
+      stuck_ticks=$(fcp_stuck_ticks "$stuck_ticks" "$pwm_val" "$actual_pwm")
+    fi
     if (( stuck_ticks >= 2 )); then
       fcp_notify_stuck "$custom" "$pwm_val" "$actual_pwm" "/var/tmp/${plugin}/nct6687_stuck_${custom}"
     fi
diff --git a/tests/nct6687_notice_test.php b/tests/nct6687_notice_test.php
index 511c64e..f2bbd65 100644
--- a/tests/nct6687_notice_test.php
+++ b/tests/nct6687_notice_test.php
@@ -79,6 +79,8 @@
 
 touch("$hwmon/fan_control_watchdog");
 $check('watchdog attribute present', false, $sys_fan);
+$log = $disabled;
+$check('watchdog attribute outranks the kernel log', false, $sys_fan);
 
 exec('rm -rf ' . escapeshellarg($root));
 
diff --git a/tests/nct6687_stuck_test.sh b/tests/nct6687_stuck_test.sh
index 702c64c..8a4b731 100755
--- a/tests/nct6687_stuck_test.sh
+++ b/tests/nct6687_stuck_test.sh
@@ -35,12 +35,18 @@ echo msi_alt1 > "$fcp_nct6687_module/parameters/fan_config"
 expect_equal yes "$(channel "$nct/pwm3")" "The first system-fan channel is watched."
 expect_equal no "$(channel "$nct/pwm2")" "The pump channel is not affected."
 expect_equal no "$(channel "$other/pwm5")" "Another chip's channel is not watched."
+echo nct6683 > "$other/name"
+expect_equal yes "$(channel "$other/pwm5")" "The driver's other chip names are watched too."
+touch "$nct/fan_control_watchdog"
+expect_equal no "$(channel "$nct/pwm5")" "A driver running with brute force on is not watched."
 
 # ===== fcp_stuck_ticks =====
 expect_equal 1 "$(fcp_stuck_ticks 0 255 154)" "Set to 100%, stuck at 60%: one stuck tick."
 expect_equal 2 "$(fcp_stuck_ticks 1 255 154)" "A second stuck tick in a row counts up."
+expect_equal 1 "$(fcp_stuck_ticks 0 154 140)" "Just above 60%, the target is checked."
 expect_equal 0 "$(fcp_stuck_ticks 1 153 120)" "A target of 60% or less is not checked."
-expect_equal 0 "$(fcp_stuck_ticks 1 200 196)" "Within 5 of the target counts as reached."
+expect_equal 1 "$(fcp_stuck_ticks 0 200 194)" "More than 5 below the target is stuck."
+expect_equal 0 "$(fcp_stuck_ticks 1 200 195)" "Within 5 of the target counts as reached."
 expect_equal 0 "$(fcp_stuck_ticks 1 200 '')" "An unreadable value resets the count."
 
 # ===== fcp_notify_stuck =====
@@ -51,6 +57,9 @@ fcp_notify_stuck HardDriveFans 255 154 "$tmp/flag"
 expect_equal 1 "$(grep -c '^-s$' "$tmp/calls")" "One notification per fan until the flag is cleared at boot."
 expect_equal 1 "$(grep -c '^Set to 100% but the nct6687 controller reports 60%' "$tmp/calls")" \
   "The notification reports the set and actual speeds as percentages."
+expect_equal 1 "$(grep -cx 'warning' "$tmp/calls")" "The notification is a warning."
+fcp_notify_stuck HardDriveFans 255 154 "$tmp/missing/flag"
+expect_equal 1 "$(grep -c '^-s$' "$tmp/calls")" "Without a flag file, no notification is sent, so ticks cannot repeat it."
 
 if (( failures > 0 )); then
   exit 1

From 57e42bb8473496cc636f3fc12228617c55d33284 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 09:30:03 +0000
Subject: [PATCH 6/8] fanctrlplus2: warn after 10 s stuck at 60% or less,
 writes included

A fan counts as stuck while its last written target is above 60% and it
reads back 60% or less. The tick that sets the speed starts the clock;
the warning follows once the stretch has lasted 10 seconds, so a target
raised on every tick no longer postpones it.
---
 README.md                                     |  2 +-
 .../scripts/disk_group_control.sh             | 27 +++++++++++--------
 .../fanctrlplus2/scripts/fanctrlplus2_loop.sh | 20 +++++---------
 tests/nct6687_stuck_test.sh                   | 15 +++++------
 4 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index 8335f55..fdabc0c 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ detected, the settings page shows a notice with the workaround. The option's
 loaded state is read from the driver's `fan_control_watchdog` attribute or its
 "MSI fan brute force mode" kernel log line, falling back to the modprobe
 configuration. While a fan on one of those channels is set above 60% but reads
-back lower on two checks in a row, the plugin also sends one Unraid
+back 60% or less for 10 seconds, the plugin also sends one Unraid
 notification per fan per boot. On Unraid, set the option on the flash drive and
 reboot:
 
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
index e461fc6..3a17e7b 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh
@@ -272,16 +272,21 @@ fcp_nct6687_msi_channel() {
   [[ "$(cat "$fcp_nct6687_module/parameters/fan_config" 2>/dev/null)" == "msi_alt1" ]]
 }
 
-# Echoes the updated count of consecutive ticks where the fan was set above
-# 60% (PWM 153) and read back lower than the target. The caller counts only
-# ticks that wrote nothing, so a chip still ramping to a new value is not
-# mistaken for a stuck one, and acts on two in a row.
-fcp_stuck_ticks() {
-  local count="$1" target="$2" actual="$3"
-  if [[ "$actual" =~ ^[0-9]+$ ]] && (( target > 153 && actual + 5 < target )); then
-    echo $((count + 1))
-  else
-    echo 0
+# A PWM value as a whole percentage, rounded the way the dashboard shows it.
+fcp_pwm_percent() {
+  echo $(( ($1 * 100 + 127) / 255 ))
+}
+
+# Echoes when the current stuck stretch began (the given time, or the start
+# carried over), or nothing when the fan is not stuck. Stuck means set above
+# 60% but reading back 60% or less: the speed a fan ignoring its writes holds.
+# The caller warns once a stretch has lasted 10 seconds, which a chip still
+# ramping up would not.
+fcp_stuck_since() {
+  local since="$1" now="$2" target="$3" actual="$4"
+  if [[ "$actual" =~ ^[0-9]+$ ]] &&
+     (( $(fcp_pwm_percent "$target") > 60 && $(fcp_pwm_percent "$actual") <= 60 )); then
+    echo "${since:-$now}"
   fi
 }
 
@@ -293,5 +298,5 @@ fcp_notify_stuck() {
   touch "$flag" 2>/dev/null || return 0
   "$fcp_notify_bin" -e "FanCtrl Plus 2" -i warning -l "/Settings/fanctrlplus2" \
     -s "Fan $name is not reaching its set speed" \
-    -d "Set to $(( (target * 100 + 127) / 255 ))% but the nct6687 controller reports $(( (actual * 100 + 127) / 255 ))%. On MSI boards this driver ignores system-fan speed changes unless its msi_fan_brute_force option is set. See the FanCtrl Plus 2 settings page."
+    -d "Set to $(fcp_pwm_percent "$target")% but the nct6687 controller reports $(fcp_pwm_percent "$actual")%. On MSI boards this driver ignores system-fan speed changes unless its msi_fan_brute_force option is set. See the FanCtrl Plus 2 settings page."
 }
diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
index 92d7f02..ed0c29e 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
@@ -44,7 +44,7 @@ else
   fan_path=""
 fi
 
-stuck_ticks=0
+stuck_since=""
 nct6687_watch=0
 fcp_nct6687_msi_channel "$controller" && nct6687_watch=1
 
@@ -153,9 +153,7 @@ while true; do
   prev_hist_src="$hist_src"
 
   # === Write when PWM changes materially or on the first iteration ===
-  wrote=0
   if [[ "$prev_pwm" == -1 ]]; then
-    wrote=1
     [[ -f "$controller_enable" ]] && echo 1 > "$controller_enable"
     echo "$pwm_val" > "$controller"
     sleep 4
@@ -171,7 +169,6 @@ while true; do
     prev_pwm=$pwm_val
   else
     if (( pwm_val - prev_pwm >= 5 || prev_pwm - pwm_val >= 5 )); then
-      wrote=1
       [[ -f "$controller_enable" ]] && echo 1 > "$controller_enable"
       echo "$pwm_val" > "$controller"
       sleep 4
@@ -191,17 +188,14 @@ while true; do
     fi
   fi
 
-  # Fans the nct6687 MSI layout may ignore: warn when one stays below its
-  # target. A tick that wrote restarts the count while the chip ramps.
+  # Fans the nct6687 MSI layout may ignore: warn once one has stayed at 60% or
+  # less for 10 seconds while set above it. The target is the last value
+  # written, which a change under 5 leaves in place.
   if (( nct6687_watch )); then
     actual_pwm=$(cat "$controller" 2>/dev/null)
-    if (( wrote )); then
-      stuck_ticks=0
-    else
-      stuck_ticks=$(fcp_stuck_ticks "$stuck_ticks" "$pwm_val" "$actual_pwm")
-    fi
-    if (( stuck_ticks >= 2 )); then
-      fcp_notify_stuck "$custom" "$pwm_val" "$actual_pwm" "/var/tmp/${plugin}/nct6687_stuck_${custom}"
+    stuck_since=$(fcp_stuck_since "$stuck_since" "$SECONDS" "$prev_pwm" "$actual_pwm")
+    if [[ -n "$stuck_since" ]] && (( SECONDS - stuck_since >= 10 )); then
+      fcp_notify_stuck "$custom" "$prev_pwm" "$actual_pwm" "/var/tmp/${plugin}/nct6687_stuck_${custom}"
     fi
   fi
 
diff --git a/tests/nct6687_stuck_test.sh b/tests/nct6687_stuck_test.sh
index 8a4b731..f0e1361 100755
--- a/tests/nct6687_stuck_test.sh
+++ b/tests/nct6687_stuck_test.sh
@@ -40,14 +40,13 @@ expect_equal yes "$(channel "$other/pwm5")" "The driver's other chip names are w
 touch "$nct/fan_control_watchdog"
 expect_equal no "$(channel "$nct/pwm5")" "A driver running with brute force on is not watched."
 
-# ===== fcp_stuck_ticks =====
-expect_equal 1 "$(fcp_stuck_ticks 0 255 154)" "Set to 100%, stuck at 60%: one stuck tick."
-expect_equal 2 "$(fcp_stuck_ticks 1 255 154)" "A second stuck tick in a row counts up."
-expect_equal 1 "$(fcp_stuck_ticks 0 154 140)" "Just above 60%, the target is checked."
-expect_equal 0 "$(fcp_stuck_ticks 1 153 120)" "A target of 60% or less is not checked."
-expect_equal 1 "$(fcp_stuck_ticks 0 200 194)" "More than 5 below the target is stuck."
-expect_equal 0 "$(fcp_stuck_ticks 1 200 195)" "Within 5 of the target counts as reached."
-expect_equal 0 "$(fcp_stuck_ticks 1 200 '')" "An unreadable value resets the count."
+# ===== fcp_stuck_since =====
+expect_equal 100 "$(fcp_stuck_since '' 100 255 154)" "Set to 100%, stuck at 60%: a stretch starts now."
+expect_equal 100 "$(fcp_stuck_since 100 110 166 154)" "A new target above 60% keeps the stretch going."
+expect_equal 100 "$(fcp_stuck_since 100 110 155 154)" "61% is above 60%; a reading of 154 rounds to 60%."
+expect_equal '' "$(fcp_stuck_since 100 110 154 120)" "A target of 60% or less ends the stretch."
+expect_equal '' "$(fcp_stuck_since 100 110 255 155)" "A reading above 60% ends the stretch."
+expect_equal '' "$(fcp_stuck_since 100 110 255 '')" "An unreadable value ends the stretch."
 
 # ===== fcp_notify_stuck =====
 printf '#!/bin/bash\nprintf "%%s\\n" "$@" >> "%s/calls"\n' "$tmp" > "$fcp_notify_bin"

From b57707e4c02ecad1b8bd9a37dbeca7ae2fca4e38 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 09:48:16 +0000
Subject: [PATCH 7/8] fanctrlplus2: create the runtime directory when a fan
 loop starts

---
 .../emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
index ed0c29e..40d3400 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/scripts/fanctrlplus2_loop.sh
@@ -33,6 +33,8 @@ aux_locate_bins "${aux_sensor:-}"
 source "/usr/local/emhttp/plugins/fanctrlplus2/scripts/disk_group_control.sh"
 
 plugin="fanctrlplus2"
+# The dashboard updater also creates this, but may start after the loops.
+mkdir -p "/var/tmp/${plugin}"
 custom="${custom:-$(basename "$cfg_file" .cfg)}"
 controller_enable="${controller}_enable"
 

From a458c6f4549445610a95ba9ece464c6acda3e6a6 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Tue, 6 Oct 2026 09:53:06 +0000
Subject: [PATCH 8/8] fanctrlplus2: let the last modprobe setting of the option
 win

---
 .../plugins/fanctrlplus2/include/Common.php   | 20 +++++++++++++------
 tests/nct6687_notice_test.php                 | 10 ++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
index cfde741..188201b 100644
--- a/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
+++ b/src/usr/local/emhttp/plugins/fanctrlplus2/include/Common.php
@@ -394,13 +394,21 @@ function fcp_nct6687_brute_force_missing(
     return end($m[1]) === 'disabled';
   }
 
-  // Kernel bools accept 1/y/t/on (optionally quoted), or the bare name;
-  // '-' and '_' are interchangeable.
-  $set = '/^\s*options\s+nct6687\s+(?:.*\s)?msi[-_]fan[-_]brute[-_]force(?:="?(?:[1yYtT][^\s"]*|[oO][nN]))?(?:[\s"]|$)/m';
-  foreach (glob($modprobe_glob) ?: [] as $conf) {
-    if (preg_match($set, (string)@file_get_contents($conf))) return false;
+  // modprobe reads the files in name order and passes every option along, and
+  // the kernel applies them in turn, so the last setting wins. Kernel bools
+  // accept 1/y/t/on (optionally quoted), or the bare name; '-' and '_' are
+  // interchangeable.
+  $files = glob($modprobe_glob) ?: [];
+  usort($files, fn($a, $b) => strcmp(basename($a), basename($b)));
+  $last = null;
+  foreach ($files as $conf) {
+    preg_match_all('/^\s*options\s+nct6687\s+(.*)$/m', (string)@file_get_contents($conf), $lines);
+    foreach ($lines[1] as $args) {
+      preg_match_all('/(?:^|\s)msi[-_]fan[-_]brute[-_]force(?:="?([^\s"]*)"?)?(?=\s|$)/', $args, $vals);
+      foreach ($vals[1] as $val) $last = $val;
+    }
   }
-  return true;
+  return $last === null || !preg_match('/^(?:$|[1yYtT]|[oO][nN])/', $last);
 }
 
 // Find storcli binary (storcli64, storcli2, storcli) in common paths
diff --git a/tests/nct6687_notice_test.php b/tests/nct6687_notice_test.php
index f2bbd65..0125cb1 100644
--- a/tests/nct6687_notice_test.php
+++ b/tests/nct6687_notice_test.php
@@ -56,11 +56,21 @@
     'options  nct6687 msi_fan_brute_force' => false,
     'options nct6687 msi_fan_brute_force=on' => false,
     'options nct6687 msi_fan_brute_force="true"' => false,
+    "options nct6687 msi_fan_brute_force=1\noptions nct6687 msi_fan_brute_force=0" => true,
+    'options nct6687 msi_fan_brute_force=0 msi_fan_brute_force=1' => false,
 ] as $line => $expected) {
     file_put_contents("$modprobe/nct6687.conf", "$line\n");
     $check("modprobe line '$line'", $expected, $sys_fan);
 }
 
+// Across files, modprobe reads them in name order, so the later file wins.
+file_put_contents("$modprobe/zz-off.conf", "options nct6687 msi_fan_brute_force=0\n");
+$check('a later file disables the option', true, $sys_fan);
+rename("$modprobe/zz-off.conf", "$modprobe/00-off.conf");
+$check('an earlier file is overridden', false, $sys_fan);
+unlink("$modprobe/00-off.conf");
+file_put_contents("$modprobe/nct6687.conf", "options nct6687 msi_fan_brute_force=1\n");
+
 // The kernel log reports the loaded value, so it overrides the modprobe files
 // (which the loop above left setting the option).
 $enabled = "Oct  6 06:20:01 Tower kernel: nct6687 nct6687.2592: MSI fan brute force mode: enabled\n";