sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AGESA mainboards: Clean up IS_ENABLED fan control

Browse Source 
Remove all checks for #if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) around
the imc.h includes.  Convert all #if to if() for fan control setup.

Change-Id: I04a9fbbf6f64f45e1a0b544267bfe840ce7fa1d9
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/21059
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Marshall Dawson
2017-08-16 18:04:06 -06:00
committed by Kyösti Mälkki
parent 0bf3f55b5c
commit 6dd620bf10
8 changed files with 500 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainboard/amd/olivehill/BiosCallOuts.c
View File

@@ -21,9 +21,7 @@
#include "heapManager.h" #include "heapManager.h"
#include "FchPlatform.h" #include "FchPlatform.h"
#include "cbfs.h" #include "cbfs.h"
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
#include "imc.h" #include "imc.h"
#endif
#include <stdlib.h> #include <stdlib.h>
const BIOS_CALLOUT_STRUCT BiosCallouts[] = const BIOS_CALLOUT_STRUCT BiosCallouts[] =
@@ -107,8 +105,7 @@ static const CODEC_TBL_LIST OlivehillCodecTableList[] =
static void oem_fan_control(FCH_DATA_BLOCK *FchParams) static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
{ {
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
imc_reg_init(); imc_reg_init();
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
@@ -166,13 +163,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }
void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset) void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset)

12
src/mainboard/amd/parmer/BiosCallOuts.c
View File

@@ -21,9 +21,7 @@
#include "heapManager.h" #include "heapManager.h"
#include "FchPlatform.h" #include "FchPlatform.h"
#include "cbfs.h" #include "cbfs.h"
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
#include "imc.h" #include "imc.h"
#endif
#include <stdlib.h> #include <stdlib.h>
const BIOS_CALLOUT_STRUCT BiosCallouts[] = const BIOS_CALLOUT_STRUCT BiosCallouts[] =
@@ -107,8 +105,7 @@ static const CODEC_TBL_LIST CodecTableList[] =
static void oem_fan_control(FCH_DATA_BLOCK *FchParams) static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
{ {
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
imc_reg_init(); imc_reg_init();
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
@@ -166,13 +163,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }
void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset) void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset)

12
src/mainboard/amd/thatcher/BiosCallOuts.c
View File

@@ -21,9 +21,7 @@
#include "heapManager.h" #include "heapManager.h"
#include "FchPlatform.h" #include "FchPlatform.h"
#include "cbfs.h" #include "cbfs.h"
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
#include "imc.h" #include "imc.h"
#endif
#include <stdlib.h> #include <stdlib.h>
const BIOS_CALLOUT_STRUCT BiosCallouts[] = const BIOS_CALLOUT_STRUCT BiosCallouts[] =
@@ -107,8 +105,7 @@ static const CODEC_TBL_LIST CodecTableList[] =
static void oem_fan_control(FCH_DATA_BLOCK *FchParams) static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
{ {
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
imc_reg_init(); imc_reg_init();
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
@@ -166,13 +163,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }

9
src/mainboard/asrock/imb-a180/BiosCallOuts.c
View File

@@ -164,7 +164,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
LibAmdMemCopy ((VOID *)(FchParams->Hwm.HwmFanControl), &oem_factl, (sizeof(FCH_HWM_FAN_CTR) * 5), FchParams->StdHeader); LibAmdMemCopy ((VOID *)(FchParams->Hwm.HwmFanControl), &oem_factl, (sizeof(FCH_HWM_FAN_CTR) * 5), FchParams->StdHeader);
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if defined CONFIG_HUDSON_IMC_FWM && (CONFIG_HUDSON_IMC_FWM == 1) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = FALSE;/* 0 disable, 1 enable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = FALSE;/* 0 disable, 1 enable TSI Auto Polling */
@@ -278,13 +278,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }
#endif #endif

12
src/mainboard/bap/ode_e20XX/BiosCallOuts.c
View File

@@ -21,9 +21,7 @@
#include "heapManager.h" #include "heapManager.h"
#include "FchPlatform.h" #include "FchPlatform.h"
#include "cbfs.h" #include "cbfs.h"
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
#include "imc.h" #include "imc.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <spd_bin.h> #include <spd_bin.h>
@@ -110,8 +108,7 @@ static const CODEC_TBL_LIST CodecTableList[] =
static void oem_fan_control(FCH_DATA_BLOCK *FchParams) static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
{ {
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
imc_reg_init(); imc_reg_init();
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
@@ -169,13 +166,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }
void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset) void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset)

12
src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c
View File

@@ -21,9 +21,7 @@
#include "heapManager.h" #include "heapManager.h"
#include "FchPlatform.h" #include "FchPlatform.h"
#include "cbfs.h" #include "cbfs.h"
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
#include "imc.h" #include "imc.h"
#endif
#include <stdlib.h> #include <stdlib.h>
const BIOS_CALLOUT_STRUCT BiosCallouts[] = const BIOS_CALLOUT_STRUCT BiosCallouts[] =
@@ -107,8 +105,7 @@ static const CODEC_TBL_LIST CodecTableList[] =
static void oem_fan_control(FCH_DATA_BLOCK *FchParams) static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
{ {
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
imc_reg_init(); imc_reg_init();
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
@@ -166,13 +163,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }
void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset) void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset)

10
src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c
View File

@@ -103,8 +103,7 @@ static const CODEC_TBL_LIST CodecTableList[] =
static void oem_fan_control(FCH_DATA_BLOCK *FchParams) static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
{ {
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
imc_reg_init(); imc_reg_init();
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
@@ -162,13 +161,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }
void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset) void board_FCH_InitReset(struct sysinfo *cb_NA, FCH_RESET_DATA_BLOCK *FchParams_reset)

10
src/mainboard/lenovo/g505s/BiosCallOuts.c
View File

@@ -105,8 +105,7 @@ static const CODEC_TBL_LIST CodecTableList[] =
static void oem_fan_control(FCH_DATA_BLOCK *FchParams) static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
{ {
/* Enable IMC fan control. the recommand way */ /* Enable IMC fan control. the recommand way */
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
imc_reg_init(); imc_reg_init();
/* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */ /* HwMonitorEnable = TRUE && HwmFchtsiAutoOpll ==FALSE to call FchECfancontrolservice */
@@ -164,13 +163,12 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
* AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it. * AGESA put EcDefaultMassege as global data in ROM, so we can't overwride it.
* so we remove it from AGESA code. Please Seee FchInitLateHwm. * so we remove it from AGESA code. Please Seee FchInitLateHwm.
*/ */
} else {
#else /* HWM fan control, the way not recommand */ /* HWM fan control, the way not recommand */
FchParams->Imc.ImcEnable = FALSE; FchParams->Imc.ImcEnable = FALSE;
FchParams->Hwm.HwMonitorEnable = TRUE; FchParams->Hwm.HwMonitorEnable = TRUE;
FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */ FchParams->Hwm.HwmFchtsiAutoPoll = TRUE;/* 1 enable, 0 disable TSI Auto Polling */
}
#endif /* CONFIG_HUDSON_IMC_FWM */
} }
/** /**