Revert "soc/intel/denverton_ns: Rewrite pmutil using pmclib"
This reverts commit ab1227226e.
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>
This commit is contained in:
Patrick Georgi
parent
062fdf13b8
commit
ff28371521
4 changed files with 184 additions and 33 deletions
|
|
@ -41,6 +41,18 @@ struct chipset_power_state {
|
|||
struct chipset_power_state *fill_power_state(void);
|
||||
|
||||
/* Power Management Utility Functions. */
|
||||
uint32_t clear_smi_status(void);
|
||||
uint16_t clear_pm1_status(void);
|
||||
uint32_t clear_tco_status(void);
|
||||
uint32_t clear_gpe_status(void);
|
||||
void clear_pmc_status(void);
|
||||
void enable_smi(uint32_t mask);
|
||||
void disable_smi(uint32_t mask);
|
||||
void enable_pm1(uint16_t events);
|
||||
void enable_pm1_control(uint32_t mask);
|
||||
void disable_pm1_control(uint32_t mask);
|
||||
void enable_gpe(uint32_t mask);
|
||||
void disable_gpe(uint32_t mask);
|
||||
void disable_all_gpe(void);
|
||||
|
||||
#endif /* _DENVERTON_NS_PM_H_ */
|
||||
|
|
|
|||
|
|
@ -19,12 +19,29 @@
|
|||
#include <arch/io.h>
|
||||
#include <console/console.h>
|
||||
|
||||
#include <intelblocks/pmclib.h>
|
||||
#include <soc/iomap.h>
|
||||
#include <soc/soc_util.h>
|
||||
#include <soc/pm.h>
|
||||
|
||||
const char *const *soc_smi_sts_array(size_t *a)
|
||||
static void print_num_status_bits(int num_bits, uint32_t status,
|
||||
const char *const bit_names[])
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!status)
|
||||
return;
|
||||
|
||||
for (i = num_bits - 1; i >= 0; i--) {
|
||||
if (status & (1 << i)) {
|
||||
if (bit_names[i])
|
||||
printk(BIOS_DEBUG, "%s ", bit_names[i]);
|
||||
else
|
||||
printk(BIOS_DEBUG, "BIT%d ", i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static uint32_t print_smi_status(uint32_t smi_sts)
|
||||
{
|
||||
static const char *const smi_sts_bits[] = {
|
||||
[2] = "BIOS",
|
||||
|
|
@ -50,11 +67,93 @@ const char *const *soc_smi_sts_array(size_t *a)
|
|||
[31] = "LEGACY_USB3",
|
||||
};
|
||||
|
||||
*a = ARRAY_SIZE(smi_sts_bits);
|
||||
return smi_sts_bits;
|
||||
if (!smi_sts)
|
||||
return 0;
|
||||
|
||||
printk(BIOS_DEBUG, "SMI_STS: ");
|
||||
print_num_status_bits(ARRAY_SIZE(smi_sts_bits), smi_sts, smi_sts_bits);
|
||||
printk(BIOS_DEBUG, "\n");
|
||||
|
||||
return smi_sts;
|
||||
}
|
||||
|
||||
const char *const *soc_tco_sts_array(size_t *a)
|
||||
static uint32_t reset_smi_status(void)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t smi_sts = inl((uint16_t)(pmbase + SMI_STS));
|
||||
outl(smi_sts, (uint16_t)(pmbase + SMI_STS));
|
||||
return smi_sts;
|
||||
}
|
||||
|
||||
uint32_t clear_smi_status(void) { return print_smi_status(reset_smi_status()); }
|
||||
|
||||
void enable_smi(uint32_t mask)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t smi_en = inl((uint16_t)(pmbase + SMI_EN));
|
||||
smi_en |= mask;
|
||||
outl(smi_en, (uint16_t)(pmbase + SMI_EN));
|
||||
}
|
||||
|
||||
void disable_smi(uint32_t mask)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t smi_en = inl((uint16_t)(pmbase + SMI_EN));
|
||||
smi_en &= ~mask;
|
||||
outl(smi_en, (uint16_t)(pmbase + SMI_EN));
|
||||
}
|
||||
|
||||
void enable_pm1_control(uint32_t mask)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t pm1_cnt = inl((uint16_t)(pmbase + PM1_CNT));
|
||||
pm1_cnt |= mask;
|
||||
outl(pm1_cnt, (uint16_t)(pmbase + PM1_CNT));
|
||||
}
|
||||
|
||||
void disable_pm1_control(uint32_t mask)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t pm1_cnt = inl((uint16_t)(pmbase + PM1_CNT));
|
||||
pm1_cnt &= ~mask;
|
||||
outl(pm1_cnt, (uint16_t)(pmbase + PM1_CNT));
|
||||
}
|
||||
|
||||
static uint16_t reset_pm1_status(void)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint16_t pm1_sts = inw((uint16_t)(pmbase + PM1_STS));
|
||||
outw(pm1_sts, (uint16_t)(pmbase + PM1_STS));
|
||||
return pm1_sts;
|
||||
}
|
||||
|
||||
static uint16_t print_pm1_status(uint16_t pm1_sts)
|
||||
{
|
||||
static const char *const pm1_sts_bits[] = {
|
||||
[0] = "TMROF", [4] = "BM", [5] = "GBL",
|
||||
[8] = "PWRBTN", [10] = "RTC", [11] = "PRBTNOR",
|
||||
[15] = "WAK",
|
||||
};
|
||||
|
||||
if (!pm1_sts)
|
||||
return 0;
|
||||
|
||||
printk(BIOS_SPEW, "PM1_STS: ");
|
||||
print_num_status_bits(ARRAY_SIZE(pm1_sts_bits), pm1_sts, pm1_sts_bits);
|
||||
printk(BIOS_SPEW, "\n");
|
||||
|
||||
return pm1_sts;
|
||||
}
|
||||
|
||||
uint16_t clear_pm1_status(void) { return print_pm1_status(reset_pm1_status()); }
|
||||
|
||||
void enable_pm1(uint16_t events)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
outw(events, (uint16_t)(pmbase + PM1_EN));
|
||||
}
|
||||
|
||||
static uint32_t print_tco_status(uint32_t tco_sts)
|
||||
{
|
||||
static const char *const tco_sts_bits[] = {
|
||||
[0] = "NMI2SMI", [1] = "OS_TCO_SMI",
|
||||
|
|
@ -65,11 +164,17 @@ const char *const *soc_tco_sts_array(size_t *a)
|
|||
[17] = "SECOND_TO", [20] = "SMLINK_SLV_SMI",
|
||||
};
|
||||
|
||||
*a = ARRAY_SIZE(tco_sts_bits);
|
||||
return tco_sts_bits;
|
||||
if (!tco_sts)
|
||||
return 0;
|
||||
|
||||
printk(BIOS_DEBUG, "TCO_STS: ");
|
||||
print_num_status_bits(ARRAY_SIZE(tco_sts_bits), tco_sts, tco_sts_bits);
|
||||
printk(BIOS_DEBUG, "\n");
|
||||
|
||||
return tco_sts;
|
||||
}
|
||||
|
||||
uint32_t soc_reset_tco_status(void)
|
||||
static uint32_t reset_tco_status(void)
|
||||
{
|
||||
uint16_t tcobase = get_tcobase();
|
||||
uint32_t tco_sts = inl((uint16_t)(tcobase + TCO1_STS));
|
||||
|
|
@ -79,7 +184,35 @@ uint32_t soc_reset_tco_status(void)
|
|||
return tco_sts & tco_en;
|
||||
}
|
||||
|
||||
const char *const *soc_std_gpe_sts_array(size_t *a)
|
||||
uint32_t clear_tco_status(void) { return print_tco_status(reset_tco_status()); }
|
||||
|
||||
void enable_gpe(uint32_t mask)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t gpe0_en = inl((uint16_t)(pmbase + GPE0_EN(GPE_STD)));
|
||||
gpe0_en |= mask;
|
||||
outl(gpe0_en, (uint16_t)(pmbase + GPE0_EN(GPE_STD)));
|
||||
}
|
||||
|
||||
void disable_gpe(uint32_t mask)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t gpe0_en = inl((uint16_t)(pmbase + GPE0_EN(GPE_STD)));
|
||||
gpe0_en &= ~mask;
|
||||
outl(gpe0_en, (uint16_t)(pmbase + GPE0_EN(GPE_STD)));
|
||||
}
|
||||
|
||||
void disable_all_gpe(void) { disable_gpe(~0); }
|
||||
|
||||
static uint32_t reset_gpe_status(void)
|
||||
{
|
||||
uint16_t pmbase = get_pmbase();
|
||||
uint32_t gpe_sts = inl((uint16_t)(pmbase + GPE0_STS(GPE_STD)));
|
||||
outl(gpe_sts, (uint16_t)(pmbase + GPE0_STS(GPE_STD)));
|
||||
return gpe_sts;
|
||||
}
|
||||
|
||||
static uint32_t print_gpe_sts(uint32_t gpe_sts)
|
||||
{
|
||||
static const char *const gpe_sts_bits[] = {
|
||||
[0] = "GPIO_0", [1] = "GPIO_1",
|
||||
|
|
@ -100,8 +233,16 @@ const char *const *soc_std_gpe_sts_array(size_t *a)
|
|||
[30] = "GPIO_30", [31] = "GPIO_31",
|
||||
};
|
||||
|
||||
*a = ARRAY_SIZE(gpe_sts_bits);
|
||||
return gpe_sts_bits;
|
||||
if (!gpe_sts)
|
||||
return gpe_sts;
|
||||
|
||||
printk(BIOS_DEBUG, "GPE0a_STS: ");
|
||||
print_num_status_bits(ARRAY_SIZE(gpe_sts_bits), gpe_sts, gpe_sts_bits);
|
||||
printk(BIOS_DEBUG, "\n");
|
||||
|
||||
return gpe_sts;
|
||||
}
|
||||
|
||||
uint32_t clear_gpe_status(void) { return print_gpe_sts(reset_gpe_status()); }
|
||||
|
||||
void clear_pmc_status(void) { /* TODO */ }
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
#include <device/pci_def.h>
|
||||
#include <elog.h>
|
||||
#include <intelblocks/fast_spi.h>
|
||||
#include <intelblocks/pmclib.h>
|
||||
#include <spi-generic.h>
|
||||
#include <soc/iomap.h>
|
||||
#include <soc/soc_util.h>
|
||||
|
|
@ -53,7 +52,7 @@ int southbridge_io_trap_handler(int smif)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void southbridge_smi_set_eos(void) { pmc_enable_smi(EOS); }
|
||||
void southbridge_smi_set_eos(void) { enable_smi(EOS); }
|
||||
|
||||
global_nvs_t *smm_get_gnvs(void) { return gnvs; }
|
||||
|
||||
|
|
@ -99,7 +98,7 @@ static void southbridge_smi_sleep(void)
|
|||
uint16_t pmbase = get_pmbase();
|
||||
|
||||
/* First, disable further SMIs */
|
||||
pmc_disable_smi(SLP_SMI_EN);
|
||||
disable_smi(SLP_SMI_EN);
|
||||
|
||||
/* Figure out SLP_TYP */
|
||||
reg32 = inl((uint16_t)(pmbase + PM1_CNT));
|
||||
|
|
@ -132,7 +131,7 @@ static void southbridge_smi_sleep(void)
|
|||
printk(BIOS_DEBUG, "SMI#: Entering S5 (Soft Power off)\n");
|
||||
|
||||
/* Disable all GPE */
|
||||
pmc_disable_all_gpe();
|
||||
disable_all_gpe();
|
||||
|
||||
/* also iterates over all bridges on bus 0 */
|
||||
busmaster_disable_on_bus(0);
|
||||
|
|
@ -146,7 +145,7 @@ static void southbridge_smi_sleep(void)
|
|||
* event again. We need to set BIT13 (SLP_EN) though to make the
|
||||
* sleep happen.
|
||||
*/
|
||||
pmc_enable_pm1_control(SLP_EN);
|
||||
enable_pm1_control(SLP_EN);
|
||||
|
||||
/* Make sure to stop executing code here for S3/S4/S5 */
|
||||
if (slp_typ > 1)
|
||||
|
|
@ -159,7 +158,7 @@ static void southbridge_smi_sleep(void)
|
|||
reg32 = inl((uint16_t)(pmbase + PM1_CNT));
|
||||
if (reg32 & SCI_EN) {
|
||||
/* The OS is not an ACPI OS, so we set the state to S0 */
|
||||
pmc_disable_pm1_control(SLP_EN | SLP_TYP);
|
||||
disable_pm1_control(SLP_EN | SLP_TYP);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -238,11 +237,11 @@ static void southbridge_smi_apmc(void)
|
|||
printk(BIOS_DEBUG, "P-state control\n");
|
||||
break;
|
||||
case APM_CNT_ACPI_DISABLE:
|
||||
pmc_disable_pm1_control(SCI_EN);
|
||||
disable_pm1_control(SCI_EN);
|
||||
printk(BIOS_DEBUG, "SMI#: ACPI disabled.\n");
|
||||
break;
|
||||
case APM_CNT_ACPI_ENABLE:
|
||||
pmc_enable_pm1_control(SCI_EN);
|
||||
enable_pm1_control(SCI_EN);
|
||||
printk(BIOS_DEBUG, "SMI#: ACPI enabled.\n");
|
||||
break;
|
||||
case APM_CNT_FINALIZE:
|
||||
|
|
@ -269,23 +268,23 @@ static void southbridge_smi_apmc(void)
|
|||
|
||||
static void southbridge_smi_pm1(void)
|
||||
{
|
||||
uint16_t pm1_sts = pmc_clear_pm1_status();
|
||||
uint16_t pm1_sts = clear_pm1_status();
|
||||
|
||||
/* While OSPM is not active, poweroff immediately
|
||||
* on a power button event.
|
||||
*/
|
||||
if (pm1_sts & PWRBTN_STS) {
|
||||
// power button pressed
|
||||
pmc_disable_pm1_control(-1UL);
|
||||
pmc_enable_pm1_control(SLP_EN | (SLP_TYP_S5 << SLP_TYP_SHIFT));
|
||||
disable_pm1_control(-1UL);
|
||||
enable_pm1_control(SLP_EN | (SLP_TYP_S5 << SLP_TYP_SHIFT));
|
||||
}
|
||||
}
|
||||
|
||||
static void southbridge_smi_gpe0(void) { pmc_clear_all_gpe_status(); }
|
||||
static void southbridge_smi_gpe0(void) { clear_gpe_status(); }
|
||||
|
||||
static void southbridge_smi_tco(void)
|
||||
{
|
||||
uint32_t tco_sts = pmc_clear_tco_status();
|
||||
uint32_t tco_sts = clear_tco_status();
|
||||
|
||||
/* Any TCO event? */
|
||||
if (!tco_sts)
|
||||
|
|
@ -355,7 +354,7 @@ void southbridge_smi_handler(void)
|
|||
/* We need to clear the SMI status registers, or we won't see what's
|
||||
* happening in the following calls.
|
||||
*/
|
||||
smi_sts = pmc_clear_smi_status();
|
||||
smi_sts = clear_smi_status();
|
||||
|
||||
/* Call SMI sub handler for each of the status bits */
|
||||
for (i = 0; i < ARRAY_SIZE(southbridge_smi); i++) {
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue