From owner-svn-src-head@FreeBSD.ORG  Tue Apr 27 18:05:34 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06E30106564A;
	Tue, 27 Apr 2010 18:05:34 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C87E58FC08;
	Tue, 27 Apr 2010 18:05:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3RI5X54082219;
	Tue, 27 Apr 2010 18:05:33 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3RI5XAp082217;
	Tue, 27 Apr 2010 18:05:33 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201004271805.o3RI5XAp082217@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 27 Apr 2010 18:05:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207285 - head/sys/dev/sym
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Apr 2010 18:05:34 -0000

Author: marius
Date: Tue Apr 27 18:05:33 2010
New Revision: 207285
URL: http://svn.freebsd.org/changeset/base/207285

Log:
  - On sparc64 obtain the initiator ID from the Open Firmware device tree
    in order to match what the PROM built-in driver uses.
  - Remove some no longer used includes.

Modified:
  head/sys/dev/sym/sym_hipd.c

Modified: head/sys/dev/sym/sym_hipd.c
==============================================================================
--- head/sys/dev/sym/sym_hipd.c	Tue Apr 27 17:57:04 2010	(r207284)
+++ head/sys/dev/sym/sym_hipd.c	Tue Apr 27 18:05:33 2010	(r207285)
@@ -87,6 +87,12 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
+
+#ifdef __sparc64__
+#include <dev/ofw/openfirm.h>
+#include <machine/ofw_machdep.h>
+#endif
+
 #include <sys/rman.h>
 
 #include <cam/cam.h>
@@ -98,10 +104,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-
 /* Short and quite clear integer types */
 typedef int8_t    s8;
 typedef int16_t   s16;
@@ -2682,6 +2684,9 @@ static int sym_prepare_setting(hcb_p np,
 	 */
 	np->myaddr = 255;
 	sym_nvram_setup_host (np, nvram);
+#ifdef __sparc64__
+	np->myaddr = OF_getscsinitid(np->device);
+#endif
 
 	/*
 	 *  Get SCSI addr of host adapter (set by bios?).