Change in coreboot[master]: soc/intel/braswell: Update GNVS using common save state accessors
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45763 ) Change subject: soc/intel/braswell: Update GNVS using common save state accessors ...................................................................... soc/intel/braswell: Update GNVS using common save state accessors Change-Id: I5a7ba328968cb5c29a6e7c3e1eda8663c77cd676 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> --- M src/soc/intel/braswell/smihandler.c 1 file changed, 7 insertions(+), 41 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/45763/1 diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c index 4d3b67e..2af6613 100644 --- a/src/soc/intel/braswell/smihandler.c +++ b/src/soc/intel/braswell/smihandler.c @@ -7,7 +7,7 @@ #include <console/console.h> #include <cpu/x86/cache.h> #include <cpu/x86/smm.h> -#include <cpu/intel/em64t100_save_state.h> +#include <cpu/x86/save_state.h> #include <device/pci_def.h> #include <elog.h> #include <soc/nvs.h> @@ -184,45 +184,9 @@ } } -/* - * Look for Synchronous IO SMI and use save state from that core in case - * we are not running on the same core that initiated the IO transaction. - */ -static em64t100_smm_state_save_area_t *smi_apmc_find_state_save(uint8_t cmd) -{ - em64t100_smm_state_save_area_t *state; - int node; - - /* Check all nodes looking for the one that issued the IO */ - for (node = 0; node < CONFIG_MAX_CPUS; node++) { - state = smm_get_save_state(node); - - /* Check for Synchronous IO (bit0==1) */ - if (!(state->io_misc_info & (1 << 0))) - continue; - - /* Make sure it was a write (bit4==0) */ - if (state->io_misc_info & (1 << 4)) - continue; - - /* Check for APMC IO port */ - if (((state->io_misc_info >> 16) & 0xff) != APM_CNT) - continue; - - /* Check AX against the requested command */ - if ((state->rax & 0xff) != cmd) - continue; - - return state; - } - - return NULL; -} - static void southbridge_smi_apmc(void) { uint8_t reg8; - em64t100_smm_state_save_area_t *state; /* Emulate B2 register as the FADT / Linux expects it */ @@ -257,10 +221,12 @@ printk(BIOS_DEBUG, "SMI#: SMM structures already initialized!\n"); return; } - state = smi_apmc_find_state_save(reg8); - if (state) { - /* EBX in the state save contains the GNVS pointer */ - gnvs = (struct global_nvs *)((uint32_t)state->rbx); + int node = get_apmc_node(reg8); + if (node >= 0) { + if (get_save_state_reg(RBX, node, &gnvs, sizeof(gnvs))) { + printk(BIOS_ERR, "SMI#: Unable to get GNVS pointer\n"); + return; + } if (smm_points_to_smram(gnvs, sizeof(*gnvs))) { printk(BIOS_ERR, "SMI#: ERROR: GNVS overlaps SMM\n"); return; -- To view, visit https://review.coreboot.org/c/coreboot/+/45763 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5a7ba328968cb5c29a6e7c3e1eda8663c77cd676 Gerrit-Change-Number: 45763 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> Gerrit-MessageType: newchange
Hello build bot (Jenkins), Patrick Rudolph, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/45763 to look at the new patch set (#11). Change subject: soc/intel/braswell: Update GNVS using common save state accessors ...................................................................... soc/intel/braswell: Update GNVS using common save state accessors Change-Id: I5a7ba328968cb5c29a6e7c3e1eda8663c77cd676 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> --- M src/soc/intel/braswell/smihandler.c 1 file changed, 7 insertions(+), 41 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/45763/11 -- To view, visit https://review.coreboot.org/c/coreboot/+/45763 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5a7ba328968cb5c29a6e7c3e1eda8663c77cd676 Gerrit-Change-Number: 45763 Gerrit-PatchSet: 11 Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> Gerrit-MessageType: newpatchset
Hello build bot (Jenkins), Patrick Rudolph, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/45763 to look at the new patch set (#12). Change subject: soc/intel/braswell: Update GNVS using common save state accessors ...................................................................... soc/intel/braswell: Update GNVS using common save state accessors Change-Id: I5a7ba328968cb5c29a6e7c3e1eda8663c77cd676 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> --- M src/soc/intel/braswell/smihandler.c 1 file changed, 7 insertions(+), 41 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/45763/12 -- To view, visit https://review.coreboot.org/c/coreboot/+/45763 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5a7ba328968cb5c29a6e7c3e1eda8663c77cd676 Gerrit-Change-Number: 45763 Gerrit-PatchSet: 12 Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> Gerrit-MessageType: newpatchset
Arthur Heymans has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/45763 ) Change subject: soc/intel/braswell: Update GNVS using common save state accessors ...................................................................... Abandoned gnvs is passed as reloc param. -- To view, visit https://review.coreboot.org/c/coreboot/+/45763 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5a7ba328968cb5c29a6e7c3e1eda8663c77cd676 Gerrit-Change-Number: 45763 Gerrit-PatchSet: 16 Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> Gerrit-CC: Paul Menzel <paulepanter@mailbox.org> Gerrit-MessageType: abandon
participants (1)
-
Arthur Heymans (Code Review)