summaryrefslogtreecommitdiff
path: root/config/coreboot/default/patches/0039-ec-lenovo-h8-Rework-invalid-temperature-reporting.patch
blob: 3e73a17d67bceefa546551f6e19a564afd9dea93 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
From aedef7382e27d1494768997a18e4d9351cb44cd6 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Sat, 12 Jul 2025 17:28:13 -0500
Subject: [PATCH 39/43] ec/lenovo/h8: Rework invalid temperature reporting

As far back as the x201, Lenovo's EC ACPI has treated 128 as an invalid
value, and returned a corrected value when it is reported/read from EC
RAM. Drop the ME workaround, which most H8-equipped boards select, in
favor of Lenovo's logic, since both accomplish the same result.

Change-Id: Icdc91e439ec30c8263de5810a13e75f7595472a5
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
---
 src/ec/lenovo/h8/acpi/thermal.asl             | 25 ++++++-------------
 .../lenovo/haswell/acpi/platform.asl          |  3 ---
 src/mainboard/lenovo/haswell/dsdt.asl         |  1 -
 src/mainboard/lenovo/l520/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/l520/dsdt.asl            |  1 -
 src/mainboard/lenovo/s230u/dsdt.asl           |  1 -
 src/mainboard/lenovo/t400/dsdt.asl            |  1 -
 src/mainboard/lenovo/t410/dsdt.asl            |  1 -
 src/mainboard/lenovo/t420/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/t420/dsdt.asl            |  1 -
 src/mainboard/lenovo/t420s/acpi/platform.asl  |  4 ---
 src/mainboard/lenovo/t420s/dsdt.asl           |  1 -
 src/mainboard/lenovo/t430/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/t430/dsdt.asl            |  1 -
 src/mainboard/lenovo/t430s/acpi/platform.asl  |  4 ---
 src/mainboard/lenovo/t430s/dsdt.asl           |  1 -
 src/mainboard/lenovo/t520/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/t520/dsdt.asl            |  1 -
 src/mainboard/lenovo/t530/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/t530/dsdt.asl            |  1 -
 src/mainboard/lenovo/x131e/acpi/platform.asl  |  4 ---
 src/mainboard/lenovo/x131e/dsdt.asl           |  1 -
 .../lenovo/x1_carbon_gen1/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl  |  1 -
 src/mainboard/lenovo/x201/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/x201/dsdt.asl            |  1 -
 src/mainboard/lenovo/x220/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/x220/dsdt.asl            |  1 -
 src/mainboard/lenovo/x230/acpi/platform.asl   |  4 ---
 src/mainboard/lenovo/x230/dsdt.asl            |  1 -
 30 files changed, 8 insertions(+), 84 deletions(-)

diff --git a/src/ec/lenovo/h8/acpi/thermal.asl b/src/ec/lenovo/h8/acpi/thermal.asl
index bf9b653e12..54f4f922bd 100644
--- a/src/ec/lenovo/h8/acpi/thermal.asl
+++ b/src/ec/lenovo/h8/acpi/thermal.asl
@@ -4,11 +4,6 @@
 
 Scope(\_TZ)
 {
-#if defined(EC_LENOVO_H8_ME_WORKAROUND)
-	Name (MEB1, 0)
-	Name (MEB2, 0)
-#endif
-
 	Method(C2K, 1, NotSerialized)
 	{
 		Local0 = Arg0 * 10
@@ -71,14 +66,12 @@ External (\PPKG, MethodObj)
 		}
 
 		Method(_TMP) {
-#if defined(EC_LENOVO_H8_ME_WORKAROUND)
-			/* Avoid tripping alarm if ME isn't booted at all yet */
-			If (!MEB1 && \_SB.PCI0.LPCB.EC.TMP0 == 128) {
+			Local0 = \_SB.PCI0.LPCB.EC.TMP0
+			/* Avoid tripping alarm if invalid value reported */
+			If (Local0 == 128) {
 				Return (C2K(40))
 			}
-			MEB1 = 1
-#endif
-			Return (C2K(\_SB.PCI0.LPCB.EC.TMP0))
+			Return (C2K(Local0))
 		}
 
 		Method (_AC0) {
@@ -158,14 +151,12 @@ External (\PPKG, MethodObj)
 		}
 
 		Method(_TMP) {
-#if defined(EC_LENOVO_H8_ME_WORKAROUND)
-			/* Avoid tripping alarm if ME isn't booted at all yet */
-			If (!MEB2 && \_SB.PCI0.LPCB.EC.TMP1 == 128) {
+			Local0 = \_SB.PCI0.LPCB.EC.TMP1
+			/* Avoid tripping alarm if invalid value reported */
+			If (Local0 == 128) {
 				Return (C2K(40))
 			}
-			MEB2 = 1
-#endif
-			Return (C2K(\_SB.PCI0.LPCB.EC.TMP1))
+			Return (C2K(Local0))
 		}
 	}
 #endif
diff --git a/src/mainboard/lenovo/haswell/acpi/platform.asl b/src/mainboard/lenovo/haswell/acpi/platform.asl
index f5a4df75f4..42587fd78a 100644
--- a/src/mainboard/lenovo/haswell/acpi/platform.asl
+++ b/src/mainboard/lenovo/haswell/acpi/platform.asl
@@ -2,9 +2,6 @@
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
 	Return(Package(){0,0})
 }
 
diff --git a/src/mainboard/lenovo/haswell/dsdt.asl b/src/mainboard/lenovo/haswell/dsdt.asl
index a7afeee766..708f524b08 100644
--- a/src/mainboard/lenovo/haswell/dsdt.asl
+++ b/src/mainboard/lenovo/haswell/dsdt.asl
@@ -2,7 +2,6 @@
 
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 #define THINKPAD_EC_GPE 17
 
 #include <acpi/acpi.h>
diff --git a/src/mainboard/lenovo/l520/acpi/platform.asl b/src/mainboard/lenovo/l520/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/l520/acpi/platform.asl
+++ b/src/mainboard/lenovo/l520/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/l520/dsdt.asl b/src/mainboard/lenovo/l520/dsdt.asl
index 06cffcf8a2..18e9f25a9a 100644
--- a/src/mainboard/lenovo/l520/dsdt.asl
+++ b/src/mainboard/lenovo/l520/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 22
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/s230u/dsdt.asl b/src/mainboard/lenovo/s230u/dsdt.asl
index 861309b8e9..47e91fdb30 100644
--- a/src/mainboard/lenovo/s230u/dsdt.asl
+++ b/src/mainboard/lenovo/s230u/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 23
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t400/dsdt.asl b/src/mainboard/lenovo/t400/dsdt.asl
index f9c682f9dc..cb824e42da 100644
--- a/src/mainboard/lenovo/t400/dsdt.asl
+++ b/src/mainboard/lenovo/t400/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t410/dsdt.asl b/src/mainboard/lenovo/t410/dsdt.asl
index 42a10e605c..e2571f60c7 100644
--- a/src/mainboard/lenovo/t410/dsdt.asl
+++ b/src/mainboard/lenovo/t410/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t420/acpi/platform.asl b/src/mainboard/lenovo/t420/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/t420/acpi/platform.asl
+++ b/src/mainboard/lenovo/t420/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/t420/dsdt.asl b/src/mainboard/lenovo/t420/dsdt.asl
index 33b6f80b17..1134782675 100644
--- a/src/mainboard/lenovo/t420/dsdt.asl
+++ b/src/mainboard/lenovo/t420/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t420s/acpi/platform.asl b/src/mainboard/lenovo/t420s/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/t420s/acpi/platform.asl
+++ b/src/mainboard/lenovo/t420s/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/t420s/dsdt.asl b/src/mainboard/lenovo/t420s/dsdt.asl
index 33b6f80b17..1134782675 100644
--- a/src/mainboard/lenovo/t420s/dsdt.asl
+++ b/src/mainboard/lenovo/t420s/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t430/acpi/platform.asl b/src/mainboard/lenovo/t430/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/t430/acpi/platform.asl
+++ b/src/mainboard/lenovo/t430/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/t430/dsdt.asl b/src/mainboard/lenovo/t430/dsdt.asl
index c19e75ee82..795f9a1ee9 100644
--- a/src/mainboard/lenovo/t430/dsdt.asl
+++ b/src/mainboard/lenovo/t430/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t430s/acpi/platform.asl b/src/mainboard/lenovo/t430s/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/t430s/acpi/platform.asl
+++ b/src/mainboard/lenovo/t430s/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/t430s/dsdt.asl b/src/mainboard/lenovo/t430s/dsdt.asl
index 33b6f80b17..1134782675 100644
--- a/src/mainboard/lenovo/t430s/dsdt.asl
+++ b/src/mainboard/lenovo/t430s/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t520/acpi/platform.asl b/src/mainboard/lenovo/t520/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/t520/acpi/platform.asl
+++ b/src/mainboard/lenovo/t520/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl
index 33b6f80b17..1134782675 100644
--- a/src/mainboard/lenovo/t520/dsdt.asl
+++ b/src/mainboard/lenovo/t520/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/t530/acpi/platform.asl b/src/mainboard/lenovo/t530/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/t530/acpi/platform.asl
+++ b/src/mainboard/lenovo/t530/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl
index 33b6f80b17..1134782675 100644
--- a/src/mainboard/lenovo/t530/dsdt.asl
+++ b/src/mainboard/lenovo/t530/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/x131e/acpi/platform.asl b/src/mainboard/lenovo/x131e/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/x131e/acpi/platform.asl
+++ b/src/mainboard/lenovo/x131e/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/x131e/dsdt.asl b/src/mainboard/lenovo/x131e/dsdt.asl
index 34391416f3..dc9878030e 100644
--- a/src/mainboard/lenovo/x131e/dsdt.asl
+++ b/src/mainboard/lenovo/x131e/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 22
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/acpi/platform.asl b/src/mainboard/lenovo/x1_carbon_gen1/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/acpi/platform.asl
+++ b/src/mainboard/lenovo/x1_carbon_gen1/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
index 6838b5e9a6..18a47960f4 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
+++ b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 #define EC_LENOVO_H8_ALT_FN_F2F3_LAYOUT 1
 
 #include <acpi/acpi.h>
diff --git a/src/mainboard/lenovo/x201/acpi/platform.asl b/src/mainboard/lenovo/x201/acpi/platform.asl
index f17adafc88..a238248886 100644
--- a/src/mainboard/lenovo/x201/acpi/platform.asl
+++ b/src/mainboard/lenovo/x201/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl
index 42a10e605c..e2571f60c7 100644
--- a/src/mainboard/lenovo/x201/dsdt.asl
+++ b/src/mainboard/lenovo/x201/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/x220/acpi/platform.asl b/src/mainboard/lenovo/x220/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/x220/acpi/platform.asl
+++ b/src/mainboard/lenovo/x220/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/x220/dsdt.asl b/src/mainboard/lenovo/x220/dsdt.asl
index 33b6f80b17..1134782675 100644
--- a/src/mainboard/lenovo/x220/dsdt.asl
+++ b/src/mainboard/lenovo/x220/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
diff --git a/src/mainboard/lenovo/x230/acpi/platform.asl b/src/mainboard/lenovo/x230/acpi/platform.asl
index c4becafc2a..9dee90edc3 100644
--- a/src/mainboard/lenovo/x230/acpi/platform.asl
+++ b/src/mainboard/lenovo/x230/acpi/platform.asl
@@ -15,10 +15,6 @@ Method(_PTS,1)
 
 Method(_WAK,1)
 {
-	/* ME may not be up yet. */
-	\_TZ.MEB1 = 0
-	\_TZ.MEB2 = 0
-
 	/* Wake the HKEY to init BT/WWAN */
 	\_SB.PCI0.LPCB.EC.HKEY.WAKE (Arg0)
 
diff --git a/src/mainboard/lenovo/x230/dsdt.asl b/src/mainboard/lenovo/x230/dsdt.asl
index 33b6f80b17..1134782675 100644
--- a/src/mainboard/lenovo/x230/dsdt.asl
+++ b/src/mainboard/lenovo/x230/dsdt.asl
@@ -3,7 +3,6 @@
 #define THINKPAD_EC_GPE 17
 #define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
 #define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
-#define EC_LENOVO_H8_ME_WORKAROUND 1
 
 #include <acpi/acpi.h>
 DefinitionBlock(
-- 
2.39.5