From owner-svn-src-projects@FreeBSD.ORG Tue Jul 10 01:25:27 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 511DE106564A; Tue, 10 Jul 2012 01:25:27 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 37FA98FC0A; Tue, 10 Jul 2012 01:25:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6A1PRxI051388; Tue, 10 Jul 2012 01:25:27 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6A1PQ6a051347; Tue, 10 Jul 2012 01:25:26 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201207100125.q6A1PQ6a051347@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 10 Jul 2012 01:25:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238326 - in projects/altix2: . etc etc/defaults etc/rc.d gnu/usr.bin/cc/cc_tools sbin/growfs sbin/ifconfig sbin/ipfw sbin/mdconfig share/man/man4 share/man/man5 share/syscons/keymaps s... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2012 01:25:27 -0000 Author: marcel Date: Tue Jul 10 01:25:25 2012 New Revision: 238326 URL: http://svn.freebsd.org/changeset/base/238326 Log: Merge ^/head@238324. Modified: projects/altix2/ObsoleteFiles.inc projects/altix2/etc/defaults/rc.conf projects/altix2/etc/devd.conf projects/altix2/etc/rc.d/ipfw projects/altix2/etc/rc.d/rarpd projects/altix2/gnu/usr.bin/cc/cc_tools/auto-host.h projects/altix2/sbin/growfs/growfs.c projects/altix2/sbin/ifconfig/af_inet6.c projects/altix2/sbin/ifconfig/ifconfig.8 projects/altix2/sbin/ipfw/ipfw.8 projects/altix2/sbin/mdconfig/Makefile projects/altix2/sbin/mdconfig/mdconfig.8 projects/altix2/sbin/mdconfig/mdconfig.c projects/altix2/share/man/man4/run.4 projects/altix2/share/man/man5/rc.conf.5 projects/altix2/share/syscons/keymaps/INDEX.keymaps projects/altix2/sys/amd64/amd64/fpu.c projects/altix2/sys/amd64/amd64/machdep.c projects/altix2/sys/amd64/amd64/mem.c projects/altix2/sys/amd64/include/cpufunc.h projects/altix2/sys/cam/scsi/scsi_all.c projects/altix2/sys/cam/scsi/scsi_ch.c projects/altix2/sys/cam/scsi/scsi_da.c projects/altix2/sys/dev/aac/aac_disk.c projects/altix2/sys/dev/acpica/acpi_cpu.c projects/altix2/sys/dev/acpica/acpi_powerres.c projects/altix2/sys/dev/agp/agp_i810.c projects/altix2/sys/dev/ata/chipsets/ata-via.c projects/altix2/sys/dev/ath/ath_hal/ah.c projects/altix2/sys/dev/ath/ath_hal/ah.h projects/altix2/sys/dev/ath/ath_hal/ah_debug.h projects/altix2/sys/dev/ath/ath_hal/ah_desc.h projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210.h projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211.h projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c projects/altix2/sys/dev/ath/if_ath.c projects/altix2/sys/dev/ath/if_ath_debug.c projects/altix2/sys/dev/ath/if_ath_debug.h projects/altix2/sys/dev/ath/if_ath_misc.h projects/altix2/sys/dev/ath/if_ath_rx.c projects/altix2/sys/dev/ath/if_ath_rx.h projects/altix2/sys/dev/ath/if_ath_rx_edma.c projects/altix2/sys/dev/ath/if_athvar.h projects/altix2/sys/dev/cxgbe/t4_sge.c projects/altix2/sys/dev/e1000/if_em.c projects/altix2/sys/dev/e1000/if_igb.c projects/altix2/sys/dev/md/md.c projects/altix2/sys/dev/usb/usb_pf.c projects/altix2/sys/dev/usb/usbdevs projects/altix2/sys/dev/usb/wlan/if_run.c projects/altix2/sys/fs/ntfs/ntfs_subr.c projects/altix2/sys/fs/ntfs/ntfs_subr.h projects/altix2/sys/fs/ntfs/ntfs_vfsops.c projects/altix2/sys/fs/ntfs/ntfs_vnops.c projects/altix2/sys/geom/bde/g_bde.c projects/altix2/sys/geom/geom.h projects/altix2/sys/geom/geom_aes.c projects/altix2/sys/geom/geom_disk.c projects/altix2/sys/geom/geom_disk.h projects/altix2/sys/geom/geom_slice.c projects/altix2/sys/geom/geom_subr.c projects/altix2/sys/geom/mountver/g_mountver.c projects/altix2/sys/geom/nop/g_nop.c projects/altix2/sys/geom/nop/g_nop.h projects/altix2/sys/geom/uncompress/g_uncompress.c projects/altix2/sys/geom/uzip/g_uzip.c projects/altix2/sys/i386/i386/machdep.c projects/altix2/sys/i386/i386/mem.c projects/altix2/sys/i386/include/cpufunc.h projects/altix2/sys/i386/isa/npx.c projects/altix2/sys/ia64/ia64/mp_machdep.c projects/altix2/sys/kern/kern_descrip.c projects/altix2/sys/kern/kern_exec.c projects/altix2/sys/kern/sys_process.c projects/altix2/sys/mips/nlm/board.c projects/altix2/sys/mips/nlm/dev/net/mdio.c projects/altix2/sys/mips/nlm/hal/mdio.h projects/altix2/sys/mips/nlm/xlp.h projects/altix2/sys/mips/nlm/xlp_pci.c projects/altix2/sys/net/if_bridge.c projects/altix2/sys/net/if_epair.c projects/altix2/sys/netinet/ipfw/ip_fw_log.c projects/altix2/sys/netinet/ipfw/ip_fw_table.c projects/altix2/sys/netinet/sctp_output.c projects/altix2/sys/netinet6/frag6.c projects/altix2/sys/netinet6/in6.c projects/altix2/sys/netinet6/nd6.h projects/altix2/sys/pc98/pc98/machdep.c projects/altix2/sys/sys/file.h projects/altix2/sys/sys/mdioctl.h projects/altix2/sys/sys/vmmeter.h projects/altix2/sys/vm/uma_core.c projects/altix2/sys/vm/vm_pageout.c projects/altix2/usr.bin/mkcsmapper/lex.l projects/altix2/usr.bin/mkesdb/lex.l projects/altix2/usr.sbin/acpi/acpidump/acpi.c projects/altix2/usr.sbin/ancontrol/ancontrol.c projects/altix2/usr.sbin/ndp/ndp.8 projects/altix2/usr.sbin/ndp/ndp.c projects/altix2/usr.sbin/newsyslog/newsyslog.c projects/altix2/usr.sbin/rarpd/Makefile projects/altix2/usr.sbin/rarpd/rarpd.8 projects/altix2/usr.sbin/rarpd/rarpd.c projects/altix2/usr.sbin/usbdump/usbdump.c Directory Properties: projects/altix2/ (props changed) projects/altix2/gnu/usr.bin/cc/cc_tools/ (props changed) projects/altix2/sbin/ (props changed) projects/altix2/sbin/ipfw/ (props changed) projects/altix2/share/man/man4/ (props changed) projects/altix2/sys/ (props changed) Modified: projects/altix2/ObsoleteFiles.inc ============================================================================== --- projects/altix2/ObsoleteFiles.inc Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/ObsoleteFiles.inc Tue Jul 10 01:25:25 2012 (r238326) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20120621: remove old man page +OLD_FILES+=usr/share/man/man8/vnconfig.8.gz # 20120613: auth.conf removed OLD_FILES+=etc/auth.conf OLD_FILES+=usr/share/examples/etc/auth.conf Modified: projects/altix2/etc/defaults/rc.conf ============================================================================== --- projects/altix2/etc/defaults/rc.conf Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/etc/defaults/rc.conf Tue Jul 10 01:25:25 2012 (r238326) @@ -123,6 +123,7 @@ firewall_script="/etc/rc.firewall" # Whi firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging +firewall_logif="NO" # Set to YES to create logging-pseudo interface firewall_flags="" # Flags passed to ipfw when type is a file firewall_coscripts="" # List of executables/scripts to run after # firewall starts/stops Modified: projects/altix2/etc/devd.conf ============================================================================== --- projects/altix2/etc/devd.conf Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/etc/devd.conf Tue Jul 10 01:25:25 2012 (r238326) @@ -320,7 +320,7 @@ notify 10 { notify 0 { match "system" "RCTL"; match "rule" "user:70:swap:.*"; - action "/usr/local/etc/rc.d/postgresql restart" + action "/usr/local/etc/rc.d/postgresql restart"; }; */ Modified: projects/altix2/etc/rc.d/ipfw ============================================================================== --- projects/altix2/etc/rc.d/ipfw Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/etc/rc.d/ipfw Tue Jul 10 01:25:25 2012 (r238326) @@ -57,6 +57,10 @@ ipfw_start() echo 'Firewall logging enabled.' sysctl net.inet.ip.fw.verbose=1 >/dev/null fi + if checkyesno firewall_logif; then + ifconfig ipfw0 create + echo 'Firewall logging pseudo-interface (ipfw0) created.' + fi } ipfw_poststart() Modified: projects/altix2/etc/rc.d/rarpd ============================================================================== --- projects/altix2/etc/rc.d/rarpd Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/etc/rc.d/rarpd Tue Jul 10 01:25:25 2012 (r238326) @@ -13,8 +13,9 @@ name="rarpd" rcvar="rarpd_enable" command="/usr/sbin/${name}" -pidfile="/var/run/${name}.pid" required_files="/etc/ethers" load_rc_config $name +pidfile="${rarpd_pidfile:-/var/run/${name}.pid}" + run_rc_command "$1" Modified: projects/altix2/gnu/usr.bin/cc/cc_tools/auto-host.h ============================================================================== --- projects/altix2/gnu/usr.bin/cc/cc_tools/auto-host.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/gnu/usr.bin/cc/cc_tools/auto-host.h Tue Jul 10 01:25:25 2012 (r238326) @@ -261,7 +261,7 @@ /* Define if your assembler supports R_PPC_REL16 relocs. */ #ifndef USED_FOR_TARGET -/* #undef HAVE_AS_REL16 */ +#define HAVE_AS_REL16 #endif Modified: projects/altix2/sbin/growfs/growfs.c ============================================================================== --- projects/altix2/sbin/growfs/growfs.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sbin/growfs/growfs.c Tue Jul 10 01:25:25 2012 (r238326) @@ -803,7 +803,6 @@ updcsloc(time_t modtime, int fsi, int fs DBG_FUNC("updcsloc") struct csum *cs; int ocscg, ncscg; - int blocks; ufs2_daddr_t d; int lcs = 0; int block; @@ -820,8 +819,6 @@ updcsloc(time_t modtime, int fsi, int fs } ocscg = dtog(&osblock, osblock.fs_csaddr); cs = fscs + ocscg; - blocks = 1 + howmany(sblock.fs_cssize, sblock.fs_bsize) - - howmany(osblock.fs_cssize, osblock.fs_bsize); /* * Read original cylinder group from disk, and make a copy. Modified: projects/altix2/sbin/ifconfig/af_inet6.c ============================================================================== --- projects/altix2/sbin/ifconfig/af_inet6.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sbin/ifconfig/af_inet6.c Tue Jul 10 01:25:25 2012 (r238326) @@ -509,8 +509,6 @@ static struct cmd inet6_cmds[] = { DEF_CMD("-ifdisabled", -ND6_IFF_IFDISABLED, setnd6flags), DEF_CMD("nud", ND6_IFF_PERFORMNUD, setnd6flags), DEF_CMD("-nud", -ND6_IFF_PERFORMNUD, setnd6flags), - DEF_CMD("prefer_source",ND6_IFF_PREFER_SOURCE, setnd6flags), - DEF_CMD("-prefer_source",-ND6_IFF_PREFER_SOURCE,setnd6flags), DEF_CMD("auto_linklocal",ND6_IFF_AUTO_LINKLOCAL,setnd6flags), DEF_CMD("-auto_linklocal",-ND6_IFF_AUTO_LINKLOCAL,setnd6flags), DEF_CMD_ARG("pltime", setip6pltime), Modified: projects/altix2/sbin/ifconfig/ifconfig.8 ============================================================================== --- projects/altix2/sbin/ifconfig/ifconfig.8 Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sbin/ifconfig/ifconfig.8 Tue Jul 10 01:25:25 2012 (r238326) @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd May 27, 2012 +.Dd July 9, 2012 .Dt IFCONFIG 8 .Os .Sh NAME @@ -716,12 +716,6 @@ Set a flag to enable Neighbor Unreachabi .It Cm -nud Clear a flag .Cm nud . -.It Cm prefer_source -Set a flag to prefer addresses on the interface as candidates of the -source address for outgoing packets. -.It Cm -prefer_source -Clear a flag -.Cm prefer_source . .El .Pp The following parameters are specific to cloning Modified: projects/altix2/sbin/ipfw/ipfw.8 ============================================================================== --- projects/altix2/sbin/ipfw/ipfw.8 Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sbin/ipfw/ipfw.8 Tue Jul 10 01:25:25 2012 (r238326) @@ -1,7 +1,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 3, 2012 +.Dd July 9, 2012 .Dt IPFW 8 .Os .Sh NAME @@ -560,7 +560,22 @@ is set to 0 (default), one can use .Xr bpf 4 attached to the .Li ipfw0 -pseudo interface. There is no overhead if no +pseudo interface. +This pseudo interface can be created after a boot +manually by using the following command: +.Bd -literal -offset indent +# ifconfig ipfw0 create +.Ed +.Pp +Or, automatically at boot time by adding the following +line to the +.Xr rc.conf 5 +file: +.Bd -literal -offset indent +firewall_logif="YES" +.Ed +.Pp +There is no overhead if no .Xr bpf 4 is attached to the pseudo interface. .Pp Modified: projects/altix2/sbin/mdconfig/Makefile ============================================================================== --- projects/altix2/sbin/mdconfig/Makefile Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sbin/mdconfig/Makefile Tue Jul 10 01:25:25 2012 (r238326) @@ -2,7 +2,6 @@ PROG= mdconfig MAN= mdconfig.8 -MLINKS= mdconfig.8 vnconfig.8 DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} LDADD= -lutil -lgeom -lbsdxml -lsbuf Modified: projects/altix2/sbin/mdconfig/mdconfig.8 ============================================================================== --- projects/altix2/sbin/mdconfig/mdconfig.8 Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sbin/mdconfig/mdconfig.8 Tue Jul 10 01:25:25 2012 (r238326) @@ -64,6 +64,11 @@ .Fl u Ar unit .Op Fl o Oo Cm no Oc Ns Ar force .Nm +.Fl r +.Fl u Ar unit +.Fl s Ar size +.Op Fl o Oo Cm no Oc Ns Ar force +.Nm .Fl l .Op Fl n .Op Fl v @@ -85,6 +90,8 @@ This will configure and attach a memory parameters specified and attach it to the system. .It Fl d Detach a memory disk from the system and release all resources. +.It Fl r +Resize a memory disk. .It Fl t Ar type Select the type of the memory disk. .Bl -tag -width "malloc" Modified: projects/altix2/sbin/mdconfig/mdconfig.c ============================================================================== --- projects/altix2/sbin/mdconfig/mdconfig.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sbin/mdconfig/mdconfig.c Tue Jul 10 01:25:25 2012 (r238326) @@ -54,7 +54,7 @@ #include static struct md_ioctl mdio; -static enum {UNSET, ATTACH, DETACH, LIST} action = UNSET; +static enum {UNSET, ATTACH, DETACH, RESIZE, LIST} action = UNSET; static int nflag; static void usage(void); @@ -81,6 +81,7 @@ usage(void) " [-s size] [-S sectorsize] [-u unit]\n" " [-x sectors/track] [-y heads/cylinder]\n" " mdconfig -d -u unit [-o [no]force]\n" +" mdconfig -r -u unit -s size [-o [no]force]\n" " mdconfig -l [-v] [-n] [-u unit]\n" " mdconfig file\n"); fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n"); @@ -96,7 +97,7 @@ main(int argc, char **argv) { int ch, fd, i, vflag; char *p; - char *fflag = NULL, *tflag = NULL, *uflag = NULL; + char *fflag = NULL, *sflag = NULL, *tflag = NULL, *uflag = NULL; bzero(&mdio, sizeof(mdio)); mdio.md_file = malloc(PATH_MAX); @@ -108,25 +109,32 @@ main(int argc, char **argv) if (argc == 1) usage(); - while ((ch = getopt(argc, argv, "ab:df:lno:s:S:t:u:vx:y:")) != -1) { + while ((ch = getopt(argc, argv, "ab:df:lno:rs:S:t:u:vx:y:")) != -1) { switch (ch) { case 'a': if (action != UNSET && action != ATTACH) - errx(1, - "-a is mutually exclusive with -d and -l"); + errx(1, "-a is mutually exclusive " + "with -d, -r, and -l"); action = ATTACH; break; case 'd': if (action != UNSET && action != DETACH) - errx(1, - "-d is mutually exclusive with -a and -l"); + errx(1, "-d is mutually exclusive " + "with -a, -r, and -l"); action = DETACH; mdio.md_options |= MD_AUTOUNIT; break; + case 'r': + if (action != UNSET && action != RESIZE) + errx(1, "-r is mutually exclusive " + "with -a, -d, and -l"); + action = RESIZE; + mdio.md_options |= MD_AUTOUNIT; + break; case 'l': if (action != UNSET && action != LIST) - errx(1, - "-l is mutually exclusive with -a and -d"); + errx(1, "-l is mutually exclusive " + "with -a, -r, and -d"); action = LIST; mdio.md_options |= MD_AUTOUNIT; break; @@ -188,6 +196,9 @@ main(int argc, char **argv) mdio.md_sectorsize = strtoul(optarg, &p, 0); break; case 's': + if (sflag != NULL) + errx(1, "-s can be passed only once"); + sflag = optarg; mdio.md_mediasize = (off_t)strtoumax(optarg, &p, 0); if (p == NULL || *p == '\0') mdio.md_mediasize *= DEV_BSIZE; @@ -242,7 +253,7 @@ main(int argc, char **argv) mdio.md_type = MD_VNODE; mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; - } else if (mdio.md_mediasize != 0) { + } else if (sflag != NULL) { /* Imply ``-t swap'' */ mdio.md_type = MD_SWAP; mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | @@ -276,15 +287,15 @@ main(int argc, char **argv) } if ((mdio.md_type == MD_MALLOC || mdio.md_type == MD_SWAP) && - mdio.md_mediasize == 0) + sflag == NULL) errx(1, "must specify -s for -t malloc or -t swap"); if (mdio.md_type == MD_VNODE && mdio.md_file[0] == '\0') errx(1, "must specify -f for -t vnode"); } else { if (mdio.md_sectorsize != 0) errx(1, "-S can only be used with -a"); - if (mdio.md_mediasize != 0) - errx(1, "-s can only be used with -a"); + if (action != RESIZE && sflag != NULL) + errx(1, "-s can only be used with -a and -r"); if (mdio.md_fwsectors != 0) errx(1, "-x can only be used with -a"); if (mdio.md_fwheads != 0) @@ -295,13 +306,20 @@ main(int argc, char **argv) errx(1, "-t can only be used with -a"); if (argc > 0) errx(1, "file can only be used with -a"); - if (action != DETACH && (mdio.md_options & ~MD_AUTOUNIT) != 0) - errx(1, "-o can only be used with -a and -d"); + if ((action != DETACH && action != RESIZE) && + (mdio.md_options & ~MD_AUTOUNIT) != 0) + errx(1, "-o can only be used with -a, -d, and -r"); if (action == DETACH && (mdio.md_options & ~(MD_FORCE | MD_AUTOUNIT)) != 0) errx(1, "only -o [no]force can be used with -d"); + if (action == RESIZE && + (mdio.md_options & ~(MD_FORCE | MD_RESERVE | MD_AUTOUNIT)) != 0) + errx(1, "only -o [no]force and -o [no]reserve can be used with -r"); } + if (action == RESIZE && sflag == NULL) + errx(1, "must specify -s for -r"); + if (action != LIST && vflag == OPT_VERBOSE) errx(1, "-v can only be used with -l"); @@ -333,6 +351,12 @@ main(int argc, char **argv) i = ioctl(fd, MDIOCDETACH, &mdio); if (i < 0) err(1, "ioctl(/dev/%s)", MDCTL_NAME); + } else if (action == RESIZE) { + if (mdio.md_options & MD_AUTOUNIT) + errx(1, "-r requires -u"); + i = ioctl(fd, MDIOCRESIZE, &mdio); + if (i < 0) + err(1, "ioctl(/dev/%s)", MDCTL_NAME); } else if (action == LIST) { if (mdio.md_options & MD_AUTOUNIT) { /* @@ -342,7 +366,6 @@ main(int argc, char **argv) md_list(NULL, OPT_LIST | vflag); } else return (md_query(uflag)); - } else usage(); close(fd); Modified: projects/altix2/share/man/man4/run.4 ============================================================================== --- projects/altix2/share/man/man4/run.4 Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/share/man/man4/run.4 Tue Jul 10 01:25:25 2012 (r238326) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 7, 2012 +.Dd July 9, 2012 .Dt RUN 4 .Os .Sh NAME @@ -122,6 +122,8 @@ driver supports the following wireless a .It Buffalo WLI-UC-G300N .It Buffalo WLI-UC-G301N .It Buffalo WLI-UC-GN +.It Buffalo WLI-UC-GNM +.It Buffalo WLI-UC-GNM2 .It Corega CG-WLUSB2GNL .It Corega CG-WLUSB2GNR .It Corega CG-WLUSB300AGN @@ -142,6 +144,7 @@ driver supports the following wireless a .It Hercules HWNU-300 .It Linksys WUSB54GC v3 .It Linksys WUSB600N +.It Logitec LAN-W150N/U2 .It Mvix Nubbin MS-811N .It Planex GW-USMicroN .It Planex GW-US300MiniS Modified: projects/altix2/share/man/man5/rc.conf.5 ============================================================================== --- projects/altix2/share/man/man5/rc.conf.5 Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/share/man/man5/rc.conf.5 Tue Jul 10 01:25:25 2012 (r238326) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 6, 2012 +.Dd July 9, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -501,6 +501,16 @@ to enable firewall event logging. This is equivalent to the .Dv IPFIREWALL_VERBOSE kernel option. +.It Va firewall_logif +.Pq Vt bool +Set to +.Dq Li YES +to create pseudo interface +.Li ipfw0 +for logging. +For more details, see +.Xr ipfw 8 +manual page. .It Va firewall_flags .Pq Vt str Flags passed to Modified: projects/altix2/share/syscons/keymaps/INDEX.keymaps ============================================================================== --- projects/altix2/share/syscons/keymaps/INDEX.keymaps Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/share/syscons/keymaps/INDEX.keymaps Tue Jul 10 01:25:25 2012 (r238326) @@ -378,6 +378,8 @@ ru.koi8-r.win.kbd:pt:Russo koi8-r (winke ru.koi8-r.win.kbd:es:Ruso koi8-r (winkeys) ru.koi8-r.win.kbd:uk:Рос╕йська koi8-r (winkeys) +spanish.dvorak.kbd:en:Spanish Dvorak + spanish.iso.kbd:en:Spanish ISO-8859-1 spanish.iso.kbd:de:Spanisch ISO-8859-1 spanish.iso.kbd:fr:Espagnol ISO-8859-1 Modified: projects/altix2/sys/amd64/amd64/fpu.c ============================================================================== --- projects/altix2/sys/amd64/amd64/fpu.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/amd64/amd64/fpu.c Tue Jul 10 01:25:25 2012 (r238326) @@ -73,10 +73,6 @@ __FBSDID("$FreeBSD$"); #define fxrstor(addr) __asm __volatile("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) #define ldmxcsr(csr) __asm __volatile("ldmxcsr %0" : : "m" (csr)) -#define start_emulating() __asm __volatile( \ - "smsw %%ax; orb %0,%%al; lmsw %%ax" \ - : : "n" (CR0_TS) : "ax") -#define stop_emulating() __asm __volatile("clts") static __inline void xrstor(char *addr, uint64_t mask) @@ -109,13 +105,14 @@ void fnstsw(caddr_t addr); void fxsave(caddr_t addr); void fxrstor(caddr_t addr); void ldmxcsr(u_int csr); -void start_emulating(void); -void stop_emulating(void); void xrstor(char *addr, uint64_t mask); void xsave(char *addr, uint64_t mask); #endif /* __GNUCLIKE_ASM && !lint */ +#define start_emulating() load_cr0(rcr0() | CR0_TS) +#define stop_emulating() clts() + #define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save->sv_env.en_cw) #define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save->sv_env.en_sw) Modified: projects/altix2/sys/amd64/amd64/machdep.c ============================================================================== --- projects/altix2/sys/amd64/amd64/machdep.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/amd64/amd64/machdep.c Tue Jul 10 01:25:25 2012 (r238326) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -206,6 +207,8 @@ struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; +struct mem_range_softc mem_range_softc; + struct mtx dt_lock; /* lock for GDT and LDT */ static void Modified: projects/altix2/sys/amd64/amd64/mem.c ============================================================================== --- projects/altix2/sys/amd64/amd64/mem.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/amd64/amd64/mem.c Tue Jul 10 01:25:25 2012 (r238326) @@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$"); */ MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); -struct mem_range_softc mem_range_softc; - /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) Modified: projects/altix2/sys/amd64/include/cpufunc.h ============================================================================== --- projects/altix2/sys/amd64/include/cpufunc.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/amd64/include/cpufunc.h Tue Jul 10 01:25:25 2012 (r238326) @@ -107,6 +107,13 @@ clflush(u_long addr) } static __inline void +clts(void) +{ + + __asm __volatile("clts"); +} + +static __inline void disable_intr(void) { __asm __volatile("cli" : : : "memory"); @@ -702,6 +709,9 @@ intr_restore(register_t rflags) int breakpoint(void); u_int bsfl(u_int mask); u_int bsrl(u_int mask); +void clflush(u_long addr); +void clts(void); +void cpuid_count(u_int ax, u_int cx, u_int *p); void disable_intr(void); void do_cpuid(u_int ax, u_int *p); void enable_intr(void); Modified: projects/altix2/sys/cam/scsi/scsi_all.c ============================================================================== --- projects/altix2/sys/cam/scsi/scsi_all.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/cam/scsi/scsi_all.c Tue Jul 10 01:25:25 2012 (r238326) @@ -4147,9 +4147,9 @@ scsi_sense_desc_sbuf(struct sbuf *sb, st struct scsi_inquiry_data *inq_data, struct scsi_sense_desc_header *header) { - int i, found; + int i; - for (i = 0, found = 0; i < (sizeof(scsi_sense_printers) / + for (i = 0; i < (sizeof(scsi_sense_printers) / sizeof(scsi_sense_printers[0])); i++) { struct scsi_sense_desc_printer *printer; Modified: projects/altix2/sys/cam/scsi/scsi_ch.c ============================================================================== --- projects/altix2/sys/cam/scsi/scsi_ch.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/cam/scsi/scsi_ch.c Tue Jul 10 01:25:25 2012 (r238326) @@ -433,17 +433,11 @@ static int chclose(struct cdev *dev, int flag, int fmt, struct thread *td) { struct cam_periph *periph; - struct ch_softc *softc; - int error; - - error = 0; periph = (struct cam_periph *)dev->si_drv1; if (periph == NULL) return(ENXIO); - softc = (struct ch_softc *)periph->softc; - cam_periph_release(periph); return(0); Modified: projects/altix2/sys/cam/scsi/scsi_da.c ============================================================================== --- projects/altix2/sys/cam/scsi/scsi_da.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/cam/scsi/scsi_da.c Tue Jul 10 01:25:25 2012 (r238326) @@ -2644,6 +2644,8 @@ dasetgeom(struct cam_periph *periph, uin softc->disk->d_flags |= DISKFLAG_CANDELETE; else softc->disk->d_flags &= ~DISKFLAG_CANDELETE; + + disk_resize(softc->disk); } static void Modified: projects/altix2/sys/dev/aac/aac_disk.c ============================================================================== --- projects/altix2/sys/dev/aac/aac_disk.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/aac/aac_disk.c Tue Jul 10 01:25:25 2012 (r238326) @@ -332,9 +332,6 @@ aac_disk_dump(void *arg, void *virtual, void aac_biodone(struct bio *bp) { - struct aac_disk *sc; - - sc = (struct aac_disk *)bp->bio_disk->d_drv1; fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); if (bp->bio_flags & BIO_ERROR) Modified: projects/altix2/sys/dev/acpica/acpi_cpu.c ============================================================================== --- projects/altix2/sys/dev/acpica/acpi_cpu.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/acpica/acpi_cpu.c Tue Jul 10 01:25:25 2012 (r238326) @@ -629,6 +629,7 @@ acpi_cpu_generic_cx_probe(struct acpi_cp cx_ptr->type = ACPI_STATE_C1; cx_ptr->trans_lat = 0; cx_ptr++; + sc->cpu_non_c3 = sc->cpu_cx_count; sc->cpu_cx_count++; /* @@ -653,6 +654,7 @@ acpi_cpu_generic_cx_probe(struct acpi_cp cx_ptr->type = ACPI_STATE_C2; cx_ptr->trans_lat = AcpiGbl_FADT.C2Latency; cx_ptr++; + sc->cpu_non_c3 = sc->cpu_cx_count; sc->cpu_cx_count++; } } @@ -670,6 +672,7 @@ acpi_cpu_generic_cx_probe(struct acpi_cp cx_ptr->trans_lat = AcpiGbl_FADT.C3Latency; cx_ptr++; sc->cpu_cx_count++; + cpu_can_deep_sleep = 1; } } } @@ -746,13 +749,13 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *s /* This is the first C1 state. Use the reserved slot. */ sc->cpu_cx_states[0] = *cx_ptr; } else { - sc->cpu_non_c3 = i; + sc->cpu_non_c3 = sc->cpu_cx_count; cx_ptr++; sc->cpu_cx_count++; } continue; case ACPI_STATE_C2: - sc->cpu_non_c3 = i; + sc->cpu_non_c3 = sc->cpu_cx_count; break; case ACPI_STATE_C3: default: @@ -761,7 +764,8 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *s "acpi_cpu%d: C3[%d] not available.\n", device_get_unit(sc->cpu_dev), i)); continue; - } + } else + cpu_can_deep_sleep = 1; break; } @@ -885,16 +889,10 @@ acpi_cpu_cx_list(struct acpi_cpu_softc * /* * Set up the list of Cx states */ - sc->cpu_non_c3 = 0; sbuf_new(&sb, sc->cpu_cx_supported, sizeof(sc->cpu_cx_supported), SBUF_FIXEDLEN); - for (i = 0; i < sc->cpu_cx_count; i++) { + for (i = 0; i < sc->cpu_cx_count; i++) sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat); - if (sc->cpu_cx_states[i].type < ACPI_STATE_C3) - sc->cpu_non_c3 = i; - else - cpu_can_deep_sleep = 1; - } sbuf_trim(&sb); sbuf_finish(&sb); } @@ -920,14 +918,12 @@ acpi_cpu_startup_cx(struct acpi_cpu_soft (void *)sc, 0, acpi_cpu_usage_sysctl, "A", "percent usage for each Cx state"); -#ifdef notyet /* Signal platform that we can handle _CST notification. */ if (!cpu_cx_generic && cpu_cst_cnt != 0) { ACPI_LOCK(acpi); AcpiOsWritePort(cpu_smi_cmd, cpu_cst_cnt, 8); ACPI_UNLOCK(acpi); } -#endif } /* Modified: projects/altix2/sys/dev/acpica/acpi_powerres.c ============================================================================== --- projects/altix2/sys/dev/acpica/acpi_powerres.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/acpica/acpi_powerres.c Tue Jul 10 01:25:25 2012 (r238326) @@ -314,7 +314,6 @@ acpi_pwr_switch_consumer(ACPI_HANDLE con ACPI_OBJECT *reslist_object; ACPI_STATUS status; char *method_name, *reslist_name; - int res_changed; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -445,7 +444,7 @@ acpi_pwr_switch_consumer(ACPI_HANDLE con * Now we are ready to switch, so kill off any current power * resource references. */ - res_changed = acpi_pwr_dereference_resource(pc); + acpi_pwr_dereference_resource(pc); /* * Add new power resource references, if we have any. Traverse the @@ -457,7 +456,6 @@ acpi_pwr_switch_consumer(ACPI_HANDLE con reslist_object->Package.Count)); acpi_ForeachPackageObject(reslist_object, acpi_pwr_reference_resource, pc); - res_changed = 1; } /* Modified: projects/altix2/sys/dev/agp/agp_i810.c ============================================================================== --- projects/altix2/sys/dev/agp/agp_i810.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/agp/agp_i810.c Tue Jul 10 01:25:25 2012 (r238326) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include MALLOC_DECLARE(M_AGP); @@ -1438,7 +1439,7 @@ agp_i810_attach(device_t dev) if (error) return (error); - if (ptoa((vm_paddr_t)realmem) > + if (ptoa((vm_paddr_t)Maxmem) > (1ULL << sc->match->driver->busdma_addr_mask_sz) - 1) { device_printf(dev, "agp_i810 does not support physical " "memory above %ju.\n", (uintmax_t)(1ULL << Modified: projects/altix2/sys/dev/ata/chipsets/ata-via.c ============================================================================== --- projects/altix2/sys/dev/ata/chipsets/ata-via.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ata/chipsets/ata-via.c Tue Jul 10 01:25:25 2012 (r238326) @@ -472,12 +472,10 @@ ata_via_sata_reset(device_t dev) static int ata_via_sata_scr_read(device_t dev, int port, int reg, u_int32_t *result) { - struct ata_channel *ch; device_t parent; uint32_t val; parent = device_get_parent(dev); - ch = device_get_softc(dev); port = (port == 1) ? 1 : 0; switch (reg) { case ATA_SSTATUS: @@ -520,12 +518,10 @@ ata_via_sata_scr_read(device_t dev, int static int ata_via_sata_scr_write(device_t dev, int port, int reg, u_int32_t value) { - struct ata_channel *ch; device_t parent; uint32_t val; parent = device_get_parent(dev); - ch = device_get_softc(dev); port = (port == 1) ? 1 : 0; switch (reg) { case ATA_SERROR: Modified: projects/altix2/sys/dev/ath/ath_hal/ah.c ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ah.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ah.c Tue Jul 10 01:25:25 2012 (r238326) @@ -619,6 +619,33 @@ ath_hal_getcapability(struct ath_hal *ah return pCap->hal4AddrAggrSupport ? HAL_OK : HAL_ENOTSUPP; case HAL_CAP_EXT_CHAN_DFS: return pCap->halExtChanDfsSupport ? HAL_OK : HAL_ENOTSUPP; + case HAL_CAP_NUM_TXMAPS: + *result = pCap->halNumTxMaps; + return HAL_OK; + case HAL_CAP_TXDESCLEN: + *result = pCap->halTxDescLen; + return HAL_OK; + case HAL_CAP_TXSTATUSLEN: + *result = pCap->halTxStatusLen; + return HAL_OK; + case HAL_CAP_RXSTATUSLEN: + *result = pCap->halRxStatusLen; + return HAL_OK; + case HAL_CAP_RXFIFODEPTH: + switch (capability) { + case HAL_RX_QUEUE_HP: + *result = pCap->halRxHpFifoDepth; + return HAL_OK; + case HAL_RX_QUEUE_LP: + *result = pCap->halRxLpFifoDepth; + return HAL_OK; + default: + return HAL_ENOTSUPP; + } + case HAL_CAP_RXBUFSIZE: + case HAL_CAP_NUM_MR_RETRIES: + return HAL_EINVAL; /* XXX not yet */ + case HAL_CAP_COMBINED_RADAR_RSSI: return pCap->halUseCombinedRadarRssi ? HAL_OK : HAL_ENOTSUPP; case HAL_CAP_AUTO_SLEEP: @@ -667,6 +694,8 @@ ath_hal_getcapability(struct ath_hal *ah return pCap->halHasBBReadWar? HAL_OK : HAL_ENOTSUPP; case HAL_CAP_SERIALISE_WAR: /* PCI register serialisation */ return pCap->halSerialiseRegWar ? HAL_OK : HAL_ENOTSUPP; + case HAL_CAP_ENHANCED_DMA_SUPPORT: + return pCap->halEnhancedDmaSupport ? HAL_OK : HAL_ENOTSUPP; default: return HAL_EINVAL; } Modified: projects/altix2/sys/dev/ath/ath_hal/ah.h ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ah.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ah.h Tue Jul 10 01:25:25 2012 (r238326) @@ -149,9 +149,14 @@ typedef enum { HAL_CAP_TS = 72, /* 3 stream */ HAL_CAP_ENHANCED_DMA_SUPPORT = 75, /* DMA FIFO support */ + HAL_CAP_NUM_TXMAPS = 76, /* Number of buffers in a transmit descriptor */ + HAL_CAP_TXDESCLEN = 77, /* Length of transmit descriptor */ + HAL_CAP_TXSTATUSLEN = 78, /* Length of transmit status descriptor */ + HAL_CAP_RXSTATUSLEN = 79, /* Length of transmit status descriptor */ + HAL_CAP_RXFIFODEPTH = 80, /* Receive hardware FIFO depth */ + HAL_CAP_RXBUFSIZE = 81, /* Receive Buffer Length */ + HAL_CAP_NUM_MR_RETRIES = 82, /* limit on multirate retries */ - HAL_CAP_RXBUFSIZE = 81, - HAL_CAP_NUM_MR_RETRIES = 82, HAL_CAP_OL_PWRCTRL = 84, /* Open loop TX power control */ HAL_CAP_BB_PANIC_WATCHDOG = 92, @@ -210,7 +215,7 @@ typedef enum { typedef enum { HAL_RX_QUEUE_HP = 0, /* high priority recv queue */ - HAL_RX_QUEUE_LP = 0, /* low priority recv queue */ + HAL_RX_QUEUE_LP = 1, /* low priority recv queue */ } HAL_RX_QUEUE; #define HAL_NUM_RX_QUEUES 2 /* max possible # of queues */ @@ -1078,8 +1083,8 @@ struct ath_hal { const struct ath_desc *ds, int *rates, int *tries); /* Receive Functions */ - uint32_t __ahdecl(*ah_getRxDP)(struct ath_hal*); - void __ahdecl(*ah_setRxDP)(struct ath_hal*, uint32_t rxdp); + uint32_t __ahdecl(*ah_getRxDP)(struct ath_hal*, HAL_RX_QUEUE); + void __ahdecl(*ah_setRxDP)(struct ath_hal*, uint32_t rxdp, HAL_RX_QUEUE); void __ahdecl(*ah_enableReceive)(struct ath_hal*); HAL_BOOL __ahdecl(*ah_stopDmaReceive)(struct ath_hal*); void __ahdecl(*ah_startPcuReceive)(struct ath_hal*); Modified: projects/altix2/sys/dev/ath/ath_hal/ah_debug.h ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ah_debug.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ah_debug.h Tue Jul 10 01:25:25 2012 (r238326) @@ -47,6 +47,11 @@ enum { HAL_DEBUG_DIVERSITY = 0x00100000, /* diversity debugging */ HAL_DEBUG_DFS = 0x00200000, /* DFS debugging */ HAL_DEBUG_HANG = 0x00400000, /* BB/MAC hang debugging */ + HAL_DEBUG_CALIBRATE = 0x00800000, /* setup calibration */ + HAL_DEBUG_POWER_MGMT = 0x01000000, /* power calibration */ + HAL_DEBUG_CHANNEL = 0x02000000, + HAL_DEBUG_QUEUE = 0x04000000, + HAL_DEBUG_PRINT_REG = 0x08000000, HAL_DEBUG_UNMASKABLE = 0x80000000, /* always printed */ HAL_DEBUG_ANY = 0xffffffff Modified: projects/altix2/sys/dev/ath/ath_hal/ah_desc.h ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ah_desc.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ah_desc.h Tue Jul 10 01:25:25 2012 (r238326) @@ -122,11 +122,12 @@ struct ath_rx_status { int8_t rs_rssi_ext[3]; /* rx frame RSSI [ext, chain 0-2] */ uint8_t rs_isaggr; /* is part of the aggregate */ uint8_t rs_moreaggr; /* more frames in aggr to follow */ + uint16_t rs_flags; /* misc flags */ uint8_t rs_num_delims; /* number of delims in aggr */ - uint8_t rs_flags; /* misc flags */ + uint8_t rs_spare0; /* padding */ uint32_t rs_evm0; /* evm bytes */ uint32_t rs_evm1; - uint32_t rs_evm2; + uint32_t rs_evm2; uint32_t rs_evm3; /* needed for ar9300 and later */ uint32_t rs_evm4; /* needed for ar9300 and later */ #endif /* AH_SUPPORT_AR5416 */ @@ -138,16 +139,19 @@ struct ath_rx_status { #define HAL_RXERR_FIFO 0x04 /* fifo overrun */ #define HAL_RXERR_DECRYPT 0x08 /* non-Michael decrypt error */ #define HAL_RXERR_MIC 0x10 /* Michael MIC decrypt error */ +#define HAL_RXERR_INCOMP 0x20 /* Rx Desc processing is incomplete */ +#define HAL_RXERR_KEYMISS 0x40 /* Key not found in keycache */ /* bits found in rs_flags */ -#define HAL_RX_MORE 0x01 /* more descriptors follow */ -#define HAL_RX_MORE_AGGR 0x02 /* more frames in aggr */ -#define HAL_RX_GI 0x04 /* full gi */ -#define HAL_RX_2040 0x08 /* 40 Mhz */ -#define HAL_RX_DELIM_CRC_PRE 0x10 /* crc error in delimiter pre */ -#define HAL_RX_DELIM_CRC_POST 0x20 /* crc error in delim after */ -#define HAL_RX_DECRYPT_BUSY 0x40 /* decrypt was too slow */ -#define HAL_RX_HI_RX_CHAIN 0x80 /* SM power save: hi Rx chain control */ +#define HAL_RX_MORE 0x0001 /* more descriptors follow */ +#define HAL_RX_MORE_AGGR 0x0002 /* more frames in aggr */ +#define HAL_RX_GI 0x0004 /* full gi */ +#define HAL_RX_2040 0x0008 /* 40 Mhz */ +#define HAL_RX_DELIM_CRC_PRE 0x0010 /* crc error in delimiter pre */ +#define HAL_RX_DELIM_CRC_POST 0x0020 /* crc error in delim after */ +#define HAL_RX_DECRYPT_BUSY 0x0040 /* decrypt was too slow */ +#define HAL_RX_HI_RX_CHAIN 0x0080 /* SM power save: hi Rx chain control */ +#define HAL_RX_IS_APSD 0x0100 /* Is ASPD trigger frame */ enum { HAL_PHYERR_UNDERRUN = 0, /* Transmit underrun */ @@ -178,6 +182,8 @@ enum { HAL_PHYERR_HT_CRC_ERROR = 34, /* */ HAL_PHYERR_HT_LENGTH_ILLEGAL = 35, /* */ HAL_PHYERR_HT_RATE_ILLEGAL = 36, /* */ + + HAL_PHYERR_SPECTRAL = 38, }; /* value found in rs_keyix to mark invalid entries */ Modified: projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210.h ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210.h Tue Jul 10 01:25:25 2012 (r238326) @@ -180,8 +180,8 @@ extern void ar5210IntrReqTxDesc(struct extern HAL_BOOL ar5210GetTxCompletionRates(struct ath_hal *ah, const struct ath_desc *, int *rates, int *tries); -extern uint32_t ar5210GetRxDP(struct ath_hal *); -extern void ar5210SetRxDP(struct ath_hal *, uint32_t rxdp); +extern uint32_t ar5210GetRxDP(struct ath_hal *, HAL_RX_QUEUE); +extern void ar5210SetRxDP(struct ath_hal *, uint32_t rxdp, HAL_RX_QUEUE); extern void ar5210EnableReceive(struct ath_hal *); extern HAL_BOOL ar5210StopDmaReceive(struct ath_hal *); extern void ar5210StartPcuReceive(struct ath_hal *); Modified: projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c Tue Jul 10 01:25:25 2012 (r238326) @@ -30,8 +30,10 @@ * Get the RXDP. */ uint32_t -ar5210GetRxDP(struct ath_hal *ah) +ar5210GetRxDP(struct ath_hal *ah, HAL_RX_QUEUE qtype) { + + HALASSERT(qtype == HAL_RX_QUEUE_HP); return OS_REG_READ(ah, AR_RXDP); } @@ -39,8 +41,10 @@ ar5210GetRxDP(struct ath_hal *ah) * Set the RxDP. */ void -ar5210SetRxDP(struct ath_hal *ah, uint32_t rxdp) +ar5210SetRxDP(struct ath_hal *ah, uint32_t rxdp, HAL_RX_QUEUE qtype) { + + HALASSERT(qtype == HAL_RX_QUEUE_HP); OS_REG_WRITE(ah, AR_RXDP, rxdp); } Modified: projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211.h ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211.h Tue Jul 10 01:25:25 2012 (r238326) @@ -205,8 +205,8 @@ extern void ar5211IntrReqTxDesc(struct extern HAL_BOOL ar5211GetTxCompletionRates(struct ath_hal *ah, const struct ath_desc *ds0, int *rates, int *tries); -extern uint32_t ar5211GetRxDP(struct ath_hal *); -extern void ar5211SetRxDP(struct ath_hal *, uint32_t rxdp); +extern uint32_t ar5211GetRxDP(struct ath_hal *, HAL_RX_QUEUE); +extern void ar5211SetRxDP(struct ath_hal *, uint32_t rxdp, HAL_RX_QUEUE); extern void ar5211EnableReceive(struct ath_hal *); extern HAL_BOOL ar5211StopDmaReceive(struct ath_hal *); extern void ar5211StartPcuReceive(struct ath_hal *); Modified: projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c Tue Jul 10 01:25:25 2012 (r238326) @@ -30,8 +30,10 @@ * Get the RXDP. */ uint32_t -ar5211GetRxDP(struct ath_hal *ah) +ar5211GetRxDP(struct ath_hal *ah, HAL_RX_QUEUE qtype) { + + HALASSERT(qtype == HAL_RX_QUEUE_HP); return OS_REG_READ(ah, AR_RXDP); } @@ -39,8 +41,10 @@ ar5211GetRxDP(struct ath_hal *ah) * Set the RxDP. */ void -ar5211SetRxDP(struct ath_hal *ah, uint32_t rxdp) +ar5211SetRxDP(struct ath_hal *ah, uint32_t rxdp, HAL_RX_QUEUE qtype) { + + HALASSERT(qtype == HAL_RX_QUEUE_HP); OS_REG_WRITE(ah, AR_RXDP, rxdp); HALASSERT(OS_REG_READ(ah, AR_RXDP) == rxdp); } Modified: projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212.h ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212.h Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212.h Tue Jul 10 01:25:25 2012 (r238326) @@ -519,8 +519,8 @@ extern HAL_BOOL ar5212SetPowerMode(struc extern HAL_POWER_MODE ar5212GetPowerMode(struct ath_hal *ah); extern HAL_BOOL ar5212GetPowerStatus(struct ath_hal *ah); -extern uint32_t ar5212GetRxDP(struct ath_hal *ath); -extern void ar5212SetRxDP(struct ath_hal *ah, uint32_t rxdp); +extern uint32_t ar5212GetRxDP(struct ath_hal *ath, HAL_RX_QUEUE); +extern void ar5212SetRxDP(struct ath_hal *ah, uint32_t rxdp, HAL_RX_QUEUE); extern void ar5212EnableReceive(struct ath_hal *ah); extern HAL_BOOL ar5212StopDmaReceive(struct ath_hal *ah); extern void ar5212StartPcuReceive(struct ath_hal *ah); Modified: projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c ============================================================================== --- projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c Tue Jul 10 01:25:25 2012 (r238326) @@ -29,8 +29,10 @@ * Get the RXDP. */ uint32_t -ar5212GetRxDP(struct ath_hal *ath) +ar5212GetRxDP(struct ath_hal *ath, HAL_RX_QUEUE qtype) { + + HALASSERT(qtype == HAL_RX_QUEUE_HP); return OS_REG_READ(ath, AR_RXDP); } @@ -38,8 +40,10 @@ ar5212GetRxDP(struct ath_hal *ath) * Set the RxDP. */ void -ar5212SetRxDP(struct ath_hal *ah, uint32_t rxdp) +ar5212SetRxDP(struct ath_hal *ah, uint32_t rxdp, HAL_RX_QUEUE qtype) { + + HALASSERT(qtype == HAL_RX_QUEUE_HP); OS_REG_WRITE(ah, AR_RXDP, rxdp); HALASSERT(OS_REG_READ(ah, AR_RXDP) == rxdp); } Modified: projects/altix2/sys/dev/ath/if_ath.c ============================================================================== --- projects/altix2/sys/dev/ath/if_ath.c Tue Jul 10 01:13:00 2012 (r238325) +++ projects/altix2/sys/dev/ath/if_ath.c Tue Jul 10 01:25:25 2012 (r238326) @@ -157,8 +157,6 @@ static void ath_update_promisc(struct if static void ath_updateslot(struct ifnet *); static void ath_bstuck_proc(void *, int); static void ath_reset_proc(void *, int); -static void ath_descdma_cleanup(struct ath_softc *sc, - struct ath_descdma *, ath_bufhead *); static int ath_desc_alloc(struct ath_softc *); static void ath_desc_free(struct ath_softc *); static struct ieee80211_node *ath_node_alloc(struct ieee80211vap *, @@ -239,15 +237,15 @@ static int ath_anicalinterval = 100; /* SYSCTL_INT(_hw_ath, OID_AUTO, anical, CTLFLAG_RW, &ath_anicalinterval, 0, "ANI calibration (msecs)"); -static int ath_rxbuf = ATH_RXBUF; /* # rx buffers to allocate */ +int ath_rxbuf = ATH_RXBUF; /* # rx buffers to allocate */ SYSCTL_INT(_hw_ath, OID_AUTO, rxbuf, CTLFLAG_RW, &ath_rxbuf, 0, "rx buffers allocated"); TUNABLE_INT("hw.ath.rxbuf", &ath_rxbuf); -static int ath_txbuf = ATH_TXBUF; /* # tx buffers to allocate */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***