diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/southbridge/intel/lynxpoint/lpc.c | 6 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/smi.c | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index ca850c0ae6..437db812af 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -967,6 +967,11 @@ static unsigned long southbridge_write_acpi_tables(struct device *device, return current; } +static void lpc_final(struct device *dev) +{ + if (acpi_is_wakeup_s3() || IS_ENABLED(CONFIG_INTEL_CHIPSET_LOCKDOWN)) + outb(APM_CNT_FINALIZE, APM_CNT); +} static struct pci_operations pci_ops = { .set_subsystem = set_subsystem, @@ -981,6 +986,7 @@ static struct device_operations device_ops = { .acpi_name = lpc_acpi_name, .write_acpi_tables = southbridge_write_acpi_tables, .init = lpc_init, + .final = lpc_final, .enable = pch_lpc_enable, .scan_bus = scan_lpc_bus, .ops_pci = &pci_ops, diff --git a/src/southbridge/intel/lynxpoint/smi.c b/src/southbridge/intel/lynxpoint/smi.c index 5dab05c5cf..cf70d21ad9 100644 --- a/src/southbridge/intel/lynxpoint/smi.c +++ b/src/southbridge/intel/lynxpoint/smi.c @@ -118,17 +118,3 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1) "d" (APM_CNT) ); } - -/* - * Finalize system before payload boot if INTEL_CHIPSET_LOCKDOWN=y - */ -#if IS_ENABLED(CONFIG_INTEL_CHIPSET_LOCKDOWN) - -static void finalize_boot(void *unused) -{ - outb(APM_CNT_FINALIZE, APM_CNT); -} - -BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, finalize_boot, NULL); - -#endif |