aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/emulation/qemu-q35
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2021-10-28 16:48:36 +0200
committerArthur Heymans <arthur@aheymans.xyz>2022-06-01 10:43:07 +0000
commit4db2e8e88a05c8858bd19d516e10df4825621bfa (patch)
tree9bdc8b568a197587b4bbd037b55f44fe0298471b /src/mainboard/emulation/qemu-q35
parent460936567f2ebd62f78dbb18e4bacab03ec5b056 (diff)
mb/emulation/qemu-q35: Support PARALLEL_MP with SMM_ASEG
Tested with SMI_DEBUG: SMM prints things on the console. Change-Id: I7db55aaabd16a6ef585c4802218790bf04650b13 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/61494 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/mainboard/emulation/qemu-q35')
-rw-r--r--src/mainboard/emulation/qemu-q35/cpu.c9
-rw-r--r--src/mainboard/emulation/qemu-q35/memmap.c8
2 files changed, 15 insertions, 2 deletions
diff --git a/src/mainboard/emulation/qemu-q35/cpu.c b/src/mainboard/emulation/qemu-q35/cpu.c
index fb31fc5963..fe3a571021 100644
--- a/src/mainboard/emulation/qemu-q35/cpu.c
+++ b/src/mainboard/emulation/qemu-q35/cpu.c
@@ -12,7 +12,14 @@ static void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
{
printk(BIOS_DEBUG, "Setting up SMI for CPU\n");
- smm_subregion(SMM_SUBREGION_HANDLER, perm_smbase, perm_smsize);
+ if (CONFIG(SMM_TSEG))
+ smm_subregion(SMM_SUBREGION_HANDLER, perm_smbase, perm_smsize);
+
+ if (CONFIG(SMM_ASEG)) {
+ smm_open_aseg();
+ *perm_smbase = 0xa0000;
+ *perm_smsize = 0x10000;
+ }
/* FIXME: on X86_64 the save state size is smaller than the size of the SMM stub */
*smm_save_state_size = sizeof(amd64_smm_state_save_area_t);
diff --git a/src/mainboard/emulation/qemu-q35/memmap.c b/src/mainboard/emulation/qemu-q35/memmap.c
index 7d5180e819..e73e0dfa12 100644
--- a/src/mainboard/emulation/qemu-q35/memmap.c
+++ b/src/mainboard/emulation/qemu-q35/memmap.c
@@ -78,6 +78,12 @@ void smm_lock(void)
*/
printk(BIOS_DEBUG, "Locking SMM.\n");
- pci_or_config8(PCI_DEV(0, 0, 0), ESMRAMC, T_EN);
+ if (CONFIG(SMM_TSEG))
+ pci_or_config8(PCI_DEV(0, 0, 0), ESMRAMC, T_EN);
pci_write_config8(PCI_DEV(0, 0, 0), SMRAMC, D_LCK | G_SMRAME | C_BASE_SEG);
}
+
+void smm_open_aseg(void)
+{
+ pci_write_config8(PCI_DEV(0, 0, 0), SMRAMC, G_SMRAME | C_BASE_SEG | D_OPEN);
+}