From owner-svn-src-user@FreeBSD.ORG Sun Dec 22 14:13:01 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 27E64CD7; Sun, 22 Dec 2013 14:13:01 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 088C31FE8; Sun, 22 Dec 2013 14:13:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMED0X9079031; Sun, 22 Dec 2013 14:13:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMED0kq079025; Sun, 22 Dec 2013 14:13:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201312221413.rBMED0kq079025@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 22 Dec 2013 14:13:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r259723 - user/nwhitehorn/mips_pic_if/mips/mips X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Dec 2013 14:13:01 -0000 Author: nwhitehorn Date: Sun Dec 22 14:13:00 2013 New Revision: 259723 URL: http://svnweb.freebsd.org/changeset/base/259723 Log: SMP fixes. Modified: user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c user/nwhitehorn/mips_pic_if/mips/mips/nexus.c Modified: user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c ============================================================================== --- user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c Sun Dec 22 13:03:33 2013 (r259722) +++ user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c Sun Dec 22 14:13:00 2013 (r259723) @@ -78,6 +78,7 @@ #include #include +#include #include #include #include @@ -377,9 +378,6 @@ mips_enable_intr(void) { struct mips_intr *i; int error, vector; -#ifdef SMP - int n; -#endif if (npics == 0) panic("no PIC detected\n"); @@ -390,21 +388,13 @@ mips_enable_intr(void) #ifdef SMP /* Install an IPI handler. */ if (mp_ncpus > 1) { - for (n = 0; n < npics; n++) { - if (piclist[n].dev != root_pic) - continue; - - KASSERT(piclist[n].ipis != 0, - ("%s: SMP root PIC does not supply any IPIs", - __func__)); - error = mips_setup_intr("IPI", - mips_get_irq(piclist[n].node, piclist[n].irqs), - mips_ipi_handler, NULL, NULL, - INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie); - if (error) { - printf("unable to setup IPI handler\n"); - return (error); - } + error = mips_setup_intr("IPI", + platform_ipi_intrnum(), + mips_ipi_handler, NULL, NULL, + INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie); + if (error) { + printf("unable to setup IPI handler\n"); + return (error); } } #endif Modified: user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c ============================================================================== --- user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c Sun Dec 22 13:03:33 2013 (r259722) +++ user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c Sun Dec 22 14:13:00 2013 (r259723) @@ -110,7 +110,7 @@ ipi_cpu(int cpu, u_int ipi) /* * Handle an IPI sent to this processor. */ -static int +int mips_ipi_handler(void *arg) { u_int cpu, ipi, ipi_bitmap; @@ -338,18 +338,10 @@ smp_init_secondary(u_int32_t cpuid) static void release_aps(void *dummy __unused) { - int ipi_irq; if (mp_ncpus == 1) return; - /* - * IPI handler - */ - ipi_irq = platform_ipi_intrnum(); - cpu_establish_hardintr("ipi", mips_ipi_handler, NULL, NULL, ipi_irq, - INTR_TYPE_MISC | INTR_EXCL, NULL); - atomic_store_rel_int(&aps_ready, 1); while (smp_started == 0) Modified: user/nwhitehorn/mips_pic_if/mips/mips/nexus.c ============================================================================== --- user/nwhitehorn/mips_pic_if/mips/mips/nexus.c Sun Dec 22 13:03:33 2013 (r259722) +++ user/nwhitehorn/mips_pic_if/mips/mips/nexus.c Sun Dec 22 14:13:00 2013 (r259723) @@ -529,7 +529,7 @@ nexus_bind_intr(device_t bus __unused, d struct resource *r, int cpu) { - return (powerpc_bind_intr(rman_get_start(r), cpu)); + return (mips_bind_intr(rman_get_start(r), cpu)); } #endif