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
04529916
Commit
04529916
authored
Aug 03, 2004
by
Dave Jones
Committed by
Dave Jones
Aug 03, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CPUFREQ] Whitespace/CodingStyle fixes for speedstep-ich
Signed-off-by:
Dave Jones
<
davej@redhat.com
>
parent
6c7b6c0c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
45 deletions
+41
-45
arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
+41
-45
No files found.
arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
View file @
04529916
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
* for chipsets ICH2-M and ICH3-M.
* for chipsets ICH2-M and ICH3-M.
*
*
* Many thanks to Ducrot Bruno for finding and fixing the last
* Many thanks to Ducrot Bruno for finding and fixing the last
* "missing link" for ICH2-M/ICH3-M support, and to Thomas Winkler
* "missing link" for ICH2-M/ICH3-M support, and to Thomas Winkler
* for extensive testing.
* for extensive testing.
*
*
* BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
* BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
*********************************************************************/
*********************************************************************/
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/cpufreq.h>
#include <linux/cpufreq.h>
#include <linux/pci.h>
#include <linux/pci.h>
...
@@ -29,24 +29,24 @@
...
@@ -29,24 +29,24 @@
/* speedstep_chipset:
/* speedstep_chipset:
* It is necessary to know which chipset is used. As accesses to
* It is necessary to know which chipset is used. As accesses to
* this device occur at various places in this module, we need a
* this device occur at various places in this module, we need a
* static struct pci_dev * pointing to that device.
* static struct pci_dev * pointing to that device.
*/
*/
static
struct
pci_dev
*
speedstep_chipset_dev
;
static
struct
pci_dev
*
speedstep_chipset_dev
;
/* speedstep_processor
/* speedstep_processor
*/
*/
static
unsigned
int
speedstep_processor
=
0
;
static
unsigned
int
speedstep_processor
=
0
;
/*
/*
* There are only two frequency states for each processor. Values
* There are only two frequency states for each processor. Values
* are in kHz for the time being.
* are in kHz for the time being.
*/
*/
static
struct
cpufreq_frequency_table
speedstep_freqs
[]
=
{
static
struct
cpufreq_frequency_table
speedstep_freqs
[]
=
{
{
SPEEDSTEP_HIGH
,
0
},
{
SPEEDSTEP_HIGH
,
0
},
{
SPEEDSTEP_LOW
,
0
},
{
SPEEDSTEP_LOW
,
0
},
{
0
,
CPUFREQ_TABLE_END
},
{
0
,
CPUFREQ_TABLE_END
},
};
};
...
@@ -68,22 +68,21 @@ static struct cpufreq_frequency_table speedstep_freqs[] = {
...
@@ -68,22 +68,21 @@ static struct cpufreq_frequency_table speedstep_freqs[] = {
* speedstep_set_state - set the SpeedStep state
* speedstep_set_state - set the SpeedStep state
* @state: new processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH)
* @state: new processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH)
*
*
* Tries to change the SpeedStep state.
* Tries to change the SpeedStep state.
*/
*/
static
void
speedstep_set_state
(
unsigned
int
state
)
static
void
speedstep_set_state
(
unsigned
int
state
)
{
{
u32
pmbase
;
u32
pmbase
;
u8
pm2_blk
;
u8
pm2_blk
;
u8
value
;
u8
value
;
unsigned
long
flags
;
unsigned
long
flags
;
if
(
!
speedstep_chipset_dev
||
(
state
>
0x1
))
if
(
!
speedstep_chipset_dev
||
(
state
>
0x1
))
return
;
return
;
/* get PMBASE */
/* get PMBASE */
pci_read_config_dword
(
speedstep_chipset_dev
,
0x40
,
&
pmbase
);
pci_read_config_dword
(
speedstep_chipset_dev
,
0x40
,
&
pmbase
);
if
(
!
(
pmbase
&
0x01
))
if
(
!
(
pmbase
&
0x01
))
{
{
printk
(
KERN_ERR
"cpufreq: could not find speedstep register
\n
"
);
printk
(
KERN_ERR
"cpufreq: could not find speedstep register
\n
"
);
return
;
return
;
}
}
...
@@ -146,18 +145,16 @@ static void speedstep_set_state (unsigned int state)
...
@@ -146,18 +145,16 @@ static void speedstep_set_state (unsigned int state)
*/
*/
static
int
speedstep_activate
(
void
)
static
int
speedstep_activate
(
void
)
{
{
u16
value
=
0
;
u16
value
=
0
;
if
(
!
speedstep_chipset_dev
)
if
(
!
speedstep_chipset_dev
)
return
-
EINVAL
;
return
-
EINVAL
;
pci_read_config_word
(
speedstep_chipset_dev
,
pci_read_config_word
(
speedstep_chipset_dev
,
0x00A0
,
&
value
);
0x00A0
,
&
value
);
if
(
!
(
value
&
0x08
))
{
if
(
!
(
value
&
0x08
))
{
value
|=
0x08
;
value
|=
0x08
;
dprintk
(
KERN_DEBUG
"cpufreq: activating SpeedStep (TM) registers
\n
"
);
dprintk
(
KERN_DEBUG
"cpufreq: activating SpeedStep (TM) registers
\n
"
);
pci_write_config_word
(
speedstep_chipset_dev
,
pci_write_config_word
(
speedstep_chipset_dev
,
0x00A0
,
value
);
0x00A0
,
value
);
}
}
return
0
;
return
0
;
...
@@ -167,15 +164,15 @@ static int speedstep_activate (void)
...
@@ -167,15 +164,15 @@ static int speedstep_activate (void)
/**
/**
* speedstep_detect_chipset - detect the Southbridge which contains SpeedStep logic
* speedstep_detect_chipset - detect the Southbridge which contains SpeedStep logic
*
*
* Detects ICH2-M, ICH3-M and ICH4-M so far. The pci_dev points to
* Detects ICH2-M, ICH3-M and ICH4-M so far. The pci_dev points to
* the LPC bridge / PM module which contains all power-management
* the LPC bridge / PM module which contains all power-management
* functions. Returns the SPEEDSTEP_CHIPSET_-number for the detected
* functions. Returns the SPEEDSTEP_CHIPSET_-number for the detected
* chipset, or zero on failure.
* chipset, or zero on failure.
*/
*/
static
unsigned
int
speedstep_detect_chipset
(
void
)
static
unsigned
int
speedstep_detect_chipset
(
void
)
{
{
speedstep_chipset_dev
=
pci_find_subsys
(
PCI_VENDOR_ID_INTEL
,
speedstep_chipset_dev
=
pci_find_subsys
(
PCI_VENDOR_ID_INTEL
,
PCI_DEVICE_ID_INTEL_82801DB_12
,
PCI_DEVICE_ID_INTEL_82801DB_12
,
PCI_ANY_ID
,
PCI_ANY_ID
,
PCI_ANY_ID
,
PCI_ANY_ID
,
NULL
);
NULL
);
...
@@ -183,7 +180,7 @@ static unsigned int speedstep_detect_chipset (void)
...
@@ -183,7 +180,7 @@ static unsigned int speedstep_detect_chipset (void)
return
4
;
/* 4-M */
return
4
;
/* 4-M */
speedstep_chipset_dev
=
pci_find_subsys
(
PCI_VENDOR_ID_INTEL
,
speedstep_chipset_dev
=
pci_find_subsys
(
PCI_VENDOR_ID_INTEL
,
PCI_DEVICE_ID_INTEL_82801CA_12
,
PCI_DEVICE_ID_INTEL_82801CA_12
,
PCI_ANY_ID
,
PCI_ANY_ID
,
PCI_ANY_ID
,
PCI_ANY_ID
,
NULL
);
NULL
);
...
@@ -198,11 +195,11 @@ static unsigned int speedstep_detect_chipset (void)
...
@@ -198,11 +195,11 @@ static unsigned int speedstep_detect_chipset (void)
NULL
);
NULL
);
if
(
speedstep_chipset_dev
)
{
if
(
speedstep_chipset_dev
)
{
/* speedstep.c causes lockups on Dell Inspirons 8000 and
/* speedstep.c causes lockups on Dell Inspirons 8000 and
* 8100 which use a pretty old revision of the 82815
* 8100 which use a pretty old revision of the 82815
* host brige. Abort on these systems.
* host brige. Abort on these systems.
*/
*/
static
struct
pci_dev
*
hostbridge
;
static
struct
pci_dev
*
hostbridge
;
u8
rev
=
0
;
u8
rev
=
0
;
hostbridge
=
pci_find_subsys
(
PCI_VENDOR_ID_INTEL
,
hostbridge
=
pci_find_subsys
(
PCI_VENDOR_ID_INTEL
,
PCI_DEVICE_ID_INTEL_82815_MC
,
PCI_DEVICE_ID_INTEL_82815_MC
,
...
@@ -212,7 +209,7 @@ static unsigned int speedstep_detect_chipset (void)
...
@@ -212,7 +209,7 @@ static unsigned int speedstep_detect_chipset (void)
if
(
!
hostbridge
)
if
(
!
hostbridge
)
return
2
;
/* 2-M */
return
2
;
/* 2-M */
pci_read_config_byte
(
hostbridge
,
PCI_REVISION_ID
,
&
rev
);
pci_read_config_byte
(
hostbridge
,
PCI_REVISION_ID
,
&
rev
);
if
(
rev
<
5
)
{
if
(
rev
<
5
)
{
dprintk
(
KERN_INFO
"cpufreq: hostbridge does not support speedstep
\n
"
);
dprintk
(
KERN_INFO
"cpufreq: hostbridge does not support speedstep
\n
"
);
...
@@ -228,8 +225,8 @@ static unsigned int speedstep_detect_chipset (void)
...
@@ -228,8 +225,8 @@ static unsigned int speedstep_detect_chipset (void)
static
unsigned
int
speedstep_get
(
unsigned
int
cpu
)
static
unsigned
int
speedstep_get
(
unsigned
int
cpu
)
{
{
unsigned
int
speed
;
unsigned
int
speed
;
cpumask_t
cpus_allowed
,
affected_cpu_map
;
cpumask_t
cpus_allowed
,
affected_cpu_map
;
/* only run on CPU to be set, or on its sibling */
/* only run on CPU to be set, or on its sibling */
cpus_allowed
=
current
->
cpus_allowed
;
cpus_allowed
=
current
->
cpus_allowed
;
...
@@ -256,7 +253,7 @@ static int speedstep_target (struct cpufreq_policy *policy,
...
@@ -256,7 +253,7 @@ static int speedstep_target (struct cpufreq_policy *policy,
unsigned
int
target_freq
,
unsigned
int
target_freq
,
unsigned
int
relation
)
unsigned
int
relation
)
{
{
unsigned
int
newstate
=
0
;
unsigned
int
newstate
=
0
;
struct
cpufreq_freqs
freqs
;
struct
cpufreq_freqs
freqs
;
cpumask_t
cpus_allowed
,
affected_cpu_map
;
cpumask_t
cpus_allowed
,
affected_cpu_map
;
int
i
;
int
i
;
...
@@ -318,9 +315,9 @@ static int speedstep_verify (struct cpufreq_policy *policy)
...
@@ -318,9 +315,9 @@ static int speedstep_verify (struct cpufreq_policy *policy)
static
int
speedstep_cpu_init
(
struct
cpufreq_policy
*
policy
)
static
int
speedstep_cpu_init
(
struct
cpufreq_policy
*
policy
)
{
{
int
result
=
0
;
int
result
=
0
;
unsigned
int
speed
;
unsigned
int
speed
;
cpumask_t
cpus_allowed
,
affected_cpu_map
;
cpumask_t
cpus_allowed
,
affected_cpu_map
;
/* capability check */
/* capability check */
...
@@ -342,16 +339,15 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
...
@@ -342,16 +339,15 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
&
speedstep_freqs
[
SPEEDSTEP_HIGH
].
frequency
,
&
speedstep_freqs
[
SPEEDSTEP_HIGH
].
frequency
,
&
speedstep_set_state
);
&
speedstep_set_state
);
set_cpus_allowed
(
current
,
cpus_allowed
);
set_cpus_allowed
(
current
,
cpus_allowed
);
if
(
result
)
{
if
(
result
)
return
result
;
return
result
;
}
/* get current speed setting */
/* get current speed setting */
speed
=
speedstep_get
(
policy
->
cpu
);
speed
=
speedstep_get
(
policy
->
cpu
);
if
(
!
speed
)
if
(
!
speed
)
return
-
EIO
;
return
-
EIO
;
dprintk
(
KERN_INFO
"cpufreq: currently at %s speed setting - %i MHz
\n
"
,
dprintk
(
KERN_INFO
"cpufreq: currently at %s speed setting - %i MHz
\n
"
,
(
speed
==
speedstep_freqs
[
SPEEDSTEP_LOW
].
frequency
)
?
"low"
:
"high"
,
(
speed
==
speedstep_freqs
[
SPEEDSTEP_LOW
].
frequency
)
?
"low"
:
"high"
,
(
speed
/
1000
));
(
speed
/
1000
));
...
@@ -383,14 +379,14 @@ static struct freq_attr* speedstep_attr[] = {
...
@@ -383,14 +379,14 @@ static struct freq_attr* speedstep_attr[] = {
static
struct
cpufreq_driver
speedstep_driver
=
{
static
struct
cpufreq_driver
speedstep_driver
=
{
.
name
=
"speedstep-ich"
,
.
name
=
"speedstep-ich"
,
.
verify
=
speedstep_verify
,
.
verify
=
speedstep_verify
,
.
target
=
speedstep_target
,
.
target
=
speedstep_target
,
.
init
=
speedstep_cpu_init
,
.
init
=
speedstep_cpu_init
,
.
exit
=
speedstep_cpu_exit
,
.
exit
=
speedstep_cpu_exit
,
.
get
=
speedstep_get
,
.
get
=
speedstep_get
,
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
.
attr
=
speedstep_attr
,
.
attr
=
speedstep_attr
,
};
};
...
...
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