From owner-svn-src-projects@FreeBSD.ORG Mon Aug 11 16:57:42 2014 Return-Path: Delivered-To: svn-src-projects@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 BF7C559D for ; Mon, 11 Aug 2014 16:57:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 934132498 for ; Mon, 11 Aug 2014 16:57:42 +0000 (UTC) Received: from andrew (uid 1231) (envelope-from andrew@FreeBSD.org) id 23db by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 11 Aug 2014 16:57:42 +0000 From: Andrew Turner Date: Mon, 11 Aug 2014 16:57:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269818 - projects/arm64/sys/dev/fdt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e8f606.23db.c1d4a@svn.freebsd.org> X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2014 16:57:42 -0000 Author: andrew Date: Mon Aug 11 16:57:42 2014 New Revision: 269818 URL: http://svnweb.freebsd.org/changeset/base/269818 Log: Hack to get the correct value for the interrupt from the vendor supplied device tree. The GIC used the format where the type is 0 for Shared Peripheral Interrupts (SPI), and 1 for Private Peripheral Interrupts. The SPIs start at 32 in the GIc so we need to adjust their values to match this. Modified: projects/arm64/sys/dev/fdt/simplebus.c Modified: projects/arm64/sys/dev/fdt/simplebus.c ============================================================================== --- projects/arm64/sys/dev/fdt/simplebus.c Mon Aug 11 16:44:06 2014 (r269817) +++ projects/arm64/sys/dev/fdt/simplebus.c Mon Aug 11 16:57:42 2014 (r269818) @@ -310,10 +310,18 @@ simplebus_setup_dinfo(device_t dev, phan icells = 1; } for (i = 0, k = 0; i < nintr; i += icells, k++) { + u_int irq; + + if (icells == 3) { + irq = intr[i + 1]; + if (intr[i] == 0) + irq += 32; + } else + irq = intr[i]; intr[i] = ofw_bus_map_intr(dev, iparent, icells, &intr[i]); - resource_list_add(&ndi->rl, SYS_RES_IRQ, k, intr[i], - intr[i], 1); + resource_list_add(&ndi->rl, SYS_RES_IRQ, k, irq, + irq, 1); } free(intr, M_OFWPROP); }