[coreboot-gerrit] Change in coreboot[master]: google/kahlee: Remove AMD IMC
Marc Jones (Code Review)
gerrit at coreboot.org
Wed May 24 01:07:13 CEST 2017
Marc Jones has uploaded a new change for review. ( https://review.coreboot.org/19832 )
Change subject: google/kahlee: Remove AMD IMC
......................................................................
google/kahlee: Remove AMD IMC
Kahlee does not use the AMD IMC. Remove the files and calls.
Change-Id: Ia837551b592b4f473eb38c06c516586fb6c95c88
Signed-off-by: Marc Jones <marcj303 at gmail.com>
---
M src/mainboard/google/kahlee/BiosCallOuts.c
M src/mainboard/google/kahlee/Kconfig
M src/mainboard/google/kahlee/Makefile.inc
D src/mainboard/google/kahlee/acpi/AmdImc.asl
D src/mainboard/google/kahlee/fchec.c
D src/mainboard/google/kahlee/fchec.h
6 files changed, 0 insertions(+), 208 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/19832/1
diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c
index 9f62dae..eef38ab 100644
--- a/src/mainboard/google/kahlee/BiosCallOuts.c
+++ b/src/mainboard/google/kahlee/BiosCallOuts.c
@@ -22,9 +22,6 @@
#include <heapManager.h>
#include <FchPlatform.h>
#include <cbfs.h>
-#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
-#include <soc/imc.h>
-#endif
#include <soc/hudson.h>
#include <stdlib.h>
#include <dimmSpd.h>
@@ -101,9 +98,6 @@
} else if (StdHeader->Func == AMD_INIT_ENV) {
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
-#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
- oem_fan_control(FchParams_env);
-#endif
/* XHCI configuration */
#if CONFIG_STONEYRIDGE_XHCI_ENABLE
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 469e1bb..ee97832 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -24,7 +24,6 @@
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_8192
select GFXUMA
- select STONEYRIDGE_IMC_FWM
select STONEYRIDGE_UART
config MAINBOARD_DIR
diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.inc
index de24187..87a46df 100644
--- a/src/mainboard/google/kahlee/Makefile.inc
+++ b/src/mainboard/google/kahlee/Makefile.inc
@@ -21,4 +21,3 @@
ramstage-y += BiosCallOuts.c
ramstage-y += OemCustomize.c
-ramstage-$(CONFIG_STONEYRIDGE_IMC_FWM) += fchec.c
diff --git a/src/mainboard/google/kahlee/acpi/AmdImc.asl b/src/mainboard/google/kahlee/acpi/AmdImc.asl
deleted file mode 100644
index 970858d..0000000
--- a/src/mainboard/google/kahlee/acpi/AmdImc.asl
+++ /dev/null
@@ -1,110 +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.
- */
-
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
- IMCX,8,
- IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
- Offset(0x80),
- MSTI, 8,
- MITS, 8,
- MRG0, 8,
- MRG1, 8,
- MRG2, 8,
- MRG3, 8,
-}
-
-Method(WACK, 0)
-{
- Store(0, Local0)
- While (LNotEqual(Local0, 0xFA)) {
- Store(MRG0, Local0)
- Sleep(10)
- }
-}
-
-//Init
-Method (ITZE, 0)
-{
- Store(0, MRG0)
- Store(0xB5, MRG1)
- Store(0, MRG2)
- Store(0x96, MSTI)
- WACK()
-
- Store(0, MRG0)
- Store(0, MRG1)
- Store(0, MRG2)
- Store(0x80, MSTI)
- WACK()
-
- Or(MRG2, 0x01, Local0)
-
- Store(0, MRG0)
- Store(0, MRG1)
- Store(Local0, MRG2)
- Store(0x81, MSTI)
- WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
- Store(0, MRG0)
- Store(0xB5, MRG1)
- Store(0, MRG2)
- Store(0x96, MSTI)
- WACK()
-
- Store(0, MRG0)
- Store(1, MRG1)
- Store(0, MRG2)
- Store(0x98, MSTI)
- WACK()
-
- Store(0, MRG0)
- Store(0xB4, MRG1)
- Store(0, MRG2)
- Store(0x96, MSTI)
- WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
- Store(0, MRG0)
- Store(0xB5, MRG1)
- Store(0, MRG2)
- Store(0x96, MSTI)
- WACK()
-
- Store(0, MRG0)
- Store(0, MRG1)
- Store(0, MRG2)
- Store(0x80, MSTI)
- WACK()
-
- Or(MRG2, 0x01, Local0)
-
- Store(0, MRG0)
- Store(0, MRG1)
- Store(Local0, MRG2)
- Store(0x81, MSTI)
- WACK()
-}
diff --git a/src/mainboard/google/kahlee/fchec.c b/src/mainboard/google/kahlee/fchec.c
deleted file mode 100644
index 532db79..0000000
--- a/src/mainboard/google/kahlee/fchec.c
+++ /dev/null
@@ -1,63 +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()
-{
- 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;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg6 = 0x98; /* SMBUS Address for SMBUS based temperature sensor such as SB-TSI and ADM1032 */
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg7 = 0x01;
- LateParams.Imc.EcStruct.MsgFun81Zone0MsgReg8 = 0x01; /* PWM steping rate in unit of PWM level percentage */
- 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 in Celsius */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg3 = 0x28; /*AC1 threshold in Celsius */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg4 = 0xff; /*AC2 threshold in Celsius */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg5 = 0xff; /*AC3 threshold in Celsius, 0xFF is not define */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg6 = 0xff; /*AC4 threshold in Celsius, 0xFF is not define */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg7 = 0xff; /*AC5 threshold in Celsius, 0xFF is not define */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg8 = 0xff; /*AC6 threshold in Celsius, 0xFF is not define */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgReg9 = 0xff; /*AC7 lowest threshold in Celsius, 0xFF is not define */
- LateParams.Imc.EcStruct.MsgFun83Zone0MsgRegA = 0x4b; /*critical threshold* in Celsius, 0xFF is not define */
- 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 percentage */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg3 = 0x32; /* AL1 percentage */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg4 = 0xff; /* AL2 percentage */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg5 = 0xff; /* AL3 percentage */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg6 = 0xff; /* AL4 percentage */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg7 = 0xff; /* AL5 percentage */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg8 = 0xff; /* AL6 percentage */
- LateParams.Imc.EcStruct.MsgFun85Zone0MsgReg9 = 0xff; /* AL7 percentage */
-
- LateParams.Imc.EcStruct.IMCFUNSupportBitMap = 0x111;
-
- FchECfancontrolservice(&LateParams);
-}
diff --git a/src/mainboard/google/kahlee/fchec.h b/src/mainboard/google/kahlee/fchec.h
deleted file mode 100644
index 36eb971..0000000
--- a/src/mainboard/google/kahlee/fchec.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 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.
- */
-
-#ifndef GOOGLE_KAHLEE_FCHEC
-#define GOOGLE_KAHLEE_FCHEC
-
-#include <soc/imc.h>
-#include "Porting.h"
-#include "AGESA.h"
-#include "FchCommonCfg.h"
-
-extern VOID FchECfancontrolservice (IN VOID *FchDataPtr);
-void agesawrapper_fchecfancontrolservice(void);
-
-#endif
--
To view, visit https://review.coreboot.org/19832
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia837551b592b4f473eb38c06c516586fb6c95c88
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Marc Jones <marc at marcjonesconsulting.com>
More information about the coreboot-gerrit
mailing list