<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21058">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">binarypi mainboards: Clean up IS_ENABLED fan control<br><br>Remove all checks for #if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) around<br>the imc.h includes. Convert from #if to if() for all fan control<br>setup code.<br><br>Change-Id: If88af42d00227285931829441909a982fc292b2b<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/mainboard/amd/bettong/BiosCallOuts.c<br>M src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c<br>M src/mainboard/amd/lamar/BiosCallOuts.c<br>M src/mainboard/amd/olivehillplus/BiosCallOuts.c<br>M src/mainboard/bap/ode_e21XX/BiosCallOuts.c<br>M src/mainboard/pcengines/apu2/BiosCallOuts.c<br>6 files changed, 435 insertions(+), 456 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/21058/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/amd/bettong/BiosCallOuts.c b/src/mainboard/amd/bettong/BiosCallOuts.c<br>index a2bd36d..facfd7e 100644<br>--- a/src/mainboard/amd/bettong/BiosCallOuts.c<br>+++ b/src/mainboard/amd/bettong/BiosCallOuts.c<br>@@ -23,9 +23,7 @@<br> #include "heapManager.h"<br> #include "FchPlatform.h"<br> #include "cbfs.h"<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br> #include "imc.h"<br>-#endif<br> #include "hudson.h"<br> #include <stdlib.h><br> #include "northbridge/amd/pi/dimmSpd.h"<br>@@ -74,9 +72,8 @@<br> } else if (StdHeader->Func == AMD_INIT_ENV) {<br> FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;<br> printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br>- oem_fan_control(FchParams_env);<br>-#endif<br>+ if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM))<br>+ oem_fan_control(FchParams_env);<br> <br> /* XHCI configuration */<br> #if IS_ENABLED(CONFIG_HUDSON_XHCI_ENABLE)<br>diff --git a/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c b/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c<br>index f992ece..8563dda 100644<br>--- a/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c<br>+++ b/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c<br>@@ -22,9 +22,7 @@<br> #include "heapManager.h"<br> #include "FchPlatform.h"<br> #include "cbfs.h"<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br> #include "imc.h"<br>-#endif<br> #include "hudson.h"<br> #include <stdlib.h><br> <br>@@ -140,128 +138,126 @@<br> LibAmdMemCopy ((VOID *)(FchParams->Hwm.HwmFanControl), &oem_factl, (sizeof (FCH_HWM_FAN_CTR) * 5), FchParams->StdHeader);<br> <br> /* Enable IMC fan control. the recommended way */<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br>+ if(IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {<br>+ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br> <br>- /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br>+ FchParams->Imc.ImcEnable = TRUE;<br>+ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>+ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br> <br>- FchParams->Imc.ImcEnable = TRUE;<br>- FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>- FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br>+ LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br> <br>- LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br>+ /* Thermal Zone Parameter */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x00; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x00; /* 6 | BIT3 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 2;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0;<br> <br>- /* Thermal Zone Parameter */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x00; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x00; /* 6 | BIT3 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 2;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0;<br>+ /* IMC Fan Policy temperature thresholds */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0; /* AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0; /* AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0; /* AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0; /* AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0; /* AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0; /* AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0; /* AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0; /* critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br> <br>- /* IMC Fan Policy temperature thresholds */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0; /* AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0; /* AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0; /* AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0; /* AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0; /* AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0; /* AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0; /* AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0; /* critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br>+ /* IMC Fan Policy PWM Settings */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0x00; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0x00; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0x00; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0x00; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0x00; /* AL7 percentage */<br> <br>- /* IMC Fan Policy PWM Settings */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0x00; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0x00; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0x00; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0x00; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0x00; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /* AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /* AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /* AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /* AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /* AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /* AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /* AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /* critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br> <br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /* AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /* AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /* AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /* AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /* AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /* AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /* AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /* critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br> <br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br>+ /* IMC Function */<br>+ FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333; /*BIT0 | BIT4 |BIT8; */<br> <br>- /* IMC Function */<br>- FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333; /*BIT0 | BIT4 |BIT8; */<br>-<br>- /* NOTE:<br>- * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>- * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>- * so we remove it from AGESA code. Please See FchInitLateHwm.<br>- */<br>-<br>-#else /* HWM fan control, using the alternative method */<br>- FchParams->Imc.ImcEnable = FALSE;<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = TRUE; /* 1 enable, 0 disable TSI Auto Polling */<br>-<br>-#endif /* CONFIG_HUDSON_IMC_FWM */<br>+ /* NOTE:<br>+ * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>+ * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>+ * so we remove it from AGESA code. Please See FchInitLateHwm.<br>+ */<br>+ } else {<br>+ /* HWM fan control, using the alternative method */<br>+ FchParams->Imc.ImcEnable = FALSE;<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE; /* 1 enable, 0 disable TSI Auto Polling */<br>+ }<br> }<br> <br> /**<br>diff --git a/src/mainboard/amd/lamar/BiosCallOuts.c b/src/mainboard/amd/lamar/BiosCallOuts.c<br>index 3a014b0..b241387 100644<br>--- a/src/mainboard/amd/lamar/BiosCallOuts.c<br>+++ b/src/mainboard/amd/lamar/BiosCallOuts.c<br>@@ -20,9 +20,7 @@<br> #include "heapManager.h"<br> #include "FchPlatform.h"<br> #include "cbfs.h"<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br> #include "imc.h"<br>-#endif<br> #include "hudson.h"<br> #include <stdlib.h><br> #include <device/azalia.h><br>@@ -155,130 +153,128 @@<br> LibAmdMemCopy ((VOID *)(FchParams->Hwm.HwmFanControl), &oem_factl, (sizeof(FCH_HWM_FAN_CTR) * 5), FchParams->StdHeader);<br> <br> /* Enable IMC fan control. the recommended way */<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br>+ if(IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {<br>+ imc_reg_init();<br> <br>- imc_reg_init();<br>+ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br> <br>- /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br>+ FchParams->Imc.ImcEnable = TRUE;<br>+ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>+ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br> <br>- FchParams->Imc.ImcEnable = TRUE;<br>- FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>- FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br>+ LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br> <br>- LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br>+ /* Thermal Zone Parameter */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x3d; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x0e; /* 6 | BIT3 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x54;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x02;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0x00;<br> <br>- /* Thermal Zone Parameter */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x3d; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x0e; /* 6 | BIT3 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x54;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x02;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0x00;<br>+ /* IMC Fan Policy temperature thresholds */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0x46; /* AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x3c; /* AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0x32; /* AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /* AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /* AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /* AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /* AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /* critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br> <br>- /* IMC Fan Policy temperature thresholds */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0x46; /* AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x3c; /* AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0x32; /* AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /* AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /* AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /* AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /* AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /* critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br>+ /* IMC Fan Policy PWM Settings */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0x5a; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x46; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0x28; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percentage */<br> <br>- /* IMC Fan Policy PWM Settings */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0x5a; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x46; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0x28; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /* AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /* AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /* AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /* AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /* AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /* AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /* AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /* critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br> <br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /* AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /* AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /* AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /* AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /* AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /* AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /* AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /* AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /* critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br> <br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; /* BIT0 | BIT2 | BIT5 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br>+ /* IMC Function */<br>+ FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333;/* BIT0 | BIT4 |BIT8 */<br> <br>- /* IMC Function */<br>- FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333;/* BIT0 | BIT4 |BIT8 */<br>-<br>- /* NOTE:<br>- * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>- * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>- * so we remove it from AGESA code. Please See FchInitLateHwm.<br>- */<br>-<br>-#else /* HWM fan control, using the alternative method */<br>- FchParams->Imc.ImcEnable = FALSE;<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */<br>-<br>-#endif /* CONFIG_HUDSON_IMC_FWM */<br>+ /* NOTE:<br>+ * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>+ * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>+ * so we remove it from AGESA code. Please See FchInitLateHwm.<br>+ */<br>+ } else {<br>+ /* HWM fan control, using the alternative method */<br>+ FchParams->Imc.ImcEnable = FALSE;<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */<br>+ }<br> }<br> <br> /**<br>diff --git a/src/mainboard/amd/olivehillplus/BiosCallOuts.c b/src/mainboard/amd/olivehillplus/BiosCallOuts.c<br>index 96e3289..454240b 100644<br>--- a/src/mainboard/amd/olivehillplus/BiosCallOuts.c<br>+++ b/src/mainboard/amd/olivehillplus/BiosCallOuts.c<br>@@ -20,9 +20,7 @@<br> #include "heapManager.h"<br> #include "FchPlatform.h"<br> #include "cbfs.h"<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br> #include "imc.h"<br>-#endif<br> #include "hudson.h"<br> #include <stdlib.h><br> <br>@@ -123,128 +121,126 @@<br> LibAmdMemCopy ((VOID *)(FchParams->Hwm.HwmFanControl), &oem_factl, (sizeof(FCH_HWM_FAN_CTR) * 5), FchParams->StdHeader);<br> <br> /* Enable IMC fan control. the recommended way */<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br>+ if(IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {<br>+ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br> <br>- /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br>+ FchParams->Imc.ImcEnable = TRUE;<br>+ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>+ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br> <br>- FchParams->Imc.ImcEnable = TRUE;<br>- FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>- FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br>+ LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br> <br>- LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br>+ /* Thermal Zone Parameter */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x3d; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x4e; //6 | BIT3;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x04;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x9a; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x01;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0x00;<br> <br>- /* Thermal Zone Parameter */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x3d; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x4e; //6 | BIT3;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x04;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x9a; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x01;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0x00;<br>+ /* IMC Fan Policy temperature thresholds */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0x46; /*AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x3c; /*AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0x32; /*AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /*AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /*AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /*AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /*AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /*critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br> <br>- /* IMC Fan Policy temperature thresholds */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0x46; /*AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x3c; /*AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0x32; /*AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /*AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /*AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /*AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /*AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /*critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br>+ /* IMC Fan Policy PWM Settings */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0x5a; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x46; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0x28; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percentage */<br> <br>- /* IMC Fan Policy PWM Settings */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0x5a; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x46; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0x28; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /*AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /*AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /*AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /*AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /*AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /*AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /*AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /*critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br> <br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /*AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /*AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /*AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /*AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /*AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /*AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /*AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /*critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /*Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br> <br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /*Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br>+ /* IMC Function */<br>+ FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333; //BIT0 | BIT4 |BIT8;<br> <br>- /* IMC Function */<br>- FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333; //BIT0 | BIT4 |BIT8;<br>-<br>- /* NOTE:<br>- * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>- * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>- * so we remove it from AGESA code. Please See FchInitLateHwm.<br>- */<br>-<br>-#else /* HWM fan control, using the alternative method */<br>- FchParams->Imc.ImcEnable = FALSE;<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = TRUE; /* 1 enable, 0 disable TSI Auto Polling */<br>-<br>-#endif /* CONFIG_HUDSON_IMC_FWM */<br>+ /* NOTE:<br>+ * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>+ * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>+ * so we remove it from AGESA code. Please See FchInitLateHwm.<br>+ */<br>+ } else {<br>+ /* HWM fan control, using the alternative method */<br>+ FchParams->Imc.ImcEnable = FALSE;<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE; /* 1 enable, 0 disable TSI Auto Polling */<br>+ }<br> }<br> <br> /**<br>diff --git a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c<br>index 1a4ed5a..651b72a 100644<br>--- a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c<br>+++ b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c<br>@@ -20,9 +20,7 @@<br> #include "heapManager.h"<br> #include "FchPlatform.h"<br> #include "cbfs.h"<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br> #include "imc.h"<br>-#endif<br> #include "hudson.h"<br> #include <stdlib.h><br> #include <spd_bin.h><br>@@ -125,128 +123,126 @@<br> LibAmdMemCopy ((VOID *)(FchParams->Hwm.HwmFanControl), &oem_factl, (sizeof(FCH_HWM_FAN_CTR) * 5), FchParams->StdHeader);<br> <br> /* Enable IMC fan control. the recommended way */<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br>+ if(IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {<br>+ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br> <br>- /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = FALSE; /* 0 disable, 1 enable TSI Auto Polling */<br>+ FchParams->Imc.ImcEnable = TRUE;<br>+ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>+ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br> <br>- FchParams->Imc.ImcEnable = TRUE;<br>- FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */<br>- FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */<br>+ LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br> <br>- LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);<br>+ /* Thermal Zone Parameter */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x3d; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x4e; //6 | BIT3;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x04;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x9a; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x01;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0x00;<br> <br>- /* Thermal Zone Parameter */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x3d; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0x4e; //6 | BIT3;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x04;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x9a; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x01;<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0x00;<br>+ /* IMC Fan Policy temperature thresholds */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0x46; /*AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x3c; /*AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0x32; /*AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /*AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /*AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /*AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /*AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /*critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br> <br>- /* IMC Fan Policy temperature thresholds */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0x46; /*AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x3c; /*AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0x32; /*AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /*AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /*AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /*AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /*AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /*critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;<br>+ /* IMC Fan Policy PWM Settings */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0x5a; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x46; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0x28; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percentage */<br> <br>- /* IMC Fan Policy PWM Settings */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0x5a; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x46; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0x28; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg1 = 0x01; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg2 = 0x55; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg3 = 0x17;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg6 = 0x90; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone1MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* zone */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /*AC0 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /*AC1 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /*AC2 threshold in Celsius */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /*AC3 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /*AC4 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /*AC5 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /*AC6 threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /*critical threshold* in Celsius, 0xFF is not define */<br>+ FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br> <br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg1 = 0x01; /* zone */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg2 = 60; /*AC0 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg3 = 40; /*AC1 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg4 = 0; /*AC2 threshold in Celsius */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg5 = 0; /*AC3 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg6 = 0; /*AC4 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg7 = 0; /*AC5 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg8 = 0; /*AC6 threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgReg9 = 0; /*AC7 lowest threshold in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegA = 0; /*critical threshold* in Celsius, 0xFF is not define */<br>- FchParams->Imc.EcStruct.MsgFun83Zone1MsgRegB = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /*Zone */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br> <br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg1 = 0x01; /*Zone */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg2 = 0; /* AL0 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg3 = 0; /* AL1 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg4 = 0; /* AL2 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg5 = 0x00; /* AL3 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg6 = 0x00; /* AL4 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg7 = 0x00; /* AL5 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg8 = 0x00; /* AL6 percentage */<br>- FchParams->Imc.EcStruct.MsgFun85Zone1MsgReg9 = 0x00; /* AL7 percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg1 = 0x2; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg7 = 2;<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg8 = 5; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone2MsgReg9 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>+ FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br> <br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg0 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg1 = 0x3; /* Zone */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg2 = 0x0; //BIT0 | BIT2 | BIT5;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg3 = 0x0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg4 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg5 = 0x00;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg6 = 0x0; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg7 = 0;<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg8 = 0; /* PWM steping rate in unit of PWM level percentage */<br>- FchParams->Imc.EcStruct.MsgFun81Zone3MsgReg9 = 0;<br>+ /* IMC Function */<br>+ FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333; //BIT0 | BIT4 |BIT8;<br> <br>- /* IMC Function */<br>- FchParams->Imc.EcStruct.IMCFUNSupportBitMap = 0x333; //BIT0 | BIT4 |BIT8;<br>-<br>- /* NOTE:<br>- * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>- * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>- * so we remove it from AGESA code. Please See FchInitLateHwm.<br>- */<br>-<br>-#else /* HWM fan control, using the alternative method */<br>- FchParams->Imc.ImcEnable = FALSE;<br>- FchParams->Hwm.HwMonitorEnable = TRUE;<br>- FchParams->Hwm.HwmFchtsiAutoPoll = TRUE; /* 1 enable, 0 disable TSI Auto Polling */<br>-<br>-#endif /* CONFIG_HUDSON_IMC_FWM */<br>+ /* NOTE:<br>+ * FchInitLateHwm will overwrite the EcStruct with EcDefaultMessage,<br>+ * AGESA put EcDefaultMessage as global data in ROM, so we can't override it.<br>+ * so we remove it from AGESA code. Please See FchInitLateHwm.<br>+ */<br>+ } else {<br>+ /* HWM fan control, using the alternative method */<br>+ FchParams->Imc.ImcEnable = FALSE;<br>+ FchParams->Hwm.HwMonitorEnable = TRUE;<br>+ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE; /* 1 enable, 0 disable TSI Auto Polling */<br>+ }<br> }<br> <br> /**<br>diff --git a/src/mainboard/pcengines/apu2/BiosCallOuts.c b/src/mainboard/pcengines/apu2/BiosCallOuts.c<br>index a239b47..5822779 100644<br>--- a/src/mainboard/pcengines/apu2/BiosCallOuts.c<br>+++ b/src/mainboard/pcengines/apu2/BiosCallOuts.c<br>@@ -23,9 +23,7 @@<br> #include "FchPlatform.h"<br> #include "cbfs.h"<br> #include "gpio_ftns.h"<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br> #include "imc.h"<br>-#endif<br> #include "hudson.h"<br> #include <stdlib.h><br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/21058">change 21058</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/21058"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If88af42d00227285931829441909a982fc292b2b </div>
<div style="display:none"> Gerrit-Change-Number: 21058 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>