From owner-svn-src-projects@FreeBSD.ORG  Sun Jan 11 19:41:53 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B8CF698F;
 Sun, 11 Jan 2015 19:41:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A623193A;
 Sun, 11 Jan 2015 19:41:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0BJfrHU008183;
 Sun, 11 Jan 2015 19:41:53 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0BJfrt9008182;
 Sun, 11 Jan 2015 19:41:53 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201501111941.t0BJfrt9008182@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 11 Jan 2015 19:41:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277018 - projects/arm_intrng/sys/arm/arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2015 19:41:53 -0000

Author: andrew
Date: Sun Jan 11 19:41:52 2015
New Revision: 277018
URL: https://svnweb.freebsd.org/changeset/base/277018

Log:
  Restore the non-intrng behaviour to enable IPIs depending on the config.

Modified:
  projects/arm_intrng/sys/arm/arm/mp_machdep.c

Modified: projects/arm_intrng/sys/arm/arm/mp_machdep.c
==============================================================================
--- projects/arm_intrng/sys/arm/arm/mp_machdep.c	Sun Jan 11 19:28:37 2015	(r277017)
+++ projects/arm_intrng/sys/arm/arm/mp_machdep.c	Sun Jan 11 19:41:52 2015	(r277018)
@@ -149,7 +149,9 @@ init_secondary(int cpu)
 {
 	struct pcpu *pc;
 	uint32_t loop_counter;
+#ifndef ARM_INTRNG
 	int start = 0, end = 0;
+#endif
 
 	cpu_setup(NULL);
 	setttb(pmap_pa);
@@ -200,6 +202,11 @@ init_secondary(int cpu)
 	mtx_unlock_spin(&ap_boot_mtx);
 
 	/* Enable ipi */
+#ifdef ARM_INTRNG
+	for (int i = 0; i < ARM_IPI_COUNT; i++)
+		arm_unmask_ipi(i);
+#else
+
 #ifdef IPI_IRQ_START
 	start = IPI_IRQ_START;
 #ifdef IPI_IRQ_END
@@ -209,12 +216,9 @@ init_secondary(int cpu)
 #endif
 #endif
 				
-	for (int i = 0; i < ARM_IPI_COUNT; i++)
-#ifdef ARM_INTRNG
-		arm_unmask_ipi(i);
-#else
+	for (int i = start; i <= end; i++)
 		arm_unmask_irq(i);
-#endif
+#endif /* !ARM_INTRNG */
 	enable_interrupts(PSR_I);
 
 	loop_counter = 0;