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

soc/intel/apollolake: 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: I1b02028a1830ff9b28b23da7a4a1fd343f329f0d
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/21551
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 11:48:53 -06:00
parent 118a84f8f5
commit 3118b6277d
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/soc/intel/apollolake/lpc.c
View File

@ -14,17 +14,14 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <intelblocks/lpc_lib.h> #include <intelblocks/lpc_lib.h>
#include <intelblocks/rtc.h> #include <intelblocks/rtc.h>
#include <pc80/mc146818rtc.h>
#include <soc/gpio.h> #include <soc/gpio.h>
#include <soc/pcr_ids.h> #include <soc/pcr_ids.h>
#include <soc/pm.h> #include <soc/pm.h>
#include <vboot/vbnv.h>
#include "chip.h" #include "chip.h"
static const struct lpc_mmio_range apl_lpc_fixed_mmio_ranges[] = { static const struct lpc_mmio_range apl_lpc_fixed_mmio_ranges[] = {
@ -83,18 +80,6 @@ void lpc_configure_pads(void)
gpio_configure_pads(lpc_gpios, ARRAY_SIZE(lpc_gpios)); gpio_configure_pads(lpc_gpios, ARRAY_SIZE(lpc_gpios));
} }
int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE);
if (!ps) {
printk(BIOS_ERR, "Could not find power state in cbmem, RTC init aborted\n");
return 1;
}
return !!(ps->gen_pmcon1 & RPS);
}
void lpc_init(struct device *dev) void lpc_init(struct device *dev)
{ {
const struct soc_intel_apollolake_config *cfg; const struct soc_intel_apollolake_config *cfg;

19
src/soc/intel/apollolake/pmutil.c
View File

@ -19,6 +19,7 @@
#include <arch/acpi.h> #include <arch/acpi.h>
#include <arch/io.h> #include <arch/io.h>
#include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <device/device.h> #include <device/device.h>
@ -26,6 +27,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <intelblocks/msr.h> #include <intelblocks/msr.h>
#include <intelblocks/pmclib.h> #include <intelblocks/pmclib.h>
#include <intelblocks/rtc.h>
#include <rules.h> #include <rules.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/cpu.h> #include <soc/cpu.h>
@ -198,3 +200,20 @@ void enable_pm_timer_emulation(void)
msr.lo = EMULATE_PM_TMR_EN | (ACPI_BASE_ADDRESS + R_ACPI_PM1_TMR); msr.lo = EMULATE_PM_TMR_EN | (ACPI_BASE_ADDRESS + R_ACPI_PM1_TMR);
wrmsr(MSR_EMULATE_PM_TMR, msr); wrmsr(MSR_EMULATE_PM_TMR, msr);
} }
static int rtc_failed(uint32_t gen_pmcon1)
{
return !!(gen_pmcon1 & RPS);
}
int soc_get_rtc_failed(void)
{
const struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE);
if (!ps) {
printk(BIOS_ERR, "Could not find power state in cbmem, RTC init aborted\n");
return 1;
}
return rtc_failed(ps->gen_pmcon1);
}