Date: Fri, 19 Nov 2004 04:43:48 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 65439 for review Message-ID: <200411190443.iAJ4hm7k012888@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=65439 Change 65439 by marcel@marcel_nfs on 2004/11/19 04:43:07 IFC @65438 Affected files ... .. //depot/projects/uart/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/std.i80321#2 integrate .. //depot/projects/uart/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/uart/cam/cam_xpt.c#3 integrate .. //depot/projects/uart/coda/coda_vnops.c#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/uart/conf/files#37 integrate .. //depot/projects/uart/conf/files.i386#12 integrate .. //depot/projects/uart/conf/files.sparc64#8 integrate .. //depot/projects/uart/conf/options.i386#6 integrate .. //depot/projects/uart/conf/options.pc98#5 integrate .. //depot/projects/uart/crypto/blowfish/arch/i386/bf_enc.S#2 integrate .. //depot/projects/uart/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/uart/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/uart/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/uart/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_snc.c#3 delete .. //depot/projects/uart/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#8 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/uart/dev/mc146818/mc146818.c#1 branch .. //depot/projects/uart/dev/mc146818/mc146818reg.h#1 branch .. //depot/projects/uart/dev/mc146818/mc146818var.h#1 branch .. //depot/projects/uart/dev/mk48txx/mk48txx.c#5 integrate .. //depot/projects/uart/dev/mk48txx/mk48txxreg.h#3 integrate .. //depot/projects/uart/dev/mk48txx/mk48txxvar.h#1 branch .. //depot/projects/uart/dev/uart/uart_bus_isa.c#7 integrate .. //depot/projects/uart/dev/uart/uart_cpu.h#14 integrate .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#10 integrate .. //depot/projects/uart/dev/uart/uart_cpu_amd64.c#8 integrate .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#9 integrate .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#10 integrate .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#9 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#20 integrate .. //depot/projects/uart/dev/usb/ehci.c#8 integrate .. //depot/projects/uart/dev/usb/ohci.c#9 integrate .. //depot/projects/uart/dev/usb/uhci.c#10 integrate .. //depot/projects/uart/dev/vkbd/vkbd.c#1 branch .. //depot/projects/uart/dev/vkbd/vkbd_var.h#1 branch .. //depot/projects/uart/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/uart/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/uart/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/uart/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_bmap.c#5 integrate .. //depot/projects/uart/i386/acpica/acpi_asus.c#5 delete .. //depot/projects/uart/i386/acpica/acpi_panasonic.c#3 delete .. //depot/projects/uart/i386/acpica/acpi_toshiba.c#2 delete .. //depot/projects/uart/i386/conf/NOTES#7 integrate .. //depot/projects/uart/i386/i386/identcpu.c#8 integrate .. //depot/projects/uart/i386/i386/machdep.c#10 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/uart/i386/i386/pmap.c#24 integrate .. //depot/projects/uart/i386/i386/support.s#5 integrate .. //depot/projects/uart/i386/i386/trap.c#7 integrate .. //depot/projects/uart/i386/include/atomic.h#4 integrate .. //depot/projects/uart/i386/include/cpu.h#4 integrate .. //depot/projects/uart/i386/include/endian.h#5 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_bmap.c#4 integrate .. //depot/projects/uart/kern/init_sysent.c#5 integrate .. //depot/projects/uart/kern/kern_descrip.c#11 integrate .. //depot/projects/uart/kern/kern_event.c#4 integrate .. //depot/projects/uart/kern/kern_intr.c#6 integrate .. //depot/projects/uart/kern/kern_ntptime.c#3 integrate .. //depot/projects/uart/kern/kern_sig.c#14 integrate .. //depot/projects/uart/kern/sys_generic.c#6 integrate .. //depot/projects/uart/kern/sys_pipe.c#13 integrate .. //depot/projects/uart/kern/sys_socket.c#4 integrate .. //depot/projects/uart/kern/syscalls.c#5 integrate .. //depot/projects/uart/kern/syscalls.master#5 integrate .. //depot/projects/uart/kern/tty.c#5 integrate .. //depot/projects/uart/kern/vfs_bio.c#13 integrate .. //depot/projects/uart/kern/vfs_cluster.c#8 integrate .. //depot/projects/uart/kern/vfs_default.c#7 integrate .. //depot/projects/uart/kern/vfs_mount.c#8 integrate .. //depot/projects/uart/kern/vfs_subr.c#11 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#10 integrate .. //depot/projects/uart/kern/vfs_vnops.c#7 integrate .. //depot/projects/uart/kern/vnode_if.src#6 integrate .. //depot/projects/uart/modules/Makefile#14 integrate .. //depot/projects/uart/modules/acpi/Makefile#9 integrate .. //depot/projects/uart/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/uart/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/uart/modules/acpi/acpi_snc/Makefile#2 delete .. //depot/projects/uart/modules/acpi/acpi_sony/Makefile#1 branch .. //depot/projects/uart/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/uart/modules/uart/Makefile#11 integrate .. //depot/projects/uart/modules/vkbd/Makefile#1 branch .. //depot/projects/uart/net/if.h#4 integrate .. //depot/projects/uart/netinet/in.c#4 integrate .. //depot/projects/uart/netinet/ip_divert.c#6 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#4 integrate .. //depot/projects/uart/pc98/conf/GENERIC#6 integrate .. //depot/projects/uart/pc98/conf/NOTES#7 integrate .. //depot/projects/uart/pc98/i386/machdep.c#8 integrate .. //depot/projects/uart/pci/if_sf.c#7 integrate .. //depot/projects/uart/pci/if_sfreg.h#4 integrate .. //depot/projects/uart/pci/if_sk.c#9 integrate .. //depot/projects/uart/pci/if_skreg.h#5 integrate .. //depot/projects/uart/security/mac/mac_sysv_msg.c#1 branch .. //depot/projects/uart/security/mac/mac_sysv_sem.c#1 branch .. //depot/projects/uart/security/mac/mac_sysv_shm.c#1 branch .. //depot/projects/uart/sparc64/conf/GENERIC#8 integrate .. //depot/projects/uart/sparc64/conf/NOTES#4 integrate .. //depot/projects/uart/sparc64/include/eeprom.h#3 integrate .. //depot/projects/uart/sparc64/isa/isa.c#6 integrate .. //depot/projects/uart/sparc64/sparc64/eeprom.c#5 integrate .. //depot/projects/uart/sparc64/sparc64/eeprom_ebus.c#5 integrate .. //depot/projects/uart/sparc64/sparc64/eeprom_sbus.c#5 integrate .. //depot/projects/uart/sparc64/sparc64/rtc.c#1 branch .. //depot/projects/uart/sys/buf.h#9 integrate .. //depot/projects/uart/sys/filedesc.h#5 integrate .. //depot/projects/uart/sys/mac.h#7 integrate .. //depot/projects/uart/sys/mac_policy.h#5 integrate .. //depot/projects/uart/sys/msg.h#3 integrate .. //depot/projects/uart/sys/sem.h#3 integrate .. //depot/projects/uart/sys/shm.h#3 integrate .. //depot/projects/uart/sys/syscall.h#5 integrate .. //depot/projects/uart/sys/syscall.mk#5 integrate .. //depot/projects/uart/sys/sysproto.h#5 integrate .. //depot/projects/uart/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/uart/ufs/ufs/ufs_bmap.c#4 integrate .. //depot/projects/uart/vm/vm_pager.c#6 integrate .. //depot/projects/uart/vm/vnode_pager.c#10 integrate Differences ... ==== //depot/projects/uart/arm/arm/busdma_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.5 2004/10/21 11:59:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.7 2004/11/16 00:57:44 cognet Exp $"); /* * MacPPC bus dma support routines @@ -97,11 +97,10 @@ * Check to see if the specified page is in an allowed DMA range. */ -static int +static __inline int bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dma_segment_t segs[], - bus_dmamap_t map, void *buf, bus_size_t buflen, struct thread *td, - int flags, vm_offset_t *lastaddrp, int *segp, - int first); + bus_dmamap_t map, void *buf, bus_size_t buflen, struct pmap *pmap, + int flags, vm_offset_t *lastaddrp, int *segp); static __inline struct arm32_dma_range * _bus_dma_inrange(struct arm32_dma_range *ranges, int nranges, @@ -367,7 +366,7 @@ void *callback_arg, int flags) { vm_offset_t lastaddr = 0; - int error, nsegs = 0; + int error, nsegs = -1; #ifdef __GNUC__ bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -379,8 +378,8 @@ map->buffer = buf; map->len = buflen; error = bus_dmamap_load_buffer(dmat, - dm_segments, map, buf, buflen, NULL, - flags, &lastaddr, &nsegs, 1); + dm_segments, map, buf, buflen, kernel_pmap, + flags, &lastaddr, &nsegs); if (error) (*callback)(callback_arg, NULL, 0, error); else @@ -395,27 +394,20 @@ * the starting segment on entrance, and the ending segment on exit. * first indicates if this is the first invocation of this function. */ -static int +static int __inline bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dma_segment_t segs[], - bus_dmamap_t map, void *buf, bus_size_t buflen, struct thread *td, - int flags, vm_offset_t *lastaddrp, int *segp, - int first) + bus_dmamap_t map, void *buf, bus_size_t buflen, struct pmap *pmap, + int flags, vm_offset_t *lastaddrp, int *segp) { bus_size_t sgsize; bus_addr_t curaddr, lastaddr, baddr, bmask; vm_offset_t vaddr = (vm_offset_t)buf; int seg; int error = 0; - pmap_t pmap; pd_entry_t *pde; pt_entry_t pte; pt_entry_t *ptep; - if (td != NULL) - pmap = vmspace_pmap(td->td_proc->p_vmspace); - else - pmap = pmap_kernel(); - lastaddr = *lastaddrp; bmask = ~(dmat->boundary - 1); @@ -496,27 +488,19 @@ * Insert chunk into a segment, coalescing with * the previous segment if possible. */ - if (first) { + if (seg >= 0 && curaddr == lastaddr && + (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && + (dmat->boundary == 0 || + (segs[seg].ds_addr & bmask) == + (curaddr & bmask))) { + segs[seg].ds_len += sgsize; + goto segdone; + } else { + if (++seg >= dmat->nsegments) + break; segs[seg].ds_addr = curaddr; segs[seg].ds_len = sgsize; - first = 0; - } else { - if (curaddr == lastaddr && - (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && - (dmat->boundary == 0 || - (segs[seg].ds_addr & bmask) == - (curaddr & bmask))) { - segs[seg].ds_len += sgsize; - goto segdone; - } - else { - if (++seg >= dmat->nsegments) - break; - segs[seg].ds_addr = curaddr; - segs[seg].ds_len = sgsize; - } } - if (error) break; segdone: @@ -549,7 +533,7 @@ #else bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; #endif - int nsegs = 0, error = 0; + int nsegs = -1, error = 0; M_ASSERTPKTHDR(m0); @@ -557,17 +541,14 @@ map->flags |= DMAMAP_MBUF | DMAMAP_COHERENT; map->buffer = m0; if (m0->m_pkthdr.len <= dmat->maxsize) { - int first = 1; vm_offset_t lastaddr = 0; struct mbuf *m; for (m = m0; m != NULL && error == 0; m = m->m_next) { - if (m->m_len > 0) { + if (m->m_len > 0) error = bus_dmamap_load_buffer(dmat, - dm_segments, map, m->m_data, m->m_len, NULL, - flags, &lastaddr, &nsegs, first); - first = 0; - } + dm_segments, map, m->m_data, m->m_len, + pmap_kernel(), flags, &lastaddr, &nsegs); } } else { error = EINVAL; @@ -599,10 +580,10 @@ #else bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; #endif - int nsegs, i, error, first; + int nsegs, i, error; bus_size_t resid; struct iovec *iov; - struct thread *td = NULL; + struct pmap *pmap; resid = uio->uio_resid; iov = uio->uio_iov; @@ -611,13 +592,14 @@ map->buffer = uio; if (uio->uio_segflg == UIO_USERSPACE) { - td = uio->uio_td; + pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace); KASSERT(td != NULL, ("bus_dmamap_load_uio: USERSPACE but no proc")); - } + } else + pmap = kernel_pmap; - first = 1; - nsegs = error = 0; + error = 0; + nsegs = -1; for (i = 0; i < uio->uio_iovcnt && resid != 0 && !error; i++) { /* * Now at the first iovec to load. Load each iovec @@ -629,9 +611,7 @@ if (minlen > 0) { error = bus_dmamap_load_buffer(dmat, dm_segments, map, - addr, minlen, td, flags, &lastaddr, &nsegs, first); - - first = 0; + addr, minlen, pmap, flags, &lastaddr, &nsegs); resid -= minlen; } ==== //depot/projects/uart/arm/xscale/i80321/std.i80321#2 (text+ko) ==== @@ -1,6 +1,4 @@ #XScale i80321 generic configuration -#$FreeBSD: src/sys/arm/xscale/i80321/std.i80321,v 1.1 2004/09/23 22:45:36 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/i80321/std.i80321,v 1.2 2004/11/18 00:05:09 cognet Exp $ files "../xscale/i80321/files.i80321" cpu CPU_XSCALE_80321 -makeoptions KERNPHYSADDR=0x00200000 -makeoptions KERNVIRTADDR=0xc0200000 ==== //depot/projects/uart/arm/xscale/i80321/std.iq31244#2 (text+ko) ==== @@ -1,4 +1,6 @@ #IQ31244 board configuration -#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.1 2004/09/23 22:45:36 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.2 2004/11/18 00:05:09 cognet Exp $ include "../xscale/i80321/std.i80321" files "../xscale/i80321/files.iq31244" +makeoptions KERNPHYSADDR=0xa0200000 +makeoptions KERNVIRTADDR=0xc0200000 ==== //depot/projects/uart/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.143 2004/10/05 04:22:20 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.145 2004/11/18 07:24:29 gibbs Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -5651,7 +5651,17 @@ if (softc->action == PROBE_INQUIRY) inquiry_len = SHORT_INQUIRY_LENGTH; else - inquiry_len = inq_buf->additional_length + 4; + inquiry_len = inq_buf->additional_length + + offsetof(struct scsi_inquiry_data, + additional_length) + 1; + + /* + * Some parallel SCSI devices fail to send an + * ignore wide residue message when dealing with + * odd length inquiry requests. Round up to be + * safe. + */ + inquiry_len = roundup2(inquiry_len, 2); scsi_inquiry(csio, /*retries*/4, @@ -5803,7 +5813,7 @@ switch(periph_qual) { case SID_QUAL_LU_CONNECTED: { - u_int8_t alen; + u_int8_t len; /* * We conservatively request only @@ -5815,9 +5825,11 @@ * the amount of information the device * is willing to give. */ - alen = inq_buf->additional_length; + len = inq_buf->additional_length + + offsetof(struct scsi_inquiry_data, + additional_length) + 1; if (softc->action == PROBE_INQUIRY - && alen > (SHORT_INQUIRY_LENGTH - 4)) { + && len > SHORT_INQUIRY_LENGTH) { softc->action = PROBE_FULL_INQUIRY; xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); ==== //depot/projects/uart/coda/coda_vnops.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.53 2004/07/28 06:05:41 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.54 2004/11/15 09:18:26 phk Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1679,7 +1679,7 @@ struct vop_bmap_args *ap = v; struct vnode *vp __attribute__((unused)) = ap->a_vp; /* file's vnode */ daddr_t bn __attribute__((unused)) = ap->a_bn; /* fs block number */ - struct vnode **vpp = ap->a_vpp; /* RETURN vp of device */ + struct bufobj **bop = ap->a_bop; /* RETURN bufobj of device */ daddr_t *bnp __attribute__((unused)) = ap->a_bnp; /* RETURN device block number */ struct thread *td __attribute__((unused)) = curthread; /* upcall decl */ @@ -1691,10 +1691,10 @@ cp = VTOC(vp); if (cp->c_ovp) { return EINVAL; - ret = VOP_BMAP(cp->c_ovp, bn, vpp, bnp, ap->a_runp, ap->a_runb); + ret = VOP_BMAP(cp->c_ovp, bn, bop, bnp, ap->a_runp, ap->a_runb); #if 0 - printf("VOP_BMAP(cp->c_ovp %p, bn %p, vpp %p, bnp %lld, ap->a_runp %p, ap->a_runb %p) = %d\n", - cp->c_ovp, bn, vpp, bnp, ap->a_runp, ap->a_runb, ret); + printf("VOP_BMAP(cp->c_ovp %p, bn %p, bop %p, bnp %lld, ap->a_runp %p, ap->a_runb %p) = %d\n", + cp->c_ovp, bn, bop, bnp, ap->a_runp, ap->a_runb, ret); #endif return ret; } else { ==== //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.30 2004/10/23 20:05:42 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.31 2004/11/18 23:56:09 marks Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.42 2004/10/23 20:04:56 rwatson Exp */ ==== //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.30 2004/10/23 20:05:42 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.31 2004/11/18 23:56:09 marks Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.42 2004/10/23 20:04:56 rwatson Exp */ ==== //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.21 2004/10/23 20:05:42 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.22 2004/11/18 23:56:09 marks Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.42 2004/10/23 20:04:56 rwatson Exp */ @@ -255,7 +255,7 @@ "#245", /* 245 = nosys */ "#246", /* 246 = nosys */ "#247", /* 247 = nosys */ - "#248", /* 248 = nosys */ + "#248", /* 248 = ntp_gettime */ "#249", /* 249 = nosys */ "minherit", /* 250 = minherit */ "rfork", /* 251 = rfork */ ==== //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.31 2004/10/23 20:05:42 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.32 2004/11/18 23:56:09 marks Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.42 2004/10/23 20:04:56 rwatson Exp */ @@ -273,7 +273,7 @@ { 0, (sy_call_t *)nosys }, /* 245 = nosys */ { 0, (sy_call_t *)nosys }, /* 246 = nosys */ { 0, (sy_call_t *)nosys }, /* 247 = nosys */ - { 0, (sy_call_t *)nosys }, /* 248 = nosys */ + { 0, (sy_call_t *)nosys }, /* 248 = ntp_gettime */ { 0, (sy_call_t *)nosys }, /* 249 = nosys */ { SYF_MPSAFE | AS(minherit_args), (sy_call_t *)minherit }, /* 250 = minherit */ { SYF_MPSAFE | AS(rfork_args), (sy_call_t *)rfork }, /* 251 = rfork */ ==== //depot/projects/uart/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.42 2004/10/23 20:04:56 rwatson Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.43 2004/11/18 23:54:26 marks Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -361,7 +361,7 @@ 245 UNIMPL nosys 246 UNIMPL nosys 247 UNIMPL nosys -248 UNIMPL nosys +248 UNIMPL ntp_gettime 249 UNIMPL nosys ; syscall numbers initially used in OpenBSD 250 MNOPROTO { int minherit(void *addr, size_t len, int inherit); } ==== //depot/projects/uart/conf/files#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.966 2004/11/12 04:48:24 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.971 2004/11/17 17:33:59 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -272,6 +272,10 @@ dev/aac/aac_pci.c optional aac pci dev/aac/aac_cam.c optional aacp aac dev/aac/aac_linux.c optional aac compat_linux +dev/acpi_support/acpi_asus.c optional acpi_asus acpi +dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi +dev/acpi_support/acpi_sony.c optional acpi_sony acpi +dev/acpi_support/acpi_toshiba.c optional acpi_toshiba acpi dev/acpica/acpi.c optional acpi dev/acpica/acpi_acad.c optional acpi dev/acpica/acpi_battery.c optional acpi @@ -300,7 +304,6 @@ dev/acpica/Osd/OsdStream.c optional acpi dev/acpica/Osd/OsdSynch.c optional acpi dev/acpica/Osd/OsdTable.c optional acpi -dev/acpica/acpi_snc.c optional acpi_snc acpi dev/acpica/acpi_video.c optional acpi_video acpi dev/adlink/adlink.c optional adlink dev/advansys/adv_eisa.c optional adv eisa @@ -550,6 +553,7 @@ dev/nsp/nsp.c optional nsp dev/nsp/nsp_pccard.c optional nsp card dev/nsp/nsp_pccard.c optional nsp pccard +dev/mc146818/mc146818.c optional mc146818 dev/mca/mca_bus.c optional mca dev/mcd/mcd.c optional mcd isa nowerror dev/mcd/mcd_isa.c optional mcd isa nowerror @@ -846,6 +850,7 @@ dev/usb/usbdi_util.c optional usb dev/utopia/utopia.c optional utopia dev/vge/if_vge.c optional vge +dev/vkbd/vkbd.c optional vkbd dev/vx/if_vx.c optional vx dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci @@ -1675,6 +1680,9 @@ security/mac/mac_process.c optional mac security/mac/mac_socket.c optional mac security/mac/mac_system.c optional mac +security/mac/mac_sysv_msg.c optional mac +security/mac/mac_sysv_sem.c optional mac +security/mac/mac_sysv_shm.c optional mac security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended ==== //depot/projects/uart/conf/files.i386#12 (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.507 2004/11/11 04:53:46 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.508 2004/11/15 05:54:14 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -192,10 +192,7 @@ 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 -i386/acpica/acpi_panasonic.c optional acpi_panasonic acpi -i386/acpica/acpi_toshiba.c optional acpi_toshiba acpi i386/acpica/acpi_wakeup.c optional acpi acpi_wakecode.h optional acpi \ dependency "$S/i386/acpica/acpi_wakecode.S" \ ==== //depot/projects/uart/conf/files.sparc64#8 (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.sparc64,v 1.62 2004/11/10 14:09:51 trhodes Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.63 2004/11/17 16:41:41 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -103,6 +103,8 @@ sparc64/sparc64/ofw_machdep.c standard sparc64/sparc64/pmap.c standard sparc64/sparc64/prof_machdep.c optional profiling-routine +sparc64/sparc64/rtc.c optional rtc ebus +sparc64/sparc64/rtc.c optional rtc isa sparc64/sparc64/rwindow.c standard sparc64/sparc64/sc_machdep.c optional sc sparc64/sparc64/spitfire.c standard ==== //depot/projects/uart/conf/options.i386#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.215 2004/08/19 20:58:23 obrien Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.216 2004/11/16 20:42:30 jhb Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -72,7 +72,6 @@ NO_MEMORY_HOLE opt_cpu.h # The CPU type affects the endian conversion functions all over the kernel. -I386_CPU opt_global.h I486_CPU opt_global.h I586_CPU opt_global.h I686_CPU opt_global.h ==== //depot/projects/uart/conf/options.pc98#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.180 2004/08/30 23:03:57 peter Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.181 2004/11/16 20:42:30 jhb Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -61,7 +61,6 @@ NO_MEMORY_HOLE opt_cpu.h # The CPU type affects the endian conversion functions all over the kernel. -I386_CPU opt_global.h I486_CPU opt_global.h I586_CPU opt_global.h I686_CPU opt_global.h ==== //depot/projects/uart/crypto/blowfish/arch/i386/bf_enc.S#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: bf_enc.S,v 1.1 2001/09/09 11:01:01 tls Exp $ */ -/* $FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc.S,v 1.1 2002/03/05 09:19:02 ume Exp $ */ +/* $FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc.S,v 1.2 2004/11/16 20:42:30 jhb Exp $ */ /* * Written by Jason R. Thorpe <thorpej@zembu.com> and Thor Lancelot Simon @@ -10,7 +10,7 @@ * XXX Should use CPP symbols defined as a result of * XXX `cc -mcpu=pentiumpro'. */ -#if defined(I386_CPU) || defined(I486_CPU) || defined(I586_CPU) +#if defined(I486_CPU) || defined(I586_CPU) #include "bf_enc_586.S" #else #include "bf_enc_686.S" ==== //depot/projects/uart/dev/acpi_support/acpi_asus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.16 2004/11/12 23:21:19 philip Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.17 2004/11/15 05:54:15 imp Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on ==== //depot/projects/uart/dev/acpi_support/acpi_panasonic.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.5 2004/11/07 23:18:23 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.6 2004/11/15 05:54:15 imp Exp $"); #include "opt_acpi.h" #include <sys/param.h> ==== //depot/projects/uart/dev/acpi_support/acpi_sony.c#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/acpi_support/acpi_sony.c,v 1.2 2004/11/13 23:39:56 imp Exp $ + * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.5 2004/11/15 20:08:44 imp Exp $ */ #include "opt_acpi.h" @@ -45,24 +45,24 @@ */ struct acpi_snc_softc { - int pid; + int pid; }; static struct acpi_snc_name_list { - char *nodename; - char *getmethod; - char *setmethod; - char *comment; -}acpi_snc_oids[] = { - { "brightness", "GBRT", "SBRT", "Display Brightness"}, - { "ctr", "GCTR", "SCTR", "??"}, - { "pcr", "GPCR", "SPCR", "???"}, + char *nodename; + char *getmethod; + char *setmethod; + char *comment; +} acpi_snc_oids[] = { + { "brightness", "GBRT", "SBRT", "Display Brightness"}, + { "ctr", "GCTR", "SCTR", "??"}, + { "pcr", "GPCR", "SPCR", "???"}, #if 0 - { "cmi", "GCMI", "SCMI", "????"}, + { "cmi", "GCMI", "SCMI", "????"}, #endif - { "wdp", "GWDP", NULL, "?????"}, - { "cdp", "GCDP", "CDPW", "??????"}, /*shares [\GL03]&0x8 flag*/ - {NULL, NULL,NULL} + { "wdp", "GWDP", NULL, "?????"}, + { "cdp", "GCDP", "CDPW", "??????"}, /*shares [\GL03]&0x8 flag*/ + {NULL, NULL,NULL} }; static int acpi_snc_probe(device_t dev); @@ -124,21 +124,21 @@ dev, i, sysctl_acpi_snc_gen_handler, "I", acpi_snc_oids[i].comment); } - - return_VALUE(0); + return (0); } static int acpi_snc_detach(device_t dev) { - return_VALUE(0); + return (0); } + #if 0 static int acpi_snc_suspend(device_t dev) { struct acpi_snc_softc *sc = device_get_softc(dev); - return_VALUE(0); + return (0); } static int @@ -155,14 +155,12 @@ int function = oidp->oid_arg2; int error = 0, val; - - acpi_GetInteger(acpi_get_handle(dev), acpi_snc_oids[function].getmethod, &val); + acpi_GetInteger(acpi_get_handle(dev), + acpi_snc_oids[function].getmethod, &val); error = sysctl_handle_int(oidp, &val, 0, req); - if (error || !req->newptr || !acpi_snc_oids[function].setmethod) - return error; - - acpi_SetInteger(acpi_get_handle(dev), acpi_snc_oids[function].setmethod, val); - return 0; - + return (error); + acpi_SetInteger(acpi_get_handle(dev), + acpi_snc_oids[function].setmethod, val); + return (0); } ==== //depot/projects/uart/dev/acpi_support/acpi_toshiba.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.13 2004/08/13 06:22:35 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.14 2004/11/15 05:54:15 imp Exp $"); #include "opt_acpi.h" #include <sys/param.h> ==== //depot/projects/uart/dev/acpica/acpi_cpu.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.45 2004/10/11 21:15:10 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.46 2004/11/16 18:47:42 njl Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -299,10 +299,6 @@ SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "cpu", CTLFLAG_RD, 0, ""); - /* If this is the first device probed, check for quirks. */ - if (device_get_unit(dev) == 0) - acpi_cpu_quirks(sc); - /* * Probe for throttling and Cx state support. * If none of these is present, free up unused resources. @@ -674,6 +670,10 @@ /* Get set of CPU devices */ devclass_get_devices(acpi_cpu_devclass, &cpu_devices, &cpu_ndevices); + /* Check for quirks via the first CPU device. */ + sc = device_get_softc(cpu_devices[0]); + acpi_cpu_quirks(sc); + /* * Make sure all the processors' Cx counts match. We should probably * also check the contents of each. However, no known systems have @@ -702,6 +702,10 @@ acpi_cpu_startup_throttling() { + /* If throttling is not usable, don't initialize it. */ + if (cpu_quirks & CPU_QUIRK_NO_THROTTLE) + return; + /* Initialise throttling states */ cpu_throttle_max = CPU_MAX_SPEED; cpu_throttle_state = CPU_MAX_SPEED; @@ -737,13 +741,22 @@ acpi_cpu_startup_cx() { struct acpi_cpu_softc *sc; - struct sbuf sb; + struct sbuf sb; int i; + /* + * Set up the list of Cx states, eliminating C3 states by truncating + * cpu_cx_count if quirks indicate C3 is not usable. + */ sc = device_get_softc(cpu_devices[0]); sbuf_new(&sb, cpu_cx_supported, sizeof(cpu_cx_supported), SBUF_FIXEDLEN); - for (i = 0; i < cpu_cx_count; i++) - sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat); + for (i = 0; i < cpu_cx_count; i++) { + if ((cpu_quirks & CPU_QUIRK_NO_C3) == 0 || + sc->cpu_cx_states[i].type != ACPI_STATE_C3) + sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat); + else + cpu_cx_count = i; + } sbuf_trim(&sb); sbuf_finish(&sb); SYSCTL_ADD_STRING(&acpi_cpu_sysctl_ctx, @@ -966,6 +979,7 @@ static int acpi_cpu_quirks(struct acpi_cpu_softc *sc) { + device_t acpi_dev; /* * C3 on multiple CPUs requires using the expensive flush cache @@ -974,7 +988,6 @@ if (mp_ncpus > 1) cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; -#ifdef notyet /* Look for various quirks of the PIIX4 part. */ acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3); if (acpi_dev != NULL) { @@ -1011,7 +1024,6 @@ break; } } -#endif return (0); } ==== //depot/projects/uart/dev/aic7xxx/aic79xx.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aicasm/aicasm_insformat.h" #else #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.32 2004/08/18 16:35:52 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.33 2004/11/18 20:22:30 gibbs Exp $"); #include <dev/aic7xxx/aic79xx_osm.h> #include <dev/aic7xxx/aic79xx_inline.h> #include <dev/aic7xxx/aicasm/aicasm_insformat.h> @@ -6487,7 +6487,7 @@ } init_done: ahd_restart(ahd); - aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US, + aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_MS, ahd_stat_timer, ahd); return (0); } @@ -8055,7 +8055,7 @@ } -#define AHD_RESET_POLL_US 1000 +#define AHD_RESET_POLL_MS 1 static void ahd_reset_poll(void *arg) { @@ -8077,7 +8077,7 @@ ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); ahd_outb(ahd, CLRSINT1, CLRSCSIRSTI); if ((ahd_inb(ahd, SSTAT1) & SCSIRSTI) != 0) { - aic_timer_reset(&ahd->reset_timer, AHD_RESET_POLL_US, + aic_timer_reset(&ahd->reset_timer, AHD_RESET_POLL_MS, ahd_reset_poll, ahd); ahd_unpause(ahd); ahd_unlock(ahd, &s); @@ -8135,7 +8135,7 @@ ahd->cmdcmplt_bucket = (ahd->cmdcmplt_bucket+1) & (AHD_STAT_BUCKETS-1); ahd->cmdcmplt_total -= ahd->cmdcmplt_counts[ahd->cmdcmplt_bucket]; ahd->cmdcmplt_counts[ahd->cmdcmplt_bucket] = 0; - aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US, + aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_MS, ahd_stat_timer, ahd); ahd_unlock(ahd, &s); ahd_list_unlock(&l); @@ -8358,7 +8358,7 @@ */ if (ahd->scb_data.recovery_scbs == 0 || (scb->flags & SCB_RECOVERY_SCB) != 0) - aic_scb_timer_reset(scb, 5 * 1000000); + aic_scb_timer_reset(scb, 5 * 1000); break; } case SCSI_STATUS_OK: @@ -9406,7 +9406,7 @@ ahd_outb(ahd, SCSISIGO, last_phase|ATNO); ahd_print_path(ahd, active_scb); printf("BDR message in message buffer\n"); - aic_scb_timer_reset(scb, 2 * 1000000); + aic_scb_timer_reset(scb, 2 * 1000); break; } else if (last_phase != P_BUSFREE && ahd_inb(ahd, SCSIPHASE) == 0) { @@ -9498,7 +9498,7 @@ ahd_set_scbptr(ahd, active_scbptr); ahd_print_path(ahd, scb); printf("Queuing a BDR SCB\n"); - aic_scb_timer_reset(scb, 2 * 1000000); + aic_scb_timer_reset(scb, 2 * 1000); break; } } ==== //depot/projects/uart/dev/aic7xxx/aic79xx.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.22 2004/08/18 16:33:14 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.23 2004/11/18 20:22:31 gibbs Exp $ */ #ifndef _AIC79XX_H_ @@ -1151,7 +1151,7 @@ /* >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411190443.iAJ4hm7k012888>