Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
c4a6c82c
Commit
c4a6c82c
authored
Sep 02, 2024
by
Rafael J. Wysocki
Browse files
Options
Browse Files
Download
Plain Diff
Merge back cpufreq material for 6.12
parents
15d75184
3ca2a3d1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
29 deletions
+13
-29
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq.c
+4
-23
drivers/cpufreq/intel_pstate.c
drivers/cpufreq/intel_pstate.c
+4
-0
drivers/cpufreq/maple-cpufreq.c
drivers/cpufreq/maple-cpufreq.c
+1
-0
drivers/cpufreq/pasemi-cpufreq.c
drivers/cpufreq/pasemi-cpufreq.c
+1
-0
drivers/cpufreq/pmac64-cpufreq.c
drivers/cpufreq/pmac64-cpufreq.c
+1
-0
drivers/cpufreq/powernv-cpufreq.c
drivers/cpufreq/powernv-cpufreq.c
+1
-0
drivers/cpufreq/ppc_cbe_cpufreq.c
drivers/cpufreq/ppc_cbe_cpufreq.c
+1
-0
include/linux/cpufreq.h
include/linux/cpufreq.h
+0
-6
No files found.
drivers/cpufreq/cpufreq.c
View file @
c4a6c82c
...
...
@@ -575,30 +575,11 @@ unsigned int cpufreq_policy_transition_delay_us(struct cpufreq_policy *policy)
return
policy
->
transition_delay_us
;
latency
=
policy
->
cpuinfo
.
transition_latency
/
NSEC_PER_USEC
;
if
(
latency
)
{
unsigned
int
max_delay_us
=
2
*
MSEC_PER_SEC
;
if
(
latency
)
/* Give a 50% breathing room between updates */
return
latency
+
(
latency
>>
1
);
/*
* If the platform already has high transition_latency, use it
* as-is.
*/
if
(
latency
>
max_delay_us
)
return
latency
;
/*
* For platforms that can change the frequency very fast (< 2
* us), the above formula gives a decent transition delay. But
* for platforms where transition_latency is in milliseconds, it
* ends up giving unrealistic values.
*
* Cap the default transition delay to 2 ms, which seems to be
* a reasonable amount of time after which we should reevaluate
* the frequency.
*/
return
min
(
latency
*
LATENCY_MULTIPLIER
,
max_delay_us
);
}
return
LATENCY_MULTIPLIER
;
return
USEC_PER_MSEC
;
}
EXPORT_SYMBOL_GPL
(
cpufreq_policy_transition_delay_us
);
...
...
drivers/cpufreq/intel_pstate.c
View file @
c4a6c82c
...
...
@@ -2425,6 +2425,10 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {
X86_MATCH
(
INTEL_ICELAKE_X
,
core_funcs
),
X86_MATCH
(
INTEL_SAPPHIRERAPIDS_X
,
core_funcs
),
X86_MATCH
(
INTEL_EMERALDRAPIDS_X
,
core_funcs
),
X86_MATCH
(
INTEL_GRANITERAPIDS_D
,
core_funcs
),
X86_MATCH
(
INTEL_GRANITERAPIDS_X
,
core_funcs
),
X86_MATCH
(
INTEL_ATOM_CRESTMONT
,
core_funcs
),
X86_MATCH
(
INTEL_ATOM_CRESTMONT_X
,
core_funcs
),
{}
};
#endif
...
...
drivers/cpufreq/maple-cpufreq.c
View file @
c4a6c82c
...
...
@@ -238,4 +238,5 @@ static int __init maple_cpufreq_init(void)
module_init
(
maple_cpufreq_init
);
MODULE_DESCRIPTION
(
"cpufreq driver for Maple 970FX/970MP boards"
);
MODULE_LICENSE
(
"GPL"
);
drivers/cpufreq/pasemi-cpufreq.c
View file @
c4a6c82c
...
...
@@ -269,5 +269,6 @@ static void __exit pas_cpufreq_exit(void)
module_init
(
pas_cpufreq_init
);
module_exit
(
pas_cpufreq_exit
);
MODULE_DESCRIPTION
(
"cpufreq driver for PA Semi PWRficient"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_AUTHOR
(
"Egor Martovetsky <egor@pasemi.com>, Olof Johansson <olof@lixom.net>"
);
drivers/cpufreq/pmac64-cpufreq.c
View file @
c4a6c82c
...
...
@@ -671,4 +671,5 @@ static int __init g5_cpufreq_init(void)
module_init
(
g5_cpufreq_init
);
MODULE_DESCRIPTION
(
"cpufreq driver for SMU & 970FX based G5 Macs"
);
MODULE_LICENSE
(
"GPL"
);
drivers/cpufreq/powernv-cpufreq.c
View file @
c4a6c82c
...
...
@@ -1160,5 +1160,6 @@ static void __exit powernv_cpufreq_exit(void)
}
module_exit
(
powernv_cpufreq_exit
);
MODULE_DESCRIPTION
(
"cpufreq driver for IBM/OpenPOWER powernv systems"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_AUTHOR
(
"Vaidyanathan Srinivasan <svaidy at linux.vnet.ibm.com>"
);
drivers/cpufreq/ppc_cbe_cpufreq.c
View file @
c4a6c82c
...
...
@@ -168,5 +168,6 @@ static void __exit cbe_cpufreq_exit(void)
module_init
(
cbe_cpufreq_init
);
module_exit
(
cbe_cpufreq_exit
);
MODULE_DESCRIPTION
(
"cpufreq driver for Cell BE processors"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_AUTHOR
(
"Christian Krafft <krafft@de.ibm.com>"
);
include/linux/cpufreq.h
View file @
c4a6c82c
...
...
@@ -577,12 +577,6 @@ static inline unsigned long cpufreq_scale(unsigned long old, u_int div,
#define CPUFREQ_POLICY_POWERSAVE (1)
#define CPUFREQ_POLICY_PERFORMANCE (2)
/*
* The polling frequency depends on the capability of the processor. Default
* polling frequency is 1000 times the transition latency of the processor.
*/
#define LATENCY_MULTIPLIER (1000)
struct
cpufreq_governor
{
char
name
[
CPUFREQ_NAME_LEN
];
int
(
*
init
)(
struct
cpufreq_policy
*
policy
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment