sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/skylake: Use newly added pmc_read_pm1_control

Browse Source 
BUG=b:67874513

Change-Id: I298065f30647ae9bba8f6a8481bd34eec64f1d8e
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/22083
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh 2017-10-16 22:26:58 -07:00 committed by Furquan Shaikh
parent 43810d9332
commit a2480184e0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/soc/intel/skylake/smihandler.c
View File

@ -140,7 +140,7 @@ static void southbridge_smi_sleep(void)
pmc_disable_smi(SLP_SMI_EN); pmc_disable_smi(SLP_SMI_EN);
/* Figure out SLP_TYP */ /* Figure out SLP_TYP */
reg32 = inl(ACPI_BASE_ADDRESS + PM1_CNT); reg32 = pmc_read_pm1_control();
printk(BIOS_SPEW, "SMI#: SLP = 0x%08x\n", reg32); printk(BIOS_SPEW, "SMI#: SLP = 0x%08x\n", reg32);
slp_typ = acpi_sleep_from_pm1(reg32); slp_typ = acpi_sleep_from_pm1(reg32);
@ -213,8 +213,7 @@ static void southbridge_smi_sleep(void)
* the line above. However, if we entered sleep state S1 and wake * the line above. However, if we entered sleep state S1 and wake
* up again, we will continue to execute code in this function. * up again, we will continue to execute code in this function.
*/ */
reg32 = inl(ACPI_BASE_ADDRESS + PM1_CNT); if (pmc_read_pm1_control() & SCI_EN) {
if (reg32 & SCI_EN) {
/* The OS is not an ACPI OS, so we set the state to S0 */ /* The OS is not an ACPI OS, so we set the state to S0 */
pmc_disable_pm1_control(SLP_EN | SLP_TYP); pmc_disable_pm1_control(SLP_EN | SLP_TYP);
} }