soc/intel/icelake: Clear PMCON status bits

This patch ports CB:31902 changes from CNL to ICL.

The prev_sleep_state value was showing 5 even after warm reboot, once the
SUS_PWR_FLR bit is being set. This bit was not being cleared.
Hence clearing the PMCON status bits.

Change-Id: Ia07aa17b4491216a277c36edfe6ed2aa489287c6
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32503
Reviewed-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Subrata Banik 2019-04-29 12:37:27 +05:30
parent d32a493091
commit ff9104eae3
3 changed files with 19 additions and 0 deletions

View File

@ -87,6 +87,8 @@ static void pch_finalize(void)
}
pch_handle_sideband(config);
pmc_clear_pmcon_sts();
}
static void soc_finalize(void *unused)

View File

@ -168,5 +168,8 @@ uint16_t smbus_tco_regs(void);
/* Set the DISB after DRAM init */
void pmc_set_disb(void);
/* Clear PMCON status bits */
void pmc_clear_pmcon_sts(void);
#endif /* !defined(__ACPI__) */
#endif

View File

@ -141,6 +141,20 @@ void pmc_set_disb(void)
write8(addr, disb_val);
}
void pmc_clear_pmcon_sts(void)
{
uint32_t reg_val;
uint8_t *addr;
addr = pmc_mmio_regs();
reg_val = read32(addr + GEN_PMCON_A);
/* Clear SUS_PWR_FLR, GBL_RST_STS, HOST_RST_STS, PWR_FLR bits
* while retaining MS4V write-1-to-clear bit */
reg_val &= ~(MS4V);
write32((addr + GEN_PMCON_A), reg_val);
}
/*
* PMC controller gets hidden from PCI bus
* during FSP-Silicon init call. Hence PWRMBASE