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

soc/intel/{skl,apl}: don't run or even include SGX code if disabled 

Do not run or include any code in case the user did not explicitly
enable SGX through `SOC_INTEL_COMMON_BLOCK_SGX_ENABLE`.

Also move the ifdef inside the ASL file.

Change-Id: Iec4d3d3eb2811ec14d29aff9601ba325724bc28c
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58426
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by:  Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Michael Niewöhner 2021-10-18 19:54:21 +02:00 committed by Felix Singer
parent e874375394
commit bc5f51fa56
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/soc/intel/apollolake/acpi.c
View File

@ -88,7 +88,7 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
gnvs->scdo = gpio_acpi_pin(cfg->sdcard_cd_gpio); gnvs->scdo = gpio_acpi_pin(cfg->sdcard_cd_gpio);
} }
if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX)) if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
sgx_fill_gnvs(gnvs); sgx_fill_gnvs(gnvs);
/* Fill in Above 4GB MMIO resource */ /* Fill in Above 4GB MMIO resource */

2
src/soc/intel/apollolake/acpi/southbridge.asl
View File

@ -30,6 +30,4 @@
#include <soc/intel/common/acpi/pci_osc.asl> #include <soc/intel/common/acpi/pci_osc.asl>
/* SGX */ /* SGX */
#if CONFIG(SOC_INTEL_COMMON_BLOCK_SGX)
#include <soc/intel/common/acpi/sgx.asl> #include <soc/intel/common/acpi/sgx.asl>
#endif

2
src/soc/intel/common/acpi/sgx.asl
View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#if CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE)
Scope(\_SB) Scope(\_SB)
{ {
// Secure Enclave memory // Secure Enclave memory
@ -54,3 +55,4 @@ Scope(\_SB)
} // end EPC Device } // end EPC Device
} // End of Scope(\_SB) } // End of Scope(\_SB)
#endif

2
src/soc/intel/common/block/sgx/Makefile.inc
View File

@ -1 +1 @@
ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_SGX) += sgx.c ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE) += sgx.c

2
src/soc/intel/skylake/acpi/pch.asl
View File

@ -62,6 +62,4 @@ Method (_OSC, 4)
} }
/* SGX */ /* SGX */
#if CONFIG(SOC_INTEL_COMMON_BLOCK_SGX)
#include <soc/intel/common/acpi/sgx.asl> #include <soc/intel/common/acpi/sgx.asl>
#endif