Merge branch 'origin' (6684e323) · Commits · 戴 / test

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -3267,6 +3267,7 @@ W: http://tpmdd.sourceforge.net
		P: Marcel Selhorst
		M: tpm@selhorst.net
		W: http://www.prosec.rub.de/tpm/
		L: tpmdd-devel@lists.sourceforge.net
		S: Maintained

		Telecom Clock Driver for MCPL0010

arch/i386/kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ obj-$(CONFIG_X86_CPUID) += cpuid.o
		obj-$(CONFIG_MICROCODE) += microcode.o
		obj-$(CONFIG_APM) += apm.o
		obj-$(CONFIG_X86_SMP) += smp.o smpboot.o tsc_sync.o
		obj-$(CONFIG_SMP) += smpcommon.o
		obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
		obj-$(CONFIG_X86_MPPARSE) += mpparse.o
		obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o

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

+28 −8

Original line number	Diff line number	Diff line
		@@ -341,15 +341,17 @@ static int powernow_acpi_init(void)
		pc.val = (unsigned long) acpi_processor_perf->states[0].control;
		for (i = 0; i < number_scales; i++) {
		u8 fid, vid;
		unsigned int speed;
		struct acpi_processor_px *state =
		&acpi_processor_perf->states[i];
		unsigned int speed, speed_mhz;

		pc.val = (unsigned long) acpi_processor_perf->states[i].control;
		pc.val = (unsigned long) state->control;
		dprintk ("acpi: P%d: %d MHz %d mW %d uS control %08x 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) state->core_frequency,
		(u32) state->power,
		(u32) state->transition_latency,
		(u32) state->control,
		pc.bits.sgtc);

		vid = pc.bits.vid;
		@@ -360,6 +362,18 @@ static int powernow_acpi_init(void)
		powernow_table[i].index \|= (vid << 8); /* upper 8 bits */

		speed = powernow_table[i].frequency;
		speed_mhz = speed / 1000;

		/* processor_perflib will multiply the MHz value by 1000 to
		* get a KHz value (e.g. 1266000). However, powernow-k7 works
		* with true KHz values (e.g. 1266768). To ensure that all
		* powernow frequencies are available, we must ensure that
		* ACPI doesn't restrict them, so we round up the MHz value
		* to ensure that perflib's computed KHz value is greater than
		* or equal to powernow's KHz value.
		*/
		if (speed % 1000 > 0)
		speed_mhz++;

		if ((fid_codes[fid] % 10)==5) {
		if (have_a0 == 1)
		@@ -368,10 +382,16 @@ static int powernow_acpi_init(void)

		dprintk (" FID: 0x%x (%d.%dx [%dMHz]) "
		"VID: 0x%x (%d.%03dV)\n", fid, fid_codes[fid] / 10,
		fid_codes[fid] % 10, speed/1000, vid,
		fid_codes[fid] % 10, speed_mhz, vid,
		mobile_vid_table[vid]/1000,
		mobile_vid_table[vid]%1000);

		if (state->core_frequency != speed_mhz) {
		state->core_frequency = speed_mhz;
		dprintk(" Corrected ACPI frequency to %d\n",
		speed_mhz);
		}

		if (latency < pc.bits.sgtc)
		latency = pc.bits.sgtc;

		@@ -602,7 +622,7 @@ static int __init powernow_cpu_init (struct cpufreq_policy *policy)
		result = powernow_acpi_init();
		if (result) {
		printk (KERN_INFO PFX "ACPI and legacy methods failed\n");
		printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n");
		printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.html\n");
		}
		} else {
		/* SGTC use the bus clock as timer */

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -521,7 +521,7 @@ static int check_supported_cpu(unsigned int cpu)

		if ((eax & CPUID_XFAM) == CPUID_XFAM_K8) {
		if (((eax & CPUID_USE_XFAM_XMOD) != CPUID_USE_XFAM_XMOD) \|\|
		((eax & CPUID_XMOD) > CPUID_XMOD_REV_G)) {
		((eax & CPUID_XMOD) > CPUID_XMOD_REV_MASK)) {
		printk(KERN_INFO PFX "Processor cpuid %x not supported\n", eax);
		goto out;
		}

arch/i386/kernel/cpu/cpufreq/powernow-k8.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ struct powernow_k8_data {
		#define CPUID_XFAM 0x0ff00000 /* extended family */
		#define CPUID_XFAM_K8 0
		#define CPUID_XMOD 0x000f0000 /* extended model */
		#define CPUID_XMOD_REV_G 0x00060000
		#define CPUID_XMOD_REV_MASK 0x00080000
		#define CPUID_XFAM_10H 0x00100000 /* family 0x10 */
		#define CPUID_USE_XFAM_XMOD 0x00000f00
		#define CPUID_GET_MAX_CAPABILITIES 0x80000000

Admin message