From 9962529199b00396d04a5f2555f4f36223d887a2 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Tue, 20 Apr 2021 11:40:48 -0600
Subject: [PATCH] soc/intel/cnl: Add config to disable IME

Replace hard-coded define with a Kconfig option. Default to true to
preserve current beahvior.

Change-Id: I684470c831bcc03a4d4f78e22367a88dc2e3def6
---
 src/soc/intel/cannonlake/Kconfig | 4 ++++
 src/soc/intel/cannonlake/me.c    | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 259a4a04d3..0a92f5d68f 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -358,4 +358,8 @@ config INTEL_GMA_BCLM_OFFSET
 config INTEL_GMA_BCLM_WIDTH
 	default 32
 
+config DISABLE_ME
+	bool "Disable the IME by setting the HAP bit at run-time"
+	default y
+
 endif
diff --git a/src/soc/intel/cannonlake/me.c b/src/soc/intel/cannonlake/me.c
index 96213d110f..1be3616cf8 100644
--- a/src/soc/intel/cannonlake/me.c
+++ b/src/soc/intel/cannonlake/me.c
@@ -154,8 +154,7 @@ void dump_me_status(void *unused)
 		hfsts6.fields.txt_support ? "YES" : "NO");
 }
 
-#define DISABLE_ME 1
-#if DISABLE_ME
+#if CONFIG(DISABLE_ME)
 
 static void disable_me(void* unused)
 {