Author: kib
Date: Sun Oct 4 12:20:59 2009
New Revision: 197744
URL: http://svn.freebsd.org/changeset/base/197744
Log:
MFC r197663:
As a workaround, for Intel CPUs, do not use CLFLUSH in
pmap_invalidate_cache_range() when self-snoop is apparently not reported
in cpu features.
Approved by: re (bz, kensmith)
Modified:
stable/8/sys/ (props changed)
stable/8/sys/amd64/amd64/initcpu.c
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/i386/i386/initcpu.c
Modified: stable/8/sys/amd64/amd64/initcpu.c
==============================================================================
--- stable/8/sys/amd64/amd64/initcpu.c Sun Oct 4 12:14:49 2009
(r197743)
+++ stable/8/sys/amd64/amd64/initcpu.c Sun Oct 4 12:20:59 2009
(r197744)
@@ -165,4 +165,10 @@ initializecpu(void)
*/
if ((cpu_feature & CPUID_CLFSH) != 0)
cpu_clflush_line_size = ((cpu_procinfo >> 8) & 0xff) * 8;
+ /*
+ * XXXKIB: (temporary) hack to work around traps generated when
+ * CLFLUSHing APIC registers window.
+ */
+ if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS))
+ cpu_feature &= ~CPUID_CLFSH;
}
Modified: stable/8/sys/i386/i386/initcpu.c
==============================================================================
--- stable/8/sys/i386/i386/initcpu.c Sun Oct 4 12:14:49 2009
(r197743)
+++ stable/8/sys/i386/i386/initcpu.c Sun Oct 4 12:20:59 2009
(r197744)
@@ -717,6 +717,12 @@ initializecpu(void)
*/
if ((cpu_feature & CPUID_CLFSH) != 0)
cpu_clflush_line_size = ((cpu_procinfo >> 8) & 0xff) * 8;
+ /*
+ * XXXKIB: (temporary) hack to work around traps generated when
+ * CLFLUSHing APIC registers window.
+ */
+ if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS))
+ cpu_feature &= ~CPUID_CLFSH;
#if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE)
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
