GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/braswell: refactor rtc failure checking 

In order to prepare for checking RTC failure in the early boot
paths move the rtc failure calculation to pmutil.c and add a helper
function to determine if failure occurred.

BUG=b:63054105

Change-Id: Ic4bf99dc3a26fbc3bd508e484963b9298ef1b24b
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/21556
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Aaron Durbin 2017-09-15 14:32:13 -06:00
parent 64b4bddcbc
commit b19e33f05c
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/intel/braswell/Makefile.inc
View File

@ -12,6 +12,7 @@ romstage-y += gpio_support.c
romstage-y += iosf.c romstage-y += iosf.c
romstage-y += lpc_init.c romstage-y += lpc_init.c
romstage-y += memmap.c romstage-y += memmap.c
romstage-y += pmutil.c
romstage-y += tsc_freq.c romstage-y += tsc_freq.c
ramstage-y += acpi.c ramstage-y += acpi.c

3
src/soc/intel/braswell/include/soc/pm.h
View File

@ -249,6 +249,9 @@ void southcluster_log_state(void);
static inline void southcluster_log_state(void) {} static inline void southcluster_log_state(void) {}
#endif #endif
/* Return non-zero when RTC failure happened. */
int rtc_failure(void);
#endif /* !defined(__ASSEMBLER__) && !defined(__ACPI__) */ #endif /* !defined(__ASSEMBLER__) && !defined(__ACPI__) */
#endif /* _SOC_PM_H_ */ #endif /* _SOC_PM_H_ */

22
src/soc/intel/braswell/pmutil.c
View File

@ -15,6 +15,7 @@
*/ */
#include <arch/io.h> #include <arch/io.h>
#include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <rules.h> #include <rules.h>
#include <soc/iomap.h> #include <soc/iomap.h>
@ -23,7 +24,7 @@
#include <soc/pm.h> #include <soc/pm.h>
#include <stdint.h> #include <stdint.h>
#if ENV_SMM #if defined(__SIMPLE_DEVICE__)
static const device_t pcu_dev = PCI_DEV(0, PCU_DEV, 0); static const device_t pcu_dev = PCI_DEV(0, PCU_DEV, 0);
@ -354,3 +355,22 @@ void clear_pmc_status(void)
write32((void *)(PMC_BASE_ADDRESS + GEN_PMCON1), gen_pmcon1 & ~RPS); write32((void *)(PMC_BASE_ADDRESS + GEN_PMCON1), gen_pmcon1 & ~RPS);
write32((void *)(PMC_BASE_ADDRESS + PRSTS), prsts); write32((void *)(PMC_BASE_ADDRESS + PRSTS), prsts);
} }
int rtc_failure(void)
{
uint32_t gen_pmcon1;
int rtc_fail;
struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE);
if (ps != NULL)
gen_pmcon1 = ps->gen_pmcon1;
else
gen_pmcon1 = read32((u32 *)(PMC_BASE_ADDRESS + GEN_PMCON1));
rtc_fail = !!(gen_pmcon1 & RPS);
if (rtc_fail)
printk(BIOS_DEBUG, "RTC failure.\n");
return rtc_fail;
}

19
src/soc/intel/braswell/southcluster.c
View File

@ -149,23 +149,8 @@ static void sc_read_resources(device_t dev)
static void sc_rtc_init(void) static void sc_rtc_init(void)
{ {
uint32_t gen_pmcon1; printk(BIOS_SPEW, "%s/%s\n", __FILE__, __func__);
int rtc_fail; cmos_init(rtc_failure());
struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE);
printk(BIOS_SPEW, "%s/%s\n",
__FILE__, __func__);
if (ps != NULL)
gen_pmcon1 = ps->gen_pmcon1;
else
gen_pmcon1 = read32((void *)(PMC_BASE_ADDRESS + GEN_PMCON1));
rtc_fail = !!(gen_pmcon1 & RPS);
if (rtc_fail)
printk(BIOS_DEBUG, "RTC failure.\n");
cmos_init(rtc_fail);
} }
static void sc_init(device_t dev) static void sc_init(device_t dev)