summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-06-24 00:06:58 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-06-24 00:06:58 +0000
commitded2c74f68121bbf0a8de44283bf76e97e507efb (patch)
tree0dd682cba0115cd88591b82355f251552a4c414d /sys
parent288c486de3f6be0db40a265fe43f75eef0cb3075 (diff)
The new AMD Opteron CPUs have up to 4 HyperTransport links instead of 3.
ok dlg@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/pci/pchb.c6
-rw-r--r--sys/arch/i386/pci/pchb.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index 12369959e4a..f42b042f042 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.33 2010/04/02 19:23:05 kettenis Exp $ */
+/* $OpenBSD: pchb.c,v 1.34 2010/06/24 00:06:57 kettenis Exp $ */
/* $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */
/*
* Copyright (c) 2000 Michael Shalayeff
@@ -90,8 +90,10 @@
#define AMD64HT_LDT1_TYPE 0xb8
#define AMD64HT_LDT2_BUS 0xd4
#define AMD64HT_LDT2_TYPE 0xd8
+#define AMD64HT_LDT3_BUS 0xf4
+#define AMD64HT_LDT3_TYPE 0xf8
-#define AMD64HT_NUM_LDT 3
+#define AMD64HT_NUM_LDT 4
#define AMD64HT_LDT_TYPE_MASK 0x0000001f
#define AMD64HT_LDT_INIT_COMPLETE 0x00000002
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index fd2ab63920d..c2839350918 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.81 2010/04/02 19:23:05 kettenis Exp $ */
+/* $OpenBSD: pchb.c,v 1.82 2010/06/24 00:06:57 kettenis Exp $ */
/* $NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $ */
/*
@@ -102,8 +102,10 @@
#define AMD64HT_LDT1_TYPE 0xb8
#define AMD64HT_LDT2_BUS 0xd4
#define AMD64HT_LDT2_TYPE 0xd8
+#define AMD64HT_LDT3_BUS 0xf4
+#define AMD64HT_LDT3_TYPE 0xf8
-#define AMD64HT_NUM_LDT 3
+#define AMD64HT_NUM_LDT 4
#define AMD64HT_LDT_TYPE_MASK 0x0000001f
#define AMD64HT_LDT_INIT_COMPLETE 0x00000002