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>
This commit is contained in:
Michael Niewöhner 2020-10-04 14:34:41 +02:00 committed by Patrick Georgi
parent 4b6ff98e84
commit 4e8baf9202
9 changed files with 5 additions and 44 deletions

View File

@ -64,10 +64,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled) if (config->PmTimerDisabled)
pmc_disable_acpi_timer(); pmc_disable_acpi_timer();
/* Disable XTAL shutdown qualification for low power idle. */
if (config->s0ix_enable)
pmc_ignore_xtal_shutdown();
pch_handle_sideband(config); pch_handle_sideband(config);
pmc_clear_pmcon_sts(); pmc_clear_pmcon_sts();

View File

@ -73,17 +73,12 @@ static void pch_finalize(void)
if (config->PmTimerDisabled) if (config->PmTimerDisabled)
pmc_disable_acpi_timer(); pmc_disable_acpi_timer();
if (config->s0ix_enable) { if (config->s0ix_enable && config->cppmvric2_adsposcdis) {
/* Disable XTAL shutdown qualification for low power idle. */
pmc_ignore_xtal_shutdown();
if (config->cppmvric2_adsposcdis) {
/* Enable Audio DSP OSC qualification for S0ix */ /* Enable Audio DSP OSC qualification for S0ix */
reg32 = read32(pmcbase + CPPMVRIC2); reg32 = read32(pmcbase + CPPMVRIC2);
reg32 &= ~ADSPOSCDIS; reg32 &= ~ADSPOSCDIS;
write32(pmcbase + CPPMVRIC2, reg32); write32(pmcbase + CPPMVRIC2, reg32);
} }
}
pch_handle_sideband(config); pch_handle_sideband(config);

View File

@ -232,7 +232,4 @@ uint8_t get_pm_pwr_cyc_dur(uint8_t slp_s4_min_assert, uint8_t slp_s3_min_assert,
/* Disabling ACPI PM timer to ensure switches off TCO and necessary of XTAL OSC shutdown */ /* Disabling ACPI PM timer to ensure switches off TCO and necessary of XTAL OSC shutdown */
void pmc_disable_acpi_timer(void); 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 */ #endif /* SOC_INTEL_COMMON_BLOCK_PMCLIB_H */

View File

@ -708,11 +708,4 @@ void pmc_disable_acpi_timer(void)
setbits8(pmcbase + PCH_PWRM_ACPI_TMR_CTL, ACPI_TIM_DIS); 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 */ #endif /* PMC_LOW_POWER_MODE_PROGRAM */

View File

@ -45,10 +45,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled) if (config->PmTimerDisabled)
pmc_disable_acpi_timer(); pmc_disable_acpi_timer();
/* Disable XTAL shutdown qualification for low power idle. */
if (config->s0ix_enable)
pmc_ignore_xtal_shutdown();
pmc_clear_pmcon_sts(); pmc_clear_pmcon_sts();
} }

View File

@ -70,10 +70,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled) if (config->PmTimerDisabled)
pmc_disable_acpi_timer(); pmc_disable_acpi_timer();
/* Disable XTAL shutdown qualification for low power idle. */
if (config->s0ix_enable)
pmc_ignore_xtal_shutdown();
pch_handle_sideband(config); pch_handle_sideband(config);
pmc_clear_pmcon_sts(); pmc_clear_pmcon_sts();

View File

@ -63,10 +63,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled) if (config->PmTimerDisabled)
pmc_disable_acpi_timer(); pmc_disable_acpi_timer();
/* Disable XTAL shutdown qualification for low power idle. */
if (config->s0ix_enable)
pmc_ignore_xtal_shutdown();
pch_handle_sideband(config); pch_handle_sideband(config);
pmc_clear_pmcon_sts(); pmc_clear_pmcon_sts();

View File

@ -73,10 +73,6 @@ static void pch_finalize_script(struct device *dev)
if (config->PmTimerDisabled) if (config->PmTimerDisabled)
pmc_disable_acpi_timer(); 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 */ /* we should disable Heci1 based on the devicetree policy */
if (config->HeciEnabled == 0) if (config->HeciEnabled == 0)
pch_disable_heci(); pch_disable_heci();

View File

@ -51,10 +51,6 @@ static void pch_finalize(void)
if (config->PmTimerDisabled) if (config->PmTimerDisabled)
pmc_disable_acpi_timer(); pmc_disable_acpi_timer();
/* Disable XTAL shutdown qualification for low power idle. */
if (config->s0ix_enable)
pmc_ignore_xtal_shutdown();
pmc_clear_pmcon_sts(); pmc_clear_pmcon_sts();
} }