9 files changed, 25 insertions, 36 deletions
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index d5f8451272..b841291086 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -409,7 +409,7 @@ static void pch_cg_init(struct device *dev)
 
 static void pch_set_acpi_mode(void)
 {
-	if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
+	if (!acpi_is_wakeup_s3()) {
 		apm_control(APM_CNT_ACPI_DISABLE);
 	}
 }
diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c
index cc004191ef..84e22a2585 100644
--- a/src/soc/intel/common/block/pmc/pmc.c
+++ b/src/soc/intel/common/block/pmc/pmc.c
@@ -93,7 +93,7 @@ static void pch_pmc_read_resources(struct device *dev)
 
 void pmc_set_acpi_mode(void)
 {
-	if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
+	if (!acpi_is_wakeup_s3()) {
 		apm_control(APM_CNT_ACPI_DISABLE);
 	}
 }
diff --git a/src/soc/intel/denverton_ns/pmc.c b/src/soc/intel/denverton_ns/pmc.c
index 3c592fe05f..64121449f5 100644
--- a/src/soc/intel/denverton_ns/pmc.c
+++ b/src/soc/intel/denverton_ns/pmc.c
@@ -24,7 +24,7 @@ static void pch_power_options(struct device *dev) { /* TODO */ }
 
 static void pch_set_acpi_mode(void)
 {
-	if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
+	if (!acpi_is_wakeup_s3()) {
 		apm_control(APM_CNT_ACPI_DISABLE);
 	}
 }
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 200463268f..038bb37c61 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -404,7 +404,7 @@ static void enable_clock_gating(struct device *dev)
 
 static void pch_set_acpi_mode(void)
 {
-	if (!acpi_is_wakeup_s3() && CONFIG(HAVE_SMI_HANDLER)) {
+	if (!acpi_is_wakeup_s3()) {
 		apm_control(APM_CNT_ACPI_DISABLE);
 	}
 }
@@ -822,11 +822,9 @@ static void lpc_final(struct device *dev)
 	spi_finalize_ops();
 
 	/* Call SMM finalize() handlers before resume */
-	if (CONFIG(HAVE_SMI_HANDLER)) {
-		if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
-		    acpi_is_wakeup_s3()) {
-			apm_control(APM_CNT_FINALIZE);
-		}
+	if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
+	    acpi_is_wakeup_s3()) {
+		apm_control(APM_CNT_FINALIZE);
 	}
 }
 
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 9e1efac236..901c97c279 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -314,12 +314,10 @@ static void enable_clock_gating(void)
 
 static void i82801gx_set_acpi_mode(struct device *dev)
 {
-	if (CONFIG(HAVE_SMI_HANDLER)) {
-		if (!acpi_is_wakeup_s3()) {
-			apm_control(APM_CNT_ACPI_DISABLE);
-		} else {
-			apm_control(APM_CNT_ACPI_ENABLE);
-		}
+	if (!acpi_is_wakeup_s3()) {
+		apm_control(APM_CNT_ACPI_DISABLE);
+	} else {
+		apm_control(APM_CNT_ACPI_ENABLE);
 	}
 }
 
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 2966b78b5e..27a7c959c9 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -343,12 +343,10 @@ static void enable_clock_gating(void)
 
 static void i82801ix_set_acpi_mode(struct device *dev)
 {
-	if (CONFIG(HAVE_SMI_HANDLER)) {
-		if (!acpi_is_wakeup_s3()) {
-			apm_control(APM_CNT_ACPI_DISABLE);
-		} else {
-			apm_control(APM_CNT_ACPI_ENABLE);
-		}
+	if (!acpi_is_wakeup_s3()) {
+		apm_control(APM_CNT_ACPI_DISABLE);
+	} else {
+		apm_control(APM_CNT_ACPI_ENABLE);
 	}
 }
 
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index d12e061226..edd1430ab3 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -347,12 +347,10 @@ static void enable_clock_gating(void)
 
 static void i82801jx_set_acpi_mode(struct device *dev)
 {
-	if (CONFIG(HAVE_SMI_HANDLER)) {
-		if (!acpi_is_wakeup_s3()) {
-			apm_control(APM_CNT_ACPI_DISABLE);
-		} else {
-			apm_control(APM_CNT_ACPI_ENABLE);
-		}
+	if (!acpi_is_wakeup_s3()) {
+		apm_control(APM_CNT_ACPI_DISABLE);
+	} else {
+		apm_control(APM_CNT_ACPI_ENABLE);
 	}
 }
 
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 2362649ae6..4f86e9b80b 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -408,8 +408,8 @@ static void enable_clock_gating(struct device *dev)
 
 static void pch_set_acpi_mode(void)
 {
-	if (!acpi_is_wakeup_s3() && CONFIG(HAVE_SMI_HANDLER)) {
-		apm_control(APM_CNT_ACPI_DISABLE); // Disable ACPI mode
+	if (!acpi_is_wakeup_s3()) {
+		apm_control(APM_CNT_ACPI_DISABLE);
 	}
 }
 
@@ -722,11 +722,9 @@ static void lpc_final(struct device *dev)
 	spi_finalize_ops();
 
 	/* Call SMM finalize() handlers before resume */
-	if (CONFIG(HAVE_SMI_HANDLER)) {
-		if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
-		    acpi_is_wakeup_s3()) {
-			apm_control(APM_CNT_FINALIZE);
-		}
+	if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
+	    acpi_is_wakeup_s3()) {
+		apm_control(APM_CNT_FINALIZE);
 	}
 }
 
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index bf03125a8a..6cdbc78212 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -473,9 +473,8 @@ static void enable_lp_clock_gating(struct device *dev)
 
 static void pch_set_acpi_mode(void)
 {
-	if (CONFIG(HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
+	if (!acpi_is_wakeup_s3())
 		apm_control(APM_CNT_ACPI_DISABLE);
-	}
 }
 
 static void pch_disable_smm_only_flashing(struct device *dev)