Date: Wed, 2 Mar 2005 14:58:46 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 72354 for review Message-ID: <200503021458.j22Ewk3v078516@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=72354 Change 72354 by jhb@jhb_slimer on 2005/03/02 14:58:20 IFC @72352. Loop back lapic timer changes. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#78 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#9 integrate .. //depot/projects/smpng/sys/conf/files.i386#77 integrate .. //depot/projects/smpng/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/hptproc.c#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#3 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/ioctl.c#3 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/smpng/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#80 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#53 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#24 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/atapi.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#27 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#104 integrate .. //depot/projects/smpng/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#27 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#78 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#73 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#78 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.232 2005/02/06 01:55:06 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.233 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -194,6 +194,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; long totalphysmem; /* total amount of physical memory in system */ long resvmem; /* amount of memory reserved for PROM */ @@ -250,6 +251,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); + realmem = alpha_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/smpng/sys/arm/arm/machdep.c#11 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.14 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.15 2005/03/01 20:12:52 cognet Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -93,6 +93,8 @@ int cold = 1; vm_offset_t vector_page; +long realmem = 0; + void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -242,6 +244,7 @@ m = vm_page_alloc(NULL, 0, VM_ALLOC_NOOBJ | VM_ALLOC_ZERO); pmap_kenter_user(ARM_TP_ADDRESS, VM_PAGE_TO_PHYS(m)); #endif + realmem = physmem; } ==== //depot/projects/smpng/sys/arm/arm/swtch.S#9 (text+ko) ==== @@ -83,7 +83,7 @@ #include <machine/asm.h> #include <machine/asmacros.h> #include <machine/armreg.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.12 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.13 2005/03/01 20:51:37 cognet Exp $"); /* @@ -202,8 +202,7 @@ str r5, [r6] /* Set the new tp */ - ldr r6, [r5, #(TD_MD)] - add r6, r6, #(MD_TP) + ldr r6, [r5, #(TD_MD + MD_TP)] mov r5, #ARM_TP_ADDRESS str r6, [r5] @@ -300,6 +299,7 @@ ldr r5, [r9, #(PCB_DACR)] /* r5 = new DACR */ mov r2, #DOMAIN_CLIENT cmp r5, r2, lsl #(PMAP_DOMAIN_KERNEL * 2) /* Sw to kernel thread? */ + mcreq p15, 0, r5, c3, c0, 0 /* Update DACR for new context */ beq .Lcs_context_switched /* Yup. Don't flush cache */ mrc p15, 0, r0, c3, c0, 0 /* r0 = old DACR */ /* ==== //depot/projects/smpng/sys/conf/files.i386#77 (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.519 2005/02/24 21:49:13 wpaul Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.520 2005/03/02 05:14:28 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -62,8 +62,8 @@ clean "opt_ah.h" # hptmvraid.o optional hptmv \ - dependency "$S/contrib/dev/hptmv/i386-elf.raid.o.uu" \ - compile-with "uudecode < $S/contrib/dev/hptmv/i386-elf.raid.o.uu" \ + dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \ + compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \ no-implicit-rule # # @@ -104,9 +104,6 @@ compat/svr4/svr4_sysvec.c optional compat_svr4 compat/svr4/svr4_termios.c optional compat_svr4 compat/svr4/svr4_ttold.c optional compat_svr4 -contrib/dev/hptmv/gui_lib.c optional hptmv -contrib/dev/hptmv/hptproc.c optional hptmv -contrib/dev/hptmv/ioctl.c optional hptmv contrib/dev/oltr/if_oltr.c optional oltr contrib/dev/oltr/if_oltr_isa.c optional oltr isa contrib/dev/oltr/if_oltr_pci.c optional oltr pci @@ -160,6 +157,9 @@ dev/fe/if_fe_isa.c optional fe isa dev/hptmv/entry.c optional hptmv dev/hptmv/mv.c optional hptmv +dev/hptmv/gui_lib.c optional hptmv +dev/hptmv/hptproc.c optional hptmv +dev/hptmv/ioctl.c optional hptmv dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis dev/if_ndis/if_ndis_pccard.c optional ndis pccard ==== //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/dev/acpi_support/acpi_ibm.c,v 1.3 2004/12/13 23:31:45 njl Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.4 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/dev/acpi_support/acpi_sony.c,v 1.7 2004/12/13 23:31:46 njl Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.8 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#80 (text+ko) ==== @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (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/dev/acpica/acpi.c,v 1.204 2005/02/25 22:01:58 njl Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.205 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#11 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/dev/acpica/acpi_battery.c,v 1.10 2004/08/13 06:21:41 njl Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.11 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/dev/acpica/acpi_button.c#17 (text+ko) ==== @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (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/dev/acpica/acpi_button.c,v 1.29 2004/06/30 16:08:03 njl Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.30 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#18 (text+ko) ==== @@ -23,9 +23,11 @@ * LIABILITY, OR TORT (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/dev/acpica/acpi_pcib_acpi.c,v 1.46 2004/11/23 22:26:44 jhb Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.47 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include <sys/param.h> #include <sys/bus.h> ==== //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#21 (text+ko) ==== @@ -23,9 +23,11 @@ * LIABILITY, OR TORT (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/dev/acpica/acpi_timer.c,v 1.37 2004/11/03 09:09:13 phk Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.38 2005/03/02 09:22:34 obrien Exp $"); + #include "opt_acpi.h" #include <sys/param.h> #include <sys/bus.h> ==== //depot/projects/smpng/sys/dev/acpica/acpi_video.c#8 (text+ko) ==== @@ -24,9 +24,11 @@ * SUCH DAMAGE. * * $Id: acpi_vid.c,v 1.4 2003/10/13 10:07:36 taku Exp $ - * $FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.9 2004/11/09 04:41:30 njl Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.10 2005/03/02 09:22:34 obrien Exp $"); + #include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> ==== //depot/projects/smpng/sys/dev/acpica/acpiio.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.12 2005/02/28 05:39:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.13 2005/03/02 09:22:34 obrien Exp $ */ #ifndef _ACPIIO_H_ ==== //depot/projects/smpng/sys/dev/acpica/acpivar.h#53 (text+ko) ==== @@ -25,12 +25,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.88 2005/02/28 05:39:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.90 2005/03/02 09:22:34 obrien Exp $ */ #ifndef _ACPIVAR_H_ #define _ACPIVAR_H_ +#ifdef _KERNEL + #include "acpi_if.h" #include "bus_if.h" #include <sys/eventhandler.h> @@ -410,4 +412,5 @@ /* ACPI task kernel thread initialization. */ int acpi_task_thread_init(void); +#endif /* _KERNEL */ #endif /* !_ACPIVAR_H_ */ ==== //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#23 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.51 2004/12/24 13:38:25 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.53 2005/03/02 03:59:28 mdodd Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -297,6 +297,9 @@ /* ATA PIO data transfer and control commands */ default: + /* XXX Doesn't handle the non-PIO case. */ + if (request->flags & ATA_R_TIMEOUT) + return ATA_OP_FINISHED; /* on control commands read back registers to the request struct */ if (request->flags & ATA_R_CONTROL) { @@ -619,8 +622,11 @@ (stat1 == err && lsb == err && msb == err && timeout > 5)) mask &= ~0x02; } + if (mask == 0 && !(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY)) + break; + ata_udelay(100000); - } + } if (bootverbose) ata_printf(ch, -1, ==== //depot/projects/smpng/sys/dev/ata/ata-queue.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.41 2004/12/08 11:16:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.42 2005/03/02 04:01:37 mdodd Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -249,6 +249,7 @@ && request->device->param){ request->flags &= ~(ATA_R_TIMEOUT | ATA_R_DEBUG); request->flags |= (ATA_R_IMMEDIATE | ATA_R_REQUEUE); + request->donecount = 0; ATA_DEBUG_RQ(request, "completed reinject"); ata_queue_request(request); return; ==== //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.18 2005/02/20 01:52:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.19 2005/03/02 00:49:37 marius Exp $"); /* * PCI front-end device driver for the HME ethernet device. @@ -310,9 +310,14 @@ * all-zero "checksum" byte. Sun calls this a "Fresh Choice * Ethernet" VPD... */ - bus_space_read_region_1(romt, romh, - vpdoff + slot * (3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN), - buf, sizeof(buf)); + /* Look at the end tag to determine whether this is a VPD with 4 NAs. */ + if (bus_space_read_1(romt, romh, + vpdoff + 3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN) != 0x79 && + bus_space_read_1(romt, romh, + vpdoff + 4 * (3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN)) == 0x79) + /* Use the Nth NA for the Nth HME on this SUNW,qfe. */ + vpdoff += slot * (3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN); + bus_space_read_region_1(romt, romh, vpdoff, buf, sizeof(buf)); vpd = (void *)(buf + 3); if (PCI_VPDRES_ISLARGE(buf[0]) == 0 || PCI_VPDRES_LARGE_NAME(buf[0]) != PCI_VPDRES_TYPE_VPD || @@ -324,11 +329,6 @@ error = ENXIO; goto fail_rres; } - if (buf + 3 + sizeof(struct pci_vpd) == NULL) { - device_printf(dev, "could not read network address\n"); - error = ENXIO; - goto fail_rres; - } bcopy(buf + 3 + sizeof(struct pci_vpd), sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/smpng/sys/dev/hptmv/access601.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/access601.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _ACCESS601_H_ #define _ACCESS601_H_ ==== //depot/projects/smpng/sys/dev/hptmv/array.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/array.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _ARRAY_H_ ==== //depot/projects/smpng/sys/dev/hptmv/atapi.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/atapi.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _ATAPI_H_ ==== //depot/projects/smpng/sys/dev/hptmv/command.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/command.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _COMMAND_H_ #define _COMMAND_H_ ==== //depot/projects/smpng/sys/dev/hptmv/gui_lib.c#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/gui_lib.c,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ /* * gui_lib.c ==== //depot/projects/smpng/sys/dev/hptmv/hptproc.c#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/hptproc.c,v 1.3 2005/03/02 05:14:27 scottl Exp $ */ /* * hptproc.c sysctl support ==== //depot/projects/smpng/sys/dev/hptmv/i386-elf.raid.o.uu#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/sys/dev/hptmv/i386-elf.raid.o.uu,v 1.3 2005/02/28 00:53:29 obrien Exp $ + * $FreeBSD: src/sys/dev/hptmv/i386-elf.raid.o.uu,v 1.4 2005/03/02 05:14:27 scottl Exp $ */ begin 664 hptmvraid.o M?T5,1@$!`0D```````````$``P`!``````````````#0N````````#0````` ==== //depot/projects/smpng/sys/dev/hptmv/ioctl.c#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/ioctl.c,v 1.3 2005/03/02 05:14:27 scottl Exp $ */ /* * ioctl.c ioctl interface implementation ==== //depot/projects/smpng/sys/dev/hptmv/mvSata.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/mvSata.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef __INCmvSatah #define __INCmvSatah ==== //depot/projects/smpng/sys/dev/hptmv/mvStorageDev.h#2 (text+ko) ==== @@ -22,7 +22,9 @@ * LIABILITY, OR TORT (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/dev/hptmv/mvStorageDev.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ + * #ifndef __INCmvStorageDevh #define __INCmvStorageDevh ==== //depot/projects/smpng/sys/dev/hptmv/raid5n.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/raid5n.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifdef _RAID5N_ ==== //depot/projects/smpng/sys/dev/hptmv/readme.txt#2 (text+ko) ==== @@ -1,5 +1,6 @@ RocketRAID 182x Driver for FreeBSD Copyright (C) 2003-2004 HighPoint Technologies, Inc. All rights reserved. +$FreeBSD: src/sys/dev/hptmv/readme.txt,v 1.2 2005/03/02 05:14:27 scottl Exp $ ############################################################################# Revision History: ==== //depot/projects/smpng/sys/dev/hptmv/vdevice.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (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/dev/hptmv/vdevice.h,v 1.2 2005/03/02 05:14:27 scottl Exp $ */ #ifndef _VDEVICE_H_ ==== //depot/projects/smpng/sys/dev/uart/uart_core.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.12 2005/01/06 01:43:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.13 2005/03/02 11:30:14 marius Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -321,14 +321,16 @@ */ sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, 0, ~0, sc->sc_class->uc_range, RF_ACTIVE); - if (sc->sc_rres == NULL) + if (sc->sc_rres == NULL) { + mtx_destroy(&sc->sc_hwmtx); return (ENXIO); + } sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); sc->sc_irid = 0; sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, - RF_ACTIVE); + RF_ACTIVE | RF_SHAREABLE); if (sc->sc_ires != NULL) { error = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, uart_intr, @@ -438,6 +440,8 @@ } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + mtx_destroy(&sc->sc_hwmtx); + return (error); } @@ -467,6 +471,8 @@ } bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + mtx_destroy(&sc->sc_hwmtx); + if (sc->sc_class->size > sizeof(*sc)) { device_set_softc(dev, NULL); free(sc, M_UART); ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#27 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.13 2005/02/08 20:25:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.14 2005/03/02 14:17:43 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,9 +66,9 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 3 -#define LAPIC_TIMER_STATHZ_DIVIDER 23 -#define LAPIC_TIMER_PROFHZ_DIVIDER 2 +#define LAPIC_TIMER_HZ_DIVIDER 2 +#define LAPIC_TIMER_STATHZ_DIVIDER 15 +#define LAPIC_TIMER_PROFHZ_DIVIDER 3 /* * Support for local APICs. Local APICs manage interrupts on each @@ -130,8 +130,6 @@ volatile lapic_t *lapic; static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; -static u_long *lapic_virtual_hardclock, *lapic_virtual_statclock, - *lapic_virtual_profclock; static void lapic_enable(void); static void lapic_timer_enable_intr(void); @@ -372,9 +370,6 @@ stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; lapic_timer_period = value / lapic_timer_hz; - intrcnt_add("lapic: hardclock", &lapic_virtual_hardclock); - intrcnt_add("lapic: statclock", &lapic_virtual_statclock); - intrcnt_add("lapic: profclock", &lapic_virtual_profclock); /* * Start up the timer on the BSP. The APs will kick off their @@ -628,10 +623,9 @@ la->la_hard_ticks += hz; if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) { - (*lapic_virtual_hardclock)++; + if (PCPU_GET(cpuid) == 0) hardclock(&frame); - } else + else hardclock_process(&frame); } @@ -639,8 +633,6 @@ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_statclock)++; statclock(&frame); } @@ -648,8 +640,6 @@ la->la_prof_ticks += profhz; if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_profclock)++; if (profprocs != 0) profclock(&frame); } ==== //depot/projects/smpng/sys/i386/isa/vesa.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/isa/vesa.c,v 1.48 2005/02/28 20:40:44 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/vesa.c,v 1.49 2005/03/01 23:17:42 iedowse Exp $"); #include "opt_vga.h" #include "opt_vesa.h" @@ -187,7 +187,7 @@ #define STATE_REG (1<<3) #define STATE_MOST (STATE_HW | STATE_DATA | STATE_REG) #define STATE_ALL (STATE_HW | STATE_DATA | STATE_DAC | STATE_REG) -#define STATE_MAXSIZE (2 * PAGE_SIZE) +#define STATE_MAXSIZE PAGE_SIZE static int vesa_bios_state_buf_size(void); static int vesa_bios_save_restore(int code, void *p, size_t size); static int vesa_bios_get_line_length(void); @@ -805,8 +805,6 @@ if (!has_vesa_bios) return (1); - /* Get a second page to support STATE_MAXSIZE. */ - (void)vm86_addpage(&vesa_vmcontext, 2, 0); return (0); } ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#91 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.196 2005/02/06 01:55:07 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.197 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -143,6 +143,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; vm_offset_t phys_avail[100]; @@ -246,6 +247,7 @@ #endif printf("real memory = %ld (%ld MB)\n", ia64_ptob(Maxmem), ia64_ptob(Maxmem) / 1048576); + realmem = ia64_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/smpng/sys/kern/kern_sig.c#104 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.301 2005/02/19 06:05:49 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.302 2005/03/02 13:43:51 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -844,7 +844,7 @@ struct timespec *timeout) { struct sigacts *ps; - sigset_t savedmask, sigset; + sigset_t savedmask; struct proc *p; int error, sig, hz, i, timevalid = 0; struct timespec rts, ets, ts; @@ -894,23 +894,12 @@ i = 0; mtx_unlock(&ps->ps_mtx); } - if (sig) { - td->td_sigmask = savedmask; - signotify(td); + if (sig) goto out; - } } if (error) goto out; - td->td_sigmask = savedmask; - signotify(td); - sigset = td->td_siglist; - SIGSETOR(sigset, p->p_siglist); - SIGSETAND(sigset, waitset); - if (!SIGISEMPTY(sigset)) - goto again; - /* * POSIX says this must be checked after looking for pending * signals. @@ -933,6 +922,9 @@ hz = 0; td->td_waitset = &waitset; + td->td_sigmask = savedmask; + SIGSETNAND(td->td_sigmask, waitset); + signotify(td); error = msleep(&ps, &p->p_mtx, PPAUSE|PCATCH, "sigwait", hz); td->td_waitset = NULL; if (timeout) { @@ -947,6 +939,8 @@ goto again; out: + td->td_sigmask = savedmask; + signotify(td); if (sig) { sig_t action; @@ -1600,8 +1594,8 @@ FOREACH_THREAD_IN_PROC(p, td) { if (td->td_waitset != NULL && SIGISMEMBER(*(td->td_waitset), sig)) { - mtx_unlock_spin(&sched_lock); - return (td); + mtx_unlock_spin(&sched_lock); + return (td); } if (!SIGISMEMBER(td->td_sigmask, sig)) { if (td == curthread) @@ -1708,9 +1702,6 @@ } else { if (!SIGISMEMBER(td->td_sigmask, sig)) siglist = &td->td_siglist; - else if (td->td_waitset != NULL && - SIGISMEMBER(*(td->td_waitset), sig)) - siglist = &td->td_siglist; else siglist = &p->p_siglist; } @@ -1736,11 +1727,7 @@ mtx_unlock(&ps->ps_mtx); return; } - if (((td->td_waitset == NULL) && - SIGISMEMBER(td->td_sigmask, sig)) || - ((td->td_waitset != NULL) && - SIGISMEMBER(td->td_sigmask, sig) && - !SIGISMEMBER(*(td->td_waitset), sig))) + if (SIGISMEMBER(td->td_sigmask, sig)) action = SIG_HOLD; else if (SIGISMEMBER(ps->ps_sigcatch, sig)) action = SIG_CATCH; @@ -1782,11 +1769,6 @@ SIGADDSET(*siglist, sig); signotify(td); /* uses schedlock */ - if (siglist == &td->td_siglist && (td->td_waitset != NULL) && - action != SIG_HOLD) { - td->td_waitset = NULL; - } - /* * Defer further processing for signals which are held, * except that stopped processes must be continued by SIGCONT. ==== //depot/projects/smpng/sys/modules/hptmv/Makefile#2 (text+ko) ==== @@ -2,10 +2,10 @@ # Makefile for RR182x FreeBSD driver # Copyright (c) 2003-2004 HighPoint Technologies, Inc. All rights reserved # -# $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.2 2004/10/24 08:38:29 scottl Exp $ +# $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.3 2005/03/02 05:14:28 scottl Exp $ -HPTMV= ${.CURDIR}/../../contrib/dev/hptmv -.PATH: ${.CURDIR}/../../dev/hptmv ${HPTMV} +HPTMV= ${.CURDIR}/../../dev/hptmv +.PATH: ${HPTMV} KMOD= hptmv SRCS= opt_scsi.h opt_cam.h ==== //depot/projects/smpng/sys/netgraph/ng_eiface.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.26 2005/02/08 10:31:55 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.27 2005/03/01 19:39:57 ru Exp $ */ #include <sys/param.h> @@ -613,6 +613,12 @@ return (ENETDOWN); } + if (m->m_len < ETHER_HDR_LEN) { + m = m_pullup(m, ETHER_HDR_LEN); + if (m == NULL) + return (EINVAL); + } + /* Note receiving interface */ m->m_pkthdr.rcvif = ifp; ==== //depot/projects/smpng/sys/netinet/ip_carp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.18 2005/03/01 13:14:33 glebius Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.19 2005/03/02 09:11:18 glebius Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1614,7 +1614,7 @@ CARP_LOCK(cif); cif->vhif_ifp = ifp; TAILQ_INIT(&cif->vhif_vrs); - callout_init(&cif->cif_tmp, NET_CALLOUT_MPSAFE); + callout_init(&cif->cif_tmo, NET_CALLOUT_MPSAFE); ifp->if_carp = cif; } else { ==== //depot/projects/smpng/sys/netinet6/icmp6.c#27 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.59 2005/02/27 18:57:10 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.60 2005/03/02 05:14:15 suz Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /*- @@ -469,8 +469,6 @@ case ICMP6_PACKET_TOO_BIG: icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_pkttoobig); - if (code != 0) - goto badcode; /* validation is made in icmp6_mtudisc_update */ ==== //depot/projects/smpng/sys/pc98/i386/machdep.c#78 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.353 2005/02/24 13:15:05 nyan Exp $ + * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.354 2005/03/01 21:55:26 wes Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503021458.j22Ewk3v078516>