[CR] Fix cpufreq_driver compatibility with kernel lower than 3.14

cyring · Feb 4, 2024 · 63b893e · 63b893e
1 parent 6221891
commit 63b893e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/aarch64/corefreqk.c b/aarch64/corefreqk.c
@@ -250,8 +250,12 @@ static struct {
 	/*MANDATORY*/	.init	= CoreFreqK_Policy_Init,
 	/*MANDATORY*/	.verify = CoreFreqK_Policy_Verify,
 	/*MANDATORY*/	.setpolicy = CoreFreqK_SetPolicy,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
 			.bios_limit= CoreFreqK_Bios_Limit,
 			.set_boost = CoreFreqK_SetBoost
+#else
+			.bios_limit= CoreFreqK_Bios_Limit
+#endif
 	},
 	.FreqGovernor = {
 			.name	= "corefreq-policy",
@@ -3342,15 +3346,18 @@ static int CoreFreqK_Bios_Limit(int cpu, unsigned int *limit)
 
 void Policy_Aggregate_Turbo(void)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
     if (PUBLIC(RO(Proc))->Registration.Driver.CPUfreq & REGISTRATION_ENABLE) {
 	CoreFreqK.FreqDriver.boost_enabled = (
 			BITWISEAND_CC(	LOCKLESS,
 					PUBLIC(RW(Proc))->TurboBoost,
 					PUBLIC(RO(Proc))->TurboBoost_Mask ) != 0
 	);
     }
+#endif
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)	\
   || ((RHEL_MAJOR == 8) && (RHEL_MINOR > 3))
 static int CoreFreqK_SetBoost(struct cpufreq_policy *policy, int state)
@@ -3368,6 +3375,7 @@ static int CoreFreqK_SetBoost(int state)
 	BITSET(BUS_LOCK, PUBLIC(RW(Proc))->OS.Signal, NTFY); /* Notify Daemon*/
 	return 0;
 }
+#endif /* 3.14.0 */
 
 static ssize_t CoreFreqK_Show_SetSpeed(struct cpufreq_policy *policy,char *buf)
 {

diff --git a/aarch64/corefreqk.h b/aarch64/corefreqk.h
@@ -442,12 +442,14 @@ static int CoreFreqK_Policy_Verify(struct cpufreq_policy*) ;
 #endif
 static int CoreFreqK_SetPolicy(struct cpufreq_policy*) ;
 static int CoreFreqK_Bios_Limit(int, unsigned int*) ;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)	\
   || ((RHEL_MAJOR == 8)  && (RHEL_MINOR > 3))
 static int CoreFreqK_SetBoost(struct cpufreq_policy*, int) ;
 #else
 static int CoreFreqK_SetBoost(int) ;
 #endif
+#endif
 static ssize_t CoreFreqK_Show_SetSpeed(struct cpufreq_policy*, char*);
 static int CoreFreqK_Store_SetSpeed(struct cpufreq_policy*, unsigned int) ;
 #endif /* CONFIG_CPU_FREQ */

diff --git a/x86_64/corefreqk.c b/x86_64/corefreqk.c
@@ -509,8 +509,12 @@ static struct {
 	/*MANDATORY*/	.init	= CoreFreqK_Policy_Init,
 	/*MANDATORY*/	.verify = CoreFreqK_Policy_Verify,
 	/*MANDATORY*/	.setpolicy = CoreFreqK_SetPolicy,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
 			.bios_limit= CoreFreqK_Bios_Limit,
 			.set_boost = CoreFreqK_SetBoost
+#else
+			.bios_limit= CoreFreqK_Bios_Limit
+#endif
 	},
 	.FreqGovernor = {
 			.name	= "corefreq-policy",
@@ -20920,15 +20924,18 @@ static int CoreFreqK_Bios_Limit(int cpu, unsigned int *limit)
 
 void Policy_Aggregate_Turbo(void)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
     if (PUBLIC(RO(Proc))->Registration.Driver.CPUfreq & REGISTRATION_ENABLE) {
 	CoreFreqK.FreqDriver.boost_enabled = (
 			BITWISEAND_CC(	LOCKLESS,
 					PUBLIC(RW(Proc))->TurboBoost,
 					PUBLIC(RO(Proc))->TurboBoost_Mask ) != 0
 	);
     }
+#endif
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)	\
   || ((RHEL_MAJOR == 8) && (RHEL_MINOR > 3))
 static int CoreFreqK_SetBoost(struct cpufreq_policy *policy, int state)
@@ -20946,6 +20953,7 @@ static int CoreFreqK_SetBoost(int state)
 	BITSET(BUS_LOCK, PUBLIC(RW(Proc))->OS.Signal, NTFY); /* Notify Daemon*/
 	return 0;
 }
+#endif /* 3.14.0 */
 
 static ssize_t CoreFreqK_Show_SetSpeed(struct cpufreq_policy *policy,char *buf)
 {

diff --git a/x86_64/corefreqk.h b/x86_64/corefreqk.h
@@ -8404,12 +8404,14 @@ static int CoreFreqK_Policy_Verify(struct cpufreq_policy*) ;
 #endif
 static int CoreFreqK_SetPolicy(struct cpufreq_policy*) ;
 static int CoreFreqK_Bios_Limit(int, unsigned int*) ;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)	\
   || ((RHEL_MAJOR == 8)  && (RHEL_MINOR > 3))
 static int CoreFreqK_SetBoost(struct cpufreq_policy*, int) ;
 #else
 static int CoreFreqK_SetBoost(int) ;
 #endif
+#endif
 static ssize_t CoreFreqK_Show_SetSpeed(struct cpufreq_policy*, char*);
 static int CoreFreqK_Store_SetSpeed(struct cpufreq_policy*, unsigned int) ;
 #endif /* CONFIG_CPU_FREQ */