Attachment 121120 Details for Bug 228344

updated fix which works on arch/i386 as well, should be ready for submission, just one minor beautification missing

mtrrfix6-tested.diff (text/x-patch), 7.18 KB, created by Bernhard Kaindl on 2007-02-26 17:48:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernhard Kaindl

Created: 2007-02-26 17:48:11 UTC

Size: 7.18 KB

patch

obsolete

>--- linux-2.6.20.orig/arch/i386/kernel/cpu/mtrr/generic.c
>+++ linux-2.6.20.mtrr/arch/i386/kernel/cpu/mtrr/generic.c
>@@ -20,12 +20,27 @@
> 	mtrr_type def_type;
> };
> 
>+struct fixed_range_block {
>+	int base_msr;
>+	int ranges;
>+};
>+
>+static struct fixed_range_block fixed_range_blocks[] = {
>+	{ MTRRfix64K_00000_MSR, 1},
>+	{ MTRRfix16K_80000_MSR, 2},
>+	{ MTRRfix4K_C0000_MSR,  8},
>+	{ 0,  0}
>+};
>+
> static unsigned long smp_changes_mask;
> static struct mtrr_state mtrr_state = {};
> 
> #undef MODULE_PARAM_PREFIX
> #define MODULE_PARAM_PREFIX "mtrr."
> 
>+#define MSR_K8_SYSCFG			0xC0010010
>+#define MTRR_K8_RDMEM_WRMEM_MASK	0x18181818
>+
> static __initdata int mtrr_show;
> module_param_named(show, mtrr_show, bool, 0);
> 
>@@ -37,7 +52,10 @@
> 	rdmsr(MTRRphysMask_MSR(index), vr->mask_lo, vr->mask_hi);
> }
> 
>-static void __init
>+/*
>+ * Retrieves the current fixed-range MTRRs from the CPU
>+ */
>+static void 
> get_fixed_ranges(mtrr_type * frs)
> {
> 	unsigned int *p = (unsigned int *) frs;
>@@ -51,6 +69,49 @@
> 		rdmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2], p[7 + i * 2]);
> }
> 
>+/*
>+ * In some situations, the setup of fixed ranges can be changed
>+ * during or after early boot and we have to update our copy of
>+ * the MTRR configuration for consitent MTRRs after resume from
>+ * disk and when when initializing secondary CPUs:
>+ */
>+void mtrr_save_fixed_ranges(void *info)
>+{
>+	get_fixed_ranges(mtrr_state.fixed_ranges);
>+}
>+
>+/*
>+ * Enable and allow read/write of extended fixed-range MTRR bits on K8 CPUs,
>+ * see AMD publication no. 24593, chapter 7.8.1, page 233 for information:
>+ */
>+static inline void k8_enable_fixed_iorrs(void)
>+{
>+	unsigned lo, hi;
>+
>+	rdmsr(MSR_K8_SYSCFG, lo, hi);
>+	mtrr_wrmsr(MSR_K8_SYSCFG, lo | 0xc0000, hi);
>+}
>+
>+/*
>+ * Updates an MTRR. Updates changed if changes were made (or tried)
>+ * If extended bits are set on Hammer CPUs, the K8 SYSCFG MSR needs an update:
>+ */
>+static void set_fixed_range(int msr, int * changed, unsigned int * 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]) & MTRR_K8_RDMEM_WRMEM_MASK))
>+			k8_enable_fixed_iorrs();
>+		mtrr_wrmsr(msr, msrwords[0], msrwords[1]);
>+		*changed = TRUE;
>+	}
>+}
>+
> static void __init print_fixed(unsigned base, unsigned step, const mtrr_type*types)
> {
> 	unsigned i;
>@@ -196,36 +257,17 @@
> 	*type = base_lo & 0xff;
> }
> 
>-static int set_fixed_ranges(mtrr_type * frs)
>+static int set_fixed_ranges(mtrr_type * fixed_range_setup)
> {
>-	unsigned int *p = (unsigned int *) frs;
>+	unsigned long long *saved = (unsigned long long *) fixed_range_setup;
> 	int changed = FALSE;
>-	int i;
>-	unsigned int lo, hi;
>+	int block=-1, range;
> 
>-	rdmsr(MTRRfix64K_00000_MSR, lo, hi);
>-	if (p[0] != lo || p[1] != hi) {
>-		mtrr_wrmsr(MTRRfix64K_00000_MSR, p[0], p[1]);
>-		changed = TRUE;
>-	}
>+	while (fixed_range_blocks[++block].ranges)
>+	    for (range=0; range < fixed_range_blocks[block].ranges; range++)
>+		set_fixed_range(fixed_range_blocks[block].base_msr + range,
>+		    &changed, (unsigned int *) saved++);
> 
>-	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;
>-		}
>-	}
> 	return changed;
> }
> 
>diff -ru linux-2.6.20.orig/arch/i386/kernel/smpboot.c linux-2.6.20-rc7-3.mtrrfix6/arch/i386/kernel/smpboot.c
>--- linux-2.6.20.orig/arch/i386/kernel/smpboot.c
>+++ linux-2.6.20.mtrr/arch/i386/kernel/smpboot.c
>@@ -59,6 +59,7 @@
> #include <asm/nmi.h>
> #include <asm/pda.h>
> #include <asm/genapic.h>
>+#include <asm/mtrr.h>
> 
> #include <mach_apic.h>
> #include <mach_wakecpu.h>
>@@ -951,6 +952,12 @@
> 	unsigned short nmi_high = 0, nmi_low = 0;
> 
> 	/*
>+	 * Save current MTRR state in case it was changed since early boot
>+	 * (e.g. by the ACPI SMI) to initialize new CPUs with MTRRs in sync:
>+	 */
>+	mtrr_save_state();
>+ 
>+	/*
> 	 * We can't use kernel_thread since we must avoid to
> 	 * reschedule the child.
> 	 */
>diff -ru linux-2.6.20.orig/arch/i386/power/cpu.c linux-2.6.20-rc7-3.mtrrfix6/arch/i386/power/cpu.c
>--- linux-2.6.20.orig/arch/i386/power/cpu.c
>+++ linux-2.6.20.mtrr/arch/i386/power/cpu.c
>@@ -21,6 +21,7 @@
> 
> void __save_processor_state(struct saved_context *ctxt)
> {
>+	mtrr_save_fixed_ranges(NULL);
> 	kernel_fpu_begin();
> 
> 	/*
>diff -ru linux-2.6.20.orig/arch/x86_64/kernel/smpboot.c linux-2.6.20-rc7-3.mtrrfix6/arch/x86_64/kernel/smpboot.c
>--- linux-2.6.20.orig/arch/x86_64/kernel/smpboot.c
>+++ linux-2.6.20.mtrr/arch/x86_64/kernel/smpboot.c
>@@ -1157,6 +1157,16 @@
>  		return -ENOSYS;
> 	}
> 
>+	/*
>+	 * Save current MTRR state of the BSP in case it was changed
>+	 * since early boot (e.g. by the ACPI SMI) to have new APs
>+	 * come up in sync with its MTRR configuration:
>+	 */
>+	if (smp_processor_id() == 0)
>+		mtrr_save_fixed_ranges(NULL);
>+	else
>+		smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
>+	
> 	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
> 	/* Boot it! */
> 	err = do_boot_cpu(cpu, apicid);
>diff -ru linux-2.6.20.orig/arch/x86_64/kernel/suspend.c linux-2.6.20-rc7-3.mtrrfix6/arch/x86_64/kernel/suspend.c
>--- linux-2.6.20.orig/arch/x86_64/kernel/suspend.c
>+++ linux-2.6.20.mtrr/arch/x86_64/kernel/suspend.c
>@@ -46,6 +46,7 @@  __save_processor_context()
> 	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(NULL);
> 
> 	/*
> 	 * control registers 
>--- linux-2.6.20.orig/include/asm-i386/mtrr.h
>+++ linux-2.6.20.mtrr/include/asm-i386/mtrr.h
>@@ -25,6 +25,7 @@
> 
> #include <linux/ioctl.h>
> #include <linux/errno.h>
>+#include <linux/smp.h>
> 
> #define	MTRR_IOCTL_BASE	'M'
> 
>@@ -78,7 +79,19 @@
> 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 *);
>+static __inline__ void mtrr_save_state (void)
>+{
>+	/*
>+	 * Save current fixed-range MTRR state of the BSP:
>+	 */
>+	if (smp_processor_id() == 0)
>+		mtrr_save_fixed_ranges(NULL);
>+	else
>+		smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
>+
>+}
>+#  else  /*  CONFIG_MTRR set/not set */
> static __inline__ int mtrr_add (unsigned long base, unsigned long size,
> 				unsigned int type, char increment)
> {
>@@ -104,8 +117,10 @@
> 
> #define mtrr_ap_init() do {} while (0)
> #define mtrr_bp_init() do {} while (0)
>-#  endif
>+#define mtrr_save_fixed_ranges(arg) do {} while (0)
>+#define mtrr_save_state() do {} while (0)
>+#  endif  /*  !CONFIG_MTRR  */
> 
>-#endif
>+#endif  /*  __KERNEL__  */
> 
> #endif  /*  _LINUX_MTRR_H  */
>--- linux-2.6.20.orig/include/asm-x86_64/proto.h
>+++ linux-2.6.20.mtrr/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(arg) do {} while (0)
> #define mtrr_ap_init() do {} while (0)
> #define mtrr_bp_init() do {} while (0)
> #endif

Actions: View

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