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

sb/intel/lynxpoint: Update `intel_me_status()` signature 

Update the parameter types of `intel_me_status()` to not be pointers.

Change-Id: I0fd577c49bec7a581c340fc2fcadcadd50b1a638
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59625
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Angel Pons 2021-11-24 15:04:05 +01:00 committed by Felix Held
parent 310d3271e4
commit 55405a3ddd
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/southbridge/intel/lynxpoint/early_me.c
View File

@ -25,7 +25,7 @@ void intel_early_me_status(void)
union me_hfs hfs = { .raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS) }; union me_hfs hfs = { .raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS) };
union me_hfs2 hfs2 = { .raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS2) }; union me_hfs2 hfs2 = { .raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS2) };
intel_me_status(&hfs, &hfs2); intel_me_status(hfs, hfs2);
} }
int intel_early_me_init(void) int intel_early_me_init(void)

2
src/southbridge/intel/lynxpoint/me.c
View File

@ -581,7 +581,7 @@ static enum me_bios_path intel_me_path(struct device *dev)
union me_hfs2 hfs2 = { .raw = pci_read_config32(dev, PCI_ME_HFS2) }; union me_hfs2 hfs2 = { .raw = pci_read_config32(dev, PCI_ME_HFS2) };
/* Check and dump status */ /* Check and dump status */
intel_me_status(&hfs, &hfs2); intel_me_status(hfs, hfs2);
/* Check Current Working State */ /* Check Current Working State */
switch (hfs.working_state) { switch (hfs.working_state) {

2
src/southbridge/intel/lynxpoint/me.h
View File

@ -334,7 +334,7 @@ enum me_bios_path {
}; };
/* Defined in me_status.c for both romstage and ramstage */ /* Defined in me_status.c for both romstage and ramstage */
void intel_me_status(union me_hfs *hfs, union me_hfs2 *hfs2); void intel_me_status(union me_hfs hfs, union me_hfs2 hfs2);
void intel_early_me_status(void); void intel_early_me_status(void);
int intel_early_me_init(void); int intel_early_me_init(void);

52
src/southbridge/intel/lynxpoint/me_status.c
View File

@ -123,72 +123,72 @@ static const char *me_progress_policy_values[] = {
[ME_HFS2_STATE_POLICY_VSCC_NO_MATCH] = "Required VSCC values for flash parts do not match", [ME_HFS2_STATE_POLICY_VSCC_NO_MATCH] = "Required VSCC values for flash parts do not match",
}; };
void intel_me_status(union me_hfs *hfs, union me_hfs2 *hfs2) void intel_me_status(union me_hfs hfs, union me_hfs2 hfs2)
{ {
if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL < BIOS_DEBUG) if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL < BIOS_DEBUG)
return; return;
/* Check Current States */ /* Check Current States */
printk(BIOS_DEBUG, "ME: FW Partition Table : %s\n", printk(BIOS_DEBUG, "ME: FW Partition Table : %s\n",
hfs->fpt_bad ? "BAD" : "OK"); hfs.fpt_bad ? "BAD" : "OK");
printk(BIOS_DEBUG, "ME: Bringup Loader Failure : %s\n", printk(BIOS_DEBUG, "ME: Bringup Loader Failure : %s\n",
hfs->ft_bup_ld_flr ? "YES" : "NO"); hfs.ft_bup_ld_flr ? "YES" : "NO");
printk(BIOS_DEBUG, "ME: Firmware Init Complete : %s\n", printk(BIOS_DEBUG, "ME: Firmware Init Complete : %s\n",
hfs->fw_init_complete ? "YES" : "NO"); hfs.fw_init_complete ? "YES" : "NO");
printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n", printk(BIOS_DEBUG, "ME: Manufacturing Mode : %s\n",
hfs->mfg_mode ? "YES" : "NO"); hfs.mfg_mode ? "YES" : "NO");
printk(BIOS_DEBUG, "ME: Boot Options Present : %s\n", printk(BIOS_DEBUG, "ME: Boot Options Present : %s\n",
hfs->boot_options_present ? "YES" : "NO"); hfs.boot_options_present ? "YES" : "NO");
printk(BIOS_DEBUG, "ME: Update In Progress : %s\n", printk(BIOS_DEBUG, "ME: Update In Progress : %s\n",
hfs->update_in_progress ? "YES" : "NO"); hfs.update_in_progress ? "YES" : "NO");
printk(BIOS_DEBUG, "ME: Current Working State : %s\n", printk(BIOS_DEBUG, "ME: Current Working State : %s\n",
me_cws_values[hfs->working_state]); me_cws_values[hfs.working_state]);
printk(BIOS_DEBUG, "ME: Current Operation State : %s\n", printk(BIOS_DEBUG, "ME: Current Operation State : %s\n",
me_opstate_values[hfs->operation_state]); me_opstate_values[hfs.operation_state]);
printk(BIOS_DEBUG, "ME: Current Operation Mode : %s\n", printk(BIOS_DEBUG, "ME: Current Operation Mode : %s\n",
me_opmode_values[hfs->operation_mode]); me_opmode_values[hfs.operation_mode]);
printk(BIOS_DEBUG, "ME: Error Code : %s\n", printk(BIOS_DEBUG, "ME: Error Code : %s\n",
me_error_values[hfs->error_code]); me_error_values[hfs.error_code]);
printk(BIOS_DEBUG, "ME: Progress Phase : %s\n", printk(BIOS_DEBUG, "ME: Progress Phase : %s\n",
me_progress_values[hfs2->progress_code]); me_progress_values[hfs2.progress_code]);
printk(BIOS_DEBUG, "ME: Power Management Event : %s\n", printk(BIOS_DEBUG, "ME: Power Management Event : %s\n",
me_pmevent_values[hfs2->current_pmevent]); me_pmevent_values[hfs2.current_pmevent]);
printk(BIOS_DEBUG, "ME: Progress Phase State : "); printk(BIOS_DEBUG, "ME: Progress Phase State : ");
switch (hfs2->progress_code) { switch (hfs2.progress_code) {
case ME_HFS2_PHASE_ROM: /* ROM Phase */ case ME_HFS2_PHASE_ROM: /* ROM Phase */
printk(BIOS_DEBUG, "%s", printk(BIOS_DEBUG, "%s",
me_progress_rom_values[hfs2->current_state]); me_progress_rom_values[hfs2.current_state]);
break; break;
case ME_HFS2_PHASE_BUP: /* Bringup Phase */ case ME_HFS2_PHASE_BUP: /* Bringup Phase */
if (hfs2->current_state < ARRAY_SIZE(me_progress_bup_values) if (hfs2.current_state < ARRAY_SIZE(me_progress_bup_values)
&& me_progress_bup_values[hfs2->current_state]) && me_progress_bup_values[hfs2.current_state])
printk(BIOS_DEBUG, "%s", printk(BIOS_DEBUG, "%s",
me_progress_bup_values[hfs2->current_state]); me_progress_bup_values[hfs2.current_state]);
else else
printk(BIOS_DEBUG, "0x%02x", hfs2->current_state); printk(BIOS_DEBUG, "0x%02x", hfs2.current_state);
break; break;
case ME_HFS2_PHASE_POLICY: /* Policy Module Phase */ case ME_HFS2_PHASE_POLICY: /* Policy Module Phase */
if (hfs2->current_state < ARRAY_SIZE(me_progress_policy_values) if (hfs2.current_state < ARRAY_SIZE(me_progress_policy_values)
&& me_progress_policy_values[hfs2->current_state]) && me_progress_policy_values[hfs2.current_state])
printk(BIOS_DEBUG, "%s", printk(BIOS_DEBUG, "%s",
me_progress_policy_values[hfs2->current_state]); me_progress_policy_values[hfs2.current_state]);
else else
printk(BIOS_DEBUG, "0x%02x", hfs2->current_state); printk(BIOS_DEBUG, "0x%02x", hfs2.current_state);
break; break;
case ME_HFS2_PHASE_HOST_COMM: /* Host Communication Phase */ case ME_HFS2_PHASE_HOST_COMM: /* Host Communication Phase */
if (!hfs2->current_state) if (!hfs2.current_state)
printk(BIOS_DEBUG, "Host communication established"); printk(BIOS_DEBUG, "Host communication established");
else else
printk(BIOS_DEBUG, "0x%02x", hfs2->current_state); printk(BIOS_DEBUG, "0x%02x", hfs2.current_state);
break; break;
default: default:
printk(BIOS_DEBUG, "Unknown phase: 0x%02x state: 0x%02x", printk(BIOS_DEBUG, "Unknown phase: 0x%02x state: 0x%02x",
hfs2->progress_code, hfs2->current_state); hfs2.progress_code, hfs2.current_state);
} }
printk(BIOS_DEBUG, "\n"); printk(BIOS_DEBUG, "\n");
} }