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

Commit 8bdbd962 authored by Alan Cox's avatar Alan Cox Committed by Ingo Molnar
Browse files

x86/cpu: Clean up various files a bit 



No code changes except printk levels (although some of the K6
mtrr code might be clearer if there were a few as would
splitting out some of the intel cache code).

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e90476d3

arch/x86/kernel/cpu/amd.c

+21 −16
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <linux/bitops.h>

#include <linux/mm.h>



#include <asm/io.h>

#include <linux/io.h>

#include <asm/processor.h>

#include <asm/apic.h>

#include <asm/cpu.h>
@@ -87,9 +87,10 @@ static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c) 
		d = d2-d;



		if (d > 20*K6_BUG_LOOP)

			printk("system stability may be impaired when more than 32 MB are used.\n");

			printk(KERN_CONT

				"system stability may be impaired when more than 32 MB are used.\n");

		else

			printk("probably OK (after B9730xxxx).\n");

			printk(KERN_CONT "probably OK (after B9730xxxx).\n");

		printk(KERN_INFO "Please see http://membres.lycos.fr/poulot/k6bug.html\n");

	}
@@ -219,8 +220,9 @@ static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) 
	if ((c->x86_model == 8 && c->x86_mask >= 1) || (c->x86_model > 8)) {

		rdmsr(MSR_K7_CLK_CTL, l, h);

		if ((l & 0xfff00000) != 0x20000000) {

			printk ("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n", l,

				((l & 0x000fffff)|0x20000000));

			printk(KERN_INFO

			    "CPU: CLK_CTL MSR was %x. Reprogramming to %x\n",

					l, ((l & 0x000fffff)|0x20000000));

			wrmsr(MSR_K7_CLK_CTL, (l & 0x000fffff)|0x20000000, h);

		}

	}
@@ -500,14 +502,17 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
}



#ifdef CONFIG_X86_32

static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)

static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,

							unsigned int size)

{

	/* AMD errata T13 (order #21922) */

	if ((c->x86 == 6)) {

		if (c->x86_model == 3 && c->x86_mask == 0)	/* Duron Rev A0 */

		/* Duron Rev A0 */

		if (c->x86_model == 3 && c->x86_mask == 0)

			size = 64;

		/* Tbird rev A1/A2 */

		if (c->x86_model == 4 &&

		    (c->x86_mask == 0 || c->x86_mask == 1))	/* Tbird rev A1/A2 */

			(c->x86_mask == 0 || c->x86_mask == 1))

			size = 256;

	}

	return size;

arch/x86/kernel/cpu/bugs.c

+5 −5
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void __init check_fpu(void) 


	boot_cpu_data.fdiv_bug = fdiv_bug;

	if (boot_cpu_data.fdiv_bug)

		printk("Hmm, FPU with FDIV bug.\n");

		printk(KERN_WARNING "Hmm, FPU with FDIV bug.\n");

}



static void __init check_hlt(void)
@@ -98,7 +98,7 @@ static void __init check_hlt(void) 
	halt();

	halt();

	halt();

	printk("OK.\n");

	printk(KERN_CONT "OK.\n");

}



/*
@@ -122,9 +122,9 @@ static void __init check_popad(void) 
	 * CPU hard. Too bad.

	 */

	if (res != 12345678)

		printk("Buggy.\n");

		printk(KERN_CONT "Buggy.\n");

	else

		printk("OK.\n");

		printk(KERN_CONT "OK.\n");

#endif

}
@@ -156,7 +156,7 @@ void __init check_bugs(void) 
{

	identify_boot_cpu();

#ifndef CONFIG_SMP

	printk("CPU: ");

	printk(KERN_INFO "CPU: ");

	print_cpu_info(&boot_cpu_data);

#endif

	check_config();

arch/x86/kernel/cpu/bugs_64.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ void __init check_bugs(void) 
{

	identify_boot_cpu();

#if !defined(CONFIG_SMP)

	printk("CPU: ");

	printk(KERN_INFO "CPU: ");

	print_cpu_info(&boot_cpu_data);

#endif

	alternative_instructions();

arch/x86/kernel/cpu/common.c

+4 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <asm/hypervisor.h>

#include <asm/processor.h>

#include <asm/sections.h>

#include <asm/topology.h>

#include <asm/cpumask.h>

#include <linux/topology.h>

#include <linux/cpumask.h>

#include <asm/pgtable.h>

#include <asm/atomic.h>

#include <asm/proto.h>
@@ -28,13 +28,13 @@ 
#include <asm/desc.h>

#include <asm/i387.h>

#include <asm/mtrr.h>

#include <asm/numa.h>

#include <linux/numa.h>

#include <asm/asm.h>

#include <asm/cpu.h>

#include <asm/mce.h>

#include <asm/msr.h>

#include <asm/pat.h>

#include <asm/smp.h>

#include <linux/smp.h>



#ifdef CONFIG_X86_LOCAL_APIC

#include <asm/uv/uv.h>

arch/x86/kernel/cpu/cyrix.c

+12 −7
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
#include <linux/delay.h>

#include <linux/pci.h>

#include <asm/dma.h>

#include <asm/io.h>

#include <linux/io.h>

#include <asm/processor-cyrix.h>

#include <asm/processor-flags.h>

#include <asm/timer.h>

#include <linux/timer.h>

#include <asm/pci-direct.h>

#include <asm/tsc.h>
@@ -282,7 +282,8 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
		 *  The 5510/5520 companion chips have a funky PIT.

		 */

		if (vendor == PCI_VENDOR_ID_CYRIX &&

	 (device == PCI_DEVICE_ID_CYRIX_5510 || device == PCI_DEVICE_ID_CYRIX_5520))

			(device == PCI_DEVICE_ID_CYRIX_5510 ||

					device == PCI_DEVICE_ID_CYRIX_5520))

			mark_tsc_unstable("cyrix 5510/5520 detected");

	}

#endif
@@ -299,7 +300,8 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c) 
			 *  ?  : 0x7x

			 * GX1 : 0x8x          GX1  datasheet 56

			 */

			if ((0x30 <= dir1 && dir1 <= 0x6f) || (0x80 <= dir1 && dir1 <= 0x8f))

			if ((0x30 <= dir1 && dir1 <= 0x6f) ||

					(0x80 <= dir1 && dir1 <= 0x8f))

				geode_configure();

			return;

		} else { /* MediaGX */
@@ -427,9 +429,12 @@ static void __cpuinit cyrix_identify(struct cpuinfo_x86 *c) 
			printk(KERN_INFO "Enabling CPUID on Cyrix processor.\n");

			local_irq_save(flags);

			ccr3 = getCx86(CX86_CCR3);

			setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10);       /* enable MAPEN  */

			setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x80);  /* enable cpuid  */

			setCx86(CX86_CCR3, ccr3);                       /* disable MAPEN */

			/* enable MAPEN  */

			setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10);

			/* enable cpuid  */

			setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x80);

			/* disable MAPEN */

			setCx86(CX86_CCR3, ccr3);

			local_irq_restore(flags);

		}

	}