* cpufreq/linux/arch/arm/mach-sa1100 cpu-sa1100.c, 1.5, 1.6 cpu-sa1110.c, 1.12, 1.13
@ 2004-08-26 13:25 Ducrot Bruno
2004-08-26 14:10 ` Russell King
0 siblings, 1 reply; 4+ messages in thread
From: Ducrot Bruno @ 2004-08-26 13:25 UTC (permalink / raw)
To: cpufreq
Update of /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100
In directory flint:/tmp/cvs-serv26017/linux/arch/arm/mach-sa1100
Modified Files:
cpu-sa1100.c cpu-sa1110.c
Log Message:
merge with current cpufreq bk tree and 2.6.9-r1
Index: cpu-sa1100.c
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100/cpu-sa1100.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu-sa1100.c 5 Nov 2003 18:27:41 -0000 1.5
+++ cpu-sa1100.c 26 Aug 2004 13:25:17 -0000 1.6
@@ -180,7 +180,7 @@
unsigned int target_freq,
unsigned int relation)
{
- unsigned int cur = sa11x0_getspeed();
+ unsigned int cur = sa11x0_getspeed(0);
unsigned int new_ppcr;
struct cpufreq_freqs freqs;
@@ -221,7 +221,7 @@
{
if (policy->cpu != 0)
return -EINVAL;
- policy->cur = policy->min = policy->max = sa11x0_getspeed();
+ policy->cur = policy->min = policy->max = sa11x0_getspeed(0);
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.min_freq = 59000;
policy->cpuinfo.max_freq = 287000;
@@ -230,15 +230,18 @@
}
static struct cpufreq_driver sa1100_driver = {
+ .flags = CPUFREQ_STICKY |
+ CPUFREQ_PANIC_OUTOFSYNC |
+ CPUFREQ_PANIC_RESUME_OUTOFSYNC,
.verify = sa11x0_verify_speed,
.target = sa1100_target,
+ .get = sa11x0_getspeed,
.init = sa1100_cpu_init,
.name = "sa1100",
};
static int __init sa1100_dram_init(void)
{
- cpufreq_gov_userspace_init();
if ((processor_id & CPU_SA1100_MASK) == CPU_SA1100_ID)
return cpufreq_register_driver(&sa1100_driver);
else
Index: cpu-sa1110.c
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100/cpu-sa1110.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpu-sa1110.c 6 Nov 2003 11:11:44 -0000 1.12
+++ cpu-sa1110.c 26 Aug 2004 13:25:17 -0000 1.13
@@ -238,7 +238,7 @@
return -EINVAL;
}
- freqs.old = sa11x0_getspeed();
+ freqs.old = sa11x0_getspeed(0);
freqs.new = sa11x0_ppcr_to_freq(ppcr);
freqs.cpu = 0;
@@ -320,7 +320,7 @@
{
if (policy->cpu != 0)
return -EINVAL;
- policy->cur = policy->min = policy->max = sa11x0_getspeed();
+ policy->cur = policy->min = policy->max = sa11x0_getspeed(0);
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.min_freq = 59000;
policy->cpuinfo.max_freq = 287000;
@@ -329,8 +329,12 @@
}
static struct cpufreq_driver sa1110_driver = {
+ .flags = CPUFREQ_STICKY |
+ CPUFREQ_PANIC_OUTOFSYNC |
+ CPUFREQ_PANIC_RESUME_OUTOFSYNC,
.verify = sa11x0_verify_speed,
.target = sa1110_target,
+ .get = sa11x0_getspeed,
.init = sa1110_cpu_init,
.name = "sa1110",
};
@@ -354,8 +358,6 @@
sdram->tck, sdram->trcd, sdram->trp,
sdram->twr, sdram->refresh, sdram->cas_latency);
- cpufreq_gov_userspace_init();
-
memcpy(&sdram_params, sdram, sizeof(sdram_params));
return cpufreq_register_driver(&sa1110_driver);
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: cpufreq/linux/arch/arm/mach-sa1100 cpu-sa1100.c, 1.5, 1.6 cpu-sa1110.c, 1.12, 1.13
2004-08-26 13:25 cpufreq/linux/arch/arm/mach-sa1100 cpu-sa1100.c, 1.5, 1.6 cpu-sa1110.c, 1.12, 1.13 Ducrot Bruno
@ 2004-08-26 14:10 ` Russell King
2004-08-26 14:15 ` Russell King
0 siblings, 1 reply; 4+ messages in thread
From: Russell King @ 2004-08-26 14:10 UTC (permalink / raw)
To: cpufreq
On Thu, Aug 26, 2004 at 02:25:51PM +0100, Ducrot Bruno wrote:
> Update of /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100
> In directory flint:/tmp/cvs-serv26017/linux/arch/arm/mach-sa1100
> @@ -329,8 +329,12 @@
> }
>
> static struct cpufreq_driver sa1110_driver = {
> + .flags = CPUFREQ_STICKY |
> + CPUFREQ_PANIC_OUTOFSYNC | <<<<
> + CPUFREQ_PANIC_RESUME_OUTOFSYNC, <<<<
Erm, _why_ ?
This makes very little sense. If you put the system to sleep at
147MHz and it normally boots at 206.4MHz, you'll resume at 206.4MHz.
It's up to the kernel to reset the clock rate itself. This is nothing
new - cpufreq has always done this, so why are we adding this new
restriction?
It makes zero sense.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: cpufreq/linux/arch/arm/mach-sa1100 cpu-sa1100.c, 1.5, 1.6 cpu-sa1110.c, 1.12, 1.13
2004-08-26 14:10 ` Russell King
@ 2004-08-26 14:15 ` Russell King
2004-08-26 16:57 ` Bruno Ducrot
0 siblings, 1 reply; 4+ messages in thread
From: Russell King @ 2004-08-26 14:15 UTC (permalink / raw)
To: cpufreq
On Thu, Aug 26, 2004 at 03:10:34PM +0100, Russell King wrote:
> On Thu, Aug 26, 2004 at 02:25:51PM +0100, Ducrot Bruno wrote:
> > Update of /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100
> > In directory flint:/tmp/cvs-serv26017/linux/arch/arm/mach-sa1100
> > @@ -329,8 +329,12 @@
> > }
> >
> > static struct cpufreq_driver sa1110_driver = {
> > + .flags = CPUFREQ_STICKY |
>
> > + CPUFREQ_PANIC_OUTOFSYNC | <<<<
> > + CPUFREQ_PANIC_RESUME_OUTOFSYNC, <<<<
>
> Erm, _why_ ?
>
> This makes very little sense. If you put the system to sleep at
> 147MHz and it normally boots at 206.4MHz, you'll resume at 206.4MHz.
>
> It's up to the kernel to reset the clock rate itself. This is nothing
> new - cpufreq has always done this, so why are we adding this new
> restriction?
>
> It makes zero sense.
And to follow that up, yes, I missed it back in June when I added
the CPUFREQ_STICKY here. However, I was completely unaware that
this change had been made back in May 2004.
Can we please route changes to architecture files via the architecture
people _before_ merging them. Pretty please?
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: cpufreq/linux/arch/arm/mach-sa1100 cpu-sa1100.c, 1.5, 1.6 cpu-sa1110.c, 1.12, 1.13
2004-08-26 14:15 ` Russell King
@ 2004-08-26 16:57 ` Bruno Ducrot
0 siblings, 0 replies; 4+ messages in thread
From: Bruno Ducrot @ 2004-08-26 16:57 UTC (permalink / raw)
To: cpufreq; +Cc: davej
On Thu, Aug 26, 2004 at 03:15:40PM +0100, Russell King wrote:
> On Thu, Aug 26, 2004 at 03:10:34PM +0100, Russell King wrote:
> > On Thu, Aug 26, 2004 at 02:25:51PM +0100, Ducrot Bruno wrote:
> > > Update of /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100
> > > In directory flint:/tmp/cvs-serv26017/linux/arch/arm/mach-sa1100
> > > @@ -329,8 +329,12 @@
> > > }
> > >
> > > static struct cpufreq_driver sa1110_driver = {
> > > + .flags = CPUFREQ_STICKY |
> >
> > > + CPUFREQ_PANIC_OUTOFSYNC | <<<<
> > > + CPUFREQ_PANIC_RESUME_OUTOFSYNC, <<<<
> >
> > Erm, _why_ ?
Because I only merged the latest bk kernel. I should pay more attention
in the future.. Sorry.
> >
> > This makes very little sense. If you put the system to sleep at
> > 147MHz and it normally boots at 206.4MHz, you'll resume at 206.4MHz.
> >
> > It's up to the kernel to reset the clock rate itself. This is nothing
> > new - cpufreq has always done this, so why are we adding this new
> > restriction?
> >
> > It makes zero sense.
>
> And to follow that up, yes, I missed it back in June when I added
> the CPUFREQ_STICKY here. However, I was completely unaware that
> this change had been made back in May 2004.
>
> Can we please route changes to architecture files via the architecture
> people _before_ merging them. Pretty please?
Does something like this ok?
Index: linux/arch/arm/mach-sa1100/cpu-sa1100.c
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100/cpu-sa1100.c,v
retrieving revision 1.6
diff -u -r1.6 cpu-sa1100.c
--- linux/arch/arm/mach-sa1100/cpu-sa1100.c 26 Aug 2004 13:25:17 -0000 1.6
+++ linux/arch/arm/mach-sa1100/cpu-sa1100.c 26 Aug 2004 16:55:27 -0000
@@ -230,9 +230,7 @@
}
static struct cpufreq_driver sa1100_driver = {
- .flags = CPUFREQ_STICKY |
- CPUFREQ_PANIC_OUTOFSYNC |
- CPUFREQ_PANIC_RESUME_OUTOFSYNC,
+ .flags = CPUFREQ_STICKY,
.verify = sa11x0_verify_speed,
.target = sa1100_target,
.get = sa11x0_getspeed,
Index: linux/arch/arm/mach-sa1100/cpu-sa1110.c
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/arm/mach-sa1100/cpu-sa1110.c,v
retrieving revision 1.13
diff -u -r1.13 cpu-sa1110.c
--- linux/arch/arm/mach-sa1100/cpu-sa1110.c 26 Aug 2004 13:25:17 -0000 1.13
+++ linux/arch/arm/mach-sa1100/cpu-sa1110.c 26 Aug 2004 16:55:27 -0000
@@ -329,9 +329,7 @@
}
static struct cpufreq_driver sa1110_driver = {
- .flags = CPUFREQ_STICKY |
- CPUFREQ_PANIC_OUTOFSYNC |
- CPUFREQ_PANIC_RESUME_OUTOFSYNC,
+ .flags = CPUFREQ_STICKY,
.verify = sa11x0_verify_speed,
.target = sa1110_target,
.get = sa11x0_getspeed,
--
Bruno Ducrot
-- Which is worse: ignorance or apathy?
-- Don't know. Don't care.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-08-26 16:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-08-26 13:25 cpufreq/linux/arch/arm/mach-sa1100 cpu-sa1100.c, 1.5, 1.6 cpu-sa1110.c, 1.12, 1.13 Ducrot Bruno
2004-08-26 14:10 ` Russell King
2004-08-26 14:15 ` Russell King
2004-08-26 16:57 ` Bruno Ducrot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.