From de4c857dc9ebc8a366b46b50fa95fb0b5198b7e9 Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@cvs.openbsd.org>
Date: Wed, 19 Oct 2005 01:41:46 +0000
Subject: Add IPMI to amd64.  Keep it disabled for now.

Prodded earlier today by deraadt@
ok krw@
---
 sys/arch/amd64/amd64/mainbus.c  | 21 ++++++++++++++++++++-
 sys/arch/amd64/conf/GENERIC     |  4 +++-
 sys/arch/amd64/conf/files.amd64 |  9 ++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c
index 8625cb64de5..e8a5aa3bd1a 100644
--- a/sys/arch/amd64/amd64/mainbus.c
+++ b/sys/arch/amd64/amd64/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.2 2005/06/02 20:09:38 tholo Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.3 2005/10/19 01:41:44 marco Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $	*/
 
 /*
@@ -45,6 +45,7 @@
 #include "pci.h"
 #include "isa.h"
 #include "acpi.h"
+#include "ipmi.h"
 
 #include <machine/cpuvar.h>
 #include <machine/i82093var.h>
@@ -55,6 +56,10 @@
 #include <dev/acpi/acpivar.h>
 #endif
 
+#if NIPMI > 0
+#include <dev/ipmivar.h>
+#endif
+
 int	mainbus_match(struct device *, void *, void *);
 void	mainbus_attach(struct device *, struct device *, void *);
 
@@ -77,6 +82,9 @@ union mainbus_attach_args {
 #if NACPI > 0
 	struct acpi_attach_args mba_aaa;
 #endif	
+#if NIPMI > 0
+	struct ipmi_attach_args mba_iaa;
+#endif
 };
 
 /*
@@ -147,6 +155,17 @@ mainbus_attach(parent, self, aux)
 	}
 #endif
 
+#if NIPMI > 0
+	{
+		memset(&mba.mba_iaa, 0, sizeof(mba.mba_iaa));
+		mba.mba_iaa.iaa_name = "ipmi";
+		mba.mba_iaa.iaa_iot  = X86_BUS_SPACE_IO;
+		mba.mba_iaa.iaa_memt = X86_BUS_SPACE_MEM;
+		if (ipmi_probe(&mba.mba_iaa))
+			config_found(self, &mba.mba_iaa, mainbus_print);
+	}
+#endif
+
 #ifdef MPBIOS
 	mpbios_present = mpbios_probe(self);
 #endif
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index af1f1cb0f9d..e586159cb08 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.82 2005/10/05 21:48:34 tdeval Exp $
+#	$OpenBSD: GENERIC,v 1.83 2005/10/19 01:41:45 marco Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -45,6 +45,8 @@ pci*	at mainbus0
 #acpitimer* at acpi?
 #hpet*	at acpi?
 
+#ipmi0	at mainbus?		# IPMI
+
 #option		ACPIVERBOSE
 #option		ACPI_ENABLE
 
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 439b8b1843c..0f35ae048b3 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.14 2005/10/05 21:48:34 tdeval Exp $
+#	$OpenBSD: files.amd64,v 1.15 2005/10/19 01:41:45 marco Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -168,6 +168,13 @@ include	"dev/usb/files.usb"
 include "../../../dev/acpi/files.acpi"
 file	arch/amd64/amd64/acpi_machdep.c		acpi
 
+#
+# IPMI
+#
+device	ipmi
+attach	ipmi at mainbus
+file	dev/ipmi.c				ipmi needs-flag
+
 #
 # device major numbers
 #
-- 
cgit v1.2.3