Date: Sat, 20 Sep 2003 14:11:22 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 38352 for review Message-ID: <200309202111.h8KLBM1G022554@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=38352 Change 38352 by marcel@marcel_nfs on 2003/09/20 14:10:29 IFC @38350 Affected files ... .. //depot/projects/ia64/etc/defaults/pccard.conf#25 integrate .. //depot/projects/ia64/share/man/man4/ath.4#10 integrate .. //depot/projects/ia64/share/man/man4/sk.4#3 integrate .. //depot/projects/ia64/share/man/man4/ulpt.4#3 integrate .. //depot/projects/ia64/sys/conf/files.ia64#48 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#18 integrate .. //depot/projects/ia64/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#11 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#36 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#36 integrate .. //depot/projects/ia64/sys/dev/pccard/pccardvar.h#12 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#33 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#45 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#45 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#31 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#95 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#77 integrate .. //depot/projects/ia64/sys/ia64/ia64/uma_machdep.c#5 branch .. //depot/projects/ia64/sys/kern/linker_if.m#2 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#18 integrate .. //depot/projects/ia64/sys/pci/if_skreg.h#2 integrate .. //depot/projects/ia64/sys/pci/yukonreg.h#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#46 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/if.c#4 integrate Differences ... ==== //depot/projects/ia64/etc/defaults/pccard.conf#25 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.264 2003/09/10 01:14:07 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.265 2003/09/20 05:21:58 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -2153,6 +2153,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Proxim Harmony OEM card +card "PROXIM" "LAN PC CARD HARMONY 80211B" + config 0x1 "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # Proxim RangeLAN-DS (OEM of Zcommax - Prism2 card) card "PROXIM" "RangeLAN-DS/LAN PC CARD" config auto "wi" ? ==== //depot/projects/ia64/share/man/man4/ath.4#10 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.10 2003/09/19 01:41:18 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.11 2003/09/20 15:10:38 se Exp $ .\"/ .Dd September 18, 2003 .Dt ATH 4 @@ -109,23 +109,27 @@ .Nm driver: .Pp -.Bl -column -compact "D-Link DWL-AG650" "AR5212" "Cardbus" -.Em "Card Chip Bus" -D-Link DWL-AB650 AR5211 CardBus -D-Link DWL-AG520 AR5212 PCI -D-Link DWL-AG650 AR5212 CardBus -D-Link DWL-G650 AR5212 CardBus -I/O Data WN-AG/CB AR5212 CardBus -Linksys WMP55AG AR5212 PCI -Linksys WPC51AB AR5211 CardBus -Linksys WPC55AG AR5212 CardBus -NEC PA-WL/54AG AR5212 CardBus -Netgear WAB501 AR5211 CardBus -Netgear WAG511 AR5212 CardBus -Netgear WG311 AR5212 CardBus -Nortel 2201 AR5212 CardBus -Orinoco 8480 AR5212 CardBus -Proxim Skyline 4030 AR5210 CardBus +.Bl -column -compact "D-Link DWL-AG650" "AR5212" "Cardbus" "a/b/g" +.Em "Card Chip Bus Standard" +D-Link DWL-AB650 AR5211 CardBus a/b +D-Link DWL-AG520 AR5212 PCI a/b/g +D-Link DWL-AG650 AR5212 CardBus a/b/g +D-Link DWL-G520B AR5212 PCI b/g +D-Link DWL-G650B AR5212 CardBus b/g +I/O Data WN-AG/CB AR5212 CardBus a/b/g +Linksys WMP55AG AR5212 PCI a/b/g +Linksys WPC51AB AR5211 CardBus a/b +Linksys WPC55AG AR5212 CardBus a/b/g +NEC PA-WL/54AG AR5212 CardBus a/b/g +Netgear WAG311 AR5212 PCI a/b/g +Netgear WAB501 AR5211 CardBus a/b +Netgear WAG511 AR5212 CardBus a/b/g +Netgear WG311 AR5212 PCI b/g +Netgear WG511T AR5212 PCI b/g +Nortel 2201 AR5212 CardBus a/b +Orinoco 8480 AR5212 CardBus a/b/g +Proxim Skyline 4030 AR5210 CardBus a +Proxim Skyline 4032 AR5210 PCI a .El .Sh EXAMPLES Join an existing BSS network (ie: connect to an access point): @@ -283,6 +287,9 @@ Different regulatory domains may not be able to communicate with each other with 802.11a as different regualtory domains do not necessarily have overlapping channels. +.Pp +Revision A1 of the D-LINK DWL-G520 and DWL-G650 are based on an +Intersil PrismGT chip and are not supported by this driver. .Sh BUGS .Pp Performance in lossy environments is suboptimal. ==== //depot/projects/ia64/share/man/man4/sk.4#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sk.4,v 1.18 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/sk.4,v 1.19 2003/09/20 11:10:51 wilko Exp $ .\" .Dd July 3, 1999 .Dt SK 4 @@ -47,6 +47,8 @@ .Pp .Bl -bullet -offset indent -compact .It +SK-9521 SK-NET GE-T single port, 1000baseT adapter +.It SK-9821 SK-NET GE-T single port, 1000baseT adapter .It SK-9822 SK-NET GE-T dual port, 1000baseT adapter @@ -58,6 +60,8 @@ SK-9843 SK-NET GE-SX single port, multimode fiber adapter .It SK-9844 SK-NET GE-SX dual port, multimode fiber adapter +.It +3COM 3C940 single port, 1000baseT adapter .El .Pp The SysKonnect adapters consist of two main components: the XaQti Corp. @@ -85,6 +89,8 @@ on the primary port fails, the SysKonnect driver will automatically switch traffic onto the second port. .Pp +Also supported is the Marvell Semiconductor 88E1000* gigabit PHY. +.Pp The XaQti XMAC II supports full and half duplex operation with autonegotiation. The XMAC also supports unlimited frame sizes. ==== //depot/projects/ia64/share/man/man4/ulpt.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.3 2002/05/30 12:59:52 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.5 2003/09/20 15:16:56 se Exp $ .\" .Dd July 12, 1998 .Dt ULPT 4 @@ -56,13 +56,13 @@ .El .Pp Some printers cannot handle the reset on open; in case of problems try the -.Pa ulpn +.Pa unlpt device. .Sh FILES -.Bl -tag -width ".Pa /dev/ulpt?" -compact +.Bl -tag -width ".Pa /dev/unlpt?" -compact .It Pa /dev/ulpt? device with reset -.It Pa /dev/ulpn? +.It Pa /dev/unlpt? device without reset .El .Sh SEE ALSO ==== //depot/projects/ia64/sys/conf/files.ia64#48 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.58 2003/09/06 23:23:25 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.59 2003/09/20 19:27:48 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -121,6 +121,7 @@ ia64/ia64/sys_machdep.c standard ia64/ia64/syscall.S standard ia64/ia64/trap.c standard +ia64/ia64/uma_machdep.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard ia64/ia64/vga_machdep.c optional vga ==== //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.15 2003/09/18 16:44:54 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.16 2003/09/20 08:38:33 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -543,7 +543,7 @@ "stat=0x%02x err=0x%02x lsb=0x%02x msb=0x%02x\n", stat0, err, lsb, msb); if (!(stat0 & ATA_S_BUSY)) { - if (err == ATA_E_ILI) { + if ((err & 0x7f) == ATA_E_ILI) { if (lsb == ATAPI_MAGIC_LSB && msb == ATAPI_MAGIC_MSB) { ch->devices |= ATA_ATAPI_MASTER; } @@ -568,7 +568,7 @@ " stat=0x%02x err=0x%02x lsb=0x%02x msb=0x%02x\n", stat1, err, lsb, msb); if (!(stat1 & ATA_S_BUSY)) { - if (err == ATA_E_ILI) { + if ((err & 0x7f) == ATA_E_ILI) { if (lsb == ATAPI_MAGIC_LSB && msb == ATAPI_MAGIC_MSB) { ch->devices |= ATA_ATAPI_SLAVE; } ==== //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#18 (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/ed/if_ed_pccard.c,v 1.52 2003/08/07 19:40:05 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.53 2003/09/20 18:03:07 imp Exp $ */ #include "opt_ed.h" @@ -148,6 +148,7 @@ { PCMCIA_CARD(DYNALINK, L10C, 0), 0}, { PCMCIA_CARD(EDIMAX, EP4000A, 0), 0}, { PCMCIA_CARD(EPSON, EEN10B, 0), 0}, + { PCMCIA_CARD(EXP, THINLANCOMBO, 0), 0}, { PCMCIA_CARD(IBM, INFOMOVER, 0), 0}, { PCMCIA_CARD(IODATA, PCLAT, 0), 0}, { PCMCIA_CARD(IODATA, PCLATE, 0), 0}, @@ -416,7 +417,8 @@ sc->chip_type = ED_CHIP_TYPE_AX88190; /* - * Set Attribute Memory IOBASE Register + * Set Attribute Memory IOBASE Register. Is this a deficiency in + * the PC Card layer, or an ax88190 specific issue? xxx */ iobase = rman_get_start(sc->port_res); ed_pccard_memwrite(dev, ED_AX88190_IOBASE0, iobase & 0xff); ==== //depot/projects/ia64/sys/dev/mii/e1000phy.c#7 (text+ko) ==== @@ -1,7 +1,7 @@ /* #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.9 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.10 2003/09/20 10:53:08 wilko Exp $"); * Principal Author: Parag Patel * Copyright (c) 2001 * All rights reserved. @@ -36,6 +36,13 @@ * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY. */ +/* + * Support added for the Marvell 88E1011 (Alaska) 1000/100/10baseTX and + * 1000baseSX PHY. + * Nathan Binkert <nate@openbsd.org> + * Jung-uk Kim <jkim@niksun.com> + */ + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -88,8 +95,9 @@ ma = device_get_ivars(dev); id = ((ma->mii_id1 << 16) | ma->mii_id2) & E1000_ID_MASK; - - if (id != E1000_ID_88E1000 && id != E1000_ID_88E1000S) { + if (id != E1000_ID_88E1000 + && id != E1000_ID_88E1000S + && id != E1000_ID_88E1011) { return ENXIO; } @@ -103,6 +111,7 @@ struct mii_softc *sc; struct mii_attach_args *ma; struct mii_data *mii; + u_int32_t id; getenv_int("e1000phy_debug", &e1000phy_debug); @@ -116,39 +125,49 @@ sc->mii_phy = ma->mii_phyno; sc->mii_service = e1000phy_service; sc->mii_pdata = mii; + sc->mii_flags |= MIIF_NOISOLATE; - sc->mii_flags |= MIIF_NOISOLATE; + id = ((ma->mii_id1 << 16) | ma->mii_id2) & E1000_ID_MASK; + if (id == E1000_ID_88E1011 + && (PHY_READ(sc, E1000_ESSR) & E1000_ESSR_FIBER_LINK)) + sc->mii_flags |= MIIF_HAVEFIBER; mii->mii_instance++; e1000phy_reset(sc); device_printf(dev, " "); #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) -/* - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_NONE, 0, sc->mii_inst), - E1000_CR_ISOLATE); -*/ - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, sc->mii_inst), - E1000_CR_SPEED_10); - printf("10baseT, "); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, IFM_FDX, sc->mii_inst), - E1000_CR_SPEED_10 | E1000_CR_FULL_DUPLEX); - printf("10baseT-FDX, "); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, 0, sc->mii_inst), - E1000_CR_SPEED_100); - printf("100baseTX, "); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_FDX, sc->mii_inst), - E1000_CR_SPEED_100 | E1000_CR_FULL_DUPLEX); - printf("100baseTX-FDX, "); - /* - * 1000BT-simplex not supported; driver must ignore this entry, - * but it must be present in order to manually set full-duplex. - */ - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0, sc->mii_inst), - E1000_CR_SPEED_1000); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, IFM_FDX, sc->mii_inst), - E1000_CR_SPEED_1000 | E1000_CR_FULL_DUPLEX); - printf("1000baseTX-FDX, "); + if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { +#if 0 + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_NONE, 0, sc->mii_inst), + E1000_CR_ISOLATE); +#endif + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, sc->mii_inst), + E1000_CR_SPEED_10); + printf("10baseT, "); + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, IFM_FDX, sc->mii_inst), + E1000_CR_SPEED_10 | E1000_CR_FULL_DUPLEX); + printf("10baseT-FDX, "); + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, 0, sc->mii_inst), + E1000_CR_SPEED_100); + printf("100baseTX, "); + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_FDX, sc->mii_inst), + E1000_CR_SPEED_100 | E1000_CR_FULL_DUPLEX); + printf("100baseTX-FDX, "); + /* + * 1000BT-simplex not supported; driver must ignore this entry, + * but it must be present in order to manually set full-duplex. + */ + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0, sc->mii_inst), + E1000_CR_SPEED_1000); + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, IFM_FDX, sc->mii_inst), + E1000_CR_SPEED_1000 | E1000_CR_FULL_DUPLEX); + printf("1000baseTX-FDX, "); + } else { + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_SX, IFM_FDX, sc->mii_inst), + E1000_CR_SPEED_1000 | E1000_CR_FULL_DUPLEX); + printf("1000baseSX-FDX, "); + } ADD(IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, sc->mii_inst), 0); printf("auto\n"); #undef ADD @@ -242,6 +261,14 @@ (void)e1000phy_mii_phy_auto(sc); break; + case IFM_1000_SX: + e1000phy_reset(sc); + + PHY_WRITE(sc, E1000_CR, + E1000_CR_FULL_DUPLEX | E1000_CR_SPEED_1000); + PHY_WRITE(sc, E1000_AR, E1000_FA_1000X_FD); + break; + case IFM_100_TX: e1000phy_reset(sc); @@ -353,27 +380,34 @@ return; } - if (ssr & E1000_SSR_1000MBS) - mii->mii_media_active |= IFM_1000_T; - else if (ssr & E1000_SSR_100MBS) - mii->mii_media_active |= IFM_100_TX; - else - mii->mii_media_active |= IFM_10_T; + if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { + if (ssr & E1000_SSR_1000MBS) + mii->mii_media_active |= IFM_1000_T; + else if (ssr & E1000_SSR_100MBS) + mii->mii_media_active |= IFM_100_TX; + else + mii->mii_media_active |= IFM_10_T; + } else { + if (ssr & E1000_SSR_1000MBS) + mii->mii_media_active |= IFM_1000_SX; + } if (ssr & E1000_SSR_DUPLEX) mii->mii_media_active |= IFM_FDX; else mii->mii_media_active |= IFM_HDX; - /* FLAG0==rx-flow-control FLAG1==tx-flow-control */ - if ((ar & E1000_AR_PAUSE) && (lpar & E1000_LPAR_PAUSE)) { - mii->mii_media_active |= IFM_FLAG0 | IFM_FLAG1; - } else if (!(ar & E1000_AR_PAUSE) && (ar & E1000_AR_ASM_DIR) && - (lpar & E1000_LPAR_PAUSE) && (lpar & E1000_LPAR_ASM_DIR)) { - mii->mii_media_active |= IFM_FLAG1; - } else if ((ar & E1000_AR_PAUSE) && (ar & E1000_AR_ASM_DIR) && - !(lpar & E1000_LPAR_PAUSE) && (lpar & E1000_LPAR_ASM_DIR)) { - mii->mii_media_active |= IFM_FLAG0; + if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { + /* FLAG0==rx-flow-control FLAG1==tx-flow-control */ + if ((ar & E1000_AR_PAUSE) && (lpar & E1000_LPAR_PAUSE)) { + mii->mii_media_active |= IFM_FLAG0 | IFM_FLAG1; + } else if (!(ar & E1000_AR_PAUSE) && (ar & E1000_AR_ASM_DIR) && + (lpar & E1000_LPAR_PAUSE) && (lpar & E1000_LPAR_ASM_DIR)) { + mii->mii_media_active |= IFM_FLAG1; + } else if ((ar & E1000_AR_PAUSE) && (ar & E1000_AR_ASM_DIR) && + !(lpar & E1000_LPAR_PAUSE) && (lpar & E1000_LPAR_ASM_DIR)) { + mii->mii_media_active |= IFM_FLAG0; + } } } @@ -381,12 +415,14 @@ e1000phy_mii_phy_auto(struct mii_softc *mii) { - PHY_WRITE(mii, E1000_AR, E1000_AR_10T | E1000_AR_10T_FD | - E1000_AR_100TX | E1000_AR_100TX_FD | - E1000_AR_PAUSE | E1000_AR_ASM_DIR); - PHY_WRITE(mii, E1000_1GCR, E1000_1GCR_1000T_FD); - PHY_WRITE(mii, E1000_CR, - E1000_CR_AUTO_NEG_ENABLE | E1000_CR_RESTART_AUTO_NEG); + if ((mii->mii_flags & MIIF_HAVEFIBER) == 0) { + PHY_WRITE(mii, E1000_AR, E1000_AR_10T | E1000_AR_10T_FD | + E1000_AR_100TX | E1000_AR_100TX_FD | + E1000_AR_PAUSE | E1000_AR_ASM_DIR); + PHY_WRITE(mii, E1000_1GCR, E1000_1GCR_1000T_FD); + PHY_WRITE(mii, E1000_CR, + E1000_CR_AUTO_NEG_ENABLE | E1000_CR_RESTART_AUTO_NEG); + } return (EJUSTRETURN); } ==== //depot/projects/ia64/sys/dev/mii/e1000phyreg.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.1 2001/04/09 21:28:53 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.2 2003/09/20 10:53:08 wilko Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -107,6 +107,7 @@ #define E1000_ID2 0x03 /* ID register 2 */ #define E1000_ID_88E1000 0x01410C50 #define E1000_ID_88E1000S 0x01410C40 +#define E1000_ID_88E1011 0x01410C20 #define E1000_ID_MASK 0xFFFFFFF0 #define E1000_AR 0x04 /* autonegotiation advertise reg */ @@ -122,6 +123,15 @@ #define E1000_AR_NEXT_PAGE 0x8000 #define E1000_AR_SPEED_MASK 0x01E0 +/* Autonegotiation register bits for fiber cards (Alaska Only!) */ +#define E1000_FA_1000X_FD 0x0020 +#define E1000_FA_1000X 0x0040 +#define E1000_FA_SYM_PAUSE 0x0080 +#define E1000_FA_ASYM_PAUSE 0x0100 +#define E1000_FA_FAULT1 0x1000 +#define E1000_FA_FAULT2 0x2000 +#define E1000_FA_NEXT_PAGE 0x8000 + #define E1000_LPAR 0x05 /* autoneg link partner abilities reg */ #define E1000_LPAR_SELECTOR_FIELD 0x0001 #define E1000_LPAR_10T 0x0020 @@ -135,6 +145,16 @@ #define E1000_LPAR_ACKNOWLEDGE 0x4000 #define E1000_LPAR_NEXT_PAGE 0x8000 +/* autoneg link partner ability register bits for fiber cards (Alaska Only!) */ +#define E1000_FPAR_1000X_FD 0x0020 +#define E1000_FPAR_1000X 0x0040 +#define E1000_FPAR_SYM_PAUSE 0x0080 +#define E1000_FPAR_ASYM_PAUSE 0x0100 +#define E1000_FPAR_FAULT1 0x1000 +#define E1000_FPAR_FAULT2 0x2000 +#define E1000_FPAR_ACK 0x4000 +#define E1000_FPAR_NEXT_PAGE 0x8000 + #define E1000_ER 0x06 /* autoneg expansion reg */ #define E1000_ER_LP_NWAY 0x0001 #define E1000_ER_PAGE_RXD 0x0002 @@ -284,3 +304,11 @@ #define E1000_LCR_PULSE_340_670MS 0x5000 #define E1000_LCR_PULSE_670_13S 0x6000 #define E1000_LCR_PULSE_13_26S 0x7000 + +/* The following register is found only on the 88E1011 Alaska PHY */ +#define E1000_ESSR 0x1B /* Extended PHY specific sts */ +#define E1000_ESSR_FIBER_LINK 0x2000 +#define E1000_ESSR_GMII_COPPER 0x000f +#define E1000_ESSR_GMII_FIBER 0x0007 +#define E1000_ESSR_TBI_COPPER 0x000d +#define E1000_ESSR_TBI_FIBER 0x0005 ==== //depot/projects/ia64/sys/dev/mii/miidevs#11 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.26 2003/09/11 03:53:46 wpaul Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.27 2003/09/20 10:53:08 wilko Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -172,5 +172,5 @@ /* Marvell Semiconductor PHYs */ model MARVELL E1000 0x0000 Marvell 88E1000 Gigabit PHY +model MARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY model xxMARVELL E1000 0x0005 Marvell 88E1000 Gigabit PHY - ==== //depot/projects/ia64/sys/dev/pccard/pccarddevs#36 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.69 2003/08/21 18:05:35 imp Exp $ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.71 2003/09/20 17:54:30 imp Exp $ /* $NetBSD: pcmciadevs,v 1.184 2003/07/26 10:39:32 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ @@ -372,6 +372,7 @@ product PLANEX_2 GWNS11H 0xb001 Planex GW-NS11H /* Proxim */ +product PROXIM HARMONY 0x0002 Proxim HARMONY 80211B product PROXIM ROAMABOUT_2400FH 0x1058 Digital RoamAbout 2400FH product PROXIM RANGELAN2_7401 0x1158 Proxim RangeLAN2 7401 product PROXIM RANGELANDS_8430 0x8000 Proxim RangeLAN-DS 8430 @@ -541,6 +542,7 @@ product EPSON EEN10B { "Seiko&spEpson&spCorp.", "Ethernet", "P/N:&spEEN10B&spRev.&sp00", NULL } Epson EEN10B product EPSON SC200 { "EPSON", "SCSI-2&spPC&spCard&spSC200", NULL, NULL } Media Intelligent SCSI-2 PC Card MSC-200 product EXP EXPMULTIMEDIA { "EXP&sp&sp&sp", "PnPIDE", "F1", NULL } EXP IDE/ATAPI DVD Card +product EXP THINLANCOMBO { "PCMCIA&spLAN", "Ethernet", NULL, NULL } EXP ThinLan Combo product FREECOM PCCARDIDE { "FREECOM", "PCCARD-IDE", NULL, NULL } FREECOM PCCARD-IDE product FUJITSU FMV_J181 { "PCMCIA&spMBH10302", "01", NULL, NULL } FUJITSU FMV-J181 PCMCIA Card product FUJITSU FMV_J182 { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.01", NULL } FUJITSU FMV-J182 PCMCIA Card ==== //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#36 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.69 2003/08/21 18:05:55 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.71 2003/09/20 18:01:51 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.69 2003/08/21 18:05:35 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.71 2003/09/20 17:54:30 imp Exp */ /* $NetBSD: pcmciadevs,v 1.184 2003/07/26 10:39:32 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ @@ -627,6 +627,9 @@ #define PCMCIA_STR_PLANEX_2_GWNS11H "Planex GW-NS11H" /* Proxim */ +#define PCMCIA_CIS_PROXIM_HARMONY { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_PROXIM_HARMONY 0x0002 +#define PCMCIA_STR_PROXIM_HARMONY "Proxim HARMONY 80211B" #define PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_PROXIM_ROAMABOUT_2400FH 0x1058 #define PCMCIA_STR_PROXIM_ROAMABOUT_2400FH "Digital RoamAbout 2400FH" @@ -954,6 +957,9 @@ #define PCMCIA_CIS_EXP_EXPMULTIMEDIA { "EXP ", "PnPIDE", "F1", NULL } #define PCMCIA_PRODUCT_EXP_EXPMULTIMEDIA 0xffffffff #define PCMCIA_STR_EXP_EXPMULTIMEDIA "EXP IDE/ATAPI DVD Card" +#define PCMCIA_CIS_EXP_THINLANCOMBO { "PCMCIA LAN", "Ethernet", NULL, NULL } +#define PCMCIA_PRODUCT_EXP_THINLANCOMBO 0xffffffff +#define PCMCIA_STR_EXP_THINLANCOMBO "EXP ThinLan Combo" #define PCMCIA_CIS_FREECOM_PCCARDIDE { "FREECOM", "PCCARD-IDE", NULL, NULL } #define PCMCIA_PRODUCT_FREECOM_PCCARDIDE 0xffffffff #define PCMCIA_STR_FREECOM_PCCARDIDE "FREECOM PCCARD-IDE" ==== //depot/projects/ia64/sys/dev/pccard/pccardvar.h#12 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $ */ -/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.42 2003/08/29 00:25:50 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.43 2003/09/20 17:46:39 imp Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -184,9 +184,6 @@ STAILQ_HEAD(, pccard_function) pf_head; }; -#define PCCARD_MEM_ATTR 1 -#define PCCARD_MEM_COMMON 2 - #define PCCARD_WIDTH_AUTO 0 #define PCCARD_WIDTH_IO8 1 #define PCCARD_WIDTH_IO16 2 ==== //depot/projects/ia64/sys/dev/usb/umass.c#33 (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.90 2003/08/22 05:54:57 njl Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.91 2003/09/20 08:18:16 gj Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -1644,9 +1644,9 @@ err = usbd_do_request(udev, &req, &buf); switch (err) { case USBD_NORMAL_COMPLETION: + maxlun = buf; DPRINTF(UDMASS_BBB, ("%s: Max Lun is %d\n", USBDEVNAME(sc->sc_dev), maxlun)); - maxlun = buf; break; case USBD_STALLED: case USBD_SHORT_XFER: ==== //depot/projects/ia64/sys/dev/usb/usbdevs#47 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.137 2003/09/19 22:42:51 jb Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.138 2003/09/20 20:01:08 se Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -146,6 +146,7 @@ vendor PANASONIC 0x04da Panasonic (Matsushita) vendor IIYAMA 0x04e1 Iiyama vendor SHUTTLE 0x04e6 Shuttle Technology +vendor SAMSUNG 0x04e8 Samsung Electronics vendor ANNABOOKS 0x04ed Annabooks vendor JVC 0x04f1 JVC vendor CHICONY 0x04f2 Chicony Electronics @@ -1042,6 +1043,9 @@ /* RATOC Systems products */ product RATOC REXUSB60 0xb000 USB serial adapter REX-USB60 +/* Samsung products */ +product SAMSUNG ML6060 0x3008 ML-6060 laser printer + /* SanDisk products */ product SANDISK SDDR05A 0x0001 ImageMate SDDR-05a product SANDISK SDDR05 0x0005 ImageMate SDDR-05 ==== //depot/projects/ia64/sys/dev/usb/usbdevs.h#45 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.145 2003/09/19 22:42:51 jb Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.146 2003/09/20 20:01:08 se Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.136 2003/09/18 15:41:06 obrien Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.137 2003/09/19 22:42:51 jb Exp */ /* @@ -153,6 +153,7 @@ #define USB_VENDOR_PANASONIC 0x04da /* Panasonic (Matsushita) */ #define USB_VENDOR_IIYAMA 0x04e1 /* Iiyama */ #define USB_VENDOR_SHUTTLE 0x04e6 /* Shuttle Technology */ +#define USB_VENDOR_SAMSUNG 0x04e8 /* Samsung Electronics */ #define USB_VENDOR_ANNABOOKS 0x04ed /* Annabooks */ #define USB_VENDOR_JVC 0x04f1 /* JVC */ #define USB_VENDOR_CHICONY 0x04f2 /* Chicony Electronics */ @@ -1049,6 +1050,9 @@ /* RATOC Systems products */ #define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial adapter REX-USB60 */ +/* Samsung products */ +#define USB_PRODUCT_SAMSUNG_ML6060 0x3008 /* ML-6060 laser printer */ + /* SanDisk products */ #define USB_PRODUCT_SANDISK_SDDR05A 0x0001 /* ImageMate SDDR-05a */ #define USB_PRODUCT_SANDISK_SDDR05 0x0005 /* ImageMate SDDR-05 */ ==== //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#45 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.145 2003/09/19 22:42:51 jb Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.146 2003/09/20 20:01:08 se Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.136 2003/09/18 15:41:06 obrien Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.137 2003/09/19 22:42:51 jb Exp */ /* @@ -2500,6 +2500,12 @@ "USB serial adapter REX-USB60", }, { + USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_ML6060, + 0, + "Samsung Electronics", + "ML-6060 laser printer", + }, + { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A, 0, "SanDisk Corp", @@ -3544,6 +3550,12 @@ NULL, }, { + USB_VENDOR_SAMSUNG, 0, + USB_KNOWNDEV_NOPROD, + "Samsung Electronics", + NULL, + }, + { USB_VENDOR_ANNABOOKS, 0, USB_KNOWNDEV_NOPROD, "Annabooks", ==== //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#31 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.39 2003/09/05 22:29:30 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.40 2003/09/20 05:27:18 imp Exp $"); #include "opt_wi.h" @@ -163,6 +163,7 @@ PCMCIA_CARD(NOKIA, C110_WLAN, 0), PCMCIA_CARD(PLANEX_2, GWNS11H, 0), PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0), + PCMCIA_CARD(PROXIM, HARMONY, 0), PCMCIA_CARD(SAMSUNG, SWL_2000N, 0), PCMCIA_CARD(SIEMENS, SS1021, 0), PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0), ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#95 (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/ia64/ia64/machdep.c,v 1.155 2003/09/19 22:51:26 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.156 2003/09/20 20:34:58 marcel Exp $ */ #include "opt_compat.h" @@ -1079,8 +1079,12 @@ if (bspst - td->td_kstack < s.ndirty) __asm __volatile("flushrs;;"); __asm __volatile("mov ar.rsc=3"); + kstk = (uint64_t*)td->td_kstack; ustk = (uint64_t*)s.bspstore; - kstk = (uint64_t*)td->td_kstack; + if ((s.bspstore & 0x1ff) == 0x1f8) { + suword64(ustk++, s.rnat); + s.rnat = 0; + } while (s.ndirty > 0) { suword64(ustk++, *kstk++); if (((uintptr_t)ustk & 0x1ff) == 0x1f8) ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#77 (text+ko) ==== @@ -43,9 +43,30 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.122 2003/09/12 07:07:48 alc Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.123 2003/09/20 19:27:48 marcel Exp $"); + +#include <sys/param.h> +#include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mman.h> +#include <sys/mutex.h> +#include <sys/proc.h> +#include <sys/sysctl.h> +#include <sys/systm.h> + +#include <vm/vm.h> +#include <vm/vm_page.h> +#include <vm/vm_map.h> +#include <vm/vm_object.h> +#include <vm/vm_pageout.h> +#include <vm/uma.h> + +#include <machine/md_var.h> +#include <machine/pal.h> + /* * Manages physical address maps. * @@ -93,38 +114,6 @@ * Kernel physically mapped cacheable */ -#include <sys/param.h> -#include <sys/kernel.h> -#include <sys/lock.h> -#include <sys/malloc.h> -#include <sys/mman.h> -#include <sys/msgbuf.h> -#include <sys/mutex.h> -#include <sys/proc.h> -#include <sys/sx.h> -#include <sys/systm.h> -#include <sys/vmmeter.h> -#include <sys/smp.h> -#include <sys/sysctl.h> - -#include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/vm_kern.h> -#include <vm/vm_page.h> -#include <vm/vm_map.h> -#include <vm/vm_object.h> -#include <vm/vm_extern.h> -#include <vm/vm_pageout.h> -#include <vm/vm_pager.h> -#include <vm/uma.h> -#include <vm/uma_int.h> - -#include <sys/user.h> - -#include <machine/cpu.h> -#include <machine/pal.h> -#include <machine/md_var.h> - /* XXX move to a header. */ extern u_int64_t ia64_gateway_page[]; @@ -506,50 +495,6 @@ map_gateway_page(); } -void * -uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) -{ - static vm_pindex_t color; - vm_page_t m; - int pflags; - void *va; - - *flags = UMA_SLAB_PRIV; - if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; - else - pflags = VM_ALLOC_SYSTEM; - if (wait & M_ZERO) - pflags |= VM_ALLOC_ZERO; - - for (;;) { - m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ); - if (m == NULL) { - if (wait & M_NOWAIT) - return (NULL); - else - VM_WAIT; - } else - break; - } - - va = (void *)IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(m)); - if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) - bzero(va, PAGE_SIZE); - return (va); -} - -void -uma_small_free(void *mem, int size, u_int8_t flags) -{ - vm_page_t m; - - m = PHYS_TO_VM_PAGE(IA64_RR_MASK((u_int64_t)mem)); - vm_page_lock_queues(); - vm_page_free(m); - vm_page_unlock_queues(); -} - /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap ==== //depot/projects/ia64/sys/kern/linker_if.m#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/kern/linker_if.m,v 1.4 2001/10/30 15:21:45 green Exp $ +# $FreeBSD: src/sys/kern/linker_if.m,v 1.5 2003/09/20 17:39:32 dfr Exp $ # #include <sys/linker.h> @@ -102,6 +102,6 @@ const char* filename; linker_file_t* result; }; -STATICMETHOD int link_preload_finish { +METHOD int link_preload_finish { linker_file_t file; }; ==== //depot/projects/ia64/sys/pci/if_sk.c#18 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $OpenBSD: if_sk.c,v 1.33 2003/08/12 05:23:06 nate Exp $ */ + /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -31,6 +33,22 @@ */ /* + * Copyright (c) 2003 Nathan L. Binkert <binkertn@umich.edu> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports * the SK-984x series adapters, both single port and dual port. * References: @@ -67,7 +85,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.64 2003/08/22 07:13:21 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.65 2003/09/20 10:53:08 wilko Exp $"); #include <sys/param.h> #include <sys/systm.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309202111.h8KLBM1G022554>