Skip to content

Commit 907486c

Browse files
cyringcyring
committed
Thermal Threshold in 2 indicators to monitor IA32_THERM_INTERRUPT
1 parent 4ce2181 commit 907486c

File tree

8 files changed

+72
-111
lines changed

8 files changed

+72
-111
lines changed

‎corefreq-cli-rsc-en.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,8 +1680,10 @@
16801680
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_EN " PROCHOT Log "
16811681
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_EN " Critical Temp. "
16821682
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_EN " Critical Log "
1683-
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_EN " Therm Threshold"
1684-
#define RSC_BOX_EVENT_THRESHOLD_LOG_CODE_EN " Threshold Log "
1683+
#define RSC_BOX_EVENT_THOLD1_STS_CODE_EN " Th. Threshold1 "
1684+
#define RSC_BOX_EVENT_THOLD2_STS_CODE_EN " Th. Threshold2 "
1685+
#define RSC_BOX_EVENT_THOLD1_LOG_CODE_EN " Threshold1 Log "
1686+
#define RSC_BOX_EVENT_THOLD2_LOG_CODE_EN " Threshold2 Log "
16851687
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_EN " Power Limit. "
16861688
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_EN " Current Limit. "
16871689
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_EN " XDomain Limit. "

‎corefreq-cli-rsc-fr.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,9 +1167,11 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
11671167
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_FR " PROCHOT Log "
11681168
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_FR " Temp. critique "
11691169
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_FR " Log critique "
1170-
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_FR " Seuil thermique"
1171-
#define RSC_BOX_EVENT_THRESHOLD_LOG_CODE_FR " Log seuil therm"
1172-
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Puissance limit"
1170+
#define RSC_BOX_EVENT_THOLD1_STS_CODE_FR " Seuil1 therm. "
1171+
#define RSC_BOX_EVENT_THOLD2_STS_CODE_FR " Seuil2 therm. "
1172+
#define RSC_BOX_EVENT_THOLD1_LOG_CODE_FR " Log seuil1 th. "
1173+
#define RSC_BOX_EVENT_THOLD2_LOG_CODE_FR " Log seuil2 th. "
1174+
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Puissance max. "
11731175
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_FR " Courant limit""\xa9"" "
11741176
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_FR " Interdomaine "
11751177
#define RSC_BOX_EVENT_RESIDENCY_CODE_FR " R""\xa9""sidence "

