Re: ACPI / cpufreq on Presario R3120

[Ken Hughes <khughes@pacific.edu>]

Dominik Brodowski wrote:

> Ignore two identical low freq entries in the ACPI tables for the powernow-k8
> driver.
> 
> Signed-off-by:	Dominik Brodowski <linux@brodo.de>
> 
> --- linux-2.6.7-rc1/arch/i386/kernel/cpu/cpufreq/powernow-k8.c~	2004-05-26 22:30:43.000000000 +0200
> +++ linux-2.6.7-rc1/arch/i386/kernel/cpu/cpufreq/powernow-k8.c	2004-06-04 17:22:23.959400368 +0200
> @@ -734,9 +734,21 @@
>  		}
>  
>  		/* verify only 1 entry from the lo frequency table */
> -		if ((fid < HI_FID_TABLE_BOTTOM) && (cntlofreq++)) {
> -			printk(KERN_ERR PFX "Too many lo freq table entries\n");
> -			goto err_out;
> +		if (fid < HI_FID_TABLE_BOTTOM) {
> +			if (cntlofreq) {
> +				/* if both entries are the same, ignore this
> +				 * one... 
> +				 */
> +				if ((powernow_table[i].frequency != powernow_table[cntlofreq].frequency) ||
> +				    (powernow_table[i].index != powernow_table[cntlofreq].index)) {
> +					printk(KERN_ERR PFX "Too many lo freq table entries\n");
> +					goto err_out;
> +				}
> +
> +				dprintk(KERN_INFO PFX "double low frequency table entry, ignoring it.\n");
> +				powernow_table[i].frequency = CPUFREQ_ENTRY_INVALID;
> +			} else
> +				cntlofreq = i;
>  		}
>                                                                                                              
>  		if (powernow_table[i].frequency != (data->acpi_data.states[i].core_frequency * 1000)) {
> 

I patched 2.6.7-rc2 with this, and get this output from the module:

powernow-k8: Found 1 AMD Athlon 64 / Opteron processors (versio1.00.09b)
powernow-k8: invalid freq entries 4294967295 kHz vs. 800000 kHz
powernow-k8:    0 : fid 0x8 (1600 MHz), vid 0x6 (1400 mV)
powernow-k8:    1 : fid 0x0 (800 MHz), vid 0x18 (950 mV)
powernow-k8: cpu_init done, current fid 0x8, vid 0x6

Seems to be working OK.  Thanks for everyone's help.

Ken