[aarch64] Aggregate the Turbo Boost from per CPU collect

Author: cyring

aarch64/corefreq-api.h

@@ -294,6 +294,7 @@ typedef struct
 	BitCC			CR_Mask 	__attribute__ ((aligned (16)));
 	BitCC			HWP_Mask	__attribute__ ((aligned (16)));
 	BitCC			PMU_Mask	__attribute__ ((aligned (16)));
+	BitCC			TurboBoost_Mask __attribute__ ((aligned (16)));
 	BitCC			SPEC_CTRL_Mask	__attribute__ ((aligned (16)));
 
 	enum THERMAL_FORMULAS	thermalFormula;
@@ -393,6 +394,7 @@ typedef struct
 	BitCC			CSV2_3		__attribute__ ((aligned (16)));
 	BitCC			CSV3		__attribute__ ((aligned (16)));
 	BitCC			SSBS		__attribute__ ((aligned (16)));
+	BitCC			TurboBoost	__attribute__ ((aligned (16)));
 	struct {
 		Bit64		Signal	__attribute__ ((aligned (8)));
 	} OS;

aarch64/corefreq-cli.c

@@ -1626,7 +1626,7 @@ REASON_CODE SysInfoProc(Window *win,
 		RefreshTopFreq, BOOST(HWP_TGT) );
     }
 /* Section Mark */
-    if (RO(Shm)->Proc.Features.Turbo_OPP == 1)
+    if (RO(Shm)->Proc.Technology.Turbo == 1)
     {
 	PUT(	SCANKEY_NULL, attrib[RO(Shm)->Proc.Features.Turbo_Unlock],
 		width, 2, "%s%.*s[%7.*s]", RSC(TURBO).CODE(),
@@ -1665,8 +1665,9 @@ REASON_CODE SysInfoProc(Window *win,
 		RefreshTopFreq, BOOST(TBO) );
     }
 /* Section Mark */
+    if (RO(Shm)->Proc.Features.Turbo_OPP == 1) {
 	PUT(SCANKEY_NULL, attrib[0], width, 2, "%s", RSC(OPP).CODE());
-
+    }
     for(boost = BOOST(1C), activeCores = 1;
       boost > BOOST(1C)-(enum RATIO_BOOST)RO(Shm)->Proc.Features.SpecTurboRatio;
 		boost--, activeCores++)

aarch64/corefreq.h

@@ -243,7 +243,8 @@ typedef struct
 				CMN		:  2-1,
 				CCN		:  3-2,
 				CCI		:  4-3,
-				_Unused1_	: 13-4,
+				Turbo		:  5-4,
+				_Unused1_	: 13-5,
 				VM		: 14-13,
 				IOMMU		: 15-14,
 				_Unused2_	: 20-15,

aarch64/corefreqd.c

@@ -737,6 +737,10 @@ void Technology_Update( RO(SHM_STRUCT) *RO(Shm),
 						RW(Proc)->VM,
 						RO(Proc)->CR_Mask) != 0;
 
+	RO(Shm)->Proc.Technology.Turbo = BITWISEAND_CC(BUS_LOCK,
+						RW(Proc)->TurboBoost,
+						RO(Proc)->TurboBoost_Mask) != 0;
+
 	if (RO(Proc)->Uncore.ICN.DSU_Type != DSU_NONE) {
 		RO(Shm)->Proc.Technology.DSU = 1;
 	}

aarch64/corefreqk.c

@@ -2461,6 +2461,9 @@ static COF_ST Factory2COF(CORE_RO *Core) {
 static void Query_Linux_CPUFREQ(CLOCK clock, unsigned int cpu)
 {
 	CORE_RO *Core = (CORE_RO *) PUBLIC(RO(Core, AT(cpu)));
+	bool	per_tblflag_cpufreq_boost = false,
+		per_cpufreq_boost_enabled = false,
+		per_policy_has_boost_freq = false;
 #ifdef CONFIG_CPU_FREQ
 	struct cpufreq_policy *pFreqPolicy = \
 		&PRIVATE(OF(Core, AT(cpu)))->FreqPolicy;
@@ -2470,6 +2473,13 @@ static void Query_Linux_CPUFREQ(CLOCK clock, unsigned int cpu)
 #ifdef CONFIG_CPU_FREQ
   if (cpufreq_get_policy(pFreqPolicy, cpu) == 0)
   {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
+	per_cpufreq_boost_enabled = cpufreq_boost_enabled();
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) \
+ && LINUX_VERSION_CODE <= KERNEL_VERSION(6, 14, 0)
+	per_policy_has_boost_freq = policy_has_boost_freq(pFreqPolicy);
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
 	struct cpufreq_frequency_table *table;
 	enum RATIO_BOOST boost = BOOST(MIN);
@@ -2491,14 +2501,20 @@ static void Query_Linux_CPUFREQ(CLOCK clock, unsigned int cpu)
 			boost++;
 		}
 	}
-     if ((table->flags & CPUFREQ_BOOST_FREQ) == CPUFREQ_BOOST_FREQ) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
+	per_tblflag_cpufreq_boost = \
+		(table->flags & CPUFREQ_BOOST_FREQ) == CPUFREQ_BOOST_FREQ;
+#endif
+     if (per_cpufreq_boost_enabled
+      || per_policy_has_boost_freq
+      || per_tblflag_cpufreq_boost)
+     {
 	if (COF2CPUFREQ(clock, COF) \
 		> COF2CPUFREQ(clock, Core->Boost[BOOST(TBH)]))
 	{
 		Core->Boost[BOOST(TBO)] = Core->Boost[BOOST(TBH)];
 		Core->Boost[BOOST(TBH)] = COF;
 	}
-	PUBLIC(RO(Proc))->Features.Turbo_OPP = 1;
      }
     }
    }
