Date: Thu, 2 May 2002 08:35:49 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10686 for review Message-ID: <200205021535.g42FZmb50043@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10686 Change 10686 by jhb@jhb_laptop on 2002/05/02 08:35:43 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/clock.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/mem.c#6 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#22 integrate ... //depot/projects/smpng/sys/conf/NOTES#8 integrate ... //depot/projects/smpng/sys/conf/files#37 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#7 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#9 integrate ... //depot/projects/smpng/sys/conf/kern.pre.mk#10 integrate ... //depot/projects/smpng/sys/conf/kmod.mk#9 integrate ... //depot/projects/smpng/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#8 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#4 integrate ... //depot/projects/smpng/sys/dev/ciss/ciss.c#5 integrate ... //depot/projects/smpng/sys/dev/isp/isp.c#19 integrate ... //depot/projects/smpng/sys/dev/mii/acphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/qsphy.c#5 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#3 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/smpng/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#7 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#5 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#14 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#11 integrate ... //depot/projects/smpng/sys/fs/udf/udf_vnops.c#2 integrate ... //depot/projects/smpng/sys/i386/acpica/Makefile#3 integrate ... //depot/projects/smpng/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/smpng/sys/i386/conf/Makefile#3 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#35 integrate ... //depot/projects/smpng/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/smpng/sys/i386/i386/mp_clock.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/clock.c#16 integrate ... //depot/projects/smpng/sys/i386/isa/loran.c#3 integrate ... //depot/projects/smpng/sys/ia64/conf/SKI#4 integrate ... //depot/projects/smpng/sys/ia64/ia64/clock.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/exception.s#19 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#38 integrate ... //depot/projects/smpng/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#13 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#29 integrate ... //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#7 integrate ... //depot/projects/smpng/sys/ia64/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/ia64/include/frame.h#2 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#26 integrate ... //depot/projects/smpng/sys/kern/kern_environment.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#36 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#38 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#39 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#35 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#10 integrate ... //depot/projects/smpng/sys/kern/subr_hints.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_log.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#47 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#16 integrate ... //depot/projects/smpng/sys/kern/tty.c#20 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#20 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#13 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#18 integrate ... //depot/projects/smpng/sys/kern/vfs_init.c#5 integrate ... //depot/projects/smpng/sys/kern/vnode_if.pl#4 delete ... //depot/projects/smpng/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/drm/radeon/Makefile#2 integrate ... //depot/projects/smpng/sys/net/bpf.c#14 integrate ... //depot/projects/smpng/sys/net/if_spppsubr.c#7 integrate ... //depot/projects/smpng/sys/net/if_tap.c#13 integrate ... //depot/projects/smpng/sys/net/if_tun.c#12 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#7 integrate ... //depot/projects/smpng/sys/net/rtsock.c#17 integrate ... //depot/projects/smpng/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#5 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#8 integrate ... //depot/projects/smpng/sys/netatm/atm_var.h#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#11 integrate ... //depot/projects/smpng/sys/netinet/accf_data.c#3 integrate ... //depot/projects/smpng/sys/netinet/accf_http.c#3 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#14 integrate ... //depot/projects/smpng/sys/netinet/ip_fw.c#13 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#11 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#17 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#17 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#19 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#6 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#10 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#12 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#7 integrate ... //depot/projects/smpng/sys/netipx/spx_usrreq.c#4 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#7 integrate ... //depot/projects/smpng/sys/netnatm/natm.c#5 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#8 integrate ... //depot/projects/smpng/sys/pc98/pc98/clock.c#9 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/clock.c#6 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#11 integrate ... //depot/projects/smpng/sys/sys/malloc.h#9 integrate ... //depot/projects/smpng/sys/sys/param.h#22 integrate ... //depot/projects/smpng/sys/sys/proc.h#47 integrate ... //depot/projects/smpng/sys/sys/signalvar.h#8 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#18 integrate ... //depot/projects/smpng/sys/sys/time.h#7 integrate ... //depot/projects/smpng/sys/sys/timepps.h#4 integrate ... //depot/projects/smpng/sys/sys/timetc.h#7 integrate ... //depot/projects/smpng/sys/sys/vnode.h#17 integrate ... //depot/projects/smpng/sys/tools/makeobjops.awk#1 branch ... //depot/projects/smpng/sys/vm/uma.h#4 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#12 integrate ... //depot/projects/smpng/sys/vm/uma_dbg.c#1 branch ... //depot/projects/smpng/sys/vm/uma_dbg.h#1 branch ... //depot/projects/smpng/sys/vm/uma_int.h#8 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#9 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#12 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#7 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#16 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.28 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.29 2002/04/30 19:34:28 phk Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -124,9 +124,6 @@ "alpha" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, alpha_timecounter, CTLFLAG_RD, - &alpha_timecounter, sizeof(alpha_timecounter), "S,timecounter", ""); - static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ @@ -135,9 +132,6 @@ "i8254" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD, - &i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", ""); - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.39 2002/02/27 18:31:35 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.40 2002/05/01 06:24:51 peter Exp $ */ /* @@ -59,8 +59,6 @@ #include <sys/signalvar.h> #include <sys/uio.h> -#include <machine/frame.h> -#include <machine/psl.h> #ifdef PERFMON #include <machine/perfmon.h> #endif ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.120 2002/04/20 14:43:34 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.121 2002/05/01 02:17:33 peter Exp $ */ #include "opt_compat.h" @@ -64,13 +64,7 @@ #include <vm/vm_object.h> #include <vm/swap_pager.h> -#include <machine/frame.h> #include <machine/limits.h> -#include <machine/psl.h> -#include <machine/sysarch.h> -#ifdef __i386__ -#include <machine/segments.h> -#endif #include <posix4/sched.h> ==== //depot/projects/smpng/sys/conf/NOTES#8 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys/<arch>/conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1027 2002/04/28 04:58:12 anholt Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1029 2002/04/30 22:47:26 scottl Exp $ # # @@ -1308,7 +1308,7 @@ # support). # device aac -device aacp # SCSI Passthrough interface (optional) +device aacp # SCSI Passthrough interface (optional, CAM required) # # Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only @@ -1633,6 +1633,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') +device my # Myson controllers # PCI Gigabit & FDDI NICs. device bge ==== //depot/projects/smpng/sys/conf/files#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.629 2002/04/28 04:58:12 anholt Exp $ +# $FreeBSD: src/sys/conf/files,v 1.630 2002/04/30 07:54:21 jeff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1371,4 +1371,5 @@ vm/vm_swap.c standard vm/vm_unix.c standard vm/uma_core.c standard +vm/uma_dbg.c standard vm/vnode_pager.c standard ==== //depot/projects/smpng/sys/conf/files.powerpc#7 (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.powerpc,v 1.8 2002/04/15 12:30:14 benno Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.9 2002/04/30 11:13:16 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -25,6 +25,7 @@ powerpc/powerpc/ofwmagic.s standard powerpc/powerpc/ofw_machdep.c standard powerpc/powerpc/pmap.c standard +powerpc/powerpc/sigcode.S standard powerpc/powerpc/suswintr.c standard powerpc/powerpc/syncicache.c standard powerpc/powerpc/sys_machdep.c standard ==== //depot/projects/smpng/sys/conf/kern.post.mk#9 (text+ko) ==== @@ -1,4 +1,3 @@ - # Part of unified Makefile for building kenrels. This includes all # the definitions that need to be included after all the % directives, # except %RULES and things that act like they are part of %RULES @@ -7,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.16 2002/04/24 11:26:19 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.17 2002/05/01 03:28:14 obrien Exp $ # # XXX why are only some phony targets marked phony? @@ -43,7 +42,7 @@ .for mfile in ${MFILES} ${mfile:T:S/.m$/.h/}: ${mfile} - perl5 $S/kern/makeobjops.pl -h ${mfile} + ${AWK} -f $S/tools/makeobjops.awk ${mfile} -h .endfor kernel-clean: ==== //depot/projects/smpng/sys/conf/kern.pre.mk#10 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.10 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.11 2002/05/01 03:28:14 obrien Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -73,7 +73,7 @@ PROFILE_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC} NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC} -NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \ +NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk $< -c ; \ ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c GEN_CFILES= $S/$M/$M/genassym.c ==== //depot/projects/smpng/sys/conf/kmod.mk#9 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.120 2002/04/29 06:35:25 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.123 2002/05/01 19:24:26 imp Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -82,6 +82,10 @@ KMODUNLOAD?= /sbin/kldunload OBJCOPY?= objcopy +.if defined(KMODDEPS) +.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" +.endif + .include <bsd.init.mk> .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S @@ -166,6 +170,9 @@ .endif .endif +.if !exists(/usr/sbin/kldxref) +NO_XREF=yes +.endif _ILINKS=@ machine @@ -253,9 +260,7 @@ done; true .endif .if !defined(NO_XREF) - @echo "FAILURES HERE ARE OK" -kldxref ${DESTDIR}${KMODDIR} - @echo "END OF SECTION WHERE FAILURES ARE OK" .endif .endif @@ -308,9 +313,9 @@ ${_src}: @ .endif .if exists(@) -${_src}: @/kern/makeobjops.pl @/${_srcsrc} +${_src}: @/tools/makeobjops.awk @/${_srcsrc} .endif - perl @/kern/makeobjops.pl -${_ext} @/${_srcsrc} + ${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext} .endif .endfor # _src .endfor # _ext @@ -341,5 +346,4 @@ .endif .include <bsd.obj.mk> - .include <bsd.kern.mk> ==== //depot/projects/smpng/sys/dev/aac/aac_cam.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/aac/aac_cam.c,v 1.1 2002/04/27 01:31:13 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.2 2002/04/30 22:50:26 scottl Exp $ */ /* @@ -67,8 +67,6 @@ struct aac_cam { device_t dev; struct aac_cam_inf *inf; - u_int32_t scsi_method_id; - int bus; struct cam_sim *sim; struct cam_path *path; }; @@ -149,6 +147,7 @@ return (EIO); } + /* Since every bus has it's own sim, every bus 'appears' as bus 0 */ if (xpt_bus_register(sim, 0) != CAM_SUCCESS) { cam_sim_free(sim, TRUE); return (EIO); @@ -163,7 +162,6 @@ camsc->sim = sim; camsc->path = path; - camsc->bus = cam_sim_bus(sim); return (0); } @@ -227,7 +225,7 @@ cpi->max_target = camsc->inf->TargetsPerBus; cpi->max_lun = 8; /* Per the controller spec */ cpi->initiator_id = camsc->inf->InitiatorBusId; - cpi->bus_id = cam_sim_bus(sim); + cpi->bus_id = camsc->inf->BusNumber; cpi->base_transfer_speed = 3300; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); strncpy(cpi->hba_vid, "Adaptec", HBA_IDLEN); @@ -242,7 +240,7 @@ { u_int32_t handle; - handle = AAC_BTL_TO_HANDLE(cam_sim_bus(sim), + handle = AAC_BTL_TO_HANDLE(camsc->inf->BusNumber, ccb->ccb_h.target_id, ccb->ccb_h.target_lun); ccb->ccb_h.status = aac_cam_get_tran_settings(sc, &ccb->cts, handle); @@ -371,7 +369,7 @@ break; } - srb->bus = cam_sim_bus(sim); /* Bus number relative to the card */ + srb->bus = camsc->inf->BusNumber; /* Bus number relative to the card */ srb->target = ccb->ccb_h.target_id; srb->lun = ccb->ccb_h.target_lun; srb->timeout = ccb->ccb_h.timeout; /* XXX */ @@ -509,7 +507,7 @@ vmi->IoctlCmd = ResetBus; rbc = (struct aac_resetbus *)&vmi->IoctlBuf[0]; - rbc->BusNumber = cam_sim_bus(sim); + rbc->BusNumber = camsc->inf->BusNumber; e = aac_sync_fib(sc, ContainerCommand, 0, fib, sizeof(struct aac_vmioctl)); ==== //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#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/acpi_timer.c,v 1.17 2002/04/26 10:06:24 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.18 2002/04/30 19:34:30 phk Exp $ */ #include "opt_acpi.h" #include <sys/param.h> @@ -102,8 +102,6 @@ "ACPI" }; -SYSCTL_OPAQUE(_debug, OID_AUTO, acpi_timecounter, CTLFLAG_RD, - &acpi_timer_timecounter, sizeof(acpi_timer_timecounter), "S,timecounter", ""); static int test_counter(void); #define N 2000 ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # $Id$ # -# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.11 2002/04/24 16:24:43 gibbs Exp $ +# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.12 2002/05/01 06:50:59 peter Exp $ PROG= aicasm @@ -23,6 +23,9 @@ .endif CFLAGS+= -I/usr/include -I. +.ifdef MAKESRCPATH +CFLAGS+= -I${MAKESRCPATH} +.endif NOMAN= noman YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/} ==== //depot/projects/smpng/sys/dev/ciss/ciss.c#5 (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/ciss/ciss.c,v 1.4 2002/04/11 09:28:09 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.5 2002/04/29 21:46:09 ps Exp $ */ /* @@ -828,8 +828,10 @@ goto out; } +#if 0 /* XXX later revisions may not need this */ sc->ciss_flags |= CISS_FLAG_FAKE_SYNCH; +#endif /* XXX only really required for old 5300 adapters? */ sc->ciss_flags |= CISS_FLAG_BMIC_ABORT; @@ -2000,7 +2002,7 @@ */ if ((sc->ciss_cam_sim = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), - sc->ciss_cfg->max_outstanding_commands, + sc->ciss_max_requests - 2, 1, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM\n"); @@ -2421,6 +2423,9 @@ /* handle post-command fixup */ ciss_cam_complete_fixup(sc, csio); + /* tell CAM we're ready for more commands */ + csio->ccb_h.status |= CAM_RELEASE_SIMQ; + xpt_done((union ccb *)csio); ciss_release_request(cr); } @@ -2442,15 +2447,15 @@ target = csio->ccb_h.target_id; cl = &sc->ciss_logical[target]; - padstr(inq->vendor, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8); - padstr(inq->product, ciss_name_ldrive_status(cl->cl_lstatus->status), 16); - padstr(inq->revision, "", 4); + padstr(inq->vendor, "COMPAQ", 8); + padstr(inq->product, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8); + padstr(inq->revision, ciss_name_ldrive_status(cl->cl_lstatus->status), 16); } } /******************************************************************************** - * Find a peripheral attahed at (target) + * Find a peripheral attached at (target) */ static struct cam_periph * ciss_find_periph(struct ciss_softc *sc, int target) @@ -2928,9 +2933,17 @@ */ ostatus = ciss_decode_ldrive_status(cn->data.logical_status.previous_state); ld->cl_status = ciss_decode_ldrive_status(cn->data.logical_status.new_state); - if (ld->cl_status != NULL) + if (ld->cl_lstatus != NULL) ld->cl_lstatus->status = cn->data.logical_status.new_state; +#if 0 + /* + * Have CAM rescan the drive if its status has changed. + */ + if (ostatus != ld->cl_status) + ciss_cam_rescan_target(sc, cn->data.logical_status.logical_drive); +#endif + break; case 1: /* logical drive has recognised new media, needs Accept Media Exchange */ @@ -3044,6 +3057,11 @@ { int bus, target, i; + if (ld->cl_lstatus == NULL) { + printf("does not exist\n"); + return; + } + /* print drive status */ switch(ld->cl_lstatus->status) { case CISS_LSTATUS_OK: @@ -3082,7 +3100,7 @@ break; } - /* print failed drives */ + /* print failed physical drives */ for (i = 0; i < CISS_BIG_MAP_ENTRIES / 8; i++) { bus = CISS_BIG_MAP_BUS(sc, ld->cl_lstatus->drive_failure_map[i]); target = CISS_BIG_MAP_TARGET(sc, ld->cl_lstatus->drive_failure_map[i]); @@ -3093,6 +3111,54 @@ } } +#ifdef CISS_DEBUG +/************************************************************************ + * Print information about the controller/driver. + */ +static void +ciss_print_adapter(struct ciss_softc *sc) +{ + int i; + + ciss_printf(sc, "ADAPTER:\n"); + for (i = 0; i < CISSQ_COUNT; i++) { + ciss_printf(sc, "%s %d/%d\n", + i == 0 ? "free" : + i == 1 ? "busy" : "complete", + sc->ciss_qstat[i].q_length, + sc->ciss_qstat[i].q_max); + } + ciss_printf(sc, "max_requests %d\n", sc->ciss_max_requests); + ciss_printf(sc, "notify_head/tail %d/%d\n", + sc->ciss_notify_head, sc->ciss_notify_tail); + ciss_printf(sc, "flags %b\n", sc->ciss_flags, + "\20\1notify_ok\2control_open\3aborting\4running\21fake_synch\22bmic_abort\n"); + + for (i = 0; i < CISS_MAX_LOGICAL; i++) { + ciss_printf(sc, "LOGICAL DRIVE %d: ", i); + ciss_print_ldrive(sc, sc->ciss_logical + i); + } + + for (i = 1; i < sc->ciss_max_requests; i++) + ciss_print_request(sc->ciss_request + i); + +} + +/* DDB hook */ +void +ciss_print0(void) +{ + struct ciss_softc *sc; + + sc = devclass_get_softc(devclass_find("ciss"), 0); + if (sc == NULL) { + printf("no ciss controllers\n"); + } else { + ciss_print_adapter(sc); + } +} +#endif + /************************************************************************ * Return a name for a logical drive status value. */ ==== //depot/projects/smpng/sys/dev/isp/isp.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.92 2002/04/16 19:55:35 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.93 2002/05/01 21:58:36 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -107,6 +107,8 @@ static const char sc2[] = "%s CHAN %d TGT %d FLAGS 0x%x 0x%x/0x%x"; static const char sc3[] = "Generated"; static const char sc4[] = "NVRAM"; +static const char bun[] = + "bad underrun for %d.%d (count %d, resid %d, status %s)"; /* * Local function prototypes. @@ -4397,11 +4399,25 @@ break; case RQCS_DATA_UNDERRUN: + { + if (IS_FC(isp)) { + int ru_marked = (sp->req_scsi_status & RQCS_RU) != 0; + if (!ru_marked || sp->req_resid > XS_XFRLEN(xs)) { + isp_prt(isp, ISP_LOGWARN, bun, XS_TGT(xs), + XS_LUN(xs), XS_XFRLEN(xs), sp->req_resid, + (ru_marked)? "marked" : "not marked"); + if (XS_NOERR(xs)) { + XS_SETERR(xs, HBA_BOTCH); + } + return; + } + } XS_RESID(xs) = sp->req_resid; if (XS_NOERR(xs)) { XS_SETERR(xs, HBA_NOERROR); } return; + } case RQCS_XACT_ERR1: isp_prt(isp, ISP_LOGERR, xact1, XS_CHANNEL(xs), @@ -4424,8 +4440,8 @@ case RQCS_QUEUE_FULL: isp_prt(isp, ISP_LOGDEBUG0, - "internal queues full for %d.%d.%d status 0x%x", XS_TGT(xs), - XS_LUN(xs), XS_CHANNEL(xs), *XS_STSP(xs)); + "internal queues full for %d.%d.%d status 0x%x", + XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), *XS_STSP(xs)); /* * If QFULL or some other status byte is set, then this @@ -4507,13 +4523,14 @@ */ if ((sp->req_completion_status & 0xff) == RQCS_PORT_UNAVAILABLE) isp_prt(isp, ISP_LOGINFO, - "Port Unavailable for target %d", XS_TGT(xs)); + "port unavailable for target %d", XS_TGT(xs)); else isp_prt(isp, ISP_LOGINFO, "port logout for target %d", XS_TGT(xs)); /* * If we're on a local loop, force a LIP (which is overkill) - * to force a re-login of this unit. + * to force a re-login of this unit. If we're on fabric, + * then we'll have to relogin as a matter of course. */ if (FCPARAM(isp)->isp_topo == TOPO_NL_PORT || FCPARAM(isp)->isp_topo == TOPO_FL_PORT) { @@ -4933,8 +4950,8 @@ ISPOPMAP(0x00, 0x00), /* 0x58: */ ISPOPMAP(0x00, 0x00), /* 0x59: */ ISPOPMAP(0x00, 0x00), /* 0x5a: */ - ISPOPMAP(0x00, 0x00), /* 0x5b: */ - ISPOPMAP(0x00, 0x00), /* 0x5c: */ + ISPOPMAP(0x03, 0x01), /* 0x5b: MBOX_DRIVER_HEARTBEAT */ + ISPOPMAP(0xcf, 0x01), /* 0x5c: MBOX_FW_HEARTBEAT */ ISPOPMAP(0x07, 0x03), /* 0x5d: MBOX_GET_SET_DATA_RATE */ ISPOPMAP(0x00, 0x00), /* 0x5e: */ ISPOPMAP(0x00, 0x00), /* 0x5f: */ ==== //depot/projects/smpng/sys/dev/mii/acphy.c#5 (text+ko) ==== @@ -89,7 +89,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.7 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.8 2002/05/01 19:15:54 semenu Exp $"; #endif static int acphy_probe (device_t); @@ -176,33 +176,31 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate and power + * down, if changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) break; - /* Wake & deisolate up is needed */ + /* Wake & deisolate up if necessary */ reg = PHY_READ(sc, MII_BMCR); if (reg & (BMCR_ISO | BMCR_PDOWN)) PHY_WRITE(sc, MII_BMCR, reg & ~(BMCR_ISO | BMCR_PDOWN)); @@ -230,12 +228,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -248,23 +240,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - acphy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) - return (0); break; } @@ -308,8 +285,7 @@ mii->mii_media_active |= IFM_NONE; return; } - diag = PHY_READ(sc, MII_ACPHY_DIAG) | - PHY_READ(sc, MII_ACPHY_DIAG); + diag = PHY_READ(sc, MII_ACPHY_DIAG); if (diag & AC_DIAG_SPEED) mii->mii_media_active |= IFM_100_TX; else ==== //depot/projects/smpng/sys/dev/mii/qsphy.c#5 (text+ko) ==== @@ -93,7 +93,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.6 2002/04/29 13:07:32 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.7 2002/05/01 19:15:54 semenu Exp $"; #endif static int qsphy_probe (device_t); @@ -180,27 +180,25 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate, if + * changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -229,12 +227,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -247,23 +239,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - qsphy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) - return (0); break; } @@ -280,7 +257,6 @@ struct mii_softc *sc; { struct mii_data *mii = sc->mii_pdata; - struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int bmsr, bmcr, pctl; mii->mii_media_status = IFM_AVALID; @@ -301,37 +277,31 @@ if (bmcr & BMCR_LOOP) mii->mii_media_active |= IFM_LOOP; - if (bmcr & BMCR_AUTOEN) { - if ((bmsr & BMSR_ACOMP) == 0) { - /* Erg, still trying, I guess... */ - mii->mii_media_active |= IFM_NONE; - return; - } - pctl = PHY_READ(sc, MII_QSPHY_PCTL) | - PHY_READ(sc, MII_QSPHY_PCTL); - switch (pctl & PCTL_OPMASK) { - case PCTL_10_T: - mii->mii_media_active |= IFM_10_T; - break; - case PCTL_10_T_FDX: - mii->mii_media_active |= IFM_10_T|IFM_FDX; - break; - case PCTL_100_TX: - mii->mii_media_active |= IFM_100_TX; - break; - case PCTL_100_TX_FDX: - mii->mii_media_active |= IFM_100_TX|IFM_FDX; - break; - case PCTL_100_T4: - mii->mii_media_active |= IFM_100_T4; - break; - default: - /* Erg... this shouldn't happen. */ - mii->mii_media_active |= IFM_NONE; - break; - } - } else - mii->mii_media_active = ife->ifm_media; + pctl = PHY_READ(sc, MII_QSPHY_PCTL); + switch (pctl & PCTL_OPMASK) { + case PCTL_10_T: + mii->mii_media_active |= IFM_10_T; + break; + case PCTL_10_T_FDX: + mii->mii_media_active |= IFM_10_T|IFM_FDX; + break; + case PCTL_100_TX: + mii->mii_media_active |= IFM_100_TX; + break; + case PCTL_100_TX_FDX: + mii->mii_media_active |= IFM_100_TX|IFM_FDX; + break; + case PCTL_100_T4: + mii->mii_media_active |= IFM_100_T4; + break; + case PCTL_AN: + mii->mii_media_active |= IFM_NONE; + break; + default: + /* Erg... this shouldn't happen. */ + mii->mii_media_active |= IFM_NONE; + break; + } } static void ==== //depot/projects/smpng/sys/dev/my/if_my.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205021535.g42FZmb50043>