head	1.3;
access;
symbols
	pkgsrc-2016Q4:1.2.0.24
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.22
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.20
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.18
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.16
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.14
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.12
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.10
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.8
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.6
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.4
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.2
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2016.12.29.19.13.01;	author wiz;	state dead;
branches;
next	1.2;
commitid	kFYPk8EnajcmFUzz;

1.2
date	2014.02.20.17.37.25;	author drochner;	state Exp;
branches;
next	1.1;
commitid	k7qZ4sAC3yUKERpx;

1.1
date	2013.12.04.10.35.01;	author drochner;	state Exp;
branches;
next	;
commitid	hw1WPb2QuNAxPNfx;


desc
@@


1.3
log
@Remove xenkernel and tools versions 3, 33, and 41.

As discussed on pkgsrc-users.
@
text
@$NetBSD: patch-CVE-2013-6885_1,v 1.2 2014/02/20 17:37:25 drochner Exp $

http://lists.xenproject.org/archives/html/xen-devel/2013-12/msg00235.html
http://lists.xenproject.org/archives/html/xen-devel/2014-02/msg01800.html

--- xen/arch/x86/cpu/amd.c.orig	2013-09-10 06:42:18.000000000 +0000
+++ xen/arch/x86/cpu/amd.c
@@@@ -661,6 +661,20 @@@@ static void __devinit init_amd(struct cp
 	}
 #endif
 
+	if (c->x86 == 0x16 && c->x86_model <= 0xf) {
+		rdmsrl(MSR_AMD64_LS_CFG, value);
+		if (!(value & (1 << 15))) {
+			static bool_t warned;
+
+			if (c == &boot_cpu_data || opt_cpu_info ||
+			    !test_and_set_bool(warned))
+				printk(KERN_WARNING
+				       "CPU%u: Applying workaround for erratum 793\n",
+				       smp_processor_id());
+			wrmsrl(MSR_AMD64_LS_CFG, value | (1 << 15));
+		}
+	}
+
 	if (c->x86 == 0x10) {
 		/*
 		 * On family 10h BIOS may not have properly enabled WC+
@


1.2
log
@from upstream: fix the fix for CVE-2013-6885
makes the workaround for AMD CPU erratum 793 work not only on
64-bit hypervisors but also for 32bit
bump PKGREV
(compile tested only)
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@add patch from upstream to fix
"Guest triggerable AMD CPU erratum may cause host hang"
bump PKGREV
@
text
@d4 1
d7 4
a10 4
+++ xen/arch/x86/cpu/amd.c	2013-12-03 16:43:52.000000000 +0000
@@@@ -649,6 +649,20 @@@@ static void __devinit init_amd(struct cp
 		       "*** Pass \"allow_unsafe\" if you're trusting"
 		       " all your (PV) guest kernels. ***\n");
d26 3
a28 3
 	/* AMD CPUs do not support SYSENTER outside of legacy mode. */
 	clear_bit(X86_FEATURE_SEP, c->x86_capability);
 
@