erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sb,soc/intel: Reduce preprocessor use with ME debugging

Browse source 
Change-Id: Iedd54730f140b6a7a40834f00d558ed99a345077
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36639
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Kyösti Mälkki 2019-11-06 06:32:27 +02:00 • committed by Patrick Georgi
commit c86fc8e63d
9 changed files with 70 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/soc/intel/broadwell/include/soc/me.h
View file

@ -493,11 +493,7 @@ struct me_fwcaps {
void intel_me_hsio_version(uint16_t *version, uint16_t *checksum);
#if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL >= BIOS_DEBUG)
/* Defined in me_status.c for both romstage and ramstage */
void intel_me_status(void);
#else
static inline void intel_me_status(void) { }
#endif
#endif

26
src/soc/intel/broadwell/me.c
View file

@ -58,11 +58,13 @@ static const char *me_bios_path_values[] = {
/* MMIO base address for MEI interface */
static u8 *mei_base_address;
#if CONFIG(DEBUG_INTEL_ME)
static void mei_dump(void *ptr, int dword, int offset, const char *type)
{
struct mei_csr *csr;
if (!CONFIG(DEBUG_INTEL_ME))
return;
printk(BIOS_SPEW, "%-9s[%02x] : ", type, offset);
switch (offset) {
@ -88,9 +90,6 @@ static void mei_dump(void *ptr, int dword, int offset, const char *type)
break;
}
}
#else
# define mei_dump(ptr, dword, offset, type) do {} while (0)
#endif
/*
* ME/MEI access helpers using memcpy to avoid aliasing.
@ -483,7 +482,6 @@ static void me_print_fw_version(mbp_fw_version_name *vers_name)
vers_name->hotfix_version, vers_name->build_version);
}
#if CONFIG(DEBUG_INTEL_ME)
static inline void print_cap(const char *name, int state)
{
printk(BIOS_DEBUG, "ME Capability: %-41s : %sabled\n",
@ -536,7 +534,6 @@ static void me_print_fwcaps(mbp_mefwcaps *cap)
print_cap("TLS", cap->tls);
print_cap("Wireless LAN (WLAN)", cap->wlan);
}
#endif
/* Send END OF POST message to the ME */
static int mkhi_end_of_post(void)
@ -804,9 +801,8 @@ static void intel_me_print_mbp(me_bios_payload *mbp_data)
{
me_print_fw_version(mbp_data->fw_version_name);
#if CONFIG(DEBUG_INTEL_ME)
me_print_fwcaps(mbp_data->fw_capabilities);
#endif
if (CONFIG(DEBUG_INTEL_ME))
me_print_fwcaps(mbp_data->fw_capabilities);
if (mbp_data->plat_time) {
printk(BIOS_DEBUG, "ME: Wake Event to ME Reset: %u ms\n",
@ -912,12 +908,12 @@ static int intel_me_read_mbp(me_bios_payload *mbp_data, struct device *dev)
}
/* Dump out the MBP contents. */
#if CONFIG(DEBUG_INTEL_ME)
printk(BIOS_INFO, "ME MBP: Header: items: %d, size dw: %d\n",
mbp->header.num_entries, mbp->header.mbp_size);
for (i = 0; i < mbp->header.mbp_size - 1; i++)
printk(BIOS_INFO, "ME MBP: %04x: 0x%08x\n", i, mbp->data[i]);
#endif
if (CONFIG(DEBUG_INTEL_ME)) {
printk(BIOS_INFO, "ME MBP: Header: items: %d, size dw: %d\n",
mbp->header.num_entries, mbp->header.mbp_size);
for (i = 0; i < mbp->header.mbp_size - 1; i++)
printk(BIOS_INFO, "ME MBP: %04x: 0x%08x\n", i, mbp->data[i]);
}
#define ASSIGN_FIELD_PTR(field_, val_) \
{ \

6
src/soc/intel/broadwell/me_status.c
View file

@ -34,8 +34,6 @@ static inline void me_read_dword_ptr(void *ptr, int offset)
memcpy(ptr, &dword, sizeof(dword));
}
#if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL >= BIOS_DEBUG)
/* HFS1[3:0] Current Working State Values */
static const char *me_cws_values[] = {
[ME_HFS_CWS_RESET] = "Reset",
@ -210,6 +208,9 @@ static const char *me_progress_policy_values[] = {
void intel_me_status(void)
{
if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL < BIOS_DEBUG)
return;
struct me_hfs _hfs, *hfs = &_hfs;
struct me_hfs2 _hfs2, *hfs2 = &_hfs2;
@ -302,7 +303,6 @@ void intel_me_status(void)
}
printk(BIOS_DEBUG, "\n");
}
#endif
void intel_me_hsio_version(uint16_t *version, uint16_t *checksum)
{