diff options
| -rw-r--r-- | src/soc/intel/alderlake/pmc.c | 17 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/pmc.c | 17 | ||||
| -rw-r--r-- | src/soc/intel/common/block/pmc/pmc.c | 18 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/pmc.c | 17 | ||||
| -rw-r--r-- | src/soc/intel/icelake/pmc.c | 9 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/pmc.c | 17 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/pmc.c | 17 |
7 files changed, 112 insertions, 0 deletions
diff --git a/src/soc/intel/alderlake/pmc.c b/src/soc/intel/alderlake/pmc.c index 0d523686d8..cce095ab22 100644 --- a/src/soc/intel/alderlake/pmc.c +++ b/src/soc/intel/alderlake/pmc.c @@ -171,6 +171,22 @@ static void pm1_enable_pwrbtn_smi(void *unused) BOOT_STATE_INIT_ENTRY(BS_DEV_INIT_CHIPS, BS_ON_EXIT, pm1_enable_pwrbtn_smi, NULL); +/* + * `pmc_final` function is native implementation of equivalent events performed by + * each FSP NotifyPhase() API invocations. + * + * + * Clear PMCON status bits (Global Reset/Power Failure/Host Reset Status bits) + * + * Perform the PMCON status bit clear operation from `.final` + * to cover any such chances where later boot stage requested a global + * reset and PMCON status bit remains set. + */ +static void pmc_final(struct device *dev) +{ + pmc_clear_pmcon_sts(); +} + struct device_operations pmc_ops = { .read_resources = soc_pmc_read_resources, .set_resources = noop_set_resources, @@ -180,4 +196,5 @@ struct device_operations pmc_ops = { .acpi_fill_ssdt = soc_pmc_fill_ssdt, #endif .scan_bus = scan_static_bus, + .final = pmc_final, }; diff --git a/src/soc/intel/cannonlake/pmc.c b/src/soc/intel/cannonlake/pmc.c index 4c88685d04..b0febd072b 100644 --- a/src/soc/intel/cannonlake/pmc.c +++ b/src/soc/intel/cannonlake/pmc.c @@ -135,6 +135,22 @@ static void pmc_fill_ssdt(const struct device *dev) generate_acpi_power_engine(); } +/* + * `pmc_final` function is native implementation of equivalent events performed by + * each FSP NotifyPhase() API invocations. + * + * + * Clear PMCON status bits (Global Reset/Power Failure/Host Reset Status bits) + * + * Perform the PMCON status bit clear operation from `.final` + * to cover any such chances where later boot stage requested a global + * reset and PMCON status bit remains set. + */ +static void pmc_final(struct device *dev) +{ + pmc_clear_pmcon_sts(); +} + struct device_operations pmc_ops = { .read_resources = soc_pmc_read_resources, .set_resources = noop_set_resources, @@ -144,4 +160,5 @@ struct device_operations pmc_ops = { .acpi_fill_ssdt = pmc_fill_ssdt, #endif .scan_bus = scan_static_bus, + .final = pmc_final, }; diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index 8598cb5d77..333bace04f 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -8,6 +8,7 @@ #include <intelblocks/acpi.h> #include <intelblocks/pmc.h> #include <soc/pci_devs.h> +#include <soc/pm.h> static void pch_pmc_add_new_resource(struct device *dev, uint8_t offset, uintptr_t base, size_t size, @@ -80,6 +81,22 @@ static void pmc_fill_ssdt(const struct device *dev) generate_acpi_power_engine(); } +/* + * `pmc_final` function is native implementation of equivalent events performed by + * each FSP NotifyPhase() API invocations. + * + * + * Clear PMCON status bits (Global Reset/Power Failure/Host Reset Status bits) + * + * Perform the PMCON status bit clear operation from `.final` + * to cover any such chances where later boot stage requested a global + * reset and PMCON status bit remains set. + */ +static void pmc_final(struct device *dev) +{ + pmc_clear_pmcon_sts(); +} + static struct device_operations device_ops = { .read_resources = pch_pmc_read_resources, .set_resources = pci_dev_set_resources, @@ -90,6 +107,7 @@ static struct device_operations device_ops = { #if CONFIG(HAVE_ACPI_TABLES) .acpi_fill_ssdt = pmc_fill_ssdt, #endif + .final = pmc_final, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/elkhartlake/pmc.c b/src/soc/intel/elkhartlake/pmc.c index 53193ea11e..cf736dd2ca 100644 --- a/src/soc/intel/elkhartlake/pmc.c +++ b/src/soc/intel/elkhartlake/pmc.c @@ -109,6 +109,22 @@ static void pmc_fill_ssdt(const struct device *dev) generate_acpi_power_engine(); } +/* + * `pmc_final` function is native implementation of equivalent events performed by + * each FSP NotifyPhase() API invocations. + * + * + * Clear PMCON status bits (Global Reset/Power Failure/Host Reset Status bits) + * + * Perform the PMCON status bit clear operation from `.final` + * to cover any such chances where later boot stage requested a global + * reset and PMCON status bit remains set. + */ +static void pmc_final(struct device *dev) +{ + pmc_clear_pmcon_sts(); +} + struct device_operations pmc_ops = { .read_resources = soc_pmc_read_resources, .set_resources = noop_set_resources, @@ -117,4 +133,5 @@ struct device_operations pmc_ops = { #if CONFIG(HAVE_ACPI_TABLES) .acpi_fill_ssdt = pmc_fill_ssdt, #endif + .final = pmc_final, }; diff --git a/src/soc/intel/icelake/pmc.c b/src/soc/intel/icelake/pmc.c index fd91cde57d..c0096007be 100644 --- a/src/soc/intel/icelake/pmc.c +++ b/src/soc/intel/icelake/pmc.c @@ -75,6 +75,15 @@ static void pmc_init(void *unused) */ if (!CONFIG(USE_PM_ACPI_TIMER)) setbits8(pmc_mmio_regs() + PCH_PWRM_ACPI_TMR_CTL, ACPI_TIM_DIS); + + /* + * Clear PMCON status bits (Global Reset/Power Failure/Host Reset Status bits) + * + * Perform the PMCON status bit clear operation from `.final` + * to cover any such chances where later boot stage requested a global + * reset and PMCON status bit remains set. + */ + pmc_clear_pmcon_sts(); } /* diff --git a/src/soc/intel/jasperlake/pmc.c b/src/soc/intel/jasperlake/pmc.c index 47c3bb104b..5ad692b73f 100644 --- a/src/soc/intel/jasperlake/pmc.c +++ b/src/soc/intel/jasperlake/pmc.c @@ -117,6 +117,22 @@ static void pmc_fill_ssdt(const struct device *dev) generate_acpi_power_engine(); } +/* + * `pmc_final` function is native implementation of equivalent events performed by + * each FSP NotifyPhase() API invocations. + * + * + * Clear PMCON status bits (Global Reset/Power Failure/Host Reset Status bits) + * + * Perform the PMCON status bit clear operation from `.final` + * to cover any such chances where later boot stage requested a global + * reset and PMCON status bit remains set. + */ +static void pmc_final(struct device *dev) +{ + pmc_clear_pmcon_sts(); +} + struct device_operations pmc_ops = { .read_resources = soc_pmc_read_resources, .set_resources = noop_set_resources, @@ -125,4 +141,5 @@ struct device_operations pmc_ops = { #if CONFIG(HAVE_ACPI_TABLES) .acpi_fill_ssdt = pmc_fill_ssdt, #endif + .final = pmc_final, }; diff --git a/src/soc/intel/tigerlake/pmc.c b/src/soc/intel/tigerlake/pmc.c index 8788170368..937943a029 100644 --- a/src/soc/intel/tigerlake/pmc.c +++ b/src/soc/intel/tigerlake/pmc.c @@ -170,6 +170,22 @@ static void pm1_enable_pwrbtn_smi(void *unused) BOOT_STATE_INIT_ENTRY(BS_DEV_INIT_CHIPS, BS_ON_EXIT, pm1_enable_pwrbtn_smi, NULL); +/* + * `pmc_final` function is native implementation of equivalent events performed by + * each FSP NotifyPhase() API invocations. + * + * + * Clear PMCON status bits (Global Reset/Power Failure/Host Reset Status bits) + * + * Perform the PMCON status bit clear operation from `.final` + * to cover any such chances where later boot stage requested a global + * reset and PMCON status bit remains set. + */ +static void pmc_final(struct device *dev) +{ + pmc_clear_pmcon_sts(); +} + struct device_operations pmc_ops = { .read_resources = soc_pmc_read_resources, .set_resources = noop_set_resources, @@ -179,4 +195,5 @@ struct device_operations pmc_ops = { .acpi_fill_ssdt = soc_pmc_fill_ssdt, #endif .scan_bus = scan_static_bus, + .final = pmc_final, }; |