From owner-svn-src-head@freebsd.org Sat Nov 25 22:42:07 2017 Return-Path: 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 28562DF26BE; Sat, 25 Nov 2017 22:42:07 +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 E8864726B5; Sat, 25 Nov 2017 22:42:06 +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 vAPMg6lM076197; Sat, 25 Nov 2017 22:42:06 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAPMg61g076195; Sat, 25 Nov 2017 22:42:06 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201711252242.vAPMg61g076195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sat, 25 Nov 2017 22:42:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326215 - in head/sys/powerpc: include powerpc X-SVN-Group: head X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: in head/sys/powerpc: include powerpc X-SVN-Commit-Revision: 326215 X-SVN-Commit-Repository: base 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.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Nov 2017 22:42:07 -0000 Author: nwhitehorn Date: Sat Nov 25 22:42:05 2017 New Revision: 326215 URL: https://svnweb.freebsd.org/changeset/base/326215 Log: Return base IRQ of PIC when added and massively increase the number of available IRQs per PIC for large systems. MFC after: 3 weeks Modified: head/sys/powerpc/include/intr_machdep.h head/sys/powerpc/powerpc/intr_machdep.c Modified: head/sys/powerpc/include/intr_machdep.h ============================================================================== --- head/sys/powerpc/include/intr_machdep.h Sat Nov 25 22:15:56 2017 (r326214) +++ head/sys/powerpc/include/intr_machdep.h Sat Nov 25 22:42:05 2017 (r326215) @@ -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: head/sys/powerpc/powerpc/intr_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/intr_machdep.c Sat Nov 25 22:15:56 2017 (r326214) +++ head/sys/powerpc/powerpc/intr_machdep.c Sat Nov 25 22:42:05 2017 (r326215) @@ -157,7 +157,7 @@ smp_intr_init(void *dummy __unused) for (vector = 0; vector < nvectors; vector++) { i = powerpc_intrs[vector]; - if (i != NULL && i->pic == root_pic) + if (i != NULL && i->event != NULL && i->pic == root_pic) PIC_BIND(i->pic, i->intline, i->cpu); } } @@ -319,7 +319,7 @@ powerpc_assign_intr_cpu(void *arg, int cpu) #endif } -void +u_int powerpc_register_pic(device_t dev, uint32_t node, u_int irqs, u_int ipis, u_int atpic) { @@ -358,6 +358,8 @@ powerpc_register_pic(device_t dev, uint32_t node, u_in ("Number of PICs exceeds maximum (%d)", MAX_PICS)); mtx_unlock(&intr_table_lock); + + return (p->base); } u_int @@ -387,7 +389,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 << 25); npics++; KASSERT(npics < MAX_PICS,