summaryrefslogtreecommitdiff
path: root/src/mainboard/intel/glkrvp
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2019-10-22 23:05:06 +0200
committerNico Huber <nico.h@gmx.de>2019-11-04 19:25:02 +0000
commit7736bfc443a913a9cde46406bcfc38015ec71f47 (patch)
tree5b107551301bbaadc538b0c2ac7c52125462beb3 /src/mainboard/intel/glkrvp
parente75a64f822931a5fbdd80f20c4d168a5c346e01a (diff)
soc/intel/sgx: convert SGX and PRMRR devicetree options to Kconfig
The devicetree is not made for user-choosable options, thus introduce Kconfig options for both SGX and the corresponding PRMRR size. The PRMRR size Kconfig has been implemented as a maximum value. At runtime the final PRMRR size gets selected by checking the supported values in MSR_PRMRR_VALID_CONFIG and trying to select the value nearest to the chosen one. When "Maximum" is chosen, the highest possibly value from the MSR gets used. When a too strict limit is set, coreboot will die, printing an error message. Tested successfully on X11SSM-F Change-Id: I5f08e85898304bba6680075ca5d6bce26aef9a4d Signed-off-by: Michael Niewöhner <foss@mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35799 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/mainboard/intel/glkrvp')
-rw-r--r--src/mainboard/intel/glkrvp/Kconfig4
-rw-r--r--src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb8
2 files changed, 4 insertions, 8 deletions
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 3380762736..ebb5a3a07b 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -86,4 +86,8 @@ config IS_GLK_RVP_1
bool "Is this RVP1?"
default n
+config SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
+ bool
+ default y
+
endif # BOARD_INTEL_GLKRVP
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
index d3d0b00c8e..c5ad27dca6 100644
--- a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
+++ b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
@@ -97,14 +97,6 @@ chip soc/intel/apollolake
# Minimum SLP S3 assertion width 28ms.
register "slp_s3_assertion_width_usecs" = "28000"
- register "sgx_enable" = "1"
-
- # PRMRR size options
- # 0x02000000 - 32MiB
- # 0x04000000 - 64MiB
- # 0x08000000 - 128MiB
- register "PrmrrSize" = "128 * MiB"
-
register "pnp_settings" = "PNP_PERF_POWER"
device domain 0 on