From owner-p4-projects@FreeBSD.ORG  Wed Apr  5 00:52:11 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6448316A41F; Wed,  5 Apr 2006 00:52:11 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 29AFF16A401
	for <perforce@freebsd.org>; Wed,  5 Apr 2006 00:52:11 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EBC8343D49
	for <perforce@freebsd.org>; Wed,  5 Apr 2006 00:52:10 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k350qA6e088837
	for <perforce@freebsd.org>; Wed, 5 Apr 2006 00:52:10 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k350qAws088834
	for perforce@freebsd.org; Wed, 5 Apr 2006 00:52:10 GMT
	(envelope-from jmg@freebsd.org)
Date: Wed, 5 Apr 2006 00:52:10 GMT
Message-Id: <200604050052.k350qAws088834@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94654 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Apr 2006 00:52:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=94654

Change 94654 by jmg@jmg_arlene on 2006/04/05 00:52:01

	try to make activate_resource work..

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#21 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#21 (text+ko) ====

@@ -52,6 +52,8 @@
 #include <sparc64/pci/ofw_pci.h>
 
 #include <machine/hv_pcivar.h>
+#include <machine/vmparam.h>
+#include <machine/tlb.h>
 
 #include "pcib_if.h"
 
@@ -425,25 +427,14 @@
 hvpci_activate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r) 
 {
-#if 0
 	void *p;
-	int error;
 
 	if (type == SYS_RES_MEMORY) {
-		/*
-		 * Need to memory-map the device space, as some drivers depend
-		 * on the virtual address being set and useable.
-		 */
-		error = sparc64_bus_mem_map(rman_get_bustag(r),
-		    rman_get_bushandle(r), rman_get_size(r), 0, 0, &p);
-		if (error != 0)
-			return (error);
+		/* XXX - we may still need to set the IE bit on the mapping */
+		p = (void *)TLB_PHYS_TO_DIRECT(rman_get_bushandle(r));
 		rman_set_virtual(r, p);
 	}
 	return (rman_activate_resource(r));
-#else
-	return (ENXIO);
-#endif
 }
 
 static int