Date: Fri, 6 Aug 2010 19:03:36 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 181972 for review Message-ID: <201008061903.o76J3apV037554@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@181972?ac=10 Change 181972 by jhb@jhb_jhbbsd on 2010/08/06 19:02:57 IFC @181971 Affected files ... .. //depot/projects/smpng/share/man/man9/BUS_NEW_PASS.9#2 integrate .. //depot/projects/smpng/share/man/man9/Makefile#16 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_vap.9#3 integrate .. //depot/projects/smpng/share/man/man9/rman.9#2 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#66 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#92 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#25 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#39 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#122 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#127 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#33 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#50 integrate .. //depot/projects/smpng/sys/ia64/include/smp.h#13 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#96 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#105 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#62 integrate .. //depot/projects/smpng/sys/mips/include/smp.h#9 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#12 integrate .. //depot/projects/smpng/sys/powerpc/include/smp.h#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#20 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#27 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#10 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#12 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/BUS_NEW_PASS.9#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/BUS_NEW_PASS.9,v 1.1 2009/06/09 14:26:23 jhb Exp $ +.\" $FreeBSD: src/share/man/man9/BUS_NEW_PASS.9,v 1.2 2010/08/06 14:33:42 joel Exp $ .\" .Dd June 8, 2009 .Dt BUS_NEW_PASS 9 @@ -45,7 +45,7 @@ level has been changed. This method is responsible for invoking .Xr BUS_NEW_PASS 9 -on child bus devices to propogate the rescan to child devices. +on child bus devices to propagate the rescan to child devices. It is also responsible for reprobing any unattached child devices and allowing drivers for the current pass to identify new children. A default implementation is provided by ==== //depot/projects/smpng/share/man/man9/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.369 2010/07/05 16:23:55 jh Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.370 2010/08/06 16:50:48 stefanf Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -769,8 +769,13 @@ lock.9 lockstatus.9 MLINKS+=LOCK_PROFILING.9 MUTEX_PROFILING.9 MLINKS+=make_dev.9 destroy_dev.9 \ + make_dev.9 destroy_dev_drain.9 \ + make_dev.9 destroy_dev_sched.9 \ + make_dev.9 destroy_dev_sched_cb.9 \ make_dev.9 dev_depends.9 \ - make_dev.9 make_dev_alias.9 + make_dev.9 make_dev_alias.9 \ + make_dev.9 make_dev_cred.9 \ + make_dev.9 make_dev_credf.9 MLINKS+=malloc.9 free.9 \ malloc.9 MALLOC_DECLARE.9 \ malloc.9 MALLOC_DEFINE.9 \ ==== //depot/projects/smpng/share/man/man9/ieee80211_vap.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_vap.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_vap.9,v 1.3 2010/08/06 14:33:42 joel Exp $ .\" .Dd August 4, 2009 .Dt IEEE8021_VAP 9 @@ -117,7 +117,7 @@ from user applications. The driver can then reclaim resources held by the vap and re-enable device operation. -The exact procedure for quiesceing a device is unspecified but typically +The exact procedure for quiescing a device is unspecified but typically it involves blocking interrupts and stopping transmit and receive processing. .Sh MULTI-VAP OPERATION ==== //depot/projects/smpng/share/man/man9/rman.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/rman.9,v 1.9 2007/04/29 19:46:33 jmg Exp $ +.\" $FreeBSD: src/share/man/man9/rman.9,v 1.10 2010/08/06 14:33:42 joel Exp $ .\" .Dd April 29, 2007 .Dt RMAN 9 @@ -157,10 +157,10 @@ It also initializes any mutexes associated with the structure. If .Fn rman_init -fails to initalize the mutex, it will return +fails to initialize the mutex, it will return .Er ENOMEM ; otherwise it will return 0 and .Fa rm -will be initalized. +will be initialized. .Pp The .Fn rman_fini ==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.33 2010/08/02 17:35:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.35 2010/08/06 17:21:32 jkim Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -71,7 +71,7 @@ static struct pcb **susppcbs; #endif -int acpi_restorecpu(struct pcb *, vm_offset_t); +int acpi_restorecpu(vm_offset_t, struct pcb *); static void *acpi_alloc_wakeup_handler(void); static void acpi_stop_beep(void *); @@ -176,7 +176,6 @@ acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus) { uint32_t mpbioswarmvec; - cpumask_t map; int cpu; u_char mpbiosreason; @@ -193,8 +192,7 @@ /* Wake up each AP. */ for (cpu = 1; cpu < mp_ncpus; cpu++) { - map = 1ul << cpu; - if ((wakeup_cpus & map) != map) + if ((wakeup_cpus & (1 << cpu)) == 0) continue; if (acpi_wakeup_ap(sc, cpu) == 0) { /* restore the warmstart vector */ ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#66 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.321 2010/08/02 17:35:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.322 2010/08/06 15:36:59 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#92 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.546 2010/07/28 15:36:12 mdf Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.547 2010/08/06 18:46:27 bschmidt Exp $ cpu HAMMER ident GENERIC @@ -62,7 +62,7 @@ options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options FLOWTABLE # per-cpu routing cache +options FLOWTABLE # per-cpu routing cache #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/smpng/sys/amd64/include/smp.h#25 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.98 2010/06/17 11:54:49 mav Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.99 2010/08/06 15:36:59 jhb Exp $ * */ ==== //depot/projects/smpng/sys/compat/x86bios/x86bios.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/x86bios/x86bios.c,v 1.22 2010/08/06 15:04:01 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/x86bios/x86bios.c,v 1.23 2010/08/06 15:24:37 jkim Exp $"); #include "opt_x86bios.h" @@ -120,9 +120,9 @@ if (addr != 0) { *offset = vtophys(addr); mtx_lock(&x86bios_lock); - for (i = 0; i < howmany(size, PAGE_SIZE); i++) + for (i = 0; i < atop(round_page(size)); i++) vm86_addpage(&x86bios_vmc, atop(*offset) + i, - addr + i * PAGE_SIZE); + addr + ptoa(i)); mtx_unlock(&x86bios_lock); } @@ -147,7 +147,7 @@ return; } if (last == x86bios_vmc.npages - 1) { - x86bios_vmc.npages -= howmany(size, PAGE_SIZE); + x86bios_vmc.npages -= atop(round_page(size)); for (i = x86bios_vmc.npages - 1; i >= 0 && x86bios_vmc.pmap[i].kva == 0; i--) x86bios_vmc.npages--; ==== //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#39 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.58 2010/07/12 23:01:21 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.59 2010/08/06 17:27:00 mjacob Exp $"); #include <dev/mpt/mpt.h> #include <dev/mpt/mpt_cam.h> @@ -194,8 +194,6 @@ #endif -#define MPT_IO_BAR 0 -#define MPT_MEM_BAR 1 static int mpt_pci_probe(device_t); static int mpt_pci_attach(device_t); @@ -420,6 +418,7 @@ struct mpt_softc *mpt; int iqd; uint32_t data, cmd; + int mpt_io_bar, mpt_mem_bar; /* Allocate the softc structure */ mpt = (struct mpt_softc*)device_get_softc(dev); @@ -505,11 +504,25 @@ } /* + * Figure out which are the I/O and MEM Bars + */ + data = pci_read_config(dev, PCIR_BAR(0), 4); + if (PCI_BAR_IO(data)) { + /* BAR0 is IO, BAR1 is memory */ + mpt_io_bar = 0; + mpt_mem_bar = 1; + } else { + /* BAR0 is memory, BAR1 is IO */ + mpt_mem_bar = 0; + mpt_io_bar = 1; + } + + /* * Set up register access. PIO mode is required for * certain reset operations (but must be disabled for * some cards otherwise). */ - mpt->pci_pio_rid = PCIR_BAR(MPT_IO_BAR); + mpt->pci_pio_rid = PCIR_BAR(mpt_io_bar); mpt->pci_pio_reg = bus_alloc_resource(dev, SYS_RES_IOPORT, &mpt->pci_pio_rid, 0, ~0, 0, RF_ACTIVE); if (mpt->pci_pio_reg == NULL) { @@ -520,7 +533,7 @@ mpt->pci_pio_sh = rman_get_bushandle(mpt->pci_pio_reg); /* Allocate kernel virtual memory for the 9x9's Mem0 region */ - mpt->pci_mem_rid = PCIR_BAR(MPT_MEM_BAR); + mpt->pci_mem_rid = PCIR_BAR(mpt_mem_bar); mpt->pci_reg = bus_alloc_resource(dev, SYS_RES_MEMORY, &mpt->pci_mem_rid, 0, ~0, 0, RF_ACTIVE); if (mpt->pci_reg == NULL) { ==== //depot/projects/smpng/sys/i386/conf/GENERIC#122 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.533 2010/07/28 15:36:12 mdf Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.534 2010/08/06 18:46:27 bschmidt Exp $ cpu I486_CPU cpu I586_CPU @@ -63,7 +63,7 @@ options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options FLOWTABLE # per-cpu routing cache +options FLOWTABLE # per-cpu routing cache #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#127 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.309 2010/06/22 16:20:10 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.310 2010/08/06 15:36:59 jhb Exp $"); #include "opt_apic.h" #include "opt_cpu.h" ==== //depot/projects/smpng/sys/i386/include/smp.h#33 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/i386/include/smp.h,v 1.100 2009/08/13 17:09:45 attilio Exp $ + * $FreeBSD: src/sys/i386/include/smp.h,v 1.101 2010/08/06 15:36:59 jhb Exp $ * */ ==== //depot/projects/smpng/sys/i386/xen/mp_machdep.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/xen/mp_machdep.c,v 1.25 2010/03/10 19:50:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/xen/mp_machdep.c,v 1.26 2010/08/06 15:36:59 jhb Exp $"); #include "opt_apic.h" #include "opt_cpu.h" ==== //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#50 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.86 2010/07/03 20:19:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.87 2010/08/06 15:36:59 jhb Exp $"); #include "opt_kstack_pages.h" ==== //depot/projects/smpng/sys/ia64/include/smp.h#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/ia64/include/smp.h,v 1.13 2010/03/17 00:37:15 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/smp.h,v 1.14 2010/08/06 15:36:59 jhb Exp $ */ #ifndef _MACHINE_SMP_H_ #define _MACHINE_SMP_H_ ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#96 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.139 2010/06/11 18:46:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.140 2010/08/06 15:36:59 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" ==== //depot/projects/smpng/sys/kern/sched_ule.c#105 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.271 2010/07/15 13:46:30 ivoras Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.272 2010/08/06 15:36:59 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" ==== //depot/projects/smpng/sys/kern/subr_smp.c#62 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.219 2010/06/11 18:46:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.220 2010/08/06 15:36:59 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/mips/include/smp.h#9 (text+ko) ==== @@ -8,7 +8,7 @@ * * from: src/sys/alpha/include/smp.h,v 1.8 2005/01/05 20:05:50 imp * JNPR: smp.h,v 1.3 2006/12/02 09:53:41 katta - * $FreeBSD: src/sys/mips/include/smp.h,v 1.7 2010/07/23 07:46:55 mav Exp $ + * $FreeBSD: src/sys/mips/include/smp.h,v 1.8 2010/08/06 15:36:59 jhb Exp $ * */ ==== //depot/projects/smpng/sys/mips/mips/mp_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/mips/mips/mp_machdep.c,v 1.14 2010/07/23 07:46:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/mp_machdep.c,v 1.15 2010/08/06 15:36:59 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/powerpc/include/smp.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/smp.h,v 1.8 2010/07/13 05:32:19 nwhitehorn Exp $ + * $FreeBSD: src/sys/powerpc/include/smp.h,v 1.9 2010/08/06 15:36:59 jhb Exp $ */ #ifndef _MACHINE_SMP_H_ ==== //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mp_machdep.c,v 1.28 2010/07/13 05:32:19 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mp_machdep.c,v 1.29 2010/08/06 15:36:59 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/sparc64/include/smp.h#27 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.29 2010/07/29 12:08:46 mav Exp $ + * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.30 2010/08/06 15:36:59 jhb Exp $ */ #ifndef _MACHINE_SMP_H_ ==== //depot/projects/smpng/sys/sun4v/include/smp.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sun4v/include/smp.h,v 1.8 2010/07/29 12:08:46 mav Exp $ + * $FreeBSD: src/sys/sun4v/include/smp.h,v 1.9 2010/08/06 15:36:59 jhb Exp $ */ #ifndef _MACHINE_SMP_H_ ==== //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#12 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_machdep.c,v 1.13 2010/07/29 12:08:46 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_machdep.c,v 1.14 2010/08/06 15:36:59 jhb Exp $"); #include "opt_trap_trace.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008061903.o76J3apV037554>