sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/pc80: Remove some __PRE_RAM__ and __SMM__

Browse Source 
Change-Id: Ic90df69c27d524086405238b9683a69771c1b9d5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35388
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2019-09-12 20:22:56 +03:00
parent b590a04f78
commit b2536f418f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/pc80/rtc/mc146818rtc.c
View File

@@ -100,7 +100,6 @@ static void cmos_set_checksum(int range_start, int range_end, int cks_loc)
#define RTC_CONTROL_DEFAULT (RTC_24H) #define RTC_CONTROL_DEFAULT (RTC_24H)
#define RTC_FREQ_SELECT_DEFAULT (RTC_REF_CLCK_32KHZ | RTC_RATE_1024HZ) #define RTC_FREQ_SELECT_DEFAULT (RTC_REF_CLCK_32KHZ | RTC_RATE_1024HZ)
#ifndef __SMM__
static bool __cmos_init(bool invalid) static bool __cmos_init(bool invalid)
{ {
bool cmos_invalid; bool cmos_invalid;
@@ -109,16 +108,14 @@ static bool __cmos_init(bool invalid)
size_t i; size_t i;
uint8_t x; uint8_t x;
#ifndef __PRE_RAM__
/* /*
* Avoid clearing pending interrupts and resetting the RTC control * Avoid clearing pending interrupts and resetting the RTC control
* register in the resume path because the Linux kernel relies on * register in the resume path because the Linux kernel relies on
* this to know if it should restart the RTC timer queue if the wake * this to know if it should restart the RTC timer queue if the wake
* was due to the RTC alarm. * was due to the RTC alarm.
*/ */
if (acpi_is_wakeup_s3()) if (ENV_RAMSTAGE && acpi_is_wakeup_s3())
return false; return false;
#endif /* __PRE_RAM__ */
printk(BIOS_DEBUG, "RTC Init\n"); printk(BIOS_DEBUG, "RTC Init\n");
@@ -200,13 +197,14 @@ static void cmos_init_vbnv(bool invalid)
void cmos_init(bool invalid) void cmos_init(bool invalid)
{ {
if (ENV_SMM)
return;
if (CONFIG(VBOOT_VBNV_CMOS)) if (CONFIG(VBOOT_VBNV_CMOS))
cmos_init_vbnv(invalid); cmos_init_vbnv(invalid);
else else
__cmos_init(invalid); __cmos_init(invalid);
} }
#endif /* __SMM__ */
/* /*
* This routine returns the value of the requested bits. * This routine returns the value of the requested bits.