Attachment 120608 Details for Bug 228344

[patch] updated fix with detection of Hammer, includes rewrite of set_fixed_ranges, tested on Ferrari 1000 in 64-bit mode - for review

bug228344-fix2-tested.diff (text/plain), 3.81 KB, created by Bernhard Kaindl on 2007-02-22 17:16:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernhard Kaindl

Created: 2007-02-22 17:16:25 UTC

Size: 3.81 KB

patch

obsolete

>--- linux-2.6.20/arch/i386/kernel/cpu/mtrr/generic.c
>+++ linux-228344/arch/i386/kernel/cpu/mtrr/generic.c
>@@ -37,7 +37,7 @@
> 	rdmsr(MTRRphysMask_MSR(index), vr->mask_lo, vr->mask_hi);
> }
> 
>-static void __init
>+static void 
> get_fixed_ranges(mtrr_type * frs)
> {
> 	unsigned int *p = (unsigned int *) frs;
>@@ -196,36 +196,50 @@
> 	*type = base_lo & 0xff;
> }
> 
>+void mtrr_save_fixed_ranges(void)
>+{
>+	get_fixed_ranges(mtrr_state.fixed_ranges);
>+}
>+
>+#define MSR_K8_SYSCFG                   0xC0010010
>+#define MSR_K8_SYSCFG_ENABLE_IORRs      0x000C0000
>+#define K8_RdMemWrMem_MASK              0x18181818
>+
>+static void k8_enable_fixed_iorrs(void)
>+{
>+	unsigned lo, hi;
>+
>+	rdmsr(MSR_K8_SYSCFG, lo, hi);
>+	mtrr_wrmsr(MSR_K8_SYSCFG, lo | MSR_K8_SYSCFG_ENABLE_IORRs, hi);
>+}
>+
>+static void update_fixed_range(int msr, int * changed, u32 * msrwords)
>+{
>+	unsigned lo, hi;
>+
>+	rdmsr(msr, lo, hi);
>+
>+	if (lo != msrwords[0] || hi != msrwords[1]) {
>+		if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
>+		    boot_cpu_data.x86 == 15 &&
>+		    ((msrwords[0] | msrwords[1]) & K8_RdMemWrMem_MASK))
>+			k8_enable_fixed_iorrs();
>+		mtrr_wrmsr(msr, msrwords[0], msrwords[1]);
>+		*changed = TRUE;
>+	}
>+}
>+
> static int set_fixed_ranges(mtrr_type * frs)
> {
>-	unsigned int *p = (unsigned int *) frs;
>+	unsigned long long *p = (unsigned long long *) frs;
> 	int changed = FALSE;
> 	int i;
>-	unsigned int lo, hi;
>-
>-	rdmsr(MTRRfix64K_00000_MSR, lo, hi);
>-	if (p[0] != lo || p[1] != hi) {
>-		mtrr_wrmsr(MTRRfix64K_00000_MSR, p[0], p[1]);
>-		changed = TRUE;
>-	}
> 
>-	for (i = 0; i < 2; i++) {
>-		rdmsr(MTRRfix16K_80000_MSR + i, lo, hi);
>-		if (p[2 + i * 2] != lo || p[3 + i * 2] != hi) {
>-			mtrr_wrmsr(MTRRfix16K_80000_MSR + i, p[2 + i * 2],
>-			      p[3 + i * 2]);
>-			changed = TRUE;
>-		}
>-	}
>-
>-	for (i = 0; i < 8; i++) {
>-		rdmsr(MTRRfix4K_C0000_MSR + i, lo, hi);
>-		if (p[6 + i * 2] != lo || p[7 + i * 2] != hi) {
>-			mtrr_wrmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2],
>-			      p[7 + i * 2]);
>-			changed = TRUE;
>-		}
>-	}
>+	update_fixed_range(MTRRfix64K_00000_MSR, &changed, (u32*)p++);
>+	update_fixed_range(MTRRfix16K_80000_MSR, &changed, (u32*)p++);
>+	update_fixed_range(MTRRfix16K_A0000_MSR, &changed, (u32*)p++);
>+	for(i=0; i<8; i++)
>+		update_fixed_range(MTRRfix4K_C0000_MSR+i, &changed, (u32*)p++);
> 	return changed;
> }
> 
>--- linux-2.6.20/arch/i386/power/cpu.c
>+++ linux-228344/arch/i386/power/cpu.c
>@@ -21,6 +21,7 @@
> 
> void __save_processor_state(struct saved_context *ctxt)
> {
>+	mtrr_save_fixed_ranges();
> 	kernel_fpu_begin();
> 
> 	/*
>--- linux-2.6.20/arch/x86_64/kernel/suspend.c
>+++ linux-228344/arch/x86_64/kernel/suspend.c
>@@ -46,6 +46,7 @@
> 	rdmsrl(MSR_FS_BASE, ctxt->fs_base);
> 	rdmsrl(MSR_GS_BASE, ctxt->gs_base);
> 	rdmsrl(MSR_KERNEL_GS_BASE, ctxt->gs_kernel_base);
>+	mtrr_save_fixed_ranges();
> 
> 	/*
> 	 * control registers 
>--- linux-2.6.20/include/asm-i386/mtrr.h
>+++ linux-228344/include/asm-i386/mtrr.h
>@@ -78,7 +78,8 @@
> extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
> extern void mtrr_ap_init(void);
> extern void mtrr_bp_init(void);
>-#  else
>+extern void mtrr_save_fixed_ranges(void);
>+#  else  /*  CONFIG_MTRR set/not set */
> static __inline__ int mtrr_add (unsigned long base, unsigned long size,
> 				unsigned int type, char increment)
> {
>@@ -104,8 +105,9 @@
> 
> #define mtrr_ap_init() do {} while (0)
> #define mtrr_bp_init() do {} while (0)
>-#  endif
>+#define mtrr_save_fixed_ranges() do {} while (0)
>+#  endif  /*  !CONFIG_MTRR  */
> 
>-#endif
>+#endif  /*  __KERNEL__  */
> 
> #endif  /*  _LINUX_MTRR_H  */
>--- linux-2.6.20/include/asm-x86_64/proto.h
>+++ linux-228344/include/asm-x86_64/proto.h
>@@ -19,7 +19,9 @@
> #ifdef CONFIG_MTRR
> extern void mtrr_ap_init(void);
> extern void mtrr_bp_init(void);
>+extern void mtrr_save_fixed_ranges(void);
> #else
>+#define mtrr_save_fixed_ranges() do {} while (0)
> #define mtrr_ap_init() do {} while (0)
> #define mtrr_bp_init() do {} while (0)
> #endif

Actions: View | Diff

Attachments on bug 228344: 109606 | 112500 | 112752 | 114778 | 120361 | 120608 | 120787 | 121120 | 121351 | 121632