[Intel] Check CPUID[0x6].EAX[19] before IA32_{PACKAGE}_THERM_STATUS

cyring · cyring · commit b3ff6561f8b6 · 2022-03-27T15:15:14.000+02:00
diff --git a/corefreqk.c b/corefreqk.c
@@ -8127,7 +8127,8 @@ void ThermalMonitor_Set(CORE_RO *Core)
 
 	if (ClearBit)
 	{
-		if (!(ThermInterrupt.High_Temp_Int|ThermInterrupt.Low_Temp_Int))
+		if (!((ThermInterrupt.High_Temp_Int|ThermInterrupt.Low_Temp_Int)
+			&& PUBLIC(RO(Proc))->Features.Power.EAX.HWFB_Cap))
 		{
 			WRMSR(ThermStatus, MSR_IA32_THERM_STATUS);
 			RDMSR(ThermStatus, MSR_IA32_THERM_STATUS);
@@ -8202,7 +8203,8 @@ void ThermalMonitor_Set(CORE_RO *Core)
 
 	if (ClearBit)
 	{
-		if (!(ThermInterrupt.High_Temp_Int|ThermInterrupt.Low_Temp_Int))
+		if (!((ThermInterrupt.High_Temp_Int|ThermInterrupt.Low_Temp_Int)
+			&& PUBLIC(RO(Proc))->Features.Power.EAX.HWFB_Cap))
 		{
 			WRMSR(ThermStatus, MSR_IA32_PACKAGE_THERM_STATUS);
 			RDMSR(ThermStatus, MSR_IA32_PACKAGE_THERM_STATUS);

Original file line number	Diff line number	Diff line change
`@@ -8127,7 +8127,8 @@ void ThermalMonitor_Set(CORE_RO *Core)`
`8127`	`8127`
`8128`	`8128`	`if (ClearBit)`
`8129`	`8129`	`{`
`8130`		`- if (!(ThermInterrupt.High_Temp_Int\|ThermInterrupt.Low_Temp_Int))`
	`8130`	`+ if (!((ThermInterrupt.High_Temp_Int\|ThermInterrupt.Low_Temp_Int)`
	`8131`	`+ && PUBLIC(RO(Proc))->Features.Power.EAX.HWFB_Cap))`
`8131`	`8132`	`{`
`8132`	`8133`	`WRMSR(ThermStatus, MSR_IA32_THERM_STATUS);`
`8133`	`8134`	`RDMSR(ThermStatus, MSR_IA32_THERM_STATUS);`
`@@ -8202,7 +8203,8 @@ void ThermalMonitor_Set(CORE_RO *Core)`
`8202`	`8203`
`8203`	`8204`	`if (ClearBit)`
`8204`	`8205`	`{`
`8205`		`- if (!(ThermInterrupt.High_Temp_Int\|ThermInterrupt.Low_Temp_Int))`
	`8206`	`+ if (!((ThermInterrupt.High_Temp_Int\|ThermInterrupt.Low_Temp_Int)`
	`8207`	`+ && PUBLIC(RO(Proc))->Features.Power.EAX.HWFB_Cap))`
`8206`	`8208`	`{`
`8207`	`8209`	`WRMSR(ThermStatus, MSR_IA32_PACKAGE_THERM_STATUS);`
`8208`	`8210`	`RDMSR(ThermStatus, MSR_IA32_PACKAGE_THERM_STATUS);`