summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-10-03 16:54:04 +0300
committerNico Huber <nico.h@gmx.de>2019-10-03 15:34:13 +0000
commit5a2bbcaa93109ba19b631489e366a71df4608f4e (patch)
treef151b6ff048e25c524dd07313cd44077e32fd60b
parent30d3c9ed48dc7e03a412b36b600b54b32f0c4162 (diff)
downloadcoreboot-5a2bbcaa93109ba19b631489e366a71df4608f4e.tar.xz
cpu/intel/: Fix regression with smmrelocate
Fix regression with commit d53fd70 intel/smm/gen1: Use smm_subregion(). The bitmask on SMRR register parameter was inverted for selected models. Change-Id: Ia572ca3bdd4da371985691b5d249f998382fbe48 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35780 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Bill XIE <persmule@hardenedlinux.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/cpu/intel/smm/gen1/smmrelocate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/intel/smm/gen1/smmrelocate.c b/src/cpu/intel/smm/gen1/smmrelocate.c
index 4ecd7db78e..3eb869ae1f 100644
--- a/src/cpu/intel/smm/gen1/smmrelocate.c
+++ b/src/cpu/intel/smm/gen1/smmrelocate.c
@@ -121,7 +121,7 @@ static void fill_in_relocation_params(struct smm_relocation_params *params)
/* On model_6fx and model_1067x bits [0:11] on smrr_base are reserved */
if (cpu_has_alternative_smrr())
- params->smrr_base.lo &= ~rmask;
+ params->smrr_base.lo &= rmask;
smm_subregion(SMM_SUBREGION_CHIPSET, &params->ied_base, &params->ied_size);
}