summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-14 06:48:28 +0300
committerPatrick Georgi <pgeorgi@google.com>2019-08-27 16:14:48 +0000
commit568a42ab8c975e41ca322e74b92a186c00aff83d (patch)
tree82fda7a2976b0b32f6ec2a11fccf643fd454cf62
parent44449192abd612b39c894ef019cfed22e151609f (diff)
downloadcoreboot-568a42ab8c975e41ca322e74b92a186c00aff83d.tar.xz
intel/baytrail: Use smm_subregion()
Change-Id: Ic2677bcf9f2f79c4db725ebcf342a8575ee7bc38 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34739 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/baytrail/cpu.c49
-rw-r--r--src/soc/intel/baytrail/include/soc/smm.h13
-rw-r--r--src/soc/intel/baytrail/memmap.c23
-rw-r--r--src/soc/intel/baytrail/romstage/romstage.c2
4 files changed, 38 insertions, 49 deletions
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index 4cb0a066e5..edc4e83da5 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -88,13 +88,12 @@ static const struct cpu_driver driver __cpu_driver = {
* MP and SMM loading initialization.
*/
-struct smm_relocation_attrs {
- uint32_t smbase;
- uint32_t smrr_base;
- uint32_t smrr_mask;
+struct smm_relocation_params {
+ msr_t smrr_base;
+ msr_t smrr_mask;
};
-static struct smm_relocation_attrs relo_attrs;
+static struct smm_relocation_params smm_reloc_params;
/* Package level MSRs */
static const struct reg_script package_msr_script[] = {
@@ -140,20 +139,32 @@ static int get_cpu_count(void)
return pattrs->num_cpus;
}
+static void fill_in_relocation_params(struct smm_relocation_params *params)
+{
+ uintptr_t tseg_base;
+ size_t tseg_size;
+
+ /* All range registers are aligned to 4KiB */
+ const u32 rmask = ~((1 << 12) - 1);
+
+ smm_region(&tseg_base, &tseg_size);
+
+ /* SMRR has 32-bits of valid address aligned to 4KiB. */
+ params->smrr_base.lo = (tseg_base & rmask) | MTRR_TYPE_WRBACK;
+ params->smrr_base.hi = 0;
+ params->smrr_mask.lo = (~(tseg_size - 1) & rmask) | MTRR_PHYS_MASK_VALID;
+ params->smrr_mask.hi = 0;
+}
+
static void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
size_t *smm_save_state_size)
{
- /* All range registers are aligned to 4KiB */
- const uint32_t rmask = ~((1 << 12) - 1);
+ printk(BIOS_DEBUG, "Setting up SMI for CPU\n");
+
+ fill_in_relocation_params(&smm_reloc_params);
- /* Initialize global tracking state. */
- relo_attrs.smbase = (uint32_t)smm_region_start();
- relo_attrs.smrr_base = relo_attrs.smbase | MTRR_TYPE_WRBACK;
- relo_attrs.smrr_mask = ~(smm_region_size() - 1) & rmask;
- relo_attrs.smrr_mask |= MTRR_PHYS_MASK_VALID;
+ smm_subregion(SMM_SUBREGION_HANDLER, perm_smbase, perm_smsize);
- *perm_smbase = relo_attrs.smbase;
- *perm_smsize = smm_region_size() - CONFIG_SMM_RESERVED_SIZE;
*smm_save_state_size = sizeof(em64t100_smm_state_save_area_t);
}
@@ -179,16 +190,12 @@ static void per_cpu_smm_trigger(void)
static void relocation_handler(int cpu, uintptr_t curr_smbase,
uintptr_t staggered_smbase)
{
- msr_t smrr;
+ struct smm_relocation_params *relo_params = &smm_reloc_params;
em64t100_smm_state_save_area_t *smm_state;
/* Set up SMRR. */
- smrr.lo = relo_attrs.smrr_base;
- smrr.hi = 0;
- wrmsr(IA32_SMRR_PHYS_BASE, smrr);
- smrr.lo = relo_attrs.smrr_mask;
- smrr.hi = 0;
- wrmsr(IA32_SMRR_PHYS_MASK, smrr);
+ wrmsr(IA32_SMRR_PHYS_BASE, relo_params->smrr_base);
+ wrmsr(IA32_SMRR_PHYS_MASK, relo_params->smrr_mask);
smm_state = (void *)(SMM_EM64T100_SAVE_STATE_OFFSET + curr_smbase);
smm_state->smbase = staggered_smbase;
diff --git a/src/soc/intel/baytrail/include/soc/smm.h b/src/soc/intel/baytrail/include/soc/smm.h
index 29b7946467..a2b7ec02d7 100644
--- a/src/soc/intel/baytrail/include/soc/smm.h
+++ b/src/soc/intel/baytrail/include/soc/smm.h
@@ -18,19 +18,6 @@
#include <types.h>
-/* There is a bug in the order of Kconfig includes in that arch/x86/Kconfig
- * is included after chipset code. This causes the chipset's Kconfig to be
- * clobbered by the arch/x86/Kconfig if they have the same name. */
-static inline int smm_region_size(void)
-{
- /* Make it 8MiB by default. */
- if (CONFIG_SMM_TSEG_SIZE == 0)
- return (8 << 20);
- return CONFIG_SMM_TSEG_SIZE;
-}
-
-uintptr_t smm_region_start(void);
-
enum {
SMM_SAVE_PARAM_GPIO_ROUTE = 0,
SMM_SAVE_PARAM_PCIE_WAKE_ENABLE,
diff --git a/src/soc/intel/baytrail/memmap.c b/src/soc/intel/baytrail/memmap.c
index 94e91ca7a1..015f13c503 100644
--- a/src/soc/intel/baytrail/memmap.c
+++ b/src/soc/intel/baytrail/memmap.c
@@ -14,29 +14,26 @@
*/
#include <cbmem.h>
-#include <stage_cache.h>
+#include <cpu/x86/smm.h>
#include <soc/iosf.h>
-#include <soc/smm.h>
-uintptr_t smm_region_start(void)
+static uintptr_t smm_region_start(void)
{
return (iosf_bunit_read(BUNIT_SMRRL) << 20);
}
+static size_t smm_region_size(void)
+{
+ return CONFIG_SMM_TSEG_SIZE;
+}
+
void *cbmem_top(void)
{
return (void *) smm_region_start();
}
-void stage_cache_external_region(void **base, size_t *size)
+void smm_region(uintptr_t *start, size_t *size)
{
- char *smm_base;
- /* 1MiB cache size */
- const long cache_size = CONFIG_SMM_RESERVED_SIZE;
-
- /* Ramstage cache lives in TSEG region which is the definition of
- * cbmem_top(). */
- smm_base = cbmem_top();
- *size = cache_size;
- *base = &smm_base[smm_region_size() - cache_size];
+ *start = (iosf_bunit_read(BUNIT_SMRRL) & 0xFFFF) << 20;
+ *size = smm_region_size();
}
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index 3607e6d15c..2b92c32f3a 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -30,7 +30,6 @@
#include <elog.h>
#include <program_loading.h>
#include <romstage_handoff.h>
-#include <stage_cache.h>
#include <string.h>
#include <timestamp.h>
#include <vendorcode/google/chromeos/chromeos.h>
@@ -41,7 +40,6 @@
#include <soc/pci_devs.h>
#include <soc/pmc.h>
#include <soc/romstage.h>
-#include <soc/smm.h>
#include <soc/spi.h>
static void program_base_addresses(void)