summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Spiegel <richard.spiegel@amd.corp-partner.google.com>2018-07-26 10:16:50 -0700
committerMartin Roth <martinroth@google.com>2018-07-31 00:45:46 +0000
commit90b2cca81fcb38e2bda94c8715519d1aa4a9d8c1 (patch)
tree96acf5ea29e90d2a668284004c919952226646c0
parent432575c5d3255000df8e5c89088925763dc8dabb (diff)
mb/amd/gardenia: Remove IMC support
Per AMD, the Integrated Micro Controller is not a supported feature of the Stoney Ridge APU. Systems are expected to implement an external EC for desired features. Remove IMC files and functions from gardenia. BUG=b:111780177 TEST=Build gardenia Change-Id: I570b7f8e364b0c2937592590cc033d5a6c9fade0 Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com> Reviewed-on: https://review.coreboot.org/27650 Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/gardenia/BiosCallOuts.c23
-rw-r--r--src/mainboard/amd/gardenia/Kconfig1
-rw-r--r--src/mainboard/amd/gardenia/Makefile.inc1
-rw-r--r--src/mainboard/amd/gardenia/fchec.c65
4 files changed, 0 insertions, 90 deletions
diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c
index 158642a038..522a63fef1 100644
--- a/src/mainboard/amd/gardenia/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/BiosCallOuts.c
@@ -15,33 +15,10 @@
#include <amdblocks/agesawrapper.h>
#include <amdblocks/BiosCallOuts.h>
-#include <soc/imc.h>
#include <soc/southbridge.h>
#include <stdlib.h>
#include <string.h>
-/* Hardware Monitor Fan Control
- * Hardware limitation:
- * HWM will fail to read the input temperature via I2C if other
- * software switches the I2C address. AMD recommends using IMC
- * to control fans, instead of HWM.
- */
-void oem_fan_control(FCH_DATA_BLOCK *FchParams)
-{
- /* Enable IMC fan control. the recommand way */
- imc_reg_init();
-
- FchParams->Imc.ImcEnable = TRUE;
-
- /* 1 IMC, 0 HWM */
- FchParams->Hwm.HwmControl = 1;
-
- /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
- FchParams->Imc.ImcEnableOverWrite = 1;
-
- memset(&FchParams->Imc.EcStruct, 0, sizeof(FCH_EC));
-}
-
void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env)
{
diff --git a/src/mainboard/amd/gardenia/Kconfig b/src/mainboard/amd/gardenia/Kconfig
index 5d74768318..f4512f7bda 100644
--- a/src/mainboard/amd/gardenia/Kconfig
+++ b/src/mainboard/amd/gardenia/Kconfig
@@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_8192
select GFXUMA
- select STONEYRIDGE_IMC_FWM
config MAINBOARD_DIR
string
diff --git a/src/mainboard/amd/gardenia/Makefile.inc b/src/mainboard/amd/gardenia/Makefile.inc
index 5ddfe45385..dd7133142c 100644
--- a/src/mainboard/amd/gardenia/Makefile.inc
+++ b/src/mainboard/amd/gardenia/Makefile.inc
@@ -24,4 +24,3 @@ romstage-y += OemCustomize.c
ramstage-y += BiosCallOuts.c
ramstage-y += gpio.c
ramstage-y += OemCustomize.c
-ramstage-$(CONFIG_STONEYRIDGE_IMC_FWM) += fchec.c
diff --git a/src/mainboard/amd/gardenia/fchec.c b/src/mainboard/amd/gardenia/fchec.c
deleted file mode 100644
index aca3a9e925..0000000000
--- a/src/mainboard/amd/gardenia/fchec.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include "fchec.h"
-
-void agesawrapper_fchecfancontrolservice(void)
-{
- FCH_DATA_BLOCK LateParams;
-
- /* Thermal Zone Parameter */
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg0 = 0x00;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg1 = 0x00; /* Zone */
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg2 = 0x3d;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg3 = 0xc6;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg4 = 0x00;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg5 = 0x04;
- /* SMBUS Address for SMBUS based temperature sensor */
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x98;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x01;
- /* PWM steping rate in unit of PWM level percentage */
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg9 = 0x00;
-
- /* IMC Fan Policy temperature thresholds */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg0 = 0x00;
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg1 = 0x00; /* Zone */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg2 = 0x3c; /*AC0 threshold */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x28; /*AC1 in oC */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0xff; /*AC2 in oC */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /*AC3 undefined */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /*AC4 undefined */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /*AC5 undefined */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /*AC6 undefined */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /*AC7 undefined */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /*crit threshold */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgRegB = 0x00;
-
- /* IMC Fan Policy PWM Settings */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg0 = 0x00;
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg1 = 0x00; /* Zone */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg2 = 0x50; /* AL0 percent */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x32; /* AL1 percent */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0xff; /* AL2 percent */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percent */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percent */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percent */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percent */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percent */
-
- LateParams.Imc.EcStruct.IMCFUNSupportBitMap = 0x111;
-
- FchECfancontrolservice(&LateParams);
-}