‎corefreq-cli-rsc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,8 +1608,10 @@ RESOURCE_ST Resource[] = {
16081608
LDT(RSC_BOX_EVENT_PROCHOT_LOG),
16091609
LDT(RSC_BOX_EVENT_CRITICAL_TMP),
16101610
LDT(RSC_BOX_EVENT_CRITICAL_LOG),
1611-
LDT(RSC_BOX_EVENT_THERM_THRESHOLD),
1612-
LDT(RSC_BOX_EVENT_THRESHOLD_LOG),
1611+
LDT(RSC_BOX_EVENT_THOLD1_STS),
1612+
LDT(RSC_BOX_EVENT_THOLD2_STS),
1613+
LDT(RSC_BOX_EVENT_THOLD1_LOG),
1614+
LDT(RSC_BOX_EVENT_THOLD2_LOG),
16131615
LDT(RSC_BOX_EVENT_POWER_LIMIT),
16141616
LDT(RSC_BOX_EVENT_CURRENT_LIMIT),
16151617
LDT(RSC_BOX_EVENT_CROSS_DOM_LIMIT),

‎corefreq-cli-rsc.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,8 +1408,10 @@ enum {
14081408
RSC_BOX_EVENT_PROCHOT_LOG,
14091409
RSC_BOX_EVENT_CRITICAL_TMP,
14101410
RSC_BOX_EVENT_CRITICAL_LOG,
1411-
RSC_BOX_EVENT_THERM_THRESHOLD,
1412-
RSC_BOX_EVENT_THRESHOLD_LOG,
1411+
RSC_BOX_EVENT_THOLD1_STS,
1412+
RSC_BOX_EVENT_THOLD2_STS,
1413+
RSC_BOX_EVENT_THOLD1_LOG,
1414+
RSC_BOX_EVENT_THOLD2_LOG,
14131415
RSC_BOX_EVENT_POWER_LIMIT,
14141416
RSC_BOX_EVENT_CURRENT_LIMIT,
14151417
RSC_BOX_EVENT_CROSS_DOM_LIMIT,

‎corefreq-cli.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9716,11 +9716,17 @@ Window *CreateEvents(unsigned long long id)
97169716
{ {BOXKEY_CLR_THM_CRIT} , RSC(BOX_EVENT_CRITICAL_LOG).CODE(),
97179717
EVENT_CRITIC_LOG , ATTRIB2 },
97189718
/* Thermal Threshold */
9719-
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERM_THRESHOLD).CODE(),
9720-
EVENT_THERM_THOLD , ATTRIB1 },
9719+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THOLD1_STS).CODE(),
9720+
EVENT_THOLD1_STS , ATTRIB1 },
97219721
/* Thermal Threshold Log */
9722-
{ {BOXKEY_CLR_THM_THOLD} , RSC(BOX_EVENT_THRESHOLD_LOG).CODE(),
9723-
EVENT_THRESHOLD_LOG , ATTRIB2 },
9722+
{ {BOXKEY_CLR_THM_THOLD1} , RSC(BOX_EVENT_THOLD1_LOG).CODE(),
9723+
EVENT_THOLD1_LOG , ATTRIB2 },
9724+
/* Thermal Threshold */
9725+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THOLD2_STS).CODE(),
9726+
EVENT_THOLD2_STS , ATTRIB1 },
9727+
/* Thermal Threshold Log */
9728+
{ {BOXKEY_CLR_THM_THOLD2} , RSC(BOX_EVENT_THOLD2_LOG).CODE(),
9729+
EVENT_THOLD2_LOG , ATTRIB2 },
97249730
/* Power Limitation */
97259731
{ {BOXKEY_CLR_PWR_LIMIT} , RSC(BOX_EVENT_POWER_LIMIT).CODE(),
97269732
EVENT_POWER_LIMIT , ATTRIB2 },
@@ -9755,12 +9761,6 @@ Window *CreateEvents(unsigned long long id)
97559761
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
97569762
EVENT_THERM_NONE , ATTRIB0 },
97579763
/* Blank cell */
9758-
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9759-
EVENT_THERM_NONE , ATTRIB0 },
9760-
/* Blank cell */
9761-
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9762-
EVENT_THERM_NONE , ATTRIB0 },
9763-
/* Blank cell */
97649764
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
97659765
EVENT_THERM_NONE , ATTRIB0 }
97669766
}, {
@@ -13634,7 +13634,8 @@ int Shortcut(SCANKEY *scan)
1363413634
case BOXKEY_CLR_THM_SENSOR:
1363513635
case BOXKEY_CLR_PROCHOT_LOG:
1363613636
case BOXKEY_CLR_THM_CRIT:
13637-
case BOXKEY_CLR_THM_THOLD:
13637+
case BOXKEY_CLR_THM_THOLD1:
13638+
case BOXKEY_CLR_THM_THOLD2:
1363813639
case BOXKEY_CLR_PWR_LIMIT:
1363913640
case BOXKEY_CLR_CUR_LIMIT:
1364013641
case BOXKEY_CLR_X_DOMAIN:

‎corefreq-cli.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ enum KEY_ENUM {
289289
BOXKEY_CLR_THM_SENSOR = BOXKEY_EVT_OR | (LSHIFT_THERMAL_LOG << 1),
290290
BOXKEY_CLR_PROCHOT_LOG = BOXKEY_EVT_OR | (LSHIFT_PROCHOT_LOG << 1),
291291
BOXKEY_CLR_THM_CRIT = BOXKEY_EVT_OR | (LSHIFT_CRITIC_LOG << 1),
292-
BOXKEY_CLR_THM_THOLD = BOXKEY_EVT_OR | (LSHIFT_THERM_THOLD << 1),
292+
BOXKEY_CLR_THM_THOLD1 = BOXKEY_EVT_OR | (LSHIFT_THOLD1_LOG << 1),
293+
BOXKEY_CLR_THM_THOLD2 = BOXKEY_EVT_OR | (LSHIFT_THOLD2_LOG << 1),
293294
BOXKEY_CLR_PWR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_POWER_LIMIT << 1),
294295
BOXKEY_CLR_CUR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_CURRENT_LIMIT << 1),
295296
BOXKEY_CLR_X_DOMAIN = BOXKEY_EVT_OR | (LSHIFT_CROSS_DOMAIN << 1),
@@ -644,7 +645,8 @@ int CheckDuplicateKey(void) \
644645
case BOXKEY_CLR_THM_SENSOR: \
645646
case BOXKEY_CLR_PROCHOT_LOG: \
646647
case BOXKEY_CLR_THM_CRIT: \
647-
case BOXKEY_CLR_THM_THOLD: \
648+
case BOXKEY_CLR_THM_THOLD1: \
649+
case BOXKEY_CLR_THM_THOLD2: \
648650
case BOXKEY_CLR_PWR_LIMIT: \
649651
case BOXKEY_CLR_CUR_LIMIT: \
650652
case BOXKEY_CLR_X_DOMAIN: \
@@ -970,15 +972,15 @@ struct RECORDER_ST {
970972

971973
#define HOT_LOG_EVENT_FILTER ( EVENT_PROCHOT_LOG \
972974
| EVENT_CRITIC_LOG \
973-
| EVENT_THRESHOLD_LOG \
974975
| EVENT_CORE_HOT_LOG \
975976
| EVENT_GFX_HOT_LOG \
976977
| EVENT_RING_HOT_LOG )
977978

