Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57621 )
Change subject: mb/system76/*: Disable IME by CMOS option ......................................................................
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.
The HECI device must be enabled in devicetree for switching modes to function correctly.
Change-Id: I3163dcb0a4af020c2cf6f94f2bb26380f17c253e Signed-off-by: Tim Crawford tcrawford@system76.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/57621 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Jeremy Soller jeremy@system76.com --- M src/mainboard/system76/addw1/cmos.default M src/mainboard/system76/addw1/cmos.layout M src/mainboard/system76/bonw14/cmos.default M src/mainboard/system76/bonw14/cmos.layout M src/mainboard/system76/cml-u/cmos.default M src/mainboard/system76/cml-u/cmos.layout M src/mainboard/system76/darp7/cmos.default M src/mainboard/system76/darp7/cmos.layout M src/mainboard/system76/galp5/cmos.default M src/mainboard/system76/galp5/cmos.layout M src/mainboard/system76/gaze15/cmos.default M src/mainboard/system76/gaze15/cmos.layout M src/mainboard/system76/gaze16/cmos.default M src/mainboard/system76/gaze16/cmos.layout M src/mainboard/system76/gaze16/devicetree.cb M src/mainboard/system76/lemp10/cmos.default M src/mainboard/system76/lemp10/cmos.layout M src/mainboard/system76/lemp9/cmos.default M src/mainboard/system76/lemp9/cmos.layout M src/mainboard/system76/oryp5/cmos.default M src/mainboard/system76/oryp5/cmos.layout M src/mainboard/system76/oryp6/cmos.default M src/mainboard/system76/oryp6/cmos.layout M src/mainboard/system76/oryp8/cmos.default M src/mainboard/system76/oryp8/cmos.layout M src/mainboard/system76/oryp8/devicetree.cb M src/mainboard/system76/whl-u/cmos.default M src/mainboard/system76/whl-u/cmos.layout M src/mainboard/system76/whl-u/devicetree.cb 29 files changed, 85 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Jeremy Soller: Looks good to me, approved
diff --git a/src/mainboard/system76/addw1/cmos.default b/src/mainboard/system76/addw1/cmos.default index 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/addw1/cmos.layout b/src/mainboard/system76/addw1/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/addw1/cmos.layout +++ b/src/mainboard/system76/addw1/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/bonw14/cmos.default b/src/mainboard/system76/bonw14/cmos.default index 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/bonw14/cmos.layout b/src/mainboard/system76/bonw14/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/bonw14/cmos.layout +++ b/src/mainboard/system76/bonw14/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/cml-u/cmos.layout b/src/mainboard/system76/cml-u/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/cml-u/cmos.layout +++ b/src/mainboard/system76/cml-u/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/darp7/cmos.default b/src/mainboard/system76/darp7/cmos.default index 06b0433..62715bc 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 +me_state=Enable diff --git a/src/mainboard/system76/darp7/cmos.layout b/src/mainboard/system76/darp7/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/darp7/cmos.layout +++ b/src/mainboard/system76/darp7/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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 06b0433..62715bc 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 +me_state=Enable diff --git a/src/mainboard/system76/galp5/cmos.layout b/src/mainboard/system76/galp5/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/galp5/cmos.layout +++ b/src/mainboard/system76/galp5/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/gaze15/cmos.layout b/src/mainboard/system76/gaze15/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/gaze15/cmos.layout +++ b/src/mainboard/system76/gaze15/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/gaze16/cmos.default b/src/mainboard/system76/gaze16/cmos.default index 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/gaze16/cmos.layout b/src/mainboard/system76/gaze16/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/gaze16/cmos.layout +++ b/src/mainboard/system76/gaze16/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/gaze16/devicetree.cb b/src/mainboard/system76/gaze16/devicetree.cb index 29eb3e3..380bdc0 100644 --- a/src/mainboard/system76/gaze16/devicetree.cb +++ b/src/mainboard/system76/gaze16/devicetree.cb @@ -125,7 +125,9 @@ device i2c 15 on end end end - device ref heci1 on end + device ref heci1 on + register "HeciEnabled" = "1" + end device ref uart2 on # Debug console register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit" diff --git a/src/mainboard/system76/lemp10/cmos.default b/src/mainboard/system76/lemp10/cmos.default index 06b0433..62715bc 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 +me_state=Enable diff --git a/src/mainboard/system76/lemp10/cmos.layout b/src/mainboard/system76/lemp10/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/lemp10/cmos.layout +++ b/src/mainboard/system76/lemp10/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/lemp9/cmos.layout b/src/mainboard/system76/lemp9/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/lemp9/cmos.layout +++ b/src/mainboard/system76/lemp9/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/cmos.default b/src/mainboard/system76/oryp5/cmos.default index 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/oryp5/cmos.layout b/src/mainboard/system76/oryp5/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/oryp5/cmos.layout +++ b/src/mainboard/system76/oryp5/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/cmos.default b/src/mainboard/system76/oryp6/cmos.default index 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/oryp6/cmos.layout b/src/mainboard/system76/oryp6/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/oryp6/cmos.layout +++ b/src/mainboard/system76/oryp6/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/oryp8/cmos.default b/src/mainboard/system76/oryp8/cmos.default index 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/oryp8/cmos.layout b/src/mainboard/system76/oryp8/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/oryp8/cmos.layout +++ b/src/mainboard/system76/oryp8/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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/oryp8/devicetree.cb b/src/mainboard/system76/oryp8/devicetree.cb index cd2e617..429ad62 100644 --- a/src/mainboard/system76/oryp8/devicetree.cb +++ b/src/mainboard/system76/oryp8/devicetree.cb @@ -160,7 +160,9 @@ device i2c 2c on end end end - device ref heci1 on end + device ref heci1 on + register "HeciEnabled" = "1" + end device ref uart2 on # Debug console register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit" diff --git a/src/mainboard/system76/whl-u/cmos.default b/src/mainboard/system76/whl-u/cmos.default index 06b0433..0d37675 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 +me_state=Disable diff --git a/src/mainboard/system76/whl-u/cmos.layout b/src/mainboard/system76/whl-u/cmos.layout index ac81752..a53c3f4 100644 --- a/src/mainboard/system76/whl-u/cmos.layout +++ b/src/mainboard/system76/whl-u/cmos.layout @@ -12,10 +12,15 @@ 400 8 r 0 century
412 4 e 6 debug_level +416 1 e 2 me_state +417 3 h 0 me_state_counter 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 3e28a16..63a9016 100644 --- a/src/mainboard/system76/whl-u/devicetree.cb +++ b/src/mainboard/system76/whl-u/devicetree.cb @@ -98,7 +98,7 @@ 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