From owner-p4-projects@FreeBSD.ORG  Wed Jul  3 22:30:39 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 555897EB; Wed,  3 Jul 2013 22:30:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 16F1E7E7
 for <perforce@freebsd.org>; Wed,  3 Jul 2013 22:30:39 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 08CE21C2D
 for <perforce@freebsd.org>; Wed,  3 Jul 2013 22:30:39 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r63MUceN071178
 for <perforce@freebsd.org>; Wed, 3 Jul 2013 22:30:38 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r63MUc8v071175
 for perforce@freebsd.org; Wed, 3 Jul 2013 22:30:38 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 3 Jul 2013 22:30:38 GMT
Message-Id: <201307032230.r63MUc8v071175@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 230523 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 03 Jul 2013 22:30:39 -0000

http://p4web.freebsd.org/@@230523?ac=10

Change 230523 by brooks@brooks_zenith on 2013/07/03 22:30:08

	Disable output when setting up interrupts.  It seems we can't
	print on the second thread when setting up IPIs.
	
	A bit of other tidying.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_pic.c#7 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_pic.c#7 (text+ko) ====

@@ -218,7 +218,9 @@
 static void
 bp_config_source(device_t ic, int src, int enable, u_long tid, u_long irq)
 {
+#if 0
 	char configstr[64];
+#endif
 	struct beripic_softc *sc;
 	uint64_t config;
 
@@ -229,9 +231,12 @@
 	config |= tid << BP_CFG_SHIFT_TID;
 	config |= irq << BP_CFG_SHIFT_IRQ;
 
-	if (bootverbose)
+#if 0
+	/* There is not valid console when doing IPI setup on APs */
+	if (bootverbose && (tid == 0 || !cold))
 		device_printf(ic, "src %d: %s\n", src,
 		    bp_strconfig(config, configstr, sizeof(configstr)));
+#endif
 	bp_write_cfg(sc, src, config);
 }
 
@@ -552,12 +557,14 @@
 	if (error != 0)
 		goto err;
 
+#ifdef NOTYET
 #ifdef SMP
 	/* XXX: bind ithread to cpu */
 	sc->bp_next_tid++;
 	if (sc->bp_next_tid >= sc->bp_nthreads)
 		sc->bp_next_tid = 0;
 #endif
+#endif
 	if (sc->bp_next_tid == 0) {
 		sc->bp_next_irq++;
 		if (sc->bp_next_irq >= sc->bp_nirqs)
@@ -650,7 +657,7 @@
 
 	bit = 1ULL << (tid % 64);
 	bus_space_write_8(sc->bp_set_bst, sc->bp_set_bsh, 
-	    BP_FIRST_SOFT / 8 + (tid >> 6), bit);
+	    (BP_FIRST_SOFT / 8) + (tid / 64), bit);
 }
 
 static void
@@ -665,7 +672,7 @@
 
 	bit = 1ULL << (tid % 64);
 	bus_space_write_8(sc->bp_clear_bst, sc->bp_clear_bsh, 
-	    BP_FIRST_SOFT / 8 + (tid >> 6), bit);
+	    (BP_FIRST_SOFT / 8) + (tid / 64), bit);
 }
 #endif