sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/emulation/qemu-q35: Support PARALLEL_MP with SMM_ASEG

Browse Source 
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>
This commit is contained in:
Arthur Heymans 2021-10-28 16:48:36 +02:00
parent 460936567f
commit 4db2e8e88a
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/qemu-x86/Kconfig
View File

@ -10,7 +10,6 @@ config CPU_QEMU_X86
if CPU_QEMU_X86 if CPU_QEMU_X86
# coreboot i440fx does not support SMM
choice choice
prompt "AP init" prompt "AP init"
default CPU_QEMU_X86_LAPIC_INIT default CPU_QEMU_X86_LAPIC_INIT
@ -24,6 +23,7 @@ config CPU_QEMU_X86_PARALLEL_MP
endchoice endchoice
# coreboot i440fx does not support SMM
choice choice
prompt "SMM support" prompt "SMM support"
default CPU_QEMU_X86_ASEG_SMM default CPU_QEMU_X86_ASEG_SMM
@ -35,7 +35,6 @@ config CPU_QEMU_X86_NO_SMM
config CPU_QEMU_X86_ASEG_SMM config CPU_QEMU_X86_ASEG_SMM
bool "SMM in ASEG" bool "SMM in ASEG"
depends on CPU_QEMU_X86_LAPIC_INIT
select SMM_ASEG select SMM_ASEG
config CPU_QEMU_X86_TSEG_SMM config CPU_QEMU_X86_TSEG_SMM

1
src/include/cpu/intel/smm_reloc.h
View File

@ -36,6 +36,7 @@ struct ied_header {
/* These helpers are for performing SMM relocation. */ /* These helpers are for performing SMM relocation. */
void northbridge_write_smram(u8 smram); void northbridge_write_smram(u8 smram);
void smm_open_aseg(void);
void smm_lock(void); void smm_lock(void);
void smm_relocate(void); void smm_relocate(void);

2
src/mainboard/emulation/qemu-i440fx/northbridge.c
View File

@ -247,7 +247,7 @@ extern const struct mp_ops mp_ops_with_smm;
void mp_init_cpus(struct bus *cpu_bus) void mp_init_cpus(struct bus *cpu_bus)
{ {
const struct mp_ops *ops = CONFIG(SMM_TSEG) ? &mp_ops_with_smm : &mp_ops_no_smm; const struct mp_ops *ops = CONFIG(NO_SMM) ? &mp_ops_no_smm : &mp_ops_with_smm;
/* TODO: Handle mp_init_with_smm failure? */ /* TODO: Handle mp_init_with_smm failure? */
mp_init_with_smm(cpu_bus, ops); mp_init_with_smm(cpu_bus, ops);

9
src/mainboard/emulation/qemu-q35/cpu.c
View File

@ -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"); 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 */ /* 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); *smm_save_state_size = sizeof(amd64_smm_state_save_area_t);

8
src/mainboard/emulation/qemu-q35/memmap.c
View File

@ -78,6 +78,12 @@ void smm_lock(void)
*/ */
printk(BIOS_DEBUG, "Locking SMM.\n"); 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); 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);
}