powernow-k7: acpi support.
PATCH 1/1 powernow-k7: acpi support.
Powernow-k7 may need ACPI perflib. This implement that. The only problem for now is to know when we need it.
arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 159 +++++++++++++++++++++++++++++ 1 files changed, 159 insertions(+)
arch/i386/kernel/cpu/cpufreq/powernow-k7.c +159 -0
@@ -27,6 +27,11 @@#include <asm/io.h> #include <asm/system.h> +#ifdef CONFIG_ACPI_PROCESSOR +#include <linux/acpi.h> +#include <acpi/processor.h> +#endif +#include "powernow-k7.h" #define DEBUG
@@ -57,6 +62,17 @@ struct pst_s {u8 numpstates; }; +#ifdef CONFIG_ACPI_PROCESSOR +union powernow_acpi_control_t { +struct { +unsigned long fid:5 , + vid:5 , + sgtc:20 , + res1:2 ; + } bits; +unsigned long val; +}; +#endif /* divide by 1000 to get VID. */ static int mobile_vid_table[32 ] = {
@@ -260,6 +276,145 @@ static void change_speed (unsigned int i } +#ifdef CONFIG_ACPI_PROCESSOR + +struct acpi_processor_performance *acpi_processor_perf; + +static int powernow_acpi_init (void ) +{ +int i; +int retval =0 ; +union powernow_acpi_control_t pc; + +if (acpi_processor_perf !=NULL && powernow_table !=NULL ) { + retval = -EINVAL ; + goto err0; + } + + acpi_processor_perf =kmalloc (sizeof (struct acpi_processor_performance ), +GFP_KERNEL ); + +if (!acpi_processor_perf) { + retval = -ENOMEM ; + goto err0; + } + +memset (acpi_processor_perf,0 ,sizeof (struct acpi_processor_performance )); + +if (acpi_processor_register_performance (acpi_processor_perf,0 )) { + retval = -EIO ; + goto err1; + } + +if (acpi_processor_perf->control_register.space_id !=ACPI_ADR_SPACE_FIXED_HARDWARE ) { + retval = -ENODEV ; + goto err2; + } + +if (acpi_processor_perf->status_register.space_id !=ACPI_ADR_SPACE_FIXED_HARDWARE ) { + retval = -ENODEV ; + goto err2; + } + + number_scales = acpi_processor_perf->state_count; + +if (number_scales <2 ) { + retval = -ENODEV ; + goto err2; + } + + powernow_table =kmalloc ((number_scales +1 ) * (sizeof (struct cpufreq_frequency_table )),GFP_KERNEL ); +if (!powernow_table) { + retval = -ENOMEM ; + goto err2; + } + +memset (powernow_table,0 , ((number_scales +1 ) *sizeof (struct cpufreq_frequency_table ))); + + pc.val = (unsigned long ) acpi_processor_perf->states[0 ].control; + fsb = (10 * (u32 ) acpi_processor_perf->states[0 ].core_frequency) / (fid_codes[pc.bits.fid]); +if (fsb >133 ) + fsb =133 ; +if (fsb <100 ) + fsb =100 ; + +if (100 +133 <2 *fsb) + fsb =133 ; +else + fsb =100 ; + + latency =0 ; + +for (i =0 ; i < number_scales; i++) { +u8 fid, vid; +unsigned int speed; + + pc.val = (unsigned long ) acpi_processor_perf->states[i].control; + dprintk (KERN_INFO PFX "acpi: P%d: %d MHz, %d mW, %d uS, control %08x, status %08x, vid: %02x fid: %02x SGTC: %d\n", + i, + (u32 ) acpi_processor_perf->states[i].core_frequency, + (u32 ) acpi_processor_perf->states[i].power, + (u32 ) acpi_processor_perf->states[i].transition_latency, + (u32 ) acpi_processor_perf->states[i].control, + (u32 ) acpi_processor_perf->states[i].status, + pc.bits.vid, + pc.bits.fid, + pc.bits.sgtc); + + vid = pc.bits.vid; + fid = pc.bits.fid; + + powernow_table[i].frequency = fsb * fid_codes[fid] *100 ; + powernow_table[i].index = fid;/* lower 8 bits */ + powernow_table[i].index |= (vid <<8 );/* upper 8 bits */ + + speed = fsb * (fid_codes[fid]/10 ); +if ((fid_codes[fid] %10 )==5 ) { + speed += fsb/2 ; +if (have_a0 ==1 ) + powernow_table[i].frequency =CPUFREQ_ENTRY_INVALID ; + } + + dprintk (KERN_INFO PFX " FID: 0x%x (%d.%dx [%dMHz])\t", fid, + fid_codes[fid] / 10, fid_codes[fid] % 10, speed); +dprintk ("VID: 0x%x (%d.%03dV)\n" , vid, mobile_vid_table[vid]/1000 , + mobile_vid_table[vid]%1000 ); + +if (latency < pc.bits.sgtc) + latency = pc.bits.sgtc; + +if (speed < minimum_speed) + minimum_speed = speed; +if (speed > maximum_speed) + maximum_speed = speed; + } + +/* Validate latency. The latency should be at least +* 10000 and must fit in a 20 bit register. +*/ +if ((latency & ((~((~0u ) <<20 )))) <10000 ) { + printk(KERN_WARNING PFX "broken latency in ACPI table.\n"); + printk(KERN_INFO PFX "ACPI set settling time to %d.%02d microseconds. " +"Should be at least 100. Correcting.\n" , + latency/100 , + latency%100); + latency =10000 ; + } + powernow_table[i].frequency =CPUFREQ_TABLE_END ; + powernow_table[i].index =0 ; + +return 0 ; + +err2: +acpi_processor_unregister_performance (acpi_processor_perf,0 ); +err1: +kfree (acpi_processor_perf); +err0: + acpi_processor_perf =NULL ; +return retval; +} +#endif +static int powernow_decode_bios (int maxfid,int startvid) {struct psb_s *psb;
@@ -428,6 +585,10 @@ static int __init powernow_init (void) static void __exit powernow_exit (void) { +if (acpi_processor_perf) { +acpi_processor_unregister_performance (acpi_processor_perf,0 ); +kfree (acpi_processor_perf); + }cpufreq_unregister_driver (&powernow_driver);if (powernow_table)kfree (powernow_table);
Signature · 4 lines
Bruno Ducrot -- Which is worse: ignorance or apathy? -- Don't know. Don't care.
PATCH 1/1 powernow-k7: example use for powernow_acpi_init()
This is an example for using the powernow-k7 ACPI perflib integration, when the legacy PSB/PST tables are broken.
arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
arch/i386/kernel/cpu/cpufreq/powernow-k7.c +9 -4
@@ -413,6 +413,8 @@ err0: acpi_processor_perf =NULL ; return retval; } +#else +static int powernow_acpi_init (void ) {return -EINVAL ;}#endif static int powernow_decode_bios (int maxfid,int startvid)
@@ -486,10 +488,13 @@ static int powernow_decode_bios (int max p+=2 ; } } - printk (KERN_INFO PFX "No PST tables match this cpuid (0x%x)\n", etuple); - printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); - printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n"); -return -EINVAL ; + ret =powernow_acpi_init (); +if (ret) { + printk (KERN_INFO PFX "No PST tables match this cpuid (0x%x)\n", etuple); + printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); + printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n"); + } +return ret; } p++; }
Signature · 4 lines
Bruno Ducrot -- Which is worse: ignorance or apathy? -- Don't know. Don't care.
Re: [PATCH] powernow-k7: example use for powernow_acpi_init()
Quoted 7 lines · Bruno Ducrot
This is an example for using the powernow-k7 ACPI perflib integration, when the legacy PSB/PST tables are broken.
arch/i386/kernel/cpu/cpufreq/powernow-k7.c +0
-3- printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); - printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n"); -return -EINVAL ;
arch/i386/kernel/cpu/cpufreq/powernow-k7.c static int powernow_decode_bios (int max · line 500
Quoted 10 lines
arch/i386/kernel/cpu/cpufreq/powernow-k7.c +7
-0+ ret =powernow_acpi_init (); +if (ret) { + printk (KERN_INFO PFX "No PST tables match this cpuid (0x%x)\n", etuple); + printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); + printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n"); + } +return ret; } p++; }
Looks good, though also mentioning that the acpi fallback failed is probably a good idea too.
Dave
Re: [PATCH] powernow-k7: example use for powernow_acpi_init()
Quoted 5 lines · Dave Jones
Quoted 4 lines · Bruno Ducrot
This is an example for using the powernow-k7 ACPI perflib integration, when the legacy PSB/PST tables are broken.
Quoted 16 lines
Review
Quoted 13 lines
(quoted diff) +7
-3- printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); - printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n"); - return -EINVAL; + ret = powernow_acpi_init(); + if (ret) { + printk (KERN_INFO PFX "No PST tables match this cpuid (0x%x)\n", etuple); + printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); + printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n"); + } + return ret; } p++; }Looks good, though also mentioning that the acpi fallback failed is probably a good idea too.
Indeed. And making ACPI perflib in case of known broken BIOS via DMI may be good (the ASUS should work with that patch, if I read correctly the DSDT). There may be though one little annoying thing for the ASUS bug: FSB will be reported at 100MHz whereas it is at 133MHz, but it's only cosmetic, I hope.
The real trouble is that I don't know how to retrieve FSB on a athlon/duron: MSR_IA32_EBL_CR_POWERON do not give it :(
arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-)
arch/i386/kernel/cpu/cpufreq/powernow-k7.c +16 -7
@@ -410,11 +410,17 @@ err2: err1:kfree (acpi_processor_perf); err0: + printk(KERN_WARNING PFX "ACPI perflib can not be used in this platform"); acpi_processor_perf =NULL ;return retval; }#else -static int powernow_acpi_init (void ) {return -EINVAL ;} +static int powernow_acpi_init (void ) +{ + printk(KERN_INFO PFX "no support for ACPI processor found." + " Please recompile your kernel with ACPI processor"); +return -EINVAL ; +}#endif static int powernow_decode_bios (int maxfid,int startvid)
@@ -427,6 +433,11 @@ static int powernow_decode_bios (int maxunsigned int etuple;unsigned int ret; +if (dmi_broken &BROKEN_CPUFREQ ) { + printk (KERN_INFO PFX "PSB/PST known to be broken. Trying ACPI perflib\n"); +return (powernow_acpi_init ()); + } + etuple =cpuid_eax (0x80000001 ); etuple &=0xf00 ; etuple |= (c->x86_model<<4 )|(c->x86_mask);
@@ -488,10 +499,12 @@ static int powernow_decode_bios (int max p+=2 ; } } + printk (KERN_INFO PFX "No PST tables match this cpuid (0x%x)\n", etuple); + printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); + printk (KERN_INFO PFX "Trying ACPI perflib\n"); ret =powernow_acpi_init ();if (ret) { - printk (KERN_INFO PFX "No PST tables match this cpuid (0x%x)\n", etuple); - printk (KERN_INFO PFX "This is indicative of a broken BIOS.\n"); + printk (KERN_INFO PFX "ACPI and leagcy methods failed\n"); printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n"); }return ret;
@@ -576,10 +589,6 @@ static struct cpufreq_driver powernow_drstatic int __init powernow_init (void ) { -if (dmi_broken &BROKEN_CPUFREQ ) { - printk (KERN_INFO PFX "Disabled at boot time by DMI,\n"); -return -ENODEV ; - }if (check_powernow ()==0 )return -ENODEV ;return cpufreq_register_driver (&powernow_driver);
Signature · 4 lines
Bruno Ducrot -- Which is worse: ignorance or apathy? -- Don't know. Don't care.
Re: [PATCH] powernow-k7: stupid bug in a printk introduced
Review
Quoted 4 lines
(quoted diff) +4
-0+static int powernow_acpi_init(void) +{ + printk(KERN_INFO PFX "no support for ACPI processor found." + " Please recompile your kernel with ACPI processor");
^
seems a \n is
needed here
Review
Quoted 3 lines
(quoted diff) +2
-0+ return -EINVAL; +} #endif
arch/i386/kernel/cpu/cpufreq/powernow-k7.c +1 -1
@@ -418,7 +418,7 @@ err0:static int powernow_acpi_init (void ) { printk(KERN_INFO PFX "no support for ACPI processor found." - " Please recompile your kernel with ACPI processor"); + " Please recompile your kernel with ACPI processor\n");return -EINVAL ; }#endif
Signature · 4 lines
Bruno Ducrot -- Which is worse: ignorance or apathy? -- Don't know. Don't care.
Re: [PATCH] powernow-k7: example use for powernow_acpi_init()
In reply to Bruno DucrotQuoted 5 lines · Bruno Ducrot
Indeed. And making ACPI perflib in case of known broken BIOS via DMI may be good (the ASUS should work with that patch, if I read correctly the DSDT). There may be though one little annoying thing for the ASUS bug: FSB will be reported at 100MHz whereas it is at 133MHz, but it's only cosmetic, I hope.
Hmm, won't that skew the calculated frequencies somewhat ?
Quoted 2 lines
The real trouble is that I don't know how to retrieve FSB on a athlon/duron:
MSR_IA32_EBL_CR_POWERONdo not give it :(
*nod*. I even looked through the powernow docs hoping that the fsb would be stored in one of those registers, but no.
One thing that I did just find though that is interesting. In the powernow documents, they describe the current/maximum/startup FID and say "multiply by 100 to determine the frequency" which is very odd if there really are 133 bus parts out there.
It does state in another part of the document that the FSB is either 100 or 133 MHz, but in bold.. "For mobile applications the FSB is 100 MHz"
Very odd.
Dave
Re: [PATCH] powernow-k7: example use for powernow_acpi_init()
Quoted 9 lines · Dave Jones
Quoted 5 lines · Bruno Ducrot
Indeed. And making ACPI perflib in case of known broken BIOS via DMI may be good (the ASUS should work with that patch, if I read correctly the DSDT). There may be though one little annoying thing for the ASUS bug: FSB will be reported at 100MHz whereas it is at 133MHz, but it's only cosmetic, I hope.
Hmm, won't that skew the calculated frequencies somewhat ?
Yes. The only solution that come in mind is to offer an override at boot time unfortunately. Need though that an ASUS user affected by a buggy bios confirm that the values given via ACPI are wrong when calculating the FSB. I'm only a human being, after all.
Quoted 10 lines
Quoted 2 lines
The real trouble is that I don't know how to retrieve FSB on a athlon/duron:
MSR_IA32_EBL_CR_POWERONdo not give it :(*nod*. I even looked through the powernow docs hoping that the fsb would be stored in one of those registers, but no.
One thing that I did just find though that is interesting. In the powernow documents, they describe the current/maximum/startup FID and say "multiply by 100 to determine the frequency" which is very odd if there really are 133 bus parts out there.
I guess that apply only for mobile athlon model 6?
Quoted 4 lines
It does state in another part of the document that the FSB is either 100 or 133 MHz, but in bold.. "For mobile applications the FSB is 100 MHz"
Very odd.
Arghhh! My laptop is running off-spec ;)
Signature · 4 lines
Bruno Ducrot -- Which is worse: ignorance or apathy? -- Don't know. Don't care.
Re: [PATCH] powernow-k7: example use for powernow_acpi_init()
In reply to Dave JonesQuoted 21 lines · Dave Jones
Quoted 5 lines · Bruno Ducrot
Indeed. And making ACPI perflib in case of known broken BIOS via DMI may be good (the ASUS should work with that patch, if I read correctly the DSDT). There may be though one little annoying thing for the ASUS bug: FSB will be reported at 100MHz whereas it is at 133MHz, but it's only cosmetic, I hope.
Hmm, won't that skew the calculated frequencies somewhat ?
Quoted 2 lines
The real trouble is that I don't know how to retrieve FSB on a athlon/duron:
MSR_IA32_EBL_CR_POWERONdo not give it :(*nod*. I even looked through the powernow docs hoping that the fsb would be stored in one of those registers, but no.
One thing that I did just find though that is interesting. In the powernow documents, they describe the current/maximum/startup FID and say "multiply by 100 to determine the frequency" which is very odd if there really are 133 bus parts out there.
Quoted 4 lines
It does state in another part of the document that the FSB is either 100 or 133 MHz, but in bold.. "For mobile applications the FSB is 100 MHz"
Very odd.
At least it's not as broken as the ACPI spec: it's impossible to determine anything with regard to current frequency settings...
Dominik
_______________________________________________
Cpufreq mailing list
[email protected]
http://www.linux.org.uk/mailman/listinfo/cpufreq