soc/intel/common: Replace smm_soutbridge_enable(SMI_FLAGS)

Change-Id: I8c4dc5ab91891de9737189bd7ae86df18d86f758
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41960
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2020-05-31 20:03:11 +03:00 committed by Patrick Georgi
parent 21ba5eea89
commit 040c531158
8 changed files with 17 additions and 8 deletions

View File

@ -44,7 +44,6 @@ void smm_relocate(void);
* SMIs. They are split so that other work between the 2 actions. */
void smm_southbridge_clear_state(void);
void smm_southbridge_enable_smi(void);
void smm_southbridge_enable(uint16_t pm1_events);
/* To be removed. */
void smm_initialize(void);

View File

@ -234,7 +234,7 @@ static void relocation_handler(int cpu, uintptr_t curr_smbase,
static void post_mp_init(void)
{
smm_southbridge_enable(PWRBTN_EN | GBL_EN);
global_smi_enable();
if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
mp_run_on_all_cpus(sgx_configure, NULL);

View File

@ -254,7 +254,7 @@ static void post_mp_init(void)
* Now that all APs have been relocated as well as the BSP let SMIs
* start flowing.
*/
smm_southbridge_enable(GBL_EN);
global_smi_enable_no_pwrbtn();
/* Lock down the SMRAM space. */
smm_lock();

View File

@ -23,7 +23,7 @@ void smm_southbridge_clear_state(void)
pmc_clear_all_gpe_status();
}
void smm_southbridge_enable(uint16_t pm1_events)
static void smm_southbridge_enable(uint16_t pm1_events)
{
uint32_t smi_params = ENABLE_SMI_PARAMS;
@ -61,6 +61,16 @@ void smm_southbridge_enable(uint16_t pm1_events)
pmc_enable_smi(smi_params);
}
void global_smi_enable(void)
{
smm_southbridge_enable(PWRBTN_EN | GBL_EN);
}
void global_smi_enable_no_pwrbtn(void)
{
smm_southbridge_enable(GBL_EN);
}
void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
{
/*

View File

@ -220,7 +220,7 @@ static void post_mp_init(void)
* Now that all APs have been relocated as well as the BSP let SMIs
* start flowing.
*/
smm_southbridge_enable(PWRBTN_EN | GBL_EN);
global_smi_enable();
/* Lock down the SMRAM space. */
smm_lock();

View File

@ -184,7 +184,7 @@ static void post_mp_init(void)
* Now that all APs have been relocated as well as the BSP let SMIs
* start flowing.
*/
smm_southbridge_enable(PWRBTN_EN | GBL_EN);
global_smi_enable();
/* Lock down the SMRAM space. */
smm_lock();

View File

@ -294,7 +294,7 @@ static void post_mp_init(void)
* Now that all APs have been relocated as well as the BSP let SMIs
* start flowing.
*/
smm_southbridge_enable(GBL_EN);
global_smi_enable_no_pwrbtn();
/* Lock down the SMRAM space. */
if (CONFIG(HAVE_SMI_HANDLER))

View File

@ -190,7 +190,7 @@ static void post_mp_init(void)
* Now that all APs have been relocated as well as the BSP let SMIs
* start flowing.
*/
smm_southbridge_enable(PWRBTN_EN | GBL_EN);
global_smi_enable();
/* Lock down the SMRAM space. */
smm_lock();