commit 7bc4dc5648c6ff37a847e99d7acee11e3e72a79d
author Subrata Banik <subrata.banik@intel.com> Thu May 17 18:40:32 2018 +0530
committer Patrick Georgi <pgeorgi@google.com> Thu Jan 10 12:18:34 2019 +0000
tree c7137be28a68c96d3711c77ef7bbd9d288d6569f
parent e7184b0ad07b0d3fe3e2f58bacd5e10e3cd88a79

soc/intel/common/block: Move tco common functions into block/smbus

This patch cleans soc/intel/{apl/cnl/icl/skl} by moving common soc
code into common/block/smbus.

BUG=b:78109109
BRANCH=NONE
TEST=Build and boot KBL/CNL/APL/ICL platform.

Change-Id: I34b33922cafee9f31702587e0f9c03b64f0781b8
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Signed-off-by: Maulik V Vaghela <maulik.v.vaghela@intel.com>
Reviewed-on: https://review.coreboot.org/c/26166
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

src/soc/intel/apollolake/pmutil.c

diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index c36d84d..812a16a 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -28,11 +28,13 @@
 #include <intelblocks/msr.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
+#include <intelblocks/tco.h>
 #include <rules.h>
 #include <soc/iomap.h>
 #include <soc/cpu.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
+#include <soc/smbus.h>
 #include <timer.h>
 #include <security/vboot/vbnv.h>
 #include "chip.h"
@@ -133,15 +135,6 @@
 	return gpe_sts_bits;
 }
 
-uint32_t soc_reset_tco_status(void)
-{
-	uint32_t tco_sts = inl(ACPI_BASE_ADDRESS + TCO_STS);
-	uint32_t tco_en = inl(ACPI_BASE_ADDRESS + TCO1_CNT);
-
-	outl(tco_sts, ACPI_BASE_ADDRESS + TCO_STS);
-	return tco_sts & tco_en;
-}
-
 void soc_clear_pm_registers(uintptr_t pmc_bar)
 {
 	uint32_t gen_pmcon1;
@@ -173,14 +166,18 @@
 {
 	uintptr_t pmc_bar0 = read_pmc_mmio_bar();
 
-	ps->tco_sts = inl(ACPI_BASE_ADDRESS + TCO_STS);
+	ps->tco1_sts = tco_read_reg(TCO1_STS);
+	ps->tco2_sts = tco_read_reg(TCO2_STS);
+
 	ps->prsts = read32((void *)(pmc_bar0 + PRSTS));
 	ps->gen_pmcon1 = read32((void *)(pmc_bar0 + GEN_PMCON1));
 	ps->gen_pmcon2 = read32((void *)(pmc_bar0 + GEN_PMCON2));
 	ps->gen_pmcon3 = read32((void *)(pmc_bar0 + GEN_PMCON3));
 
-	printk(BIOS_DEBUG, "prsts: %08x tco_sts: %08x\n",
-	       ps->prsts, ps->tco_sts);
+	printk(BIOS_DEBUG, "prsts: %08x\n",
+	       ps->prsts);
+	printk(BIOS_DEBUG, "tco_sts:   %04x %04x\n",
+	       ps->tco1_sts, ps->tco2_sts);
 	printk(BIOS_DEBUG,
 	       "gen_pmcon1: %08x gen_pmcon2: %08x gen_pmcon3: %08x\n",
 	       ps->gen_pmcon1, ps->gen_pmcon2, ps->gen_pmcon3);