summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2011-05-29 14:50:25 +0000
committerderaadt <deraadt@openbsd.org>2011-05-29 14:50:25 +0000
commitfb8a90917c061f021472e471c95653249a0f7d16 (patch)
tree12699e576e4d8a9109969a50528390239b473306
parentpcidevs.h (diff)
downloadwireguard-openbsd-fb8a90917c061f021472e471c95653249a0f7d16.tar.xz
wireguard-openbsd-fb8a90917c061f021472e471c95653249a0f7d16.zip
Use k1x cpu scaling on all families 0x10 and above (the trend is likely to
continue); makes the AMD E-350 speed adjust (from slow to way slower). discussion with jsg.
-rw-r--r--sys/arch/amd64/amd64/identcpu.c4
-rw-r--r--sys/arch/i386/i386/machdep.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c
index f2d71811169..ad7bc7e5dad 100644
--- a/sys/arch/amd64/amd64/identcpu.c
+++ b/sys/arch/amd64/amd64/identcpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: identcpu.c,v 1.31 2011/05/23 09:52:24 claudio Exp $ */
+/* $OpenBSD: identcpu.c,v 1.32 2011/05/29 14:50:25 deraadt Exp $ */
/* $NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */
/*
@@ -364,7 +364,7 @@ identifycpu(struct cpu_info *ci)
if ((ci->ci_signature & 0xF00) == 0xf00)
setperf_setup = k8_powernow_init;
}
- if (ci->ci_family == 0x10 || ci->ci_family == 0x11)
+ if (ci->ci_family >= 0x10)
setperf_setup = k1x_init;
}
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 355dd681b59..94ed6a5197e 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.495 2011/05/23 09:54:20 claudio Exp $ */
+/* $OpenBSD: machdep.c,v 1.496 2011/05/29 14:50:26 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -1345,7 +1345,7 @@ amd_family6_setperf_setup(struct cpu_info *ci)
k8_powernow_init();
break;
}
- if (ci->ci_family == 0x10 || ci->ci_family == 0x11)
+ if (ci->ci_family >= 0x10)
k1x_init(ci);
}
#endif