Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbf70132 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] sets nforce2 minimum PLL divider to 2.
  [CPUFREQ] Make powernow-k7 work on SMP kernels.
  [CPUFREQ] cpufreq core {d,}printk adjustments
  [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino
  [CPUFREQ] dprintk adjustments to cpufreq-nforce2
  [CPUFREQ] Prepare powernow-k8 for future CPUs.
  [CPUFREQ] Make acpi-cpufreq 'sticky'.
  [CPUFREQ] Remove strange No-op from longrun.c
  [CPUFREQ] Remove more freq_table reinitialisations.
  [CPUFREQ] Fix another redundant initialisation in freq_table
  [CPUFREQ] Remove duplicate assignment in freq_table
  [CPUFREQ] CodingStyle nits in cpufreq_stats.c
  [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2
  [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq
  [CPUFREQ] Remove pointless reinitialisation from powernow-k8
  [CPUFREQ] Remove redundant initialisation from longhaul.
  [CPUFREQ] Clean up longhaul's speed pretty-printer
  [CPUFREQ] Disambiguate loop indexes in powernow-k7
  [CPUFREQ] Typo in powernow-k8
parents 2090af71 6ccf58ab

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+10 −10
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ acpi_processor_set_performance ( 
{

	u16			port = 0;

	u8			bit_width = 0;

	int			ret = 0;

	int			ret;

	u32			value = 0;

	int			i = 0;

	struct cpufreq_freqs    cpufreq_freqs;
@@ -195,7 +195,6 @@ acpi_processor_set_performance ( 
			udelay(10);

		}

	} else {

		i = 0;

		value = (u32) data->acpi_data.states[state].status;

	}
@@ -452,6 +451,7 @@ static struct cpufreq_driver acpi_cpufreq_driver = { 
	.name	= "acpi-cpufreq",

	.owner	= THIS_MODULE,

	.attr	= acpi_cpufreq_attr,

	.flags	= CPUFREQ_STICKY,

};

arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c

+5 −6
Original line number Diff line number Diff line 
/*

 * (C) 2004  Sebastian Witt <se.witt@gmx.net>

 * (C) 2004-2006  Sebastian Witt <se.witt@gmx.net>

 *

 *  Licensed under the terms of the GNU GPL License version 2.

 *  Based upon reverse engineered information
@@ -90,7 +90,7 @@ static int nforce2_calc_pll(unsigned int fsb) 


	/* Try to calculate multiplier and divider up to 4 times */

	while (((mul == 0) || (div == 0)) && (tried <= 3)) {

		for (xdiv = 1; xdiv <= 0x80; xdiv++)

		for (xdiv = 2; xdiv <= 0x80; xdiv++)

			for (xmul = 1; xmul <= 0xfe; xmul++)

				if (nforce2_calc_fsb(NFORCE2_PLL(xmul, xdiv)) ==

				    fsb + tried) {
@@ -117,8 +117,7 @@ static void nforce2_write_pll(int pll) 
	int temp;



	/* Set the pll addr. to 0x00 */

	temp = 0x00;

	pci_write_config_dword(nforce2_chipset_dev, NFORCE2_PLLADR, temp);

	pci_write_config_dword(nforce2_chipset_dev, NFORCE2_PLLADR, 0);



	/* Now write the value in all 64 registers */

	for (temp = 0; temp <= 0x3f; temp++)
@@ -266,7 +265,7 @@ static int nforce2_target(struct cpufreq_policy *policy, 
	if (freqs.old == freqs.new)

		return 0;



	dprintk(KERN_INFO "cpufreq: Old CPU frequency %d kHz, new %d kHz\n",

	dprintk("Old CPU frequency %d kHz, new %d kHz\n",

	       freqs.old, freqs.new);



	cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
@@ -278,7 +277,7 @@ static int nforce2_target(struct cpufreq_policy *policy, 
		printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n",

                       target_fsb);

	else

		dprintk(KERN_INFO "cpufreq: Changed FSB successfully to %d\n",

		dprintk("Changed FSB successfully to %d\n",

                       target_fsb);



	/* Enable IRQs */

arch/i386/kernel/cpu/cpufreq/longhaul.c

+12 −8
Original line number Diff line number Diff line
@@ -77,13 +77,17 @@ static char speedbuffer[8]; 


static char *print_speed(int speed)

{

	if (speed > 1000) {

	if (speed < 1000) {

		snprintf(speedbuffer, sizeof(speedbuffer),"%dMHz", speed);

		return speedbuffer;

	}



	if (speed%1000 == 0)

			sprintf (speedbuffer, "%dGHz", speed/1000);

		snprintf(speedbuffer, sizeof(speedbuffer),

			"%dGHz", speed/1000);

	else

			sprintf (speedbuffer, "%d.%dGHz", speed/1000, (speed%1000)/100);

	} else

		sprintf (speedbuffer, "%dMHz", speed);

		snprintf(speedbuffer, sizeof(speedbuffer),

			"%d.%dGHz", speed/1000, (speed%1000)/100);



	return speedbuffer;

}
@@ -675,7 +679,7 @@ static int __init longhaul_init(void) 


static void __exit longhaul_exit(void)

{

	int i=0;

	int i;



	for (i=0; i < numscales; i++) {

		if (clock_ratio[i] == maxmult) {

arch/i386/kernel/cpu/cpufreq/longrun.c

+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ static unsigned int __init longrun_determine_freqs(unsigned int *low_freq, 
		/* set to 0 to try_hi perf_pctg */

		msr_lo &= 0xFFFFFF80;

		msr_hi &= 0xFFFFFF80;

		msr_lo |= 0;

		msr_hi |= try_hi;

		wrmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);

arch/i386/kernel/cpu/cpufreq/powernow-k7.c

+5 −8
Original line number Diff line number Diff line
@@ -452,23 +452,23 @@ static int powernow_decode_bios (int maxfid, int startvid) 


			pst = (struct pst_s *) p;



			for (i = 0 ; i <psb->numpst; i++) {

			for (j=0; j<psb->numpst; j++) {

				pst = (struct pst_s *) p;

				number_scales = pst->numpstates;



				if ((etuple == pst->cpuid) && check_fsb(pst->fsbspeed) &&

				    (maxfid==pst->maxfid) && (startvid==pst->startvid))

				{

					dprintk ("PST:%d (@%p)\n", i, pst);

					dprintk ("PST:%d (@%p)\n", j, pst);

					dprintk (" cpuid: 0x%x  fsb: %d  maxFID: 0x%x  startvid: 0x%x\n",

						 pst->cpuid, pst->fsbspeed, pst->maxfid, pst->startvid);



					ret = get_ranges ((char *) pst + sizeof (struct pst_s));

					return ret;



				} else {

					unsigned int k;

					p = (char *) pst + sizeof (struct pst_s);

					for (j=0 ; j < number_scales; j++)

					for (k=0; k<number_scales; k++)

						p+=2;

				}

			}
@@ -581,10 +581,7 @@ static int __init powernow_cpu_init (struct cpufreq_policy *policy) 


	rdmsrl (MSR_K7_FID_VID_STATUS, fidvidstatus.val);



	/* recalibrate cpu_khz */

	result = recalibrate_cpu_khz();

	if (result)

		return result;

	recalibrate_cpu_khz();



	fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];

	if (!fsb) {