Date: Fri, 2 Jul 2004 03:14:30 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 56255 for review Message-ID: <200407020314.i623EUfH006250@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=56255 Change 56255 by jhb@jhb_slimer on 2004/07/02 03:14:15 IFC @56244. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/sgmap.c#4 integrate .. //depot/projects/smpng/sys/alpha/isa/isa.c#13 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#20 integrate .. //depot/projects/smpng/sys/alpha/pci/apecs.c#13 integrate .. //depot/projects/smpng/sys/alpha/pci/cia.c#17 integrate .. //depot/projects/smpng/sys/alpha/pci/pcibus.c#5 integrate .. //depot/projects/smpng/sys/alpha/pci/t2.c#19 integrate .. //depot/projects/smpng/sys/alpha/pci/tsunami.c#15 integrate .. //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#6 integrate .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#14 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#11 integrate .. //depot/projects/smpng/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/smpng/sys/conf/NOTES#71 integrate .. //depot/projects/smpng/sys/conf/files#112 integrate .. //depot/projects/smpng/sys/conf/files.amd64#17 integrate .. //depot/projects/smpng/sys/conf/files.i386#62 integrate .. //depot/projects/smpng/sys/conf/files.ia64#41 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#32 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#67 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_isab.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#24 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#43 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#21 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#30 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#23 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#29 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#40 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#18 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#24 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#12 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#19 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#46 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#54 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#12 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#16 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#27 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#17 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#83 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#62 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/i386/isa/isa.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#11 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#25 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#5 integrate .. //depot/projects/smpng/sys/ia64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#15 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#44 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#45 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#74 integrate .. //depot/projects/smpng/sys/modules/Makefile#78 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ahb/Makefile#1 branch .. //depot/projects/smpng/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.h#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#56 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#27 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#44 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#22 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powermac/maciovar.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#40 integrate .. //depot/projects/smpng/sys/powerpc/psim/iobus.c#5 integrate .. //depot/projects/smpng/sys/powerpc/psim/iobusvar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#14 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#10 integrate .. //depot/projects/smpng/sys/sys/param.h#63 integrate .. //depot/projects/smpng/sys/sys/rman.h#8 integrate .. //depot/projects/smpng/sys/sys/syscall.h#44 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#44 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#46 integrate .. //depot/projects/smpng/sys/sys/thr.h#3 integrate .. //depot/projects/smpng/sys/sys/tty.h#14 integrate .. //depot/projects/smpng/sys/sys/umtx.h#4 integrate .. //depot/projects/smpng/sys/tools/acpi_quirks2h.awk#2 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/sgmap.c#4 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/isa/isa.c#13 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#20 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.29 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/pci/apecs.c#13 (text+ko) ==== @@ -55,8 +55,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.25 2003/12/23 02:36:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.26 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/pci/cia.c#17 (text+ko) ==== @@ -87,10 +87,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.43 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/pci/pcibus.c#5 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.33 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.34 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_isa.h" +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/pci/t2.c#19 (text+ko) ==== @@ -51,8 +51,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.21 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/pci/tsunami.c#15 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.24 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#6 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.16 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.17 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#14 (text+ko) ==== @@ -56,8 +56,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.26 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.27 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -56,3 +56,9 @@ intr_model = model; } + +int +acpi_machdep_quirks(int *quirks) +{ + return (0); +} ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.61 2004/06/30 19:24:26 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -41,6 +41,7 @@ * and I/O memory address space. */ +#define __RMAN_RESOURCE_VISIBLE #include "opt_isa.h" #include <sys/param.h> ==== //depot/projects/smpng/sys/boot/common/newvers.sh#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $ # $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -33,7 +33,7 @@ # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 LC_ALL=C; export LC_ALL -u=${USER-root} h=`hostname` t=`date` +u=${USER-root} h=${HOSTNAME-`hostname`} t=`date` #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '` r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.16 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.17 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.26 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.27 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#9 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -595,10 +595,10 @@ 428 UNIMPL __acl_aclcheck_link ; XXX implement 429 UNIMPL sigwait -430 MNOPROTO { int thr_create(ucontext_t *ctx, thr_id_t *id, int flag s); } +430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } 431 MNOPROTO { void thr_exit(void); } -432 MNOPROTO { int thr_self(thr_id_t *id); } -433 MNOPROTO { int thr_kill(thr_id_t id, int sig); } +432 MNOPROTO { int thr_self(long *id); } +433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO { int jail_attach(int jid); } @@ -608,4 +608,4 @@ 440 UNIMPL kse_switchin 441 UNIMPL ksem_timedwait 442 MNOPROTO { int thr_suspend(const struct timespec *timeout); } -443 MNOPROTO { int thr_wake(thr_id_t id); } +443 MNOPROTO { int thr_wake(long id); } ==== //depot/projects/smpng/sys/conf/NOTES#71 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1237 2004/06/29 02:30:11 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1238 2004/06/30 01:00:59 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -178,6 +178,11 @@ # and WITNESS options. options MUTEX_NOINLINE +# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters +# when a contested mutex is released rather than just awaking the highest +# priority waiter. +options MUTEX_WAKE_ALL + # SMP Debugging Options: # # MUTEX_DEBUG enables various extra assertions in the mutex code. ==== //depot/projects/smpng/sys/conf/files#112 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/sys/conf/files,v 1.914 2004/06/28 16:22:20 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.921 2004/06/30 14:52:49 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # -acpi_quirks.h standard \ +acpi_quirks.h optional acpi \ dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ @@ -45,7 +45,7 @@ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule before-depend \ clean "miidevs.h" -pccarddevs.h optional pccard \ +pccarddevs.h standard \ dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ no-obj no-implicit-rule before-depend \ @@ -290,6 +290,7 @@ dev/acpica/acpi_pcib_acpi.c optional acpi pci dev/acpica/acpi_pcib_pci.c optional acpi pci dev/acpica/acpi_powerres.c optional acpi +dev/acpica/acpi_quirk.c optional acpi dev/acpica/acpi_resource.c optional acpi dev/acpica/acpi_thermal.c optional acpi dev/acpica/acpi_timer.c optional acpi ==== //depot/projects/smpng/sys/conf/files.amd64#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.37 2004/05/24 12:08:56 bde Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.38 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -35,6 +35,7 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # +dev/acpica/acpi_if.m standard amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/smpng/sys/conf/files.i386#62 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.494 2004/06/23 17:33:24 brooks Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.495 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -180,6 +180,7 @@ geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +dev/acpica/acpi_if.m standard i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_asus.c optional acpi_asus acpi i386/acpica/acpi_machdep.c optional acpi ==== //depot/projects/smpng/sys/conf/files.ia64#41 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.68 2004/05/17 06:51:19 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.69 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,6 +75,7 @@ geom/geom_gpt.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +dev/acpica/acpi_if.m standard ia64/acpica/OsdEnvironment.c optional acpi ia64/acpica/acpi_machdep.c optional acpi ia64/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/smpng/sys/conf/kmod.mk#32 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.163 2004/06/29 18:56:14 njl Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -293,7 +293,7 @@ MFILES?= kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \ dev/iicbus/iicbus_if.m isa/isa_if.m \ libkern/iconv_converter_if.m \ - dev/eisa/eisa_if.m dev/mii/miibus_if.m \ + dev/acpica/acpi_if.m dev/eisa/eisa_if.m dev/mii/miibus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ ==== //depot/projects/smpng/sys/conf/newvers.sh#12 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.61 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $ TYPE="FreeBSD" REVISION="5.2" @@ -81,7 +81,7 @@ fi touch version -v=`cat version` u=${USER-root} d=`pwd` h=`hostname` t=`date` +v=`cat version` u=${USER-root} d=`pwd` h=${HOSTNAME-`hostname`} t=`date` i=`make -V KERN_IDENT` cat << EOF > vers.c $COPYRIGHT ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#67 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.168 2004/06/29 01:33:35 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.174 2004/07/01 17:21:18 imp Exp $ */ #include "opt_acpi.h" @@ -78,36 +78,20 @@ .d_name = "acpi", }; -#if __FreeBSD_version >= 500000 +/* Global mutex for locking access to the ACPI subsystem. */ struct mtx acpi_mutex; -#endif + +/* Bitmap of device quirks. */ +int acpi_quirks; /* Local pools for managing system resources for ACPI child devices. */ -struct rman acpi_rman_io, acpi_rman_mem; - -struct acpi_quirks { - char *OemId; - uint32_t OemRevision; - char *value; -}; - -#define ACPI_OEM_REV_ANY 0 - -static struct acpi_quirks acpi_quirks_table[] = { -#ifdef notyet - /* Bad PCI routing table. Used on some SuperMicro boards. */ - { "PTLTD ", 0x06040000, "pci_link" }, -#endif - - { NULL, 0, NULL } -}; +struct rman acpi_rman_io, acpi_rman_mem; static int acpi_modevent(struct module *mod, int event, void *junk); static void acpi_identify(driver_t *driver, device_t parent); static int acpi_probe(device_t dev); static int acpi_attach(device_t dev); static int acpi_shutdown(device_t dev); -static void acpi_quirks_set(void); static device_t acpi_add_child(device_t bus, int order, const char *name, int unit); static int acpi_print_child(device_t bus, device_t child); @@ -123,18 +107,25 @@ int rid, struct resource *r); static uint32_t acpi_isa_get_logicalid(device_t dev); static int acpi_isa_get_compatid(device_t dev, uint32_t *cids, int count); +static char *acpi_device_id_probe(device_t bus, device_t dev, char **ids); +static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev, + ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters, + ACPI_BUFFER *ret); +static ACPI_STATUS acpi_device_walk_ns(device_t bus, device_t dev, + ACPI_OBJECT_TYPE type, UINT32 max_depth, + ACPI_WALK_CALLBACK user_fn, void *context, void **ret); static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids); static void acpi_probe_children(device_t bus); static int acpi_probe_order(ACPI_HANDLE handle, int *order); static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); +static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); -static int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw); -static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, - void **status); -static int acpi_wake_limit_walk(int sstate); +static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); +static int acpi_wake_run_prep(ACPI_HANDLE handle, int sstate); +static int acpi_wake_prep_walk(int sstate); static int acpi_wake_sysctl_walk(device_t dev); static int acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS); static void acpi_system_eventhandler_sleep(void *arg, int state); @@ -175,6 +166,11 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + /* ACPI bus */ + DEVMETHOD(acpi_id_probe, acpi_device_id_probe), + DEVMETHOD(acpi_evaluate_object, acpi_device_eval_obj), + DEVMETHOD(acpi_walk_namespace, acpi_device_walk_ns), + /* ISA emulation */ DEVMETHOD(isa_pnp_probe, acpi_isa_pnp_probe), @@ -218,7 +214,7 @@ static int acpi_modevent(struct module *mod, int event, void *junk) { - switch(event) { + switch (event) { case MOD_LOAD: if (!cold) { printf("The ACPI driver cannot be loaded after boot.\n"); @@ -244,18 +240,17 @@ #ifdef ACPI_DEBUGGER char *debugpoint; #endif - static int error, started = 0; + static int started = 0; + int error, val; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (started) - return_VALUE (error); + return_VALUE (0); started = 1; -#if __FreeBSD_version >= 500000 /* Initialise the ACPI mutex */ mtx_init(&acpi_mutex, "ACPI global lock", NULL, MTX_DEF); -#endif /* * Set the globals from our tunables. This is needed because ACPI-CA @@ -287,13 +282,21 @@ if (ACPI_FAILURE(error = AcpiLoadTables())) { printf("ACPI: table load failed: %s\n", AcpiFormatException(error)); - return_VALUE(error); + AcpiTerminate(); + return_VALUE (error); } - /* Set up any quirks we have for this XSDT. */ - acpi_quirks_set(); - if (acpi_disabled("acpi")) + /* Set up any quirks we have for this system. */ + acpi_table_quirks(&acpi_quirks); + + /* If the user manually set the disabled hint to 0, override any quirk. */ + if (resource_int_value("acpi", 0, "disabled", &val) == 0 && val == 0) + acpi_quirks &= ~ACPI_Q_BROKEN; + if (acpi_quirks & ACPI_Q_BROKEN) { + printf("ACPI disabled by blacklist. Contact your BIOS vendor.\n"); + AcpiTerminate(); return_VALUE (AE_ERROR); + } return_VALUE (AE_OK); } @@ -536,7 +539,7 @@ /* Only enable S4BIOS by default if the FACS says it is available. */ if (AcpiGbl_FACS->S4Bios_f != 0) - sc->acpi_s4bios = 1; + sc->acpi_s4bios = 1; /* * Dispatch the default sleep state to devices. The lid switch is set @@ -629,60 +632,12 @@ /* Allow children to shutdown first. */ bus_generic_shutdown(dev); - /* Disable all wake GPEs not appropriate for reboot/poweroff. */ - acpi_wake_limit_walk(ACPI_STATE_S5); + /* Enable any GPEs that are able to power-on the system (i.e., RTC). */ + acpi_wake_prep_walk(ACPI_STATE_S5); + return (0); } -static void -acpi_quirks_set() -{ - XSDT_DESCRIPTOR *xsdt; - struct acpi_quirks *quirk; - char *env, *tmp; - int len; - - /* - * If the user loaded a custom table or disabled "quirks", leave - * the settings alone. - */ - len = 0; - if ((env = getenv("acpi_dsdt_load")) != NULL) { - /* XXX No strcasecmp but this is good enough. */ - if (*env == 'Y' || *env == 'y') - goto out; - freeenv(env); - } - if ((env = getenv("debug.acpi.disabled")) != NULL) { - if (strstr("quirks", env) != NULL) - goto out; - len = strlen(env); - } - - /* - * Search through our quirk table and concatenate the disabled - * values with whatever we find. - */ - xsdt = AcpiGbl_XSDT; - for (quirk = acpi_quirks_table; quirk->OemId; quirk++) { - if (!strncmp(xsdt->OemId, quirk->OemId, strlen(quirk->OemId)) && - (xsdt->OemRevision == quirk->OemRevision || - quirk->OemRevision == ACPI_OEM_REV_ANY)) { - len += strlen(quirk->value) + 2; - if ((tmp = malloc(len, M_TEMP, M_NOWAIT)) == NULL) - goto out; - sprintf(tmp, "%s %s", env ? env : "", quirk->value); - setenv("debug.acpi.disabled", tmp); - free(tmp, M_TEMP); - break; - } - } - -out: - if (env) - freeenv(env); -} - /* * Handle a new device being added */ @@ -787,6 +742,9 @@ case ACPI_IVAR_PRIVATE: *(void **)result = ad->ad_private; break; + case ACPI_IVAR_FLAGS: + *(int *)result = ad->ad_flags; + break; case ISA_IVAR_VENDORID: case ISA_IVAR_SERIAL: case ISA_IVAR_COMPATID: @@ -822,6 +780,9 @@ case ACPI_IVAR_PRIVATE: ad->ad_private = (void *)value; break; + case ACPI_IVAR_FLAGS: + ad->ad_flags = (int)value; + break; default: panic("bad ivar write request (%d)", index); return (ENOENT); @@ -1053,6 +1014,46 @@ return_VALUE (valid); } +static char * +acpi_device_id_probe(device_t bus, device_t dev, char **ids) +{ + ACPI_HANDLE h; + int i; + + h = acpi_get_handle(dev); + if (ids == NULL || h == NULL || acpi_get_type(dev) != ACPI_TYPE_DEVICE) + return (NULL); + + /* Try to match one of the array of IDs with a HID or CID. */ + for (i = 0; ids[i] != NULL; i++) { + if (acpi_MatchHid(h, ids[i])) + return (ids[i]); + } + return (NULL); +} + +static ACPI_STATUS +acpi_device_eval_obj(device_t bus, device_t dev, ACPI_STRING pathname, + ACPI_OBJECT_LIST *parameters, ACPI_BUFFER *ret) +{ + ACPI_HANDLE h; + + if ((h = acpi_get_handle(dev)) == NULL) + return (AE_BAD_PARAMETER); + return (AcpiEvaluateObject(h, pathname, parameters, ret)); +} + +static ACPI_STATUS +acpi_device_walk_ns(device_t bus, device_t dev, ACPI_OBJECT_TYPE type, + UINT32 max_depth, ACPI_WALK_CALLBACK user_fn, void *context, void **ret) +{ + ACPI_HANDLE h; + + if ((h = acpi_get_handle(dev)) == NULL) + return (AE_BAD_PARAMETER); + return (AcpiWalkNamespace(type, h, max_depth, user_fn, context, ret)); +} + static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids) { @@ -1195,7 +1196,7 @@ bus = (device_t)context; if (ACPI_SUCCESS(AcpiGetType(handle, &type))) { - switch(type) { + switch (type) { case ACPI_TYPE_DEVICE: case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_THERMAL: @@ -1221,10 +1222,6 @@ acpi_set_handle(child, handle); AcpiAttachData(handle, acpi_fake_objhandler, child); - /* Check if the device can generate wake events. */ - if (ACPI_SUCCESS(AcpiEvaluateObject(handle, "_PRW", NULL, NULL))) - device_set_flags(child, ACPI_FLAG_WAKE_CAPABLE); - /* * Check that the device is present. If it's not present, * leave it disabled (so that we have a device_t attached to @@ -1398,8 +1395,8 @@ /* * Match a HID string against a handle */ -BOOLEAN -acpi_MatchHid(ACPI_HANDLE h, char *hid) +static BOOLEAN +acpi_MatchHid(ACPI_HANDLE h, const char *hid) { ACPI_DEVICE_INFO *devinfo; ACPI_BUFFER buf; @@ -1771,8 +1768,8 @@ sc->acpi_sstate = state; sc->acpi_sleep_disabled = 1; - /* Disable all wake GPEs not appropriate for this state. */ - acpi_wake_limit_walk(state); + /* Enable any GPEs as appropriate and requested by the user. */ + acpi_wake_prep_walk(state); /* Inform all devices that we are going to sleep. */ if (DEVICE_SUSPEND(root_bus) != 0) { @@ -1818,6 +1815,9 @@ break; } } + + /* Resume devices, re-enable GPEs and fixed events. */ + acpi_wake_prep_walk(state); AcpiLeaveSleepState((UINT8)state); DEVICE_RESUME(root_bus); sc->acpi_sstate = ACPI_STATE_S0; @@ -1849,10 +1849,6 @@ { struct acpi_prw_data prw; - /* Check that the device can wake the system. */ - if ((device_get_flags(dev) & ACPI_FLAG_WAKE_CAPABLE) == 0) - return (ENXIO); - /* Evaluate _PRW to find the GPE. */ if (acpi_parse_prw(acpi_get_handle(dev), &prw) != 0) return (ENXIO); @@ -1875,149 +1871,124 @@ ACPI_STATUS status; int flags; - /* Make sure the device supports waking the system. */ - flags = device_get_flags(dev); + /* Make sure the device supports waking the system and get the GPE. */ handle = acpi_get_handle(dev); - if ((flags & ACPI_FLAG_WAKE_CAPABLE) == 0 || handle == NULL) - return (ENXIO); - - /* Evaluate _PRW to find the GPE. */ if (acpi_parse_prw(handle, &prw) != 0) return (ENXIO); + flags = acpi_get_flags(dev); if (enable) { status = AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); if (ACPI_FAILURE(status)) { device_printf(dev, "enable wake failed\n"); return (ENXIO); } - device_set_flags(dev, flags | ACPI_FLAG_WAKE_ENABLED); + acpi_set_flags(dev, flags | ACPI_FLAG_WAKE_ENABLED); } else { status = AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); if (ACPI_FAILURE(status)) { device_printf(dev, "disable wake failed\n"); return (ENXIO); } - device_set_flags(dev, flags & ~ACPI_FLAG_WAKE_ENABLED); + acpi_set_flags(dev, flags & ~ACPI_FLAG_WAKE_ENABLED); } return (0); } -/* Configure a device's GPE appropriately for the new sleep state. */ -int -acpi_wake_sleep_prep(device_t dev, int sstate) +static int +acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate) { struct acpi_prw_data prw; - ACPI_HANDLE handle; - int flags; + device_t dev; - /* Check that this is an ACPI device and get its GPE. */ - flags = device_get_flags(dev); - handle = acpi_get_handle(dev); - if ((flags & ACPI_FLAG_WAKE_CAPABLE) == 0 || handle == NULL) - return (ENXIO); - >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407020314.i623EUfH006250>