Patrick Georgi submitted this change.
soc/intel/*: drop useless XTAL shutdown qualification code
The XTAL shutdown (dis)qualification bit already unconditionally gets
set to 1 by FSP for these platforms, making this code redundant.
Change-Id: I7fa4afb0de2af1814e5b91c152d82d7ead310338
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46016
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/soc/intel/alderlake/finalize.c
M src/soc/intel/cannonlake/finalize.c
M src/soc/intel/common/block/include/intelblocks/pmclib.h
M src/soc/intel/common/block/pmc/pmclib.c
M src/soc/intel/elkhartlake/finalize.c
M src/soc/intel/icelake/finalize.c
M src/soc/intel/jasperlake/finalize.c
M src/soc/intel/skylake/finalize.c
M src/soc/intel/tigerlake/finalize.c
9 files changed, 5 insertions(+), 44 deletions(-)
diff --git a/src/soc/intel/alderlake/finalize.c b/src/soc/intel/alderlake/finalize.c
index 24dbbd6..b18d72b 100644
--- a/src/soc/intel/alderlake/finalize.c
+++ b/src/soc/intel/alderlake/finalize.c
@@ -64,10 +64,6 @@
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pch_handle_sideband(config);
pmc_clear_pmcon_sts();
diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c
index 9eb9cbe..6ef43b9 100644
--- a/src/soc/intel/cannonlake/finalize.c
+++ b/src/soc/intel/cannonlake/finalize.c
@@ -73,16 +73,11 @@
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- if (config->s0ix_enable) {
- /* Disable XTAL shutdown qualification for low power idle. */
- pmc_ignore_xtal_shutdown();
-
- if (config->cppmvric2_adsposcdis) {
- /* Enable Audio DSP OSC qualification for S0ix */
- reg32 = read32(pmcbase + CPPMVRIC2);
- reg32 &= ~ADSPOSCDIS;
- write32(pmcbase + CPPMVRIC2, reg32);
- }
+ if (config->s0ix_enable && config->cppmvric2_adsposcdis) {
+ /* Enable Audio DSP OSC qualification for S0ix */
+ reg32 = read32(pmcbase + CPPMVRIC2);
+ reg32 &= ~ADSPOSCDIS;
+ write32(pmcbase + CPPMVRIC2, reg32);
}
pch_handle_sideband(config);
diff --git a/src/soc/intel/common/block/include/intelblocks/pmclib.h b/src/soc/intel/common/block/include/intelblocks/pmclib.h
index fa063f2..2acc275 100644
--- a/src/soc/intel/common/block/include/intelblocks/pmclib.h
+++ b/src/soc/intel/common/block/include/intelblocks/pmclib.h
@@ -232,7 +232,4 @@
/* Disabling ACPI PM timer to ensure switches off TCO and necessary of XTAL OSC shutdown */
void pmc_disable_acpi_timer(void);
-/* Disable XTAL shutdown qualification for low power idle. */
-void pmc_ignore_xtal_shutdown(void);
-
#endif /* SOC_INTEL_COMMON_BLOCK_PMCLIB_H */
diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c
index 8825bbe..a5dff2d 100644
--- a/src/soc/intel/common/block/pmc/pmclib.c
+++ b/src/soc/intel/common/block/pmc/pmclib.c
@@ -708,11 +708,4 @@
setbits8(pmcbase + PCH_PWRM_ACPI_TMR_CTL, ACPI_TIM_DIS);
}
-
-void pmc_ignore_xtal_shutdown(void)
-{
- uint8_t *pmcbase = pmc_mmio_regs();
-
- setbits8(pmcbase + CPPMVRIC, XTALSDQDIS);
-}
#endif /* PMC_LOW_POWER_MODE_PROGRAM */
diff --git a/src/soc/intel/elkhartlake/finalize.c b/src/soc/intel/elkhartlake/finalize.c
index bae8bcf..a1cfd8b 100644
--- a/src/soc/intel/elkhartlake/finalize.c
+++ b/src/soc/intel/elkhartlake/finalize.c
@@ -45,10 +45,6 @@
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pmc_clear_pmcon_sts();
}
diff --git a/src/soc/intel/icelake/finalize.c b/src/soc/intel/icelake/finalize.c
index 363f579..395bd39 100644
--- a/src/soc/intel/icelake/finalize.c
+++ b/src/soc/intel/icelake/finalize.c
@@ -70,10 +70,6 @@
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pch_handle_sideband(config);
pmc_clear_pmcon_sts();
diff --git a/src/soc/intel/jasperlake/finalize.c b/src/soc/intel/jasperlake/finalize.c
index 1badad3..61b8e33 100644
--- a/src/soc/intel/jasperlake/finalize.c
+++ b/src/soc/intel/jasperlake/finalize.c
@@ -63,10 +63,6 @@
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pch_handle_sideband(config);
pmc_clear_pmcon_sts();
diff --git a/src/soc/intel/skylake/finalize.c b/src/soc/intel/skylake/finalize.c
index ff32189..9edc7a2 100644
--- a/src/soc/intel/skylake/finalize.c
+++ b/src/soc/intel/skylake/finalize.c
@@ -73,10 +73,6 @@
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
/* we should disable Heci1 based on the devicetree policy */
if (config->HeciEnabled == 0)
pch_disable_heci();
diff --git a/src/soc/intel/tigerlake/finalize.c b/src/soc/intel/tigerlake/finalize.c
index 2cc9671..44e6806 100644
--- a/src/soc/intel/tigerlake/finalize.c
+++ b/src/soc/intel/tigerlake/finalize.c
@@ -51,10 +51,6 @@
if (config->PmTimerDisabled)
pmc_disable_acpi_timer();
- /* Disable XTAL shutdown qualification for low power idle. */
- if (config->s0ix_enable)
- pmc_ignore_xtal_shutdown();
-
pmc_clear_pmcon_sts();
}
To view, visit change 46016. To unsubscribe, or for help writing mail filters, visit settings.