From ded2c74f68121bbf0a8de44283bf76e97e507efb Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Thu, 24 Jun 2010 00:06:58 +0000 Subject: The new AMD Opteron CPUs have up to 4 HyperTransport links instead of 3. ok dlg@ --- sys/arch/amd64/pci/pchb.c | 6 ++++-- sys/arch/i386/pci/pchb.c | 6 ++++-- 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 -- cgit v1.2.3