From owner-p4-projects  Thu Apr 11 23: 4:49 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6BFEC37B405; Thu, 11 Apr 2002 23:04:42 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id BEBF537B404
	for <perforce@freebsd.org>; Thu, 11 Apr 2002 23:04:41 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3C64fq51758
	for perforce@freebsd.org; Thu, 11 Apr 2002 23:04:41 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Thu, 11 Apr 2002 23:04:41 -0700 (PDT)
Message-Id: <200204120604.g3C64fq51758@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 9602 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9602

Change 9602 by peter@peter_thunder on 2002/04/11 23:03:49

	Try and make 'options SKI' non-fatal for real hardware
	and make the detection work properly.

Affected files ...

... //depot/projects/ia64/sys/conf/options.ia64#3 edit
... //depot/projects/ia64/sys/ia64/ia64/machdep.c#25 edit

Differences ...

==== //depot/projects/ia64/sys/conf/options.ia64#3 (text+ko) ====

@@ -70,3 +70,4 @@
 
 # Device options
 DEV_SPLASH		opt_splash.h
+DEV_ACPICA		opt_acpi.h

==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#25 (text+ko) ====

@@ -30,6 +30,11 @@
 #include "opt_ddb.h"
 #include "opt_ski.h"
 #include "opt_msgbuf.h"
+#include "opt_acpi.h"
+
+#if !defined(SKI) && !defined(DEV_ACPICA)
+#error "You need the SKI option and/or the acpica device"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -222,12 +227,19 @@
 	bufinit();
 	vm_pager_bufferinit();
 
-#ifndef SKI
+#ifdef DEV_ACPICA
 	/*
 	 * Traverse the MADT to discover IOSAPIC and Local SAPIC
 	 * information.
 	 */
-	ia64_probe_sapics();
+	if (!ia64_running_in_simulator())
+		ia64_probe_sapics();
+#else
+	/*
+	 * It is an error to boot a SKI-only kernel on hardware.
+	 */
+	if (!ia64_running_in_simulator())
+		panic("Mandatory 'device acpica' is missing");
 #endif
 }
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message