From owner-p4-projects@FreeBSD.ORG Thu Oct 24 16:09:13 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E83DFF12; Thu, 24 Oct 2013 16:09:12 +0000 (UTC) Delivered-To: perforce@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 ESMTP id 9303CF10 for ; Thu, 24 Oct 2013 16:09:12 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (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 7F42E286A for ; Thu, 24 Oct 2013 16:09:12 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r9OG9CeS053712 for ; Thu, 24 Oct 2013 16:09:12 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r9OG9Cdl053709 for perforce@freebsd.org; Thu, 24 Oct 2013 16:09:12 GMT (envelope-from brooks@freebsd.org) Date: Thu, 24 Oct 2013 16:09:12 GMT Message-Id: <201310241609.r9OG9Cdl053709@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 1187342 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Oct 2013 16:09:13 -0000 http://p4web.freebsd.org/@@1187342?ac=10 Change 1187342 by brooks@brooks_zenith on 2013/10/24 16:09:08 ifdef around platform_init_secondary() rather than requiring that all MIPS platforms provide a stub. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#16 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#9 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/cavium/octeon_mp.c#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/gxemul_machdep.c#7 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/include/hwfunc.h#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/include/pte.h#6 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/mp_machdep.c#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/nlm/xlp_machdep.c#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/rmi/xlr_machdep.c#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/sibyte/sb_machdep.c#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#16 (text+ko) ==== @@ -89,6 +89,7 @@ # Options specific to the BERI platform. # BERI_LARGE_TLB opt_global.h +PLATFORM_INIT_SECONDARY opt_global.h # # Options that control the Atheros SoC peripherals ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#9 (text+ko) ==== @@ -4,3 +4,4 @@ cpu CPU_MIPS4KC options BERI_LARGE_TLB +options PLATFORM_INIT_SECONDARY ==== //depot/projects/ctsrd/beribsd/src/sys/mips/cavium/octeon_mp.c#5 (text+ko) ==== @@ -46,12 +46,6 @@ unsigned octeon_ap_boot = ~0; void -platform_init_secondary(int cpuid) -{ - -} - -void platform_ipi_send(int cpuid) { cvmx_write_csr(CVMX_CIU_MBOX_SETX(cpuid), 1); ==== //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/gxemul_machdep.c#7 (text+ko) ==== @@ -174,12 +174,6 @@ #ifdef SMP void -platform_init_secondary(int cpuid) -{ - -} - -void platform_ipi_send(int cpuid) { GXEMUL_MP_DEV_WRITE(GXEMUL_MP_DEV_IPI_ONE, (1 << 16) | cpuid); ==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/hwfunc.h#6 (text+ko) ==== @@ -69,10 +69,12 @@ */ int platform_ipi_intrnum(void); +#ifdef PLATFORM_INIT_SECONDARY /* * Set up IPIs for this CPU. */ void platform_init_secondary(int cpuid); +#endif /* * Trigger a IPI interrupt on 'cpuid'. ==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/pte.h#6 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/mp_machdep.c#6 (text+ko) ==== @@ -302,7 +302,9 @@ while (!aps_ready) ; +#ifdef PLATFORM_INIT_SECONDARY platform_init_secondary(cpuid); +#endif /* Initialize curthread. */ KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); @@ -345,7 +347,9 @@ if (mp_ncpus == 1) return; +#ifdef PLATFORM_INIT_SECONDARY platform_init_secondary(0); +#endif /* * IPI handler ==== //depot/projects/ctsrd/beribsd/src/sys/mips/nlm/xlp_machdep.c#5 (text+ko) ==== @@ -697,12 +697,6 @@ } void -platform_init_secondary(int cpuid) -{ - -} - -void platform_ipi_send(int cpuid) { ==== //depot/projects/ctsrd/beribsd/src/sys/mips/rmi/xlr_machdep.c#5 (text+ko) ==== @@ -578,12 +578,6 @@ } void -platform_init_secondary(int cpuid) -{ - -} - -void platform_ipi_send(int cpuid) { ==== //depot/projects/ctsrd/beribsd/src/sys/mips/sibyte/sb_machdep.c#6 (text+ko) ==== @@ -295,12 +295,6 @@ #ifdef SMP void -platform_init_secondary(int cpuid) -{ - -} - -void platform_ipi_send(int cpuid) { KASSERT(cpuid == 0 || cpuid == 1,