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

drivers/pc80/rtc: Clean up some inlined functions 

Change-Id: Ie73797b4e9a09605a0685f0b03cb85e9a3be93ad
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38179
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2020-01-04 17:38:17 +02:00
parent a0259b4273
commit 1a9b7b50c7
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,12 @@ static void cmos_set_checksum(int range_start, int range_end, int cks_loc)
cmos_write(((sum >> 0) & 0x0ff), cks_loc + 1);
}
/* See if the CMOS error condition has been flagged */
int cmos_error(void)
{
return (cmos_read(RTC_VALID) & RTC_VRT) == 0;
}
#define RTC_CONTROL_DEFAULT (RTC_24H)
#define RTC_FREQ_SELECT_DEFAULT (RTC_REF_CLCK_32KHZ | RTC_RATE_1024HZ)
@ -90,7 +96,6 @@ static bool __cmos_init(bool invalid)
bool checksum_invalid = false;
bool clear_cmos;
size_t i;
uint8_t x;
/*
* Avoid clearing pending interrupts and resetting the RTC control
@ -104,8 +109,7 @@ static bool __cmos_init(bool invalid)
printk(BIOS_DEBUG, "RTC Init\n");
/* See if there has been a CMOS power problem. */
x = cmos_read(RTC_VALID);
cmos_invalid = !(x & RTC_VRT);
cmos_invalid = cmos_error();
if (CONFIG(USE_OPTION_TABLE)) {
/* See if there is a CMOS checksum error */
@ -118,7 +122,7 @@ static bool __cmos_init(bool invalid)
}
if (cmos_invalid || invalid)
cmos_write(cmos_read(RTC_CONTROL) | RTC_SET, RTC_CONTROL);
cmos_disable_rtc();
if (invalid || cmos_invalid || checksum_invalid) {
if (clear_cmos) {
@ -406,6 +410,17 @@ enum cb_err set_option(const char *name, void *value)
return CB_SUCCESS;
}
/*
* Upon return the caller is guaranteed 244 microseconds to complete any
* RTC operations. wait_uip may be called a single time prior to multiple
* accesses, but sequences requiring more time should call wait_uip again.
*/
static void wait_uip(void)
{
while (cmos_read(RTC_REG_A) & RTC_UIP)
;
}
/*
* If the CMOS is cleared, the rtc_reg has the invalid date. That
* hurts some OSes. Even if we don't set USE_OPTION_TABLE, we need

20
src/drivers/pc80/rtc/mc146818rtc_boot.c
View File

@ -19,14 +19,6 @@
#include <option_table.h>
#endif
int cmos_error(void)
{
unsigned char reg_d;
/* See if the cmos error condition has been flagged */
reg_d = cmos_read(RTC_REG_D);
return (reg_d & RTC_VRT) == 0;
}
int cmos_chksum_valid(void)
{
#if CONFIG(USE_OPTION_TABLE)
@ -59,10 +51,10 @@ void sanitize_cmos(void)
CBFS_COMPONENT_CMOS_DEFAULT, &length);
if (cmos_default) {
size_t i;
cmos_disable_rtc();
u8 control_state = cmos_disable_rtc();
for (i = 14; i < MIN(128, length); i++)
cmos_write_inner(cmos_default[i], i);
cmos_enable_rtc();
cmos_restore_rtc(control_state);
}
}
}
@ -72,22 +64,22 @@ void sanitize_cmos(void)
#error "CONFIG_MAX_REBOOT_CNT too high"
#endif
static inline int boot_count(uint8_t rtc_byte)
static int boot_count(uint8_t rtc_byte)
{
return rtc_byte >> 4;
}
static inline uint8_t increment_boot_count(uint8_t rtc_byte)
static uint8_t increment_boot_count(uint8_t rtc_byte)
{
return rtc_byte + (1 << 4);
}
static inline uint8_t boot_set_fallback(uint8_t rtc_byte)
static uint8_t boot_set_fallback(uint8_t rtc_byte)
{
return rtc_byte & ~RTC_BOOT_NORMAL;
}
static inline int boot_use_normal(uint8_t rtc_byte)
static int boot_use_normal(uint8_t rtc_byte)
{
return rtc_byte & RTC_BOOT_NORMAL;
}

47
src/include/pc80/mc146818rtc.h
View File

@ -114,16 +114,6 @@ static inline unsigned char cmos_read(unsigned char addr)
return inb(RTC_BASE_PORT + offs + 1);
}
/* Upon return the caller is guaranteed 244 microseconds to complete any
* RTC operations. wait_uip may be called a single time prior to multiple
* accesses, but sequences requiring more time should call wait_uip again.
*/
static inline void wait_uip(void)
{
while (cmos_read(RTC_REG_A) & RTC_UIP)
;
}
static inline void cmos_write_inner(unsigned char val, unsigned char addr)
{
int offs = 0;
@ -135,31 +125,34 @@ static inline void cmos_write_inner(unsigned char val, unsigned char addr)
outb(val, RTC_BASE_PORT + offs + 1);
}
static inline void cmos_write(unsigned char val, unsigned char addr)
static inline u8 cmos_disable_rtc(void)
{
u8 control_state = cmos_read(RTC_CONTROL);
/* There are various places where RTC bits might be hiding,
* eg. the Century / AltCentury byte. So to be safe, disable
* RTC before changing any value.
*/
if ((addr != RTC_CONTROL) && !(control_state & RTC_SET))
if (!(control_state & RTC_SET))
cmos_write_inner(control_state | RTC_SET, RTC_CONTROL);
cmos_write_inner(val, addr);
/* reset to prior configuration */
if ((addr != RTC_CONTROL) && !(control_state & RTC_SET))
return control_state;
}
static inline void cmos_restore_rtc(u8 control_state)
{
if (!(control_state & RTC_SET))
cmos_write_inner(control_state, RTC_CONTROL);
}
static inline void cmos_disable_rtc(void)
static inline void cmos_write(unsigned char val, unsigned char addr)
{
u8 control_state = cmos_read(RTC_CONTROL);
cmos_write(control_state | RTC_SET, RTC_CONTROL);
}
u8 control_state;
static inline void cmos_enable_rtc(void)
{
u8 control_state = cmos_read(RTC_CONTROL);
cmos_write(control_state & ~RTC_SET, RTC_CONTROL);
/*
* There are various places where RTC bits might be hiding,
* eg. the Century / AltCentury byte. So to be safe, disable
* RTC before changing any value.
*/
if (addr != RTC_CONTROL)
control_state = cmos_disable_rtc();
cmos_write_inner(val, addr);
if (addr != RTC_CONTROL)
cmos_restore_rtc(control_state);
}
static inline u32 cmos_read32(u8 offset)