978979
#define HOT_STS_EVENT_FILTER ( EVENT_THERMAL_STS \
979980
| EVENT_PROCHOT_STS \
980981
| EVENT_CRITIC_TMP \
981-
| EVENT_THERM_THOLD \
982+
| EVENT_THOLD1_STS \
983+
| EVENT_THOLD2_STS \
982984
| EVENT_CORE_THM_STS \
983985
| EVENT_CORE_HOT_STS \
984986
| EVENT_GFX_THM_STS \
@@ -989,4 +991,5 @@ struct RECORDER_ST {
989991
#define STATUS_EVENT_FILTER ( EVENT_THERMAL_STS \
990992
| EVENT_PROCHOT_STS \
991993
| EVENT_CRITIC_TMP \
992-
| EVENT_THERM_THOLD )
994+
| EVENT_THOLD1_STS \
995+
| EVENT_THOLD2_STS )

‎corefreqk.c

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8094,8 +8094,11 @@ void ThermalMonitor_IA32(CORE_RO *Core)
80948094
ThermStatus.CriticalTemp_Log = 0;
80958095
ClearBit = 1;
80968096
}
8097-
if (Clear_Events & EVENT_THERM_THOLD) {
8097+
if (Clear_Events & EVENT_THOLD1_LOG) {
80988098
ThermStatus.Threshold1_Log = 0;
8099+
ClearBit = 1;
8100+
}
8101+
if (Clear_Events & EVENT_THOLD2_LOG) {
80998102
ThermStatus.Threshold2_Log = 0;
81008103
ClearBit = 1;
81018104
}
@@ -8148,8 +8151,8 @@ void ThermalMonitor_IA32(CORE_RO *Core)
81488151
((Bit64) ThermStatus.Thermal_Log << LSHIFT_THERMAL_LOG)
81498152
| ((Bit64) ThermStatus.PROCHOT_Log << LSHIFT_PROCHOT_LOG)
81508153
| ((Bit64) ThermStatus.CriticalTemp_Log << LSHIFT_CRITIC_LOG)
8151-
| ((Bit64) (ThermStatus.Threshold1_Log
8152-
| ThermStatus.Threshold2_Log) << LSHIFT_THRESHOLD_LOG)
8154+
| ((Bit64) ThermStatus.Threshold1_Log << LSHIFT_THOLD1_LOG)
8155+
| ((Bit64) ThermStatus.Threshold2_Log << LSHIFT_THOLD2_LOG)
81538156
| ((Bit64) ThermStatus.PwrLimit_Log << LSHIFT_POWER_LIMIT)
81548157
| ((Bit64) ThermStatus.CurLimit_Log << LSHIFT_CURRENT_LIMIT)
81558158
| ((Bit64) ThermStatus.XDomLimit_Log << LSHIFT_CROSS_DOMAIN);
@@ -8158,8 +8161,8 @@ void ThermalMonitor_IA32(CORE_RO *Core)
81588161
((Bit64) ThermStatus.Thermal_Status << LSHIFT_THERMAL_STS)
81598162
| ((Bit64) ThermStatus.PROCHOT_Event << LSHIFT_PROCHOT_STS)
81608163
| ((Bit64) ThermStatus.CriticalTemp << LSHIFT_CRITIC_TMP)
8161-
| ((Bit64) (ThermStatus.Threshold1
8162-
| ThermStatus.Threshold2) << LSHIFT_THERM_THOLD);
8164+
| ((Bit64) ThermStatus.Threshold1 << LSHIFT_THOLD1_STS)
8165+
| ((Bit64) ThermStatus.Threshold2 << LSHIFT_THOLD2_STS);
81638166

81648167
if (PUBLIC(RO(Proc))->Features.Power.EAX.PTM
81658168
&& (Core->Bind == PUBLIC(RO(Proc))->Service.Core))
@@ -8180,8 +8183,11 @@ void ThermalMonitor_IA32(CORE_RO *Core)
81808183
ThermStatus.CriticalTemp_Log = 0;
81818184
ClearBit = 1;
81828185
}
8183-
if (Clear_Events & EVENT_THERM_THOLD) {
8186+
if (Clear_Events & EVENT_THOLD1_LOG) {
81848187
ThermStatus.Threshold1_Log = 0;
8188+
ClearBit = 1;
8189+
}
8190+
if (Clear_Events & EVENT_THOLD2_LOG) {
81858191
ThermStatus.Threshold2_Log = 0;
81868192
ClearBit = 1;
81878193
}
@@ -8230,16 +8236,16 @@ void ThermalMonitor_IA32(CORE_RO *Core)
82308236
((Bit64) ThermStatus.Thermal_Log << LSHIFT_THERMAL_LOG)
82318237
| ((Bit64) ThermStatus.PROCHOT_Log << LSHIFT_PROCHOT_LOG)
82328238
| ((Bit64) ThermStatus.CriticalTemp_Log << LSHIFT_CRITIC_LOG)
8233-
| ((Bit64) (ThermStatus.Threshold1_Log
8234-
| ThermStatus.Threshold2_Log) << LSHIFT_THRESHOLD_LOG)
8239+
| ((Bit64) ThermStatus.Threshold1_Log << LSHIFT_THOLD1_LOG)
8240+
| ((Bit64) ThermStatus.Threshold2_Log << LSHIFT_THOLD2_LOG)
82358241
| ((Bit64) ThermStatus.PwrLimit_Log << LSHIFT_POWER_LIMIT);
82368242

82378243
PUBLIC(RO(Proc))->PowerThermal.Events[eSTS] = \
82388244
((Bit64) ThermStatus.Thermal_Status << LSHIFT_THERMAL_STS)
82398245
| ((Bit64) ThermStatus.PROCHOT_Event << LSHIFT_PROCHOT_STS)
82408246
| ((Bit64) ThermStatus.CriticalTemp << LSHIFT_CRITIC_TMP)
8241-
| ((Bit64) (ThermStatus.Threshold1
8242-
| ThermStatus.Threshold2) << LSHIFT_THERM_THOLD);
8247+
| ((Bit64) ThermStatus.Threshold1 << LSHIFT_THOLD1_STS)
8248+
| ((Bit64) ThermStatus.Threshold2 << LSHIFT_THOLD2_STS);
82438249
}
82448250
}
82458251
}
@@ -12728,8 +12734,8 @@ void Core_Intel_Temp(CORE_RO *Core)
1272812734
((Bit64) ThermStatus.Thermal_Log << LSHIFT_THERMAL_LOG)
1272912735
| ((Bit64) ThermStatus.PROCHOT_Log << LSHIFT_PROCHOT_LOG)
1273012736
| ((Bit64) ThermStatus.CriticalTemp_Log << LSHIFT_CRITIC_LOG)
12731-
| ((Bit64) (ThermStatus.Threshold1_Log
12732-
| ThermStatus.Threshold2_Log) << LSHIFT_THRESHOLD_LOG)
12737+
| ((Bit64) ThermStatus.Threshold1_Log << LSHIFT_THOLD1_LOG)
12738+
| ((Bit64) ThermStatus.Threshold2_Log << LSHIFT_THOLD2_LOG)
1273312739
| ((Bit64) ThermStatus.PwrLimit_Log << LSHIFT_POWER_LIMIT)
1273412740
| ((Bit64) ThermStatus.CurLimit_Log << LSHIFT_CURRENT_LIMIT)
1273512741
| ((Bit64) ThermStatus.XDomLimit_Log << LSHIFT_CROSS_DOMAIN);
@@ -12738,8 +12744,8 @@ void Core_Intel_Temp(CORE_RO *Core)
1273812744
((Bit64) ThermStatus.Thermal_Status << LSHIFT_THERMAL_STS)
1273912745
| ((Bit64) ThermStatus.PROCHOT_Event << LSHIFT_PROCHOT_STS)
1274012746
| ((Bit64) ThermStatus.CriticalTemp << LSHIFT_CRITIC_TMP)
12741-
| ((Bit64) (ThermStatus.Threshold1
12742-
| ThermStatus.Threshold2) << LSHIFT_THERM_THOLD);
12747+
| ((Bit64) ThermStatus.Threshold1 << LSHIFT_THOLD1_STS)
12748+
| ((Bit64) ThermStatus.Threshold2 << LSHIFT_THOLD2_STS);
1274312749
}
1274412750

1274512751
#define Pkg_Intel_Temp(Pkg) \
@@ -12754,16 +12760,16 @@ void Core_Intel_Temp(CORE_RO *Core)
1275412760
((Bit64) ThermStatus.Thermal_Log << LSHIFT_THERMAL_LOG) \
1275512761
| ((Bit64) ThermStatus.PROCHOT_Log << LSHIFT_PROCHOT_LOG) \
1275612762
| ((Bit64) ThermStatus.CriticalTemp_Log << LSHIFT_CRITIC_LOG) \
12757-
| ((Bit64) (ThermStatus.Threshold1_Log \
12758-
| ThermStatus.Threshold2_Log) << LSHIFT_THRESHOLD_LOG)\
12763+
| ((Bit64) ThermStatus.Threshold1_Log << LSHIFT_THOLD1_LOG) \
12764+
| ((Bit64) ThermStatus.Threshold2_Log << LSHIFT_THOLD2_LOG) \
1275912765
| ((Bit64) ThermStatus.PwrLimit_Log << LSHIFT_POWER_LIMIT); \
1276012766
\
1276112767
Pkg->PowerThermal.Events[eSTS] = \
1276212768
((Bit64) ThermStatus.Thermal_Status << LSHIFT_THERMAL_STS) \
1276312769
| ((Bit64) ThermStatus.PROCHOT_Event << LSHIFT_PROCHOT_STS) \
1276412770
| ((Bit64) ThermStatus.CriticalTemp << LSHIFT_CRITIC_TMP) \
12765-
| ((Bit64) (ThermStatus.Threshold1 \
12766-
| ThermStatus.Threshold2) << LSHIFT_THERM_THOLD); \
12771+
| ((Bit64) ThermStatus.Threshold1 << LSHIFT_THOLD1_STS) \
12772+
| ((Bit64) ThermStatus.Threshold2 << LSHIFT_THOLD2_STS); \
1276712773
} \
1276812774
})
1276912775

@@ -19765,7 +19771,8 @@ static long CoreFreqK_ioctl( struct file *filp,
1976519771
case EVENT_THERMAL_LOG:
1976619772
case EVENT_PROCHOT_LOG:
1976719773
case EVENT_CRITIC_LOG:
19768-
case EVENT_THERM_THOLD:
19774+
case EVENT_THOLD1_LOG:
19775+
case EVENT_THOLD2_LOG:
1976919776
case EVENT_POWER_LIMIT:
1977019777
case EVENT_CURRENT_LIMIT:
1977119778
case EVENT_CROSS_DOMAIN:

‎coretypes.h

Lines changed: 9 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,12 @@ typedef struct
262262
} THERMAL_POINT;
263263

264264
enum EVENT_LOG {
265-
/* MSR_IA32_{PACKAGE}_THERM_STATUS: x7 */
265+
/* MSR_IA32_{PACKAGE}_THERM_STATUS: x8 */
266266
LSHIFT_THERMAL_LOG,
267267
LSHIFT_PROCHOT_LOG,
268268
LSHIFT_CRITIC_LOG,
269-
LSHIFT_THRESHOLD_LOG,
269+
LSHIFT_THOLD1_LOG,
270+
LSHIFT_THOLD2_LOG,
270271
LSHIFT_POWER_LIMIT,
271272
LSHIFT_CURRENT_LIMIT,
272273
LSHIFT_CROSS_DOMAIN,
@@ -308,7 +309,8 @@ enum EVENT_STS {
308309
LSHIFT_THERMAL_STS,
309310
LSHIFT_PROCHOT_STS,
310311
LSHIFT_CRITIC_TMP,
311-
LSHIFT_THERM_THOLD,
312+
LSHIFT_THOLD1_STS,
313+
LSHIFT_THOLD2_STS,
312314
/* MSR_SKL_CORE_PERF_LIMIT_REASONS: x11 */
313315
LSHIFT_CORE_THM_STS,
314316
LSHIFT_CORE_HOT_STS,
@@ -357,8 +359,10 @@ enum THERM_PWR_EVENTS {
357359
EVENT_PROCHOT_LOG = 0x1LLU << LSHIFT_PROCHOT_LOG,
358360
EVENT_CRITIC_TMP = 0x1LLU << LSHIFT_CRITIC_TMP,
359361
EVENT_CRITIC_LOG = 0x1LLU << LSHIFT_CRITIC_LOG,
360-
EVENT_THERM_THOLD = 0x1LLU << LSHIFT_THERM_THOLD,
361-
EVENT_THRESHOLD_LOG = 0x1LLU << LSHIFT_THRESHOLD_LOG,
362+
EVENT_THOLD1_STS = 0x1LLU << LSHIFT_THOLD1_STS,
363+
EVENT_THOLD2_STS = 0x1LLU << LSHIFT_THOLD2_STS,
364+
EVENT_THOLD1_LOG = 0x1LLU << LSHIFT_THOLD1_LOG,
365+
EVENT_THOLD2_LOG = 0x1LLU << LSHIFT_THOLD2_LOG,
362366
EVENT_POWER_LIMIT = 0x1LLU << LSHIFT_POWER_LIMIT,
363367
EVENT_CURRENT_LIMIT = 0x1LLU << LSHIFT_CURRENT_LIMIT,
364368
EVENT_CROSS_DOMAIN = 0x1LLU << LSHIFT_CROSS_DOMAIN,
@@ -425,68 +429,6 @@ enum THERM_PWR_EVENTS {
425429
EVENT_ALL_OF_THEM = EVENT_RING_EDP_LOG << 1
426430
};
427431

428-
#define ALL_EVENT_MASK (EVENT_THERMAL_STS \
429-
| EVENT_THERMAL_LOG \
430-
| EVENT_PROCHOT_STS \
431-
| EVENT_PROCHOT_LOG \
432-
| EVENT_CRITIC_TMP \
433-
| EVENT_CRITIC_LOG \
434-
| EVENT_THERM_THOLD \
435-
| EVENT_THRESHOLD_LOG \
436-
| EVENT_POWER_LIMIT \
437-
| EVENT_CURRENT_LIMIT \
438-
| EVENT_CROSS_DOMAIN \
439-
| EVENT_CORE_THM_STS \
440-
| EVENT_CORE_HOT_STS \
441-
| EVENT_CORE_HOT_LOG \
442-
| EVENT_CORE_THM_LOG \
443-
| EVENT_CORE_RES_STS \
444-
| EVENT_CORE_RES_LOG \
445-
| EVENT_CORE_AVG_STS \
446-
| EVENT_CORE_AVG_LOG \
447-
| EVENT_CORE_VRT_STS \
448-
| EVENT_CORE_VRT_LOG \
449-
| EVENT_CORE_TDC_STS \
450-
| EVENT_CORE_TDC_LOG \
451-
| EVENT_CORE_PL1_LOG \
452-
| EVENT_CORE_PL2_LOG \
453-
| EVENT_CORE_EDP_LOG \
454-
| EVENT_CORE_BST_STS \
455-
| EVENT_CORE_BST_LOG \
456-
| EVENT_CORE_ATT_STS \
457-
| EVENT_CORE_ATT_LOG \
458-
| EVENT_GFX_THM_STS \
459-
| EVENT_GFX_HOT_STS \
460-
| EVENT_GFX_HOT_LOG \
461-
| EVENT_GFX_THM_LOG \
462-
| EVENT_GFX_AVG_STS \
463-
| EVENT_GFX_AVG_LOG \
464-
| EVENT_GFX_VRT_STS \
465-
| EVENT_GFX_VRT_LOG \
466-
| EVENT_GFX_TDC_STS \
467-
| EVENT_GFX_TDC_LOG \
468-
| EVENT_GFX_PL1_LOG \
469-
| EVENT_GFX_PL2_LOG \
470-
| EVENT_GFX_EDP_LOG \
471-
| EVENT_GFX_EFF_STS \
472-
| EVENT_GFX_EFF_LOG \
473-
| EVENT_RING_THM_STS \
474-
| EVENT_RING_HOT_STS \
475-
| EVENT_RING_HOT_LOG \
476-
| EVENT_RING_THM_LOG \
477-
| EVENT_RING_AVG_STS \
478-
| EVENT_RING_AVG_LOG \
479-
| EVENT_RING_VRT_STS \
480-
| EVENT_RING_VRT_LOG \
481-
| EVENT_RING_TDC_STS \
482-
| EVENT_RING_TDC_LOG \
483-
| EVENT_RING_PL1_STS \
484-
| EVENT_RING_PL1_LOG \
485-
| EVENT_RING_PL2_STS \
486-
| EVENT_RING_PL2_LOG \
487-
| EVENT_RING_EDP_STS \
488-
| EVENT_RING_EDP_LOG)
489-
490432
enum SENSOR_LIMITS {
491433
SENSOR_LOWEST,
492434
SENSOR_HIGHEST,

0 commit comments

Comments
 (0)