Date: Tue, 14 Feb 2006 21:30:19 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 91767 for review Message-ID: <200602142130.k1ELUJac041927@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91767 Change 91767 by marcel@marcel_nfs on 2006/02/14 21:29:47 IFC @91765 Affected files ... .. //depot/projects/uart/alpha/alpha/machdep.c#16 integrate .. //depot/projects/uart/conf/files.amd64#16 integrate .. //depot/projects/uart/conf/files.i386#21 integrate .. //depot/projects/uart/dev/asr/asr.c#11 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/uart/dev/ath/if_ath.c#21 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/uart/dev/dc/if_dc.c#3 integrate .. //depot/projects/uart/dev/em/if_em.c#19 integrate .. //depot/projects/uart/dev/em/if_em.h#17 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#21 integrate .. //depot/projects/uart/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/uart/dev/lge/if_lge.c#12 integrate .. //depot/projects/uart/dev/mii/mii.c#7 integrate .. //depot/projects/uart/dev/nge/if_nge.c#13 integrate .. //depot/projects/uart/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/uart/dev/re/if_re.c#14 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#16 integrate .. //depot/projects/uart/dev/tx/if_tx.c#12 integrate .. //depot/projects/uart/dev/usb/if_aue.c#11 integrate .. //depot/projects/uart/dev/usb/if_axe.c#11 integrate .. //depot/projects/uart/dev/usb/if_rue.c#9 integrate .. //depot/projects/uart/dev/usb/if_udav.c#6 integrate .. //depot/projects/uart/dev/usb/umass.c#16 integrate .. //depot/projects/uart/dev/usb/umct.c#6 integrate .. //depot/projects/uart/dev/vge/if_vge.c#8 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#24 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#10 integrate .. //depot/projects/uart/kern/kern_sig.c#22 integrate .. //depot/projects/uart/kern/kern_thread.c#19 integrate .. //depot/projects/uart/kern/sys_process.c#13 integrate .. //depot/projects/uart/kern/uipc_socket.c#15 integrate .. //depot/projects/uart/modules/Makefile#23 integrate .. //depot/projects/uart/net/if_media.c#5 integrate .. //depot/projects/uart/net/if_media.h#6 integrate .. //depot/projects/uart/net80211/ieee80211.c#12 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#13 integrate .. //depot/projects/uart/netgraph/ng_eiface.c#9 integrate .. //depot/projects/uart/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#14 integrate .. //depot/projects/uart/netinet/ip_dummynet.h#9 integrate .. //depot/projects/uart/netinet/ip_fw.h#11 integrate .. //depot/projects/uart/netinet6/nd6.c#11 integrate .. //depot/projects/uart/pci/if_pcn.c#10 integrate .. //depot/projects/uart/pci/if_rl.c#20 integrate .. //depot/projects/uart/pci/if_sf.c#13 integrate .. //depot/projects/uart/pci/if_sis.c#17 integrate .. //depot/projects/uart/pci/if_sk.c#17 integrate .. //depot/projects/uart/pci/if_ste.c#10 integrate .. //depot/projects/uart/pci/if_vr.c#10 integrate .. //depot/projects/uart/pci/if_wb.c#10 integrate .. //depot/projects/uart/pci/if_xl.c#18 integrate .. //depot/projects/uart/security/audit/audit.c#2 integrate .. //depot/projects/uart/security/audit/audit_bsm.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/uart/ufs/ufs/ufs_quota.c#8 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/machdep.c#16 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.236 2005/10/14 12:43:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.237 2006/02/14 14:50:10 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -250,7 +250,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); - realmem = alpha_ptob(Maxmem); + realmem = Maxmem; /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/uart/conf/files.amd64#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.81 2006/01/24 21:13:50 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.82 2006/02/13 17:56:24 ambrisko Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -155,6 +155,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa ==== //depot/projects/uart/conf/files.i386#21 (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.551 2006/01/31 23:11:34 rik Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.552 2006/02/13 17:56:24 ambrisko Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -183,6 +183,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/lnc/if_lnc_isa.c optional lnc isa dev/mem/memutil.c optional mem ==== //depot/projects/uart/dev/asr/asr.c#11 (text+ko) ==== @@ -165,7 +165,7 @@ #include <dev/asr/sys_info.h> -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.76 2006/02/05 05:05:27 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.77 2006/02/12 06:57:41 scottl Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -387,7 +387,7 @@ struct cdev *ha_devt; } Asr_softc_t; -static Asr_softc_t * Asr_softc; +static Asr_softc_t *Asr_softc_list; /* * Prototypes of the routines we have in this object. @@ -1970,7 +1970,7 @@ sizeof(I2O_SET_SYSTAB_HEADER), M_TEMP, M_WAITOK | M_ZERO)) == NULL) { return (ENOMEM); } - for (ha = Asr_softc; ha; ha = ha->ha_next) { + for (ha = Asr_softc_list; ha; ha = ha->ha_next) { ++SystemTable->NumberEntries; } if ((Message_Ptr = (PI2O_EXEC_SYS_TAB_SET_MESSAGE)malloc ( @@ -2001,7 +2001,7 @@ &(Message_Ptr->StdMessageFrame)) & 0xF0) >> 2)); SG(sg, 0, I2O_SGL_FLAGS_DIR, SystemTable, sizeof(I2O_SET_SYSTAB_HEADER)); ++sg; - for (ha = Asr_softc; ha; ha = ha->ha_next) { + for (ha = Asr_softc_list; ha; ha = ha->ha_next) { SG(sg, 0, ((ha->ha_next) ? (I2O_SGL_FLAGS_DIR) @@ -2408,7 +2408,7 @@ unit = device_get_unit(dev); sc->ha_dev = dev; - if (Asr_softc == NULL) { + if (Asr_softc_list == NULL) { /* * Fixup the OS revision as saved in the dptsig for the * engine (dptioctl.h) to pick up. @@ -2420,7 +2420,7 @@ */ LIST_INIT(&(sc->ha_ccb)); /* Link us into the HA list */ - for (ha = &Asr_softc; *ha; ha = &((*ha)->ha_next)); + for (ha = &Asr_softc_list; *ha; ha = &((*ha)->ha_next)); *(ha) = sc; /* ==== //depot/projects/uart/dev/ata/ata-chipset.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.157 2006/02/09 20:54:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.158 2006/02/13 13:47:58 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -1658,6 +1658,18 @@ RF_ACTIVE))) { /* is AHCI or RAID mode enabled in BIOS ? */ if (pci_read_config(dev, 0x90, 1) & 0xc0) { + + /* reset AHCI controller */ + ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, + ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) | ATA_AHCI_GHC_HR); + DELAY(1000000); + if (ATA_INL(ctlr->r_res2, ATA_AHCI_GHC) & ATA_AHCI_GHC_HR) { + bus_release_resource(dev, ctlr->r_type2, + ctlr->r_rid2, ctlr->r_res2); + device_printf(dev, "AHCI controller reset failure\n"); + return ENXIO; + } + /* enable AHCI mode */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, ATA_AHCI_GHC_AE); ==== //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.12 2006/02/09 20:49:55 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.13 2006/02/13 18:40:53 sam Exp $"); /* * John Bicket's SampleRate control algorithm. @@ -654,8 +654,7 @@ * A fixed rate is to be used; ic_fixed_rate is an * index into the supported rate set. Convert this * to the index into the negotiated rate set for - * the node. We know the rate is there because the - * rate set is checked when the station associates. + * the node. */ const struct ieee80211_rateset *rs = &ic->ic_sup_rates[ic->ic_curmode]; @@ -666,7 +665,7 @@ ; KASSERT(srate >= 0, ("fixed rate %d not in rate set", ic->ic_fixed_rate)); - sn->static_rate_ndx = srate; + sn->static_rate_ndx = srate; } DPRINTF(sc, "%s: %s size 1600 rate/tt", __func__, ether_sprintf(ni->ni_macaddr)); ==== //depot/projects/uart/dev/ath/if_ath.c#21 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.126 2006/02/10 19:07:08 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.127 2006/02/13 18:23:32 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -3870,7 +3870,6 @@ sc->sc_lastrx = ath_hal_gettsf64(sc->sc_ah); if (txqactive(sc->sc_ah, sc->sc_cabq->axq_qnum)) ath_tx_processq(sc, sc->sc_cabq); - ath_tx_processq(sc, sc->sc_cabq); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_tx_timer = 0; ==== //depot/projects/uart/dev/bfe/if_bfe.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.30 2005/11/11 16:04:50 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.31 2006/02/14 12:44:54 glebius Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -386,7 +386,6 @@ ifp->if_watchdog = bfe_watchdog; ifp->if_init = bfe_init; ifp->if_mtu = ETHERMTU; - ifp->if_baudrate = 100000000; IFQ_SET_MAXLEN(&ifp->if_snd, BFE_TX_QLEN); ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/uart/dev/dc/if_dc.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.178 2005/12/28 18:00:37 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.179 2006/02/14 12:44:54 glebius Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -2201,7 +2201,6 @@ ifp->if_start = dc_start; ifp->if_watchdog = dc_watchdog; ifp->if_init = dc_init; - ifp->if_baudrate = 10000000; IFQ_SET_MAXLEN(&ifp->if_snd, DC_TX_LIST_CNT - 1); ifp->if_snd.ifq_drv_maxlen = DC_TX_LIST_CNT - 1; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/uart/dev/em/if_em.c#19 (text+ko) ==== @@ -31,12 +31,49 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.107 2006/02/09 12:57:17 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.108 2006/02/14 13:11:36 glebius Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" #endif +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kernel.h> +#include <sys/kthread.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/rman.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.h> + +#include <machine/bus.h> +#include <machine/resource.h> + +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_media.h> + +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/ip.h> +#include <netinet/tcp.h> +#include <netinet/udp.h> + +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> +#include <dev/em/if_em_hw.h> #include <dev/em/if_em.h> /********************************************************************* ==== //depot/projects/uart/dev/em/if_em.h#17 (text+ko) ==== @@ -31,51 +31,11 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.42 2006/02/04 16:50:14 scottl Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.43 2006/02/14 13:11:36 glebius Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/bus.h> -#include <sys/endian.h> -#include <sys/kernel.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/module.h> -#include <sys/socket.h> -#include <sys/sockio.h> -#include <sys/sysctl.h> -#include <sys/taskqueue.h> -#include <sys/kthread.h> - -#include <machine/bus.h> -#include <sys/rman.h> -#include <machine/resource.h> - -#include <net/bpf.h> -#include <net/ethernet.h> -#include <net/if.h> -#include <net/if_arp.h> -#include <net/if_dl.h> -#include <net/if_media.h> - -#include <net/if_types.h> -#include <net/if_vlan_var.h> - -#include <netinet/in_systm.h> -#include <netinet/in.h> -#include <netinet/ip.h> -#include <netinet/tcp.h> -#include <netinet/udp.h> - -#include <dev/pci/pcivar.h> -#include <dev/pci/pcireg.h> - -#include <dev/em/if_em_hw.h> - /* Tunables */ /* ==== //depot/projects/uart/dev/fxp/if_fxp.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.253 2006/01/04 23:00:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.254 2006/02/14 12:44:54 glebius Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -758,7 +758,6 @@ } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_baudrate = 100000000; ifp->if_init = fxp_init; ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ==== //depot/projects/uart/dev/ipmi/ipmi.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.1 2006/02/10 20:51:35 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.2 2006/02/13 16:50:45 ambrisko Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1056,7 +1056,7 @@ return 0; } -#ifdef DEBUG +#ifdef IMPI_DEBUG static void dump_buf(u_char *data, int len){ char buf[20]; ==== //depot/projects/uart/dev/lge/if_lge.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.46 2005/11/23 18:51:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.47 2006/02/14 12:44:55 glebius Exp $"); /* * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public @@ -546,7 +546,6 @@ ifp->if_start = lge_start; ifp->if_watchdog = lge_watchdog; ifp->if_init = lge_init; - ifp->if_baudrate = 1000000000; ifp->if_snd.ifq_maxlen = LGE_TX_LIST_CNT - 1; ifp->if_capabilities = IFCAP_RXCSUM; ifp->if_capenable = ifp->if_capabilities; ==== //depot/projects/uart/dev/mii/mii.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mii/mii.c,v 1.26 2005/06/11 00:20:38 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/mii.c,v 1.27 2006/02/14 12:10:03 glebius Exp $"); /* * MII bus layer, glues MII-capable network interface drivers to sharable @@ -240,9 +240,20 @@ miibus_statchg(device_t dev) { device_t parent; + struct mii_data *mii; + struct ifnet *ifp; parent = device_get_parent(dev); MIIBUS_STATCHG(parent); + + mii = device_get_softc(dev); + + /* + * Note that each NIC's softc must start with an ifnet pointer. + * XXX: EVIL HACK! + */ + ifp = *(struct ifnet **)device_get_softc(parent); + ifp->if_baudrate = ifmedia_baudrate(mii->mii_media_active); return; } ==== //depot/projects/uart/dev/nge/if_nge.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.85 2005/12/18 18:24:26 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.86 2006/02/14 12:44:55 glebius Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -860,7 +860,6 @@ ifp->if_start = nge_start; ifp->if_watchdog = nge_watchdog; ifp->if_init = nge_init; - ifp->if_baudrate = 1000000000; ifp->if_snd.ifq_maxlen = NGE_TX_LIST_CNT - 1; ifp->if_hwassist = NGE_CSUM_FEATURES; ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING; ==== //depot/projects/uart/dev/ppbus/if_plip.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.39 2005/12/21 10:54:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.40 2006/02/13 17:53:39 jhb Exp $"); /* * Parallel port TCP/IP interfaces added. I looked at the driver from @@ -185,7 +185,7 @@ { device_t dev; - dev = device_find_child(parent, "plip", 0); + dev = device_find_child(parent, "plip", -1); if (!dev) BUS_ADD_CHILD(parent, 0, "plip", -1); } ==== //depot/projects/uart/dev/re/if_re.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.62 2005/12/18 18:24:26 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.63 2006/02/14 12:44:55 glebius Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -1225,10 +1225,6 @@ #endif ifp->if_watchdog = re_watchdog; ifp->if_init = re_init; - if (sc->rl_type == RL_8169) - ifp->if_baudrate = 1000000000; - else - ifp->if_baudrate = 100000000; IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN); ifp->if_snd.ifq_drv_maxlen = RL_IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); ==== //depot/projects/uart/dev/sound/pci/ich.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.59 2006/01/14 23:37:08 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.60 2006/02/12 10:42:47 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -677,7 +677,6 @@ ich_init(struct sc_info *sc) { u_int32_t stat; - int sz; ich_wr(sc, ICH_REG_GLOB_CNT, ICH_GLOB_CTL_COLD, 4); DELAY(600000); @@ -701,15 +700,6 @@ if (sc->hasmic && ich_resetchan(sc, 2)) return ENXIO; - if (bus_dmamem_alloc(sc->dmat, (void **)&sc->dtbl, BUS_DMA_NOWAIT, &sc->dtmap)) - return ENOSPC; - - sz = sizeof(struct ich_desc) * ICH_DTBL_LENGTH * 3; - if (bus_dmamap_load(sc->dmat, sc->dtmap, sc->dtbl, sz, ich_setmap, sc, 0)) { - bus_dmamem_free(sc->dmat, (void **)&sc->dtbl, sc->dtmap); - return ENOSPC; - } - return 0; } @@ -828,6 +818,15 @@ goto bad; } + if (bus_dmamem_alloc(sc->dmat, (void **)&sc->dtbl, + BUS_DMA_NOWAIT, &sc->dtmap)) + goto bad; + + if (bus_dmamap_load(sc->dmat, sc->dtmap, sc->dtbl, + sizeof(struct ich_desc) * ICH_DTBL_LENGTH * 3, + ich_setmap, sc, 0)) + goto bad; + sc->codec = AC97_CREATE(dev, sc, ich_ac97); if (sc->codec == NULL) goto bad; @@ -895,6 +894,10 @@ if (sc->nabmbar) bus_release_resource(dev, sc->regtype, sc->nabmbarid, sc->nabmbar); + if (sc->dtmap) + bus_dmamap_unload(sc->dmat, sc->dtmap); + if (sc->dmat) + bus_dma_tag_destroy(sc->dmat); if (sc->ich_lock) snd_mtxfree(sc->ich_lock); free(sc, M_DEVBUF); @@ -916,6 +919,7 @@ bus_release_resource(dev, SYS_RES_IRQ, sc->irqid, sc->irq); bus_release_resource(dev, sc->regtype, sc->nambarid, sc->nambar); bus_release_resource(dev, sc->regtype, sc->nabmbarid, sc->nabmbar); + bus_dmamap_unload(sc->dmat, sc->dtmap); bus_dma_tag_destroy(sc->dmat); snd_mtxfree(sc->ich_lock); free(sc, M_DEVBUF); @@ -987,24 +991,21 @@ } /* Reinit mixer */ ich_pci_codec_reset(sc); + ICH_UNLOCK(sc); ac97_setextmode(sc->codec, sc->hasvra | sc->hasvrm); if (mixer_reinit(dev) == -1) { device_printf(dev, "unable to reinitialize the mixer\n"); - ICH_UNLOCK(sc); return ENXIO; } /* Re-start DMA engines */ for (i = 0 ; i < 3; i++) { struct sc_chinfo *ch = &sc->ch[i]; if (sc->ch[i].run_save) { - ICH_UNLOCK(sc); ichchan_setblocksize(0, ch, ch->blksz); ichchan_setspeed(0, ch, ch->spd); ichchan_trigger(0, ch, PCMTRIG_START); - ICH_LOCK(sc); } } - ICH_UNLOCK(sc); return 0; } ==== //depot/projects/uart/dev/tx/if_tx.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.94 2006/01/21 20:07:19 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.95 2006/02/14 12:44:55 glebius Exp $"); /* * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie) @@ -248,7 +248,6 @@ ifp->if_watchdog = epic_ifwatchdog; ifp->if_init = epic_init; ifp->if_timer = 0; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = TX_RING_SIZE - 1; /* Enable busmastering. */ @@ -1192,13 +1191,6 @@ CSR_WRITE_4(sc, MIICFG, sc->miicfg); } - /* Update baudrate. */ - if (IFM_SUBTYPE(media) == IFM_100_TX || - IFM_SUBTYPE(media) == IFM_100_FX) - sc->ifp->if_baudrate = 100000000; - else - sc->ifp->if_baudrate = 10000000; - epic_stop_activity(sc); epic_set_tx_mode(sc); epic_start_activity(sc); ==== //depot/projects/uart/dev/usb/if_aue.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.95 2005/11/11 16:04:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.96 2006/02/14 12:44:55 glebius Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -730,7 +730,6 @@ ifp->if_start = aue_start; ifp->if_watchdog = aue_watchdog; ifp->if_init = aue_init; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; /* ==== //depot/projects/uart/dev/usb/if_axe.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.35 2005/11/11 16:04:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.36 2006/02/14 12:44:55 glebius Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -500,7 +500,6 @@ ifp->if_start = axe_start; ifp->if_watchdog = axe_watchdog; ifp->if_init = axe_init; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; sc->axe_qdat.ifp = ifp; ==== //depot/projects/uart/dev/usb/if_rue.c#9 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.27 2005/11/11 16:04:55 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.28 2006/02/14 12:44:55 glebius Exp $"); /* * RealTek RTL8150 USB to fast ethernet controller driver. @@ -682,7 +682,6 @@ ifp->if_start = rue_start; ifp->if_watchdog = rue_watchdog; ifp->if_init = rue_init; - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; /* MII setup */ ==== //depot/projects/uart/dev/usb/if_udav.c#6 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.20 2005/12/04 10:06:04 ru Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.21 2006/02/14 12:44:55 glebius Exp $ */ /*- * Copyright (c) 2003 * Shingo WATANABE <nabe@nabechan.org>. All rights reserved. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.20 2005/12/04 10:06:04 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.21 2006/02/14 12:44:55 glebius Exp $"); #include "opt_inet.h" #if defined(__NetBSD__) @@ -415,7 +415,6 @@ ifp->if_stop = udav_stop; #endif #if defined(__FreeBSD__) - ifp->if_baudrate = 10000000; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; #endif #if defined(__NetBSD__) ==== //depot/projects/uart/dev/usb/umass.c#16 (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/usb/umass.c,v 1.132 2006/01/31 19:09:38 imp Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.133 2006/02/12 15:51:03 iedowse Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -2651,21 +2651,17 @@ } } -/* umass_cam_poll - * all requests are handled through umass_cam_action, requests - * are never pending. So, nothing to do here. - */ Static void umass_cam_poll(struct cam_sim *sim) { -#ifdef USB_DEBUG struct umass_softc *sc = (struct umass_softc *) sim->softc; DPRINTF(UDMASS_SCSI, ("%s: CAM poll\n", USBDEVNAME(sc->sc_dev))); -#endif - /* nop */ + usbd_set_polling(sc->sc_udev, 1); + usbd_dopoll(sc->iface); + usbd_set_polling(sc->sc_udev, 0); } ==== //depot/projects/uart/dev/usb/umct.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/umct.c,v 1.9 2004/10/05 04:03:00 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/umct.c,v 1.10 2006/02/12 17:32:59 glebius Exp $"); /* * Driver for the MCT (Magic Control Technology) USB-RS232 Converter. @@ -255,7 +255,7 @@ } if (sc->sc_intr_number == -1) { - printf("%s: Could not fint interrupt in\n", devname); + printf("%s: Could not find interrupt in\n", devname); ucom->sc_dying = 1; goto error; } ==== //depot/projects/uart/dev/vge/if_vge.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.23 2005/12/18 18:24:27 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.24 2006/02/14 12:44:56 glebius Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -1061,7 +1061,6 @@ #endif ifp->if_watchdog = vge_watchdog; ifp->if_init = vge_init; - ifp->if_baudrate = 1000000000; ifp->if_snd.ifq_maxlen = VGE_IFQ_MAXLEN; TASK_INIT(&sc->vge_txtask, 0, vge_tx_task, ifp); ==== //depot/projects/uart/geom/mirror/g_mirror.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.72 2006/02/11 17:39:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.74 2006/02/12 17:38:09 pjd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -787,7 +787,7 @@ if (sc->sc_writes > 0) return (0); if (!from_access && sc->sc_provider->acw > 0) { - timeout = g_mirror_idletime - (time_second - sc->sc_last_write); + timeout = g_mirror_idletime - (time_uptime - sc->sc_last_write); if (timeout > 0) return (timeout); } @@ -813,7 +813,7 @@ struct g_mirror_disk *disk; sc->sc_idle = 0; - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; g_topology_lock(); LIST_FOREACH(disk, &sc->sc_disks, d_next) { if (disk->d_state != G_MIRROR_DISK_STATE_ACTIVE) @@ -1368,7 +1368,7 @@ if (sc->sc_idle) g_mirror_unidle(sc); else - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; /* * Allocate all bios before sending any request, so we can @@ -2188,9 +2188,7 @@ g_mirror_disk_state2str(disk->d_state))); DISK_STATE_CHANGED(); - if (disk->d_state == G_MIRROR_DISK_STATE_NEW) - disk->d_flags &= ~G_MIRROR_DISK_FLAG_DIRTY; - else if (disk->d_state == G_MIRROR_DISK_STATE_SYNCHRONIZING) { + if (disk->d_state == G_MIRROR_DISK_STATE_SYNCHRONIZING) { disk->d_flags &= ~G_MIRROR_DISK_FLAG_SYNCHRONIZING; disk->d_flags &= ~G_MIRROR_DISK_FLAG_FORCE_SYNC; g_mirror_sync_stop(disk, 0); @@ -2199,6 +2197,7 @@ disk->d_sync.ds_offset = 0; disk->d_sync.ds_offset_done = 0; g_mirror_update_idle(sc, disk); + g_mirror_update_metadata(disk); G_MIRROR_DEBUG(0, "Device %s: provider %s activated.", sc->sc_name, g_mirror_get_diskname(disk)); break; @@ -2534,7 +2533,7 @@ sc->sc_flags = md->md_mflags; sc->sc_bump_id = 0; sc->sc_idle = 1; - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; sc->sc_writes = 0; bioq_init(&sc->sc_queue); mtx_init(&sc->sc_queue_mtx, "gmirror:queue", NULL, MTX_DEF); ==== //depot/projects/uart/geom/raid3/g_raid3.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.50 2006/02/11 17:42:31 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.53 2006/02/12 17:38:09 pjd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,6 +71,8 @@ &g_raid3_syncs_per_sec, 0, "Number of synchronizations requests per second"); static u_int g_raid3_disconnect_on_failure = 1; +TUNABLE_INT("kern.geom.raid3.disconnect_on_failure", + &g_raid3_disconnect_on_failure); SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, disconnect_on_failure, CTLFLAG_RW, &g_raid3_disconnect_on_failure, 0, "Disconnect component on I/O failure."); @@ -807,7 +809,7 @@ if (sc->sc_writes > 0) return (0); if (!from_access && sc->sc_provider->acw > 0) { - timeout = g_raid3_idletime - (time_second - sc->sc_last_write); + timeout = g_raid3_idletime - (time_uptime - sc->sc_last_write); if (timeout > 0) return (timeout); } @@ -835,7 +837,7 @@ u_int i; sc->sc_idle = 0; - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; g_topology_lock(); for (i = 0; i < sc->sc_ndisks; i++) { disk = &sc->sc_disks[i]; @@ -1573,7 +1575,7 @@ if (sc->sc_idle) g_raid3_unidle(sc); else - sc->sc_last_write = time_second; + sc->sc_last_write = time_uptime; ndisks = sc->sc_ndisks; @@ -2437,9 +2439,7 @@ g_raid3_disk_state2str(disk->d_state))); DISK_STATE_CHANGED(); - if (disk->d_state == G_RAID3_DISK_STATE_NEW) - disk->d_flags &= ~G_RAID3_DISK_FLAG_DIRTY; - else if (disk->d_state == G_RAID3_DISK_STATE_SYNCHRONIZING) { + if (disk->d_state == G_RAID3_DISK_STATE_SYNCHRONIZING) { disk->d_flags &= ~G_RAID3_DISK_FLAG_SYNCHRONIZING; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602142130.k1ELUJac041927>