From a377b8b7443a038618557d61198485358043b41c Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Mon, 13 Sep 2021 11:49:33 -0600 Subject: [PATCH] mb/system76/*: Disable IME by CMOS option Add CMOS option to set IME mode. Default to "Disable" for CNL and TGL-H, and "Enable" for TGL-U. Not set for KBL, which uses ME_CLEANER. HECI device must be enabled in devicetree for switching modes to function correctly. Change-Id: I9b400c05c38bf76c02c4a2b113bf843b0240a75f Signed-off-by: Tim Crawford --- src/mainboard/system76/addw1/cmos.default | 1 + src/mainboard/system76/addw1/cmos.layout | 4 ++++ src/mainboard/system76/addw1/devicetree.cb | 2 +- src/mainboard/system76/bonw14/cmos.default | 1 + src/mainboard/system76/bonw14/cmos.layout | 4 ++++ src/mainboard/system76/cml-u/cmos.default | 1 + src/mainboard/system76/cml-u/cmos.layout | 4 ++++ src/mainboard/system76/cml-u/devicetree.cb | 2 +- src/mainboard/system76/darp7/cmos.default | 1 + src/mainboard/system76/darp7/cmos.layout | 4 ++++ src/mainboard/system76/galp5/cmos.default | 1 + src/mainboard/system76/galp5/cmos.layout | 4 ++++ src/mainboard/system76/gaze15/cmos.default | 1 + src/mainboard/system76/gaze15/cmos.layout | 4 ++++ src/mainboard/system76/gaze15/devicetree.cb | 2 +- src/mainboard/system76/gaze16/cmos.default | 1 + src/mainboard/system76/gaze16/cmos.layout | 4 ++++ src/mainboard/system76/lemp10/cmos.default | 1 + src/mainboard/system76/lemp10/cmos.layout | 4 ++++ src/mainboard/system76/lemp9/cmos.default | 1 + src/mainboard/system76/lemp9/cmos.layout | 4 ++++ src/mainboard/system76/lemp9/devicetree.cb | 2 +- src/mainboard/system76/oryp5/cmos.default | 1 + src/mainboard/system76/oryp5/cmos.layout | 4 ++++ src/mainboard/system76/oryp5/devicetree.cb | 2 +- src/mainboard/system76/oryp6/cmos.default | 1 + src/mainboard/system76/oryp6/cmos.layout | 4 ++++ src/mainboard/system76/oryp6/devicetree.cb | 2 +- src/mainboard/system76/oryp8/cmos.default | 1 + src/mainboard/system76/oryp8/cmos.layout | 4 ++++ src/mainboard/system76/whl-u/cmos.default | 1 + src/mainboard/system76/whl-u/cmos.layout | 4 ++++ src/mainboard/system76/whl-u/devicetree.cb | 2 +- 33 files changed, 72 insertions(+), 7 deletions(-) diff --git a/src/mainboard/system76/addw1/cmos.default b/src/mainboard/system76/addw1/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/addw1/cmos.default +++ b/src/mainboard/system76/addw1/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/addw1/cmos.layout b/src/mainboard/system76/addw1/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/addw1/cmos.layout +++ b/src/mainboard/system76/addw1/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/addw1/devicetree.cb b/src/mainboard/system76/addw1/devicetree.cb index 576cb415bd..cfea8d7a76 100644 --- a/src/mainboard/system76/addw1/devicetree.cb +++ b/src/mainboard/system76/addw1/devicetree.cb @@ -105,7 +105,7 @@ chip soc/intel/cannonlake device pci 15.1 off end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 - device pci 16.0 off end # Management Engine Interface 1 + device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection diff --git a/src/mainboard/system76/bonw14/cmos.default b/src/mainboard/system76/bonw14/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/bonw14/cmos.default +++ b/src/mainboard/system76/bonw14/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/bonw14/cmos.layout b/src/mainboard/system76/bonw14/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/bonw14/cmos.layout +++ b/src/mainboard/system76/bonw14/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/cml-u/cmos.default b/src/mainboard/system76/cml-u/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/cml-u/cmos.default +++ b/src/mainboard/system76/cml-u/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/cml-u/cmos.layout b/src/mainboard/system76/cml-u/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/cml-u/cmos.layout +++ b/src/mainboard/system76/cml-u/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/cml-u/devicetree.cb b/src/mainboard/system76/cml-u/devicetree.cb index 232d36c589..da86024f50 100644 --- a/src/mainboard/system76/cml-u/devicetree.cb +++ b/src/mainboard/system76/cml-u/devicetree.cb @@ -98,7 +98,7 @@ chip soc/intel/cannonlake device pci 15.1 off end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 - device pci 16.0 off end # Management Engine Interface 1 + device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection diff --git a/src/mainboard/system76/darp7/cmos.default b/src/mainboard/system76/darp7/cmos.default index 06b04332a2..537847bce5 100644 --- a/src/mainboard/system76/darp7/cmos.default +++ b/src/mainboard/system76/darp7/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Enable diff --git a/src/mainboard/system76/darp7/cmos.layout b/src/mainboard/system76/darp7/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/darp7/cmos.layout +++ b/src/mainboard/system76/darp7/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/galp5/cmos.default b/src/mainboard/system76/galp5/cmos.default index 06b04332a2..537847bce5 100644 --- a/src/mainboard/system76/galp5/cmos.default +++ b/src/mainboard/system76/galp5/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Enable diff --git a/src/mainboard/system76/galp5/cmos.layout b/src/mainboard/system76/galp5/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/galp5/cmos.layout +++ b/src/mainboard/system76/galp5/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/gaze15/cmos.default b/src/mainboard/system76/gaze15/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/gaze15/cmos.default +++ b/src/mainboard/system76/gaze15/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/gaze15/cmos.layout b/src/mainboard/system76/gaze15/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/gaze15/cmos.layout +++ b/src/mainboard/system76/gaze15/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/gaze15/devicetree.cb b/src/mainboard/system76/gaze15/devicetree.cb index 46c20fae99..12f89b944c 100644 --- a/src/mainboard/system76/gaze15/devicetree.cb +++ b/src/mainboard/system76/gaze15/devicetree.cb @@ -102,7 +102,7 @@ chip soc/intel/cannonlake device pci 15.1 on end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 - device pci 16.0 off end # Management Engine Interface 1 + device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection diff --git a/src/mainboard/system76/gaze16/cmos.default b/src/mainboard/system76/gaze16/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/gaze16/cmos.default +++ b/src/mainboard/system76/gaze16/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/gaze16/cmos.layout b/src/mainboard/system76/gaze16/cmos.layout index ac817525dd..bb32bb4f62 100644 --- a/src/mainboard/system76/gaze16/cmos.layout +++ b/src/mainboard/system76/gaze16/cmos.layout @@ -12,10 +12,14 @@ entries 400 8 r 0 century 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/lemp10/cmos.default b/src/mainboard/system76/lemp10/cmos.default index 06b04332a2..537847bce5 100644 --- a/src/mainboard/system76/lemp10/cmos.default +++ b/src/mainboard/system76/lemp10/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Enable diff --git a/src/mainboard/system76/lemp10/cmos.layout b/src/mainboard/system76/lemp10/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/lemp10/cmos.layout +++ b/src/mainboard/system76/lemp10/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/lemp9/cmos.default b/src/mainboard/system76/lemp9/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/lemp9/cmos.default +++ b/src/mainboard/system76/lemp9/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/lemp9/cmos.layout b/src/mainboard/system76/lemp9/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/lemp9/cmos.layout +++ b/src/mainboard/system76/lemp9/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/lemp9/devicetree.cb b/src/mainboard/system76/lemp9/devicetree.cb index 5648ca8bb4..00d3708ec1 100644 --- a/src/mainboard/system76/lemp9/devicetree.cb +++ b/src/mainboard/system76/lemp9/devicetree.cb @@ -102,7 +102,7 @@ chip soc/intel/cannonlake device pci 15.1 off end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 - device pci 16.0 off end # Management Engine Interface 1 + device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection diff --git a/src/mainboard/system76/oryp5/cmos.default b/src/mainboard/system76/oryp5/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/oryp5/cmos.default +++ b/src/mainboard/system76/oryp5/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/oryp5/cmos.layout b/src/mainboard/system76/oryp5/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/oryp5/cmos.layout +++ b/src/mainboard/system76/oryp5/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/oryp5/devicetree.cb b/src/mainboard/system76/oryp5/devicetree.cb index 95c8d92395..dca6bba359 100644 --- a/src/mainboard/system76/oryp5/devicetree.cb +++ b/src/mainboard/system76/oryp5/devicetree.cb @@ -115,7 +115,7 @@ chip soc/intel/cannonlake device pci 15.1 on end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 - device pci 16.0 off end # Management Engine Interface 1 + device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection diff --git a/src/mainboard/system76/oryp6/cmos.default b/src/mainboard/system76/oryp6/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/oryp6/cmos.default +++ b/src/mainboard/system76/oryp6/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/oryp6/cmos.layout b/src/mainboard/system76/oryp6/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/oryp6/cmos.layout +++ b/src/mainboard/system76/oryp6/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/oryp6/devicetree.cb b/src/mainboard/system76/oryp6/devicetree.cb index 0de6155928..71a0a4688a 100644 --- a/src/mainboard/system76/oryp6/devicetree.cb +++ b/src/mainboard/system76/oryp6/devicetree.cb @@ -117,7 +117,7 @@ chip soc/intel/cannonlake device pci 15.1 off end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 - device pci 16.0 off end # Management Engine Interface 1 + device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection diff --git a/src/mainboard/system76/oryp8/cmos.default b/src/mainboard/system76/oryp8/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/oryp8/cmos.default +++ b/src/mainboard/system76/oryp8/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/oryp8/cmos.layout b/src/mainboard/system76/oryp8/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/oryp8/cmos.layout +++ b/src/mainboard/system76/oryp8/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/whl-u/cmos.default b/src/mainboard/system76/whl-u/cmos.default index 06b04332a2..f74e93c201 100644 --- a/src/mainboard/system76/whl-u/cmos.default +++ b/src/mainboard/system76/whl-u/cmos.default @@ -1,2 +1,3 @@ boot_option=Fallback debug_level=Debug +ime_mode=Disable diff --git a/src/mainboard/system76/whl-u/cmos.layout b/src/mainboard/system76/whl-u/cmos.layout index c886443348..8443309df6 100644 --- a/src/mainboard/system76/whl-u/cmos.layout +++ b/src/mainboard/system76/whl-u/cmos.layout @@ -13,10 +13,14 @@ entries #409 2 e 7 power_on_after_fail 412 4 e 6 debug_level +416 1 e 2 ime_mode 984 16 h 0 check_sum enumerations +2 0 Enable +2 1 Disable + 4 0 Fallback 4 1 Normal diff --git a/src/mainboard/system76/whl-u/devicetree.cb b/src/mainboard/system76/whl-u/devicetree.cb index 3e28a16c03..63a9016b13 100644 --- a/src/mainboard/system76/whl-u/devicetree.cb +++ b/src/mainboard/system76/whl-u/devicetree.cb @@ -98,7 +98,7 @@ chip soc/intel/cannonlake device pci 15.1 off end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 - device pci 16.0 off end # Management Engine Interface 1 + device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection