Commit bcde1ebb authored by TAKADA Yoshihito's avatar TAKADA Yoshihito Committed by Andi Kleen
Browse files

[PATCH] i386: geode configuration fixes 



Original code doesn't write back to CCR4 register.  This patch reflects a
value of a register.

Cc: Jordan Crouse <jordan.crouse@amd.com>
Acked-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 86c41837

arch/i386/kernel/cpu/cyrix.c

+10 −11
Original line number Diff line number Diff line
@@ -161,19 +161,19 @@ static void __cpuinit set_cx86_inc(void) 
static void __cpuinit geode_configure(void)

{

	unsigned long flags;

	u8 ccr3, ccr4;

	u8 ccr3;

	local_irq_save(flags);



	/* Suspend on halt power saving and enable #SUSP pin */

	setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);



	ccr3 = getCx86(CX86_CCR3);

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

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

	

	ccr4 = getCx86(CX86_CCR4);

	ccr4 |= 0x38;		/* FPU fast, DTE cache, Mem bypass */



	setCx86(CX86_CCR3, ccr3);

	/* FPU fast, DTE cache, Mem bypass */

	setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x38);

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

	

	set_cx86_memwb();

	set_cx86_reorder();
@@ -420,14 +420,13 @@ static void __cpuinit cyrix_identify(struct cpuinfo_x86 * c) 
		

   	        if (dir0 == 5 || dir0 == 3)

   	        {

			unsigned char ccr3, ccr4;

			unsigned char ccr3;

			unsigned long flags;

			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  */

			ccr4 = getCx86(CX86_CCR4);

			setCx86(CX86_CCR4, ccr4 | 0x80);          /* enable cpuid  */

			setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x80);  /* enable cpuid  */

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

			local_irq_restore(flags);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE