diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2019-01-24 16:03:41 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-01-24 15:23:47 +0000 |
| commit | ff28371521e453541c3c2de50dd5c3dfc68cc292 (patch) | |
| tree | 79734a21d14bcc1146f172d7dc372f7690409961 /src/soc/intel/denverton_ns/smm.c | |
| parent | 062fdf13b8b7593c729401a5281087c3a09998d2 (diff) | |
Revert "soc/intel/denverton_ns: Rewrite pmutil using pmclib"
This reverts commit ab1227226ebd78b40783cb200e60711b900352f0.
There were significant changes around soc_reset_tco_status() that this
code needs to be adapted to.
Change-Id: I563c9ddb3c7931c2b02f5c97a3be5e44fa873889
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/31071
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/soc/intel/denverton_ns/smm.c')
| -rw-r--r-- | src/soc/intel/denverton_ns/smm.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/soc/intel/denverton_ns/smm.c b/src/soc/intel/denverton_ns/smm.c index 65d249911a..9d3fa75a6a 100644 --- a/src/soc/intel/denverton_ns/smm.c +++ b/src/soc/intel/denverton_ns/smm.c @@ -23,7 +23,6 @@ #include <cpu/x86/smm.h> #include <string.h> -#include <intelblocks/pmclib.h> #include <soc/iomap.h> #include <soc/soc_util.h> #include <soc/pm.h> @@ -49,10 +48,10 @@ void southcluster_smm_clear_state(void) } /* Dump and clear status registers */ - pmc_clear_smi_status(); - pmc_clear_pm1_status(); - pmc_clear_tco_status(); - pmc_clear_all_gpe_status(); + clear_smi_status(); + clear_pm1_status(); + clear_tco_status(); + clear_gpe_status(); clear_pmc_status(); } @@ -61,8 +60,8 @@ void southcluster_smm_enable_smi(void) printk(BIOS_DEBUG, "Enabling SMIs.\n"); /* Configure events Disable pcie wake. */ - pmc_enable_pm1(PWRBTN_EN | GBL_EN | PCIEXPWAK_DIS); - pmc_disable_std_gpe(PME_B0_EN); + enable_pm1(PWRBTN_EN | GBL_EN | PCIEXPWAK_DIS); + disable_gpe(PME_B0_EN); /* Enable SMI generation: * - on APMC writes (io 0xb2) @@ -72,7 +71,7 @@ void southcluster_smm_enable_smi(void) * - on TCO events * - on microcontroller writes (io 0x62/0x66) */ - pmc_enable_smi(APMC_EN | SLP_SMI_EN | GBL_SMI_EN | EOS); + enable_smi(APMC_EN | SLP_SMI_EN | GBL_SMI_EN | EOS); } void smm_setup_structures(void *gnvs, void *tcg, void *smi1) |