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

ELOG: Avoid some preprocessor use 

Change-Id: I8daf8868af2e8c2b07b0dda0eeaf863f2f550c59
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36648
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2019-11-06 12:07:21 +02:00
parent 9dd1a12f9c
commit be5317f6d0
8 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ec/quanta/ene_kb3940q/ec.c
View File

@ -125,11 +125,11 @@ void ec_mem_write(u8 addr, u8 data)
static void ene_kb3940q_log_events(void) static void ene_kb3940q_log_events(void)
{ {
#if CONFIG(ELOG) if (CONFIG(ELOG)) {
u8 reason = ec_mem_read(EC_SHUTDOWN_REASON); u8 reason = ec_mem_read(EC_SHUTDOWN_REASON);
if (reason) if (reason)
elog_add_event_byte(ELOG_TYPE_EC_SHUTDOWN, reason); elog_add_event_byte(ELOG_TYPE_EC_SHUTDOWN, reason);
#endif }
} }
static void ene_kb3940q_init(struct device *dev) static void ene_kb3940q_init(struct device *dev)

4
src/soc/intel/broadwell/me.c
View File

@ -700,8 +700,7 @@ static me_bios_path intel_me_path(struct device *dev)
path = ME_ERROR_BIOS_PATH; path = ME_ERROR_BIOS_PATH;
} }
#if CONFIG(ELOG) if (CONFIG(ELOG) && path != ME_NORMAL_BIOS_PATH) {
if (path != ME_NORMAL_BIOS_PATH) {
struct elog_event_data_me_extended data = { struct elog_event_data_me_extended data = {
.current_working_state = hfs.working_state, .current_working_state = hfs.working_state,
.operation_state = hfs.operation_state, .operation_state = hfs.operation_state,
@ -715,7 +714,6 @@ static me_bios_path intel_me_path(struct device *dev)
elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT, elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT,
&data, sizeof(data)); &data, sizeof(data));
} }
#endif
return path; return path;
} }

4
src/southbridge/intel/bd82x6x/me.c
View File

@ -585,8 +585,7 @@ static me_bios_path intel_me_path(struct device *dev)
if (hfs.error_code || hfs.fpt_bad) if (hfs.error_code || hfs.fpt_bad)
path = ME_ERROR_BIOS_PATH; path = ME_ERROR_BIOS_PATH;
#if CONFIG(ELOG) if (CONFIG(ELOG) && path != ME_NORMAL_BIOS_PATH) {
if (path != ME_NORMAL_BIOS_PATH) {
struct elog_event_data_me_extended data = { struct elog_event_data_me_extended data = {
.current_working_state = hfs.working_state, .current_working_state = hfs.working_state,
.operation_state = hfs.operation_state, .operation_state = hfs.operation_state,
@ -600,7 +599,6 @@ static me_bios_path intel_me_path(struct device *dev)
elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT, elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT,
&data, sizeof(data)); &data, sizeof(data));
} }
#endif
return path; return path;
} }

4
src/southbridge/intel/bd82x6x/me_8.x.c
View File

@ -573,8 +573,7 @@ static me_bios_path intel_me_path(struct device *dev)
path = ME_ERROR_BIOS_PATH; path = ME_ERROR_BIOS_PATH;
} }
#if CONFIG(ELOG) if (CONFIG(ELOG) && path != ME_NORMAL_BIOS_PATH) {
if (path != ME_NORMAL_BIOS_PATH) {
struct elog_event_data_me_extended data = { struct elog_event_data_me_extended data = {
.current_working_state = hfs.working_state, .current_working_state = hfs.working_state,
.operation_state = hfs.operation_state, .operation_state = hfs.operation_state,
@ -588,7 +587,6 @@ static me_bios_path intel_me_path(struct device *dev)
elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT, elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT,
&data, sizeof(data)); &data, sizeof(data));
} }
#endif
return path; return path;
} }

2
src/southbridge/intel/ibexpeak/lpc.c
View File

@ -286,9 +286,7 @@ static void pch_rtc_init(struct device *dev)
if (rtc_failed) { if (rtc_failed) {
reg8 &= ~RTC_BATTERY_DEAD; reg8 &= ~RTC_BATTERY_DEAD;
pci_write_config8(dev, GEN_PMCON_3, reg8); pci_write_config8(dev, GEN_PMCON_3, reg8);
#if CONFIG(ELOG)
elog_add_event(ELOG_TYPE_RTC_RESET); elog_add_event(ELOG_TYPE_RTC_RESET);
#endif
} }
printk(BIOS_DEBUG, "rtc_failed = 0x%x\n", rtc_failed); printk(BIOS_DEBUG, "rtc_failed = 0x%x\n", rtc_failed);

4
src/southbridge/intel/ibexpeak/me.c
View File

@ -469,8 +469,7 @@ static me_bios_path intel_me_path(struct device *dev)
if (hfs.error_code || hfs.fpt_bad) if (hfs.error_code || hfs.fpt_bad)
path = ME_ERROR_BIOS_PATH; path = ME_ERROR_BIOS_PATH;
#if CONFIG(ELOG) if (CONFIG(ELOG) && path != ME_NORMAL_BIOS_PATH) {
if (path != ME_NORMAL_BIOS_PATH) {
struct elog_event_data_me_extended data = { struct elog_event_data_me_extended data = {
.current_working_state = hfs.working_state, .current_working_state = hfs.working_state,
.operation_state = hfs.operation_state, .operation_state = hfs.operation_state,
@ -484,7 +483,6 @@ static me_bios_path intel_me_path(struct device *dev)
elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT, elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT,
&data, sizeof(data)); &data, sizeof(data));
} }
#endif
return path; return path;
} }

4
src/southbridge/intel/lynxpoint/me_9.x.c
View File

@ -718,8 +718,7 @@ static me_bios_path intel_me_path(struct device *dev)
path = ME_ERROR_BIOS_PATH; path = ME_ERROR_BIOS_PATH;
} }
#if CONFIG(ELOG) if (CONFIG(ELOG) && path != ME_NORMAL_BIOS_PATH) {
if (path != ME_NORMAL_BIOS_PATH) {
struct elog_event_data_me_extended data = { struct elog_event_data_me_extended data = {
.current_working_state = hfs.working_state, .current_working_state = hfs.working_state,
.operation_state = hfs.operation_state, .operation_state = hfs.operation_state,
@ -733,7 +732,6 @@ static me_bios_path intel_me_path(struct device *dev)
elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT, elog_add_event_raw(ELOG_TYPE_MANAGEMENT_ENGINE_EXT,
&data, sizeof(data)); &data, sizeof(data));
} }
#endif
return path; return path;
} }

6
src/southbridge/intel/lynxpoint/smi.c
View File

@ -29,10 +29,10 @@ void smm_southbridge_clear_state(void)
{ {
u32 smi_en; u32 smi_en;
#if CONFIG(ELOG)
/* Log events from chipset before clearing */ /* Log events from chipset before clearing */
pch_log_state(); if (CONFIG(ELOG))
#endif pch_log_state();
printk(BIOS_DEBUG, "Initializing Southbridge SMI..."); printk(BIOS_DEBUG, "Initializing Southbridge SMI...");
printk(BIOS_SPEW, " ... pmbase = 0x%04x\n", get_pmbase()); printk(BIOS_SPEW, " ... pmbase = 0x%04x\n", get_pmbase());