From owner-svn-src-projects@freebsd.org Mon Aug 22 19:28:56 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 37F07BC29B6
for <svn-src-projects@mailman.ysv.freebsd.org>;
Mon, 22 Aug 2016 19:28:56 +0000 (UTC)
(envelope-from nwhitehorn@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 E283D121E;
Mon, 22 Aug 2016 19:28:55 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MJStfo079276;
Mon, 22 Aug 2016 19:28:55 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MJStHC079274;
Mon, 22 Aug 2016 19:28:55 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201608221928.u7MJStHC079274@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 22 Aug 2016 19:28:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r304628 - in projects/powernv/powerpc: include powerpc
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.22
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2016 19:28:56 -0000
Author: nwhitehorn
Date: Mon Aug 22 19:28:54 2016
New Revision: 304628
URL: https://svnweb.freebsd.org/changeset/base/304628
Log:
As a stopgap until PPC intr_machdep is burned to the ground, allow PICs to
learn what the IRQ <-> interrupt line mapping being used for them is.
Modified:
projects/powernv/powerpc/include/intr_machdep.h
projects/powernv/powerpc/powerpc/intr_machdep.c
Modified: projects/powernv/powerpc/include/intr_machdep.h
==============================================================================
--- projects/powernv/powerpc/include/intr_machdep.h Mon Aug 22 19:27:30 2016 (r304627)
+++ projects/powernv/powerpc/include/intr_machdep.h Mon Aug 22 19:28:54 2016 (r304628)
@@ -46,7 +46,7 @@ driver_filter_t powerpc_ipi_handler;
void intrcnt_add(const char *name, u_long **countp);
-void powerpc_register_pic(device_t, uint32_t, u_int, u_int, u_int);
+u_int powerpc_register_pic(device_t, uint32_t, u_int, u_int, u_int);
u_int powerpc_get_irq(uint32_t, u_int);
void powerpc_dispatch_intr(u_int, struct trapframe *);
Modified: projects/powernv/powerpc/powerpc/intr_machdep.c
==============================================================================
--- projects/powernv/powerpc/powerpc/intr_machdep.c Mon Aug 22 19:27:30 2016 (r304627)
+++ projects/powernv/powerpc/powerpc/intr_machdep.c Mon Aug 22 19:28:54 2016 (r304628)
@@ -317,7 +317,7 @@ powerpc_assign_intr_cpu(void *arg, int c
#endif
}
-void
+u_int
powerpc_register_pic(device_t dev, uint32_t node, u_int irqs, u_int ipis,
u_int atpic)
{
@@ -356,6 +356,8 @@ powerpc_register_pic(device_t dev, uint3
("Number of PICs exceeds maximum (%d)", MAX_PICS));
mtx_unlock(&intr_table_lock);
+
+ return (p->base);
}
u_int
@@ -385,7 +387,7 @@ powerpc_get_irq(uint32_t node, u_int pin
piclist[idx].irqs = 124;
piclist[idx].ipis = 4;
piclist[idx].base = nirqs;
- nirqs += 128;
+ nirqs += (1 << 24);
npics++;
KASSERT(npics < MAX_PICS,