@@ -2509,6 +2525,8 @@ static void Query_Linux_CPUFREQ(CLOCK clock, unsigned int cpu)
 		boost * sizeof(enum RATIO_BOOST));
 
 	memset(&Core->Boost[BOOST(18C)], 0, diff * sizeof(enum RATIO_BOOST));
+
+	PUBLIC(RO(Proc))->Features.Turbo_OPP = 1;
    }
 #endif
   }
@@ -2533,6 +2551,15 @@ static void Query_Linux_CPUFREQ(CLOCK clock, unsigned int cpu)
 	COF = Factory2COF(Core);
     }
 	Core->Boost[BOOST(TGT)] = COF;
+
+    if (per_cpufreq_boost_enabled
+     || per_policy_has_boost_freq
+     || per_tblflag_cpufreq_boost)
+    {
+	BITSET_CC(BUS_LOCK, PUBLIC(RW(Proc))->TurboBoost, Core->Bind);
+    } else {
+	BITCLR_CC(BUS_LOCK, PUBLIC(RW(Proc))->TurboBoost, Core->Bind);
+    }
 }
 
 #ifdef CONFIG_PM_OPP
@@ -3334,6 +3361,7 @@ static void PerCore_Reset(CORE_RO *Core)
 	BITCLR_CC(BUS_LOCK, PUBLIC(RO(Proc))->PMU_Mask	, Core->Bind);
 	BITCLR_CC(BUS_LOCK, PUBLIC(RO(Proc))->HWP_Mask	, Core->Bind);
 	BITCLR_CC(BUS_LOCK, PUBLIC(RO(Proc))->CR_Mask	, Core->Bind);
+	BITCLR_CC(BUS_LOCK, PUBLIC(RO(Proc))->TurboBoost_Mask,Core->Bind);
 	BITCLR_CC(BUS_LOCK, PUBLIC(RO(Proc))->SPEC_CTRL_Mask, Core->Bind);
 
 	BITCLR_CC(BUS_LOCK, PUBLIC(RW(Proc))->HWP	, Core->Bind);
@@ -3343,6 +3371,7 @@ static void PerCore_Reset(CORE_RO *Core)
 	BITCLR_CC(BUS_LOCK, PUBLIC(RW(Proc))->CSV3	, Core->Bind);
 	BITCLR_CC(BUS_LOCK, PUBLIC(RW(Proc))->SSBS	, Core->Bind);
 	BITCLR_CC(BUS_LOCK, PUBLIC(RW(Proc))->VM	, Core->Bind);
+	BITCLR_CC(BUS_LOCK, PUBLIC(RW(Proc))->TurboBoost, Core->Bind);
 
 	BITWISECLR(LOCKLESS, Core->ThermalPoint.Mask);
 	BITWISECLR(LOCKLESS, Core->ThermalPoint.Kind);
@@ -3582,6 +3611,7 @@ static void PerCore_GenericMachine(void *arg)
 	SystemRegisters(Core);
 
 	BITSET_CC(BUS_LOCK, PUBLIC(RO(Proc))->PMU_Mask, Core->Bind);
+	BITSET_CC(BUS_LOCK, PUBLIC(RO(Proc))->TurboBoost_Mask,Core->Bind);
 	BITSET_CC(BUS_LOCK, PUBLIC(RO(Proc))->SPEC_CTRL_Mask, Core->Bind);
 }