From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hendrik Muhs Subject: [PATCH] Another powernow-k7 patch for Desktop XP-M usage Date: Tue, 12 Oct 2004 10:18:20 +0200 Sender: cpufreq-bounces@www.linux.org.uk Message-ID: <200410121018.20518.Hendrik.Muhs@web.de> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_MN5aB47irGVSe7P" Return-path: Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cpufreq-bounces+glkc-cpufreq=gmane.org@www.linux.org.uk To: cpufreq@www.linux.org.uk --Boundary-00=_MN5aB47irGVSe7P Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, I have Athlon XP-M CPU running on Desktop board, which means my BIOS has no PST tables. After testing the available patches to fix this problem, I combined them an wrote my own patch. The attached patch is for the latest stable kernel 2.6.8.1 and adds the following parameters: - overwrite_table activates the manually settings, set it to >=1 - multiplier specifies an array of multipliers, odd multipliers must be multiplied by 10: 3.5 -> 35 - voltage specifies an array of VCore voltages in respect to the specified multipliers. You have to specify them as mV: 1.125 -> 1125 - switch_latency sets the state transition latency in microseconds (default 200us) The patch does not allow overclocking: higher multipliers and/or voltages than the maximum specified on CPU will be ignored. You do not have to specify voltages, in this case the CPU default will be used (on some boards voltage switching is not possible anyway). example usage: modprobe powernow-k7 overwrite_table=1 multiplier=3,4,5,6,7,8,9,10 Disclaimer: It should not be possible to burn the CPU, but some combinations could crash the system. I give no guaranty that it works for your system and/or any possibly resulting hardware damage. Have fun with it, Hendrik --Boundary-00=_MN5aB47irGVSe7P Content-Type: text/x-diff; charset="us-ascii"; name="powernow-k7.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="powernow-k7.patch" --- arch/i386/kernel/cpu/cpufreq/powernow-k7.c.orig 2004-08-14 07:36:12.000000000 +0200 +++ arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2004-10-03 18:20:56.000000000 +0200 @@ -76,28 +76,50 @@ }; #endif -/* divide by 1000 to get VID. */ +/* divide by 1000 to get VCore voltage in V. */ static int mobile_vid_table[32] = { 2000, 1950, 1900, 1850, 1800, 1750, 1700, 1650, 1600, 1550, 1500, 1450, 1400, 1350, 1300, 0, 1275, 1250, 1225, 1200, 1175, 1150, 1125, 1100, - 1075, 1050, 1024, 1000, 975, 950, 925, 0, + 1075, 1050, 1025, 1000, 975, 950, 925, 0, }; -/* divide by 10 to get FID. */ +/* divide by 10 to get multiplier. */ static int fid_codes[32] = { 110, 115, 120, 125, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100, 105, 30, 190, 40, 200, 130, 135, 140, 210, - 150, 225, 160, 165, 170, 180, -1, -1, + 150, 220, 160, 165, 170, 180, -1, -1, }; +/* translation table for even multiplier to fid */ +static int even_multiplier[20]= { + 16, 18, 4, 6, 8, 10, 12, 14, // 3, 4, 5, 6, 7 ,8 , 9, 10 + 0, 2, 20, 22, 24, 26, 28, 29, // 11, 12, 13, 14, 15, 16, 17, 18 + 17, 19, 23, 25, // 19, 20, 21, 22 +}; + +/* translation table for odd multiplier to fid*/ +static int odd_multiplier[9]={ + 5, 7, 9, 11, 12, 13, 1, 3, // 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5 + 21, // 13.5 +}; + + /* This parameter is used in order to force ACPI instead of legacy method for * configuration purpose. */ static int acpi_force; +/* This parameters can be used to manually overwrite the tables */ +static int overwrite_table = 0; +#define MAX_PST 10 +static int maxPSTSize = MAX_PST; +static int multiplier[MAX_PST]= {[0 ... (MAX_PST - 1)] = 0}; +static int voltage[MAX_PST]= {[0 ... (MAX_PST - 1)] = 0}; +static int switch_latency=0; + static struct cpufreq_frequency_table *powernow_table; static unsigned int can_scale_bus; @@ -414,6 +436,131 @@ } #endif +static int powernow_manual_settings(union msr_fidvidstatus *fidvidstatus) +{ + int i,k, validentry; + unsigned int max_multiplier, max_voltage; + unsigned int speed, cm; + u8 vid, fid; + static struct cpufreq_frequency_table *powernow_table_tmp; + + if (switch_latency > 0) { + if (switch_latency < 100) { + printk (KERN_INFO PFX "Settling time passed as %d microseconds." + "Should be at least 100. Correcting.\n", switch_latency); + switch_latency = 100; + } + latency = switch_latency; + } else { + latency = 200; + } + dprintk (KERN_INFO PFX "Settling Time: %d microseconds.\n", latency); + + /* get number of specified multipliers */ + for (i=0; i< MAX_PST; i++) { + if (multiplier[i] == 0) { + number_scales=i; + break; + } + } + + /* get maximum values */ + max_multiplier = fid_codes[fidvidstatus->bits.MFID]; + max_voltage = mobile_vid_table[fidvidstatus->bits.MVID]; + + /* allocate memory */ + powernow_table=kmalloc((sizeof(struct cpufreq_frequency_table) * (number_scales + 1)), GFP_KERNEL); + if (!powernow_table) + return -ENOMEM; + memset(powernow_table,0,(sizeof(struct cpufreq_frequency_table)*(number_scales+1))); + + k=0; + for(i=0; i 4) && (cm < 14)) { + fid= odd_multiplier[cm-5]; + validentry = 1; + } + } else { + /* even_multiplier */ + if ((cm < 23) && (cm > 2)) { + fid = even_multiplier[cm-3]; + validentry=1; + } + } + } + } + + if (validentry) { + /* if no voltage specified use CPU default */ + if (voltage[i] == 0) + voltage[i] = max_voltage; + + /* we do not allow higher voltages than the CPU's maximum + 925 mV is the minimum */ + if ((voltage[i] <= max_voltage) && (voltage[i] >= 925)) { + if (voltage[i] >= 1300) { + vid = 40 - (voltage[i]/50); + } else { + vid = 67 - (voltage[i]/25); + } + /* calculate speed */ + speed = fsb * fid_codes[fid] / 10; + powernow_table[k].frequency = speed; + powernow_table[k].index=fid; /*lower 8 bits*/ + powernow_table[k].index|= (vid << 8); /*upper 8 bits*/ + + if (speed < minimum_speed) + minimum_speed = speed; + if (speed > maximum_speed) + maximum_speed = speed; + + dprintk (KERN_INFO PFX " FID: 0x%x (%d.%dx [%dMHz])\t", fid, fid_codes[fid] / 10, fid_codes[fid] % 10, speed/1000); + dprintk ("VID: 0x%x (%d.%03dV)\n", vid, mobile_vid_table[vid]/1000, mobile_vid_table[vid]%1000); + k++; + } + } else { + // invalid entry + dprintk (KERN_INFO PFX "Entry %d is invalid\n", i+1); + } + } + + if (k < number_scales) { + /* some entrys were invalid need to realloc table */ + number_scales = k; + powernow_table_tmp = kmalloc((sizeof(struct cpufreq_frequency_table) * (number_scales + 1)), GFP_KERNEL); + if (!powernow_table_tmp) { + kfree(powernow_table); + return -ENOMEM; + } + memcpy(powernow_table_tmp,powernow_table,(sizeof(struct cpufreq_frequency_table) * (number_scales + 1))); + kfree(powernow_table); + powernow_table=powernow_table_tmp; + } + + + /* Terminate frequency list */ + powernow_table[number_scales].frequency = CPUFREQ_TABLE_END; + powernow_table[number_scales].index = 0; + + return 0; +} + static int powernow_decode_bios (int maxfid, int startvid) { struct psb_s *psb; @@ -601,6 +748,11 @@ if (dmi_check_system(powernow_dmi_table) || acpi_force) { printk (KERN_INFO PFX "PSB/PST known to be broken. Trying ACPI instead\n"); result = powernow_acpi_init(); + } + else if (overwrite_table){ + printk(KERN_INFO PFX "Overwriting PST table with manual settings\n"); + result = powernow_manual_settings(&fidvidstatus); + } else { result = powernow_decode_bios(fidvidstatus.bits.MFID, fidvidstatus.bits.SVID); if (result) { @@ -681,6 +833,14 @@ module_param(acpi_force, int, 0444); MODULE_PARM_DESC(acpi_force, "Force ACPI to be used"); +module_param(overwrite_table,int,0444); +MODULE_PARM_DESC(overwrite_table, "overwrite table with manually settings"); +module_param_array(multiplier, int, maxPSTSize, 0444); +MODULE_PARM_DESC(multiplier, "Specifiy up to 10 multipliers, multiply them by 10: 5->50, 5.5->55"); +module_param_array(voltage, int, maxPSTSize, 0444); +MODULE_PARM_DESC(voltage, "Specify voltages in respect to the given multipliers, specify them in mV: 1.275V -> 1275"); +module_param(switch_latency, int, 0444); +MODULE_PARM_DESC(switch_latency, "Set state transition latency in microseconds (default 200us)"); MODULE_AUTHOR ("Dave Jones "); MODULE_DESCRIPTION ("Powernow driver for AMD K7 processors."); @@ -688,4 +848,3 @@ late_initcall(powernow_init); module_exit(powernow_exit); - --Boundary-00=_MN5aB47irGVSe7P Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Cpufreq mailing list Cpufreq@www.linux.org.uk http://www.linux.org.uk/mailman/listinfo/cpufreq --Boundary-00=_MN5aB47irGVSe7P--