[coreboot-gerrit] Change in ...coreboot[master]: sb/intel/common/smi.c: Remove unused functions
Arthur Heymans (Code Review)
gerrit at coreboot.org
Mon Dec 3 11:54:17 CET 2018
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30019
Change subject: sb/intel/common/smi.c: Remove unused functions
......................................................................
sb/intel/common/smi.c: Remove unused functions
Since all targets using sb/intel/common and cpu/intel/smm/gen1
are now using PARALLEL_MP some code is not used anymore.
Change-Id: Ibdc2bb0f1412366b945813efbc1b6451d27f376f
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
M src/cpu/intel/smm/gen1/smi.h
M src/cpu/intel/smm/gen1/smmrelocate.c
M src/southbridge/intel/common/smi.c
3 files changed, 0 insertions(+), 204 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/30019/1
diff --git a/src/cpu/intel/smm/gen1/smi.h b/src/cpu/intel/smm/gen1/smi.h
index d6a6f88..ec62458 100644
--- a/src/cpu/intel/smm/gen1/smi.h
+++ b/src/cpu/intel/smm/gen1/smi.h
@@ -17,11 +17,8 @@
/* These helpers are for performing SMM relocation. */
void southbridge_smm_init(void);
-void southbridge_trigger_smi(void);
-void southbridge_clear_smi_status(void);
u32 northbridge_get_tseg_base(void);
u32 northbridge_get_tseg_size(void);
-int cpu_get_apic_id_map(int *apic_id_map);
void northbridge_write_smram(u8 smram);
void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
size_t *smm_save_state_size);
diff --git a/src/cpu/intel/smm/gen1/smmrelocate.c b/src/cpu/intel/smm/gen1/smmrelocate.c
index f2035f2..fa038a3 100644
--- a/src/cpu/intel/smm/gen1/smmrelocate.c
+++ b/src/cpu/intel/smm/gen1/smmrelocate.c
@@ -86,60 +86,6 @@
}
}
-/* The relocation work is actually performed in SMM context, but the code
- * resides in the ramstage module. This occurs by trampolining from the default
- * SMRAM entry point to here. */
-static void asmlinkage cpu_smm_do_relocation(void *arg)
-{
- em64t101_smm_state_save_area_t *save_state;
- msr_t mtrr_cap;
- struct smm_relocation_params *relo_params;
- const struct smm_module_params *p;
- const struct smm_runtime *runtime;
- int cpu;
-
- p = arg;
- runtime = p->runtime;
- relo_params = p->arg;
- cpu = p->cpu;
-
- if (cpu >= CONFIG_MAX_CPUS) {
- printk(BIOS_CRIT,
- "Invalid CPU number assigned in SMM stub: %d\n", cpu);
- return;
- }
-
- printk(BIOS_DEBUG, "In relocation handler: cpu %d\n", cpu);
-
- /* All threads need to set IEDBASE and SMBASE in the save state area.
- * Since one thread runs at a time during the relocation the save state
- * is the same for all cpus. */
- save_state = (void *)(runtime->smbase + SMM_DEFAULT_SIZE -
- runtime->save_state_size);
-
- /* The relocated handler runs with all CPUs concurrently. Therefore
- * stagger the entry points adjusting SMBASE downwards by save state
- * size * CPU num. */
- save_state->smbase = relo_params->smram_base -
- cpu * runtime->save_state_size;
- if (CONFIG_IED_REGION_SIZE != 0) {
- save_state->iedbase = relo_params->ied_base;
-
- printk(BIOS_DEBUG, "New SMBASE=0x%08x IEDBASE=0x%08x @ %p\n",
- save_state->smbase, save_state->iedbase, save_state);
- } else {
- printk(BIOS_DEBUG, "New SMBASE=0x%08x @ %p\n",
- save_state->smbase, save_state);
- }
-
- /* Write SMRR MSRs based on indicated support. */
- mtrr_cap = rdmsr(MTRR_CAP_MSR);
- if (mtrr_cap.lo & SMRR_SUPPORTED)
- write_smrr(relo_params);
-
- southbridge_clear_smi_status();
-}
-
static void fill_in_relocation_params(struct smm_relocation_params *params)
{
/* All range registers are aligned to 4KiB */
@@ -188,33 +134,6 @@
}
}
-static int install_relocation_handler(int *apic_id_map, int num_cpus,
- struct smm_relocation_params *relo_params)
-{
- /* The default SMM entry happens serially at the default location.
- * Therefore, there is only 1 concurrent save state area. Set the
- * stack size to the save state size, and call into the
- * do_relocation handler. */
- int save_state_size = sizeof(em64t101_smm_state_save_area_t);
- struct smm_loader_params smm_params = {
- .per_cpu_stack_size = save_state_size,
- .num_concurrent_stacks = num_cpus,
- .per_cpu_save_state_size = save_state_size,
- .num_concurrent_save_states = 1,
- .handler = &cpu_smm_do_relocation,
- .handler_arg = (void *)relo_params,
- };
-
- default_smm_area = backup_default_smm_area();
-
- if (smm_setup_relocation_handler(&smm_params))
- return -1;
- int i;
- for (i = 0; i < num_cpus; i++)
- smm_params.runtime->apic_id_to_cpu[i] = apic_id_map[i];
- return 0;
-}
-
static void setup_ied_area(struct smm_relocation_params *params)
{
char *ied_base;
@@ -234,94 +153,6 @@
memset(ied_base + (1 << 20), 0, (32 << 10));
}
-static int install_permanent_handler(int *apic_id_map, int num_cpus,
- struct smm_relocation_params *relo_params)
-{
- /* There are num_cpus concurrent stacks and num_cpus concurrent save
- * state areas. Lastly, set the stack size to the save state size. */
- int save_state_size = sizeof(em64t101_smm_state_save_area_t);
- struct smm_loader_params smm_params = {
- .per_cpu_stack_size = save_state_size,
- .num_concurrent_stacks = num_cpus,
- .per_cpu_save_state_size = save_state_size,
- .num_concurrent_save_states = num_cpus,
- };
-
- printk(BIOS_DEBUG, "Installing SMM handler to 0x%08x\n",
- relo_params->smram_base);
- if (smm_load_module((void *)relo_params->smram_base,
- relo_params->smram_size, &smm_params))
- return -1;
- int i;
- for (i = 0; i < num_cpus; i++)
- smm_params.runtime->apic_id_to_cpu[i] = apic_id_map[i];
- return 0;
-}
-
-static int cpu_smm_setup(void)
-{
- int num_cpus;
- int apic_id_map[CONFIG_MAX_CPUS];
-
- printk(BIOS_DEBUG, "Setting up SMI for CPU\n");
-
- fill_in_relocation_params(&smm_reloc_params);
-
- /* enable the SMM memory window */
- northbridge_write_smram(D_OPEN | G_SMRAME | C_BASE_SEG);
-
- if (CONFIG_IED_REGION_SIZE != 0)
- setup_ied_area(&smm_reloc_params);
-
- num_cpus = cpu_get_apic_id_map(apic_id_map);
- if (num_cpus > CONFIG_MAX_CPUS) {
- printk(BIOS_CRIT,
- "Error: Hardware CPUs (%d) > MAX_CPUS (%d)\n",
- num_cpus, CONFIG_MAX_CPUS);
- }
-
- if (install_relocation_handler(apic_id_map, num_cpus,
- &smm_reloc_params)) {
- printk(BIOS_CRIT, "SMM Relocation handler install failed.\n");
- return -1;
- }
-
- if (install_permanent_handler(apic_id_map, num_cpus,
- &smm_reloc_params)) {
- printk(BIOS_CRIT, "SMM Permanent handler install failed.\n");
- return -1;
- }
-
- /* Ensure the SMM handlers hit DRAM before performing first SMI. */
- /* TODO(adurbin): Is this really needed? */
- wbinvd();
-
- /* close the SMM memory window and enable normal SMM */
- northbridge_write_smram(G_SMRAME | C_BASE_SEG);
-
- return 0;
-}
-
-void smm_init(void)
-{
- /* Return early if CPU SMM setup failed. */
- if (cpu_smm_setup())
- return;
-
- southbridge_smm_init();
-
- /* Initiate first SMI to kick off SMM-context relocation. Note: this
- * SMI being triggered here queues up an SMI in the APs which are in
- * wait-for-SIPI state. Once an AP gets an SIPI it will service the SMI
- * at the SMM_DEFAULT_BASE before jumping to startup vector. */
- southbridge_trigger_smi();
-
- printk(BIOS_DEBUG, "Relocation complete.\n");
-
- /* Lock down the SMRAM space. */
- smm_lock();
-}
-
void smm_init_completion(void)
{
restore_default_smm_area(default_smm_area);
diff --git a/src/southbridge/intel/common/smi.c b/src/southbridge/intel/common/smi.c
index 17ac0cb..36c01e6 100644
--- a/src/southbridge/intel/common/smi.c
+++ b/src/southbridge/intel/common/smi.c
@@ -104,38 +104,6 @@
write_pmbase32(SMI_EN, smi_en);
}
-void southbridge_trigger_smi(void)
-{
- /**
- * There are several methods of raising a controlled SMI# via
- * software, among them:
- * - Writes to io 0xb2 (APMC)
- * - Writes to the Local Apic ICR with Delivery mode SMI.
- *
- * Using the local apic is a bit more tricky. According to
- * AMD Family 11 Processor BKDG no destination shorthand must be
- * used.
- * The whole SMM initialization is quite a bit hardware specific, so
- * I'm not too worried about the better of the methods at the moment
- */
-
- /* raise an SMI interrupt */
- printk(BIOS_SPEW, " ... raise SMI#\n");
- outb(0x00, 0xb2);
-}
-
-void southbridge_clear_smi_status(void)
-{
- /* Clear SMI status */
- reset_smi_status();
-
- /* Clear PM1 status */
- reset_pm1_status();
-
- /* Set EOS bit so other SMIs can occur. */
- smi_set_eos();
-}
-
void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
{
/*
--
To view, visit https://review.coreboot.org/c/coreboot/+/30019
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ibdc2bb0f1412366b945813efbc1b6451d27f376f
Gerrit-Change-Number: 30019
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181203/23894395/attachment-0001.html>
More information about the coreboot-gerrit
mailing list