From owner-svn-src-head@freebsd.org  Mon Mar 14 06:30:39 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12EB0AD0B83;
 Mon, 14 Mar 2016 06:30:39 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D8DC87A3;
 Mon, 14 Mar 2016 06:30:38 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2E6Ubjo031150;
 Mon, 14 Mar 2016 06:30:37 GMT (envelope-from wma@FreeBSD.org)
Received: (from wma@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2E6Ub9r031149;
 Mon, 14 Mar 2016 06:30:37 GMT (envelope-from wma@FreeBSD.org)
Message-Id: <201603140630.u2E6Ub9r031149@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wma set sender to wma@FreeBSD.org
 using -f
From: Wojciech Macek <wma@FreeBSD.org>
Date: Mon, 14 Mar 2016 06:30:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296824 - 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.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Mar 2016 06:30:39 -0000

Author: wma
Date: Mon Mar 14 06:30:37 2016
New Revision: 296824
URL: https://svnweb.freebsd.org/changeset/base/296824

Log:
  Fix GIC interrupt decoding in INTRNG code
  
     Bug was already fixed in not-INTRNG code, it needs to be corrected
     here as well.  Source: https://reviews.freebsd.org/rS294422
  
  Submitted by:          Bartosz Szczepanek <bsz@semihalf.com>
  Obtained from:         Semihalf
  Sponsored by:          Stormshield
  Reviewed by:           cognet, wma
  Approved by:           cognet (mentor)
  Differential Revision: https://reviews.freebsd.org/D5029

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

Modified: head/sys/arm/arm/gic.c
==============================================================================
--- head/sys/arm/arm/gic.c	Mon Mar 14 04:39:35 2016	(r296823)
+++ head/sys/arm/arm/gic.c	Mon Mar 14 06:30:37 2016	(r296824)
@@ -755,7 +755,7 @@ gic_map_fdt(struct arm_gic_softc *sc, st
 		 * The hardware only supports active-high-level or rising-edge.
 		 */
 		tripol = isrc->isrc_cells[2];
-		if (tripol & 0x0a) {
+		if (tripol & 0x0a && irq >= GIC_FIRST_SPI) {
 			device_printf(sc->gic_dev,
 			   "unsupported trigger/polarity configuration "
 			   "0x%02x\n",  tripol & 0x0f);