mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-08-22 18:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added fan control support for ITE IT8721F, IT8665E, IT8686E, IT8688E and IT879XE super I/O chips.

Browse Source
This commit is contained in:
Michael Möller 2020-04-25 23:50:33 +02:00
parent 8afd59327e
commit 7bf4f655d2
2 changed files with 87 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
Hardware/LPC/IT87XX.cs
View File

@ -50,10 +50,15 @@ namespace OpenHardwareMonitor.Hardware.LPC {
private readonly byte[] FAN_TACHOMETER_EXT_REG = private readonly byte[] FAN_TACHOMETER_EXT_REG =
{ 0x18, 0x19, 0x1a, 0x81, 0x83 }; { 0x18, 0x19, 0x1a, 0x81, 0x83 };
private const byte VOLTAGE_BASE_REG = 0x20; private const byte VOLTAGE_BASE_REG = 0x20;
private readonly byte[] FAN_PWM_CTRL_REG = { 0x15, 0x16, 0x17 }; private const byte FAN_MAIN_CTRL_REG = 0x13;
private readonly byte[] FAN_PWM_CTRL_REG;
private readonly byte[] FAN_PWM_CTRL_EXT_REG =
{ 0x63, 0x6b, 0x73, 0x7b, 0xa3 };
private bool[] restoreDefaultFanPwmControlRequired = new bool[3]; private bool[] restoreDefaultFanPwmControlRequired = new bool[5];
private byte[] initialFanPwmControl = new byte[3]; private bool[] initialFanOutputModeEnabled = new bool[3];
private byte[] initialFanPwmControl = new byte[5];
private byte[] initialFanPwmControlExt = new byte[5];
private byte ReadByte(byte register, out bool valid) { private byte ReadByte(byte register, out bool valid) {
Ring0.WriteIoPort(addressReg, register); Ring0.WriteIoPort(addressReg, register);
@ -86,10 +91,23 @@ namespace OpenHardwareMonitor.Hardware.LPC {
} }
private void SaveDefaultFanPwmControl(int index) { private void SaveDefaultFanPwmControl(int index) {
bool valid;
if (!restoreDefaultFanPwmControlRequired[index]) { if (!restoreDefaultFanPwmControlRequired[index]) {
initialFanPwmControl[index] = initialFanPwmControl[index] = ReadByte(FAN_PWM_CTRL_REG[index], out _);
ReadByte(FAN_PWM_CTRL_REG[index], out valid);
if (index < 3) {
initialFanOutputModeEnabled[index] =
(ReadByte(FAN_MAIN_CTRL_REG, out _) & (1 << index)) > 0;
}
if (chip == Chip.IT8721F ||
chip == Chip.IT8665E ||
chip == Chip.IT8686E ||
chip == Chip.IT8688E ||
chip == Chip.IT879XE)
{
initialFanPwmControlExt[index] =
ReadByte(FAN_PWM_CTRL_EXT_REG[index], out _);
}
restoreDefaultFanPwmControlRequired[index] = true; restoreDefaultFanPwmControlRequired[index] = true;
} }
} }
@ -97,6 +115,23 @@ namespace OpenHardwareMonitor.Hardware.LPC {
private void RestoreDefaultFanPwmControl(int index) { private void RestoreDefaultFanPwmControl(int index) {
if (restoreDefaultFanPwmControlRequired[index]) { if (restoreDefaultFanPwmControlRequired[index]) {
WriteByte(FAN_PWM_CTRL_REG[index], initialFanPwmControl[index]); WriteByte(FAN_PWM_CTRL_REG[index], initialFanPwmControl[index]);
if (index < 3) {
var value = ReadByte(FAN_MAIN_CTRL_REG, out _);
if ((value & (1 << index)) > 0 != initialFanOutputModeEnabled[index]) {
WriteByte(FAN_MAIN_CTRL_REG, (byte)(value ^ (1 << index)));
}
}
if (chip == Chip.IT8721F ||
chip == Chip.IT8665E ||
chip == Chip.IT8686E ||
chip == Chip.IT8688E ||
chip == Chip.IT879XE)
{
WriteByte(FAN_PWM_CTRL_EXT_REG[index], initialFanPwmControlExt[index]);
}
restoreDefaultFanPwmControlRequired[index] = false; restoreDefaultFanPwmControlRequired[index] = false;
} }
} }
@ -111,8 +146,25 @@ namespace OpenHardwareMonitor.Hardware.LPC {
if (value.HasValue) { if (value.HasValue) {
SaveDefaultFanPwmControl(index); SaveDefaultFanPwmControl(index);
// set output value if (index < 3) {
WriteByte(FAN_PWM_CTRL_REG[index], (byte)(value.Value >> 1)); if (!initialFanOutputModeEnabled[index]) {
WriteByte(FAN_MAIN_CTRL_REG,
(byte)(ReadByte(FAN_MAIN_CTRL_REG, out _) | (1 << index)));
}
}
if (chip == Chip.IT8721F ||
chip == Chip.IT8665E ||
chip == Chip.IT8686E ||
chip == Chip.IT8688E ||
chip == Chip.IT879XE)
{
WriteByte(FAN_PWM_CTRL_REG[index],
(byte)(initialFanPwmControl[index] & 0x7F));
WriteByte(FAN_PWM_CTRL_EXT_REG[index], value.Value);
} else {
WriteByte(FAN_PWM_CTRL_REG[index], (byte)(value.Value >> 1));
}
} else { } else {
RestoreDefaultFanPwmControl(index); RestoreDefaultFanPwmControl(index);
} }
@ -143,6 +195,12 @@ namespace OpenHardwareMonitor.Hardware.LPC {
if (!valid) if (!valid)
return; return;
if (chip == Chip.IT8665E) {
FAN_PWM_CTRL_REG = new byte[] { 0x15, 0x16, 0x17, 0x1e, 0x1f };
} else {
FAN_PWM_CTRL_REG = new byte[] { 0x15, 0x16, 0x17, 0x7f, 0xa7 };
}
switch (chip) { switch (chip) {
case Chip.IT8665E: case Chip.IT8665E:
case Chip.IT8686E: case Chip.IT8686E:
@ -150,6 +208,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
voltages = new float?[9]; voltages = new float?[9];
temperatures = new float?[6]; temperatures = new float?[6];
fans = new float?[5]; fans = new float?[5];
controls = new float?[5];
break; break;
case Chip.IT8655E: case Chip.IT8655E:
voltages = new float?[9]; voltages = new float?[9];
@ -160,6 +219,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
voltages = new float?[9]; voltages = new float?[9];
temperatures = new float?[3]; temperatures = new float?[3];
fans = new float?[3]; fans = new float?[3];
controls = new float?[3];
break; break;
case Chip.IT8705F: case Chip.IT8705F:
voltages = new float?[9]; voltages = new float?[9];
@ -358,11 +418,22 @@ namespace OpenHardwareMonitor.Hardware.LPC {
continue; continue;
if ((value & 0x80) > 0) { if ((value & 0x80) > 0) {
// automatic operation (value can't be read) // automatic operation (value can't be read)
controls[i] = null; controls[i] = null;
} else { } else {
// software operation // software operation
controls[i] = (float)Math.Round((value & 0x7F) * 100.0f / 0x7F); if (chip == Chip.IT8721F ||
chip == Chip.IT8665E ||
chip == Chip.IT8686E ||
chip == Chip.IT8688E ||
chip == Chip.IT879XE)
{
value = ReadByte(FAN_PWM_CTRL_EXT_REG[i], out valid);
if (valid)
controls[i] = (float)Math.Round(value * 100.0f / 0xFF);
} else {
controls[i] = (float)Math.Round((value & 0x7F) * 100.0f / 0x7F);
}
} }
} }

5
Hardware/Mainboard/SuperIOHardware.cs
View File

@ -814,6 +814,11 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("System 2 Fan", 2)); f.Add(new Fan("System 2 Fan", 2));
f.Add(new Fan("PCH Fan", 3)); f.Add(new Fan("PCH Fan", 3));
f.Add(new Fan("CPU OPT Fan", 4)); f.Add(new Fan("CPU OPT Fan", 4));
c.Add(new Ctrl("CPU Fan", 0));
c.Add(new Ctrl("System 1 Fan", 1));
c.Add(new Ctrl("System 2 Fan", 2));
c.Add(new Ctrl("PCH Fan", 3));
c.Add(new Ctrl("CPU OPT Fan", 4));
break; break;
case Model.Z390_M_GAMING: // IT8688E case Model.Z390_M_GAMING: // IT8688E
case Model.Z390_AORUS_ULTRA: case Model.Z390_AORUS_ULTRA: