From owner-svn-src-head@FreeBSD.ORG  Thu Jun 12 11:41:04 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A024814A;
 Thu, 12 Jun 2014 11:41:04 +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 8D58821B6;
 Thu, 12 Jun 2014 11:41:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CBf4UN096951;
 Thu, 12 Jun 2014 11:41:04 GMT (envelope-from br@svn.freebsd.org)
Received: (from br@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CBf474096950;
 Thu, 12 Jun 2014 11:41:04 GMT (envelope-from br@svn.freebsd.org)
Message-Id: <201406121141.s5CBf474096950@svn.freebsd.org>
From: Ruslan Bukin <br@FreeBSD.org>
Date: Thu, 12 Jun 2014 11:41:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267389 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Thu, 12 Jun 2014 11:41:04 -0000

Author: br
Date: Thu Jun 12 11:41:04 2014
New Revision: 267389
URL: http://svnweb.freebsd.org/changeset/base/267389

Log:
  Activate IRQ 30 (non-secure private timer IRQ) for case we are running
  in non-secure state.

Modified:
  head/sys/arm/arm/gic.c

Modified: head/sys/arm/arm/gic.c
==============================================================================
--- head/sys/arm/arm/gic.c	Thu Jun 12 11:37:38 2014	(r267388)
+++ head/sys/arm/arm/gic.c	Thu Jun 12 11:41:04 2014	(r267389)
@@ -166,8 +166,9 @@ gic_init_secondary(void)
 	/* Enable interrupt distribution */
 	gic_d_write_4(GICD_CTLR, 0x01);
 
-	/* Activate IRQ 29, ie private timer IRQ*/
+	/* Activate IRQ 29-30, ie private timer (secure & non-secure) IRQs */
 	gic_d_write_4(GICD_ISENABLER(29 >> 5), (1UL << (29 & 0x1F)));
+	gic_d_write_4(GICD_ISENABLER(30 >> 5), (1UL << (30 & 0x1F)));
 }
 
 static int