svn commit: r250042 - in user/adrian/net80211_tx: bin/hostname bin/kill lib/libstand lib/libstand/mips lib/libthr/thread share/examples/BSD_daemon share/man/man4/man4.arm sys/arm/xilinx sys/cam/ata...
Adrian Chadd
adrian at FreeBSD.org
Mon Apr 29 08:21:38 UTC 2013
Author: adrian
Date: Mon Apr 29 08:21:32 2013
New Revision: 250042
URL: http://svnweb.freebsd.org/changeset/base/250042
Log:
MFH
Added:
user/adrian/net80211_tx/share/examples/BSD_daemon/beastie2.eps
- copied unchanged from r250041, head/share/examples/BSD_daemon/beastie2.eps
Modified:
user/adrian/net80211_tx/bin/hostname/hostname.c
user/adrian/net80211_tx/bin/kill/kill.c
user/adrian/net80211_tx/lib/libstand/Makefile
user/adrian/net80211_tx/lib/libstand/mips/_setjmp.S
user/adrian/net80211_tx/lib/libthr/thread/thr_sig.c
user/adrian/net80211_tx/share/examples/BSD_daemon/README
user/adrian/net80211_tx/share/man/man4/man4.arm/devcfg.4
user/adrian/net80211_tx/sys/arm/xilinx/zy7_devcfg.c
user/adrian/net80211_tx/sys/arm/xilinx/zy7_ehci.c
user/adrian/net80211_tx/sys/arm/xilinx/zy7_gpio.c
user/adrian/net80211_tx/sys/arm/xilinx/zy7_l2cache.c
user/adrian/net80211_tx/sys/arm/xilinx/zy7_machdep.c
user/adrian/net80211_tx/sys/arm/xilinx/zy7_reg.h
user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.c
user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.h
user/adrian/net80211_tx/sys/cam/ata/ata_da.c
user/adrian/net80211_tx/sys/cam/scsi/scsi_da.c
user/adrian/net80211_tx/sys/cam/scsi/scsi_xpt.c
user/adrian/net80211_tx/sys/dev/ath/if_ath.c
user/adrian/net80211_tx/sys/dev/cadence/if_cgem.c
user/adrian/net80211_tx/sys/dev/cadence/if_cgem_hw.h
user/adrian/net80211_tx/sys/dev/ciss/ciss.c
user/adrian/net80211_tx/sys/dev/hptrr/hptrr_osm_bsd.c
user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_subr.c
user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_vnops.c
user/adrian/net80211_tx/sys/kern/uipc_syscalls.c
user/adrian/net80211_tx/sys/netpfil/ipfw/ip_dummynet.c
user/adrian/net80211_tx/sys/vm/vm_mmap.c
user/adrian/net80211_tx/sys/vm/vm_object.c
user/adrian/net80211_tx/sys/vm/vm_object.h
user/adrian/net80211_tx/sys/vm/vm_radix.c
user/adrian/net80211_tx/sys/vm/vnode_pager.c
user/adrian/net80211_tx/tools/build/mk/OptionalObsoleteFiles.inc
user/adrian/net80211_tx/tools/tools/nanobsd/nanobsd.sh
user/adrian/net80211_tx/usr.bin/Makefile
user/adrian/net80211_tx/usr.bin/biff/biff.1
Directory Properties:
user/adrian/net80211_tx/ (props changed)
user/adrian/net80211_tx/share/man/man4/ (props changed)
user/adrian/net80211_tx/sys/ (props changed)
Modified: user/adrian/net80211_tx/bin/hostname/hostname.c
==============================================================================
--- user/adrian/net80211_tx/bin/hostname/hostname.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/bin/hostname/hostname.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-static void usage(void);
+static void usage(void) __dead2;
int
main(int argc, char *argv[])
Modified: user/adrian/net80211_tx/bin/kill/kill.c
==============================================================================
--- user/adrian/net80211_tx/bin/kill/kill.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/bin/kill/kill.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -156,7 +156,7 @@ signame_to_signum(const char *sig)
{
int n;
- if (!strncasecmp(sig, "SIG", (size_t)3))
+ if (strncasecmp(sig, "SIG", 3) == 0)
sig += 3;
for (n = 1; n < sys_nsig; n++) {
if (!strcasecmp(sys_signame[n], sig))
Modified: user/adrian/net80211_tx/lib/libstand/Makefile
==============================================================================
--- user/adrian/net80211_tx/lib/libstand/Makefile Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/lib/libstand/Makefile Mon Apr 29 08:21:32 2013 (r250042)
@@ -54,9 +54,7 @@ SRCS+= ntoh.c
# string functions from libc
.PATH: ${.CURDIR}/../libc/string
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "powerpc" || \
- ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "amd64" || \
- ${MACHINE_CPUARCH} == "arm"
+.if ${MACHINE_CPUARCH} != "ia64"
SRCS+= bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \
Modified: user/adrian/net80211_tx/lib/libstand/mips/_setjmp.S
==============================================================================
--- user/adrian/net80211_tx/lib/libstand/mips/_setjmp.S Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/lib/libstand/mips/_setjmp.S Mon Apr 29 08:21:32 2013 (r250042)
@@ -72,7 +72,6 @@ LEAF(_setjmp)
REG_S s7, ((S7 + 3) * SZREG)(a0)
REG_S sp, ((SP + 3) * SZREG)(a0)
REG_S s8, ((S8 + 3) * SZREG)(a0)
- REG_S v0, ((32 + 38) * SZREG)(a0)
j ra
move v0, zero
END(_setjmp)
@@ -96,7 +95,6 @@ LEAF(_longjmp)
REG_L s5, ((S5 + 3) * SZREG)(a0)
REG_L s6, ((S6 + 3) * SZREG)(a0)
REG_L s7, ((S7 + 3) * SZREG)(a0)
- REG_L v0, ((32 + 38) * SZREG)(a0) # get fpu status
REG_L sp, ((SP + 3) * SZREG)(a0)
REG_L s8, ((S8 + 3) * SZREG)(a0)
Modified: user/adrian/net80211_tx/lib/libthr/thread/thr_sig.c
==============================================================================
--- user/adrian/net80211_tx/lib/libthr/thread/thr_sig.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/lib/libthr/thread/thr_sig.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -336,13 +336,6 @@ check_deferred_signal(struct pthread *cu
memcpy(&info, &curthread->deferred_siginfo, sizeof(siginfo_t));
/* remove signal */
curthread->deferred_siginfo.si_signo = 0;
- if (act.sa_flags & SA_RESETHAND) {
- struct sigaction tact;
-
- tact = act;
- tact.sa_handler = SIG_DFL;
- _sigaction(info.si_signo, &tact, NULL);
- }
handle_signal(&act, info.si_signo, &info, uc);
}
}
Modified: user/adrian/net80211_tx/share/examples/BSD_daemon/README
==============================================================================
--- user/adrian/net80211_tx/share/examples/BSD_daemon/README Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/share/examples/BSD_daemon/README Mon Apr 29 08:21:32 2013 (r250042)
@@ -35,6 +35,10 @@ beastie.eps
Before committing this, clean out the comment brought
over from the .fig file to avoid Dollar-FreeBSD-Dollar junk
+beastie2.eps
+ Written by Rahul Siddharthan beaste2.eps is a
+ smaller, simpler version of the beastie eps graphic.
+
eps.patch
Add some comments about tweakables in the .eps file and set
the linecaps to round to improve visual appearance.
Copied: user/adrian/net80211_tx/share/examples/BSD_daemon/beastie2.eps (from r250041, head/share/examples/BSD_daemon/beastie2.eps)
==============================================================================
Binary file (source and/or target). No diff available.
Modified: user/adrian/net80211_tx/share/man/man4/man4.arm/devcfg.4
==============================================================================
--- user/adrian/net80211_tx/share/man/man4/man4.arm/devcfg.4 Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/share/man/man4/man4.arm/devcfg.4 Mon Apr 29 08:21:32 2013 (r250042)
@@ -37,7 +37,9 @@ The special file
.Pa /dev/devcfg
can be used to configure the PL (FPGA) section of the Xilinx Zynq-7000.
.Pp
-On the first write to the character device at file offset 0, the devcfg driver
+On the first write to the character device at file offset 0, the
+.Nm
+driver
asserts the top-level PL reset signals, disables the PS-PL level shifters,
and clears the PL configuration.
Write data is sent to the PCAP (processor configuration access port).
@@ -54,16 +56,18 @@ The file should not be confused with the
design tools.
It is the binary form of the configuration bitstream.
The Xilinx
-.Pa promgen
+.Ic promgen
tool can do the conversion:
.Bd -literal -offset indent
promgen -b -w -p bin -data_width 32 -u 0 design.bit -o design.bit.bin
.Ed
.Sh SYSCTL VARIABLES
-The devcfg driver provides the following
+The
+.Nm
+driver provides the following
.Xr sysctl 8
variables:
-.Bl -tag -width 12
+.Bl -tag -width 4n
.It Va hw.fpga.pl_done
.Pp
This variable always reflects the status of the PL's DONE signal.
@@ -73,15 +77,19 @@ A 1 means the PL section has been proper
This variable controls if the PS-PL level shifters are enabled after the
PL section has been reconfigured.
This variable is 1 by default but setting it to 0 allows the PL section to be
-programmed with configurations that don't interface to the PS section of the
+programmed with configurations that do not interface to the PS section of the
part.
Changing this value has no effect on the level shifters until the next device
reconfiguration.
+.El
.Sh FILES
-/dev/devcfg Character device for
+.Bl -tag -width 12n
+.It Pa /dev/devcfg
+Character device for the
.Nm
driver.
-.Sh AUTHORS
-Thomas Skibo
+.El
.Sh SEE ALSO
Zynq-7000 SoC Technical Reference Manual (Xilinx doc UG585)
+.Sh AUTHORS
+Thomas Skibo
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_devcfg.c
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_devcfg.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_devcfg.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,32 +1,33 @@
/*-
- * Copyright (C) 2013, Thomas Skibo.
+ * Copyright (c) 2013 Thomas Skibo
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of contributors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD$
*/
-/* Zynq-7000 Devcfg driver. This allows programming the PL (FPGA) section
+/*
+ * Zynq-7000 Devcfg driver. This allows programming the PL (FPGA) section
* of Zynq.
*
* Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_ehci.c
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_ehci.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_ehci.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,31 +1,33 @@
/*-
- * Copyright (C) 2012-2013, Thomas Skibo.
+ * Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of contributors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD$
*/
-/* A host-controller driver for Zynq-7000's USB OTG controller.
+/*
+ * A host-controller driver for Zynq-7000's USB OTG controller.
*
* Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
* (v1.4) November 16, 2012. Xilinx doc UG585. Ch. 15 covers the USB
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_gpio.c
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_gpio.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_gpio.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,32 +1,33 @@
/*-
- * Copyright (C) 2013, Thomas Skibo.
+ * Copyright (c) 2013 Thomas Skibo
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of contributors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD$
*/
-/* A GPIO driver for Xilinx Zynq-7000.
+/*
+ * A GPIO driver for Xilinx Zynq-7000.
*
* The GPIO peripheral on Zynq allows controlling 114 general purpose I/Os.
*
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_l2cache.c
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_l2cache.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_l2cache.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,5 +1,5 @@
/*-
- * Copyright (C) 2013, Thomas Skibo.
+ * Copyright (c) 2013 Thomas Skibo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -11,20 +11,24 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_machdep.c
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_machdep.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_machdep.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,32 +1,33 @@
/*-
- * Copyright (C) 2012-2013, Thomas Skibo.
+ * Copyright (c) 2013 Thomas Skibo
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of contributors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD$
*/
-/* Machine dependent code for Xilinx Zynq-7000 Soc.
+/*
+ * Machine dependent code for Xilinx Zynq-7000 Soc.
*
* Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
* (v1.4) November 16, 2012. Xilinx doc UG585.
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_reg.h
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_reg.h Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_reg.h Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,33 +1,33 @@
/*-
- * Copyright (C) 2012-2013, Thomas Skibo.
+ * Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of contributors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Thomas Skibo OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD$
*/
-/* $FreeBSD$ */
-
-/* Address regions of Zynq-7000.
+/*
+ * Address regions of Zynq-7000.
* Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
* (v1.4) November 16, 2012. Xilinx doc UG585.
*/
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.c
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,32 +1,33 @@
/*-
- * Copyright (C) 2013, Thomas Skibo.
+ * Copyright (c) 2013 Thomas Skibo
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of contributors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD$
*/
-/* Zynq-700 SLCR driver. Provides hooks for cpu_reset and PL control stuff.
+/*
+ * Zynq-700 SLCR driver. Provides hooks for cpu_reset and PL control stuff.
* In the future, maybe MIO control, clock control, etc. could go here.
*
* Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
Modified: user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.h
==============================================================================
--- user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.h Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/arm/xilinx/zy7_slcr.h Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,34 +1,33 @@
/*-
- * Copyright (C) 2013, Thomas Skibo.
+ * Copyright (c) 2013 Thomas Skibo
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The names of contributors may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD$
*/
-/* $FreeBSD$ */
-
-/* Defines for Zynq-7000 SLCR registers.
+/*
+ * Defines for Zynq-7000 SLCR registers.
*
* Most of these registers are initialized by the First Stage Boot
* Loader and are not modified by the kernel.
Modified: user/adrian/net80211_tx/sys/cam/ata/ata_da.c
==============================================================================
--- user/adrian/net80211_tx/sys/cam/ata/ata_da.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/cam/ata/ata_da.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1147,7 +1147,7 @@ adaregister(struct cam_periph *periph, v
snprintf(announce_buf, sizeof(announce_buf),
"kern.cam.ada.%d.write_cache", periph->unit_number);
TUNABLE_INT_FETCH(announce_buf, &softc->write_cache);
- /* Disable queue sorting for non-rotatational media by default */
+ /* Disable queue sorting for non-rotational media by default. */
if (cgd->ident_data.media_rotation_rate == 1)
softc->sort_io_queue = 0;
else
Modified: user/adrian/net80211_tx/sys/cam/scsi/scsi_da.c
==============================================================================
--- user/adrian/net80211_tx/sys/cam/scsi/scsi_da.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/cam/scsi/scsi_da.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -3058,6 +3058,10 @@ dadone(struct cam_periph *periph, union
bdc = (struct scsi_vpd_block_characteristics *)csio->data_ptr;
if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
+ /*
+ * Disable queue sorting for non-rotational media
+ * by default.
+ */
if (scsi_2btoul(bdc->medium_rotation_rate) ==
SVPD_BDC_RATE_NONE_ROTATING)
softc->sort_io_queue = 0;
@@ -3106,8 +3110,8 @@ dadone(struct cam_periph *periph, union
ATA_DSM_BLK_RANGES);
}
/*
- * Disable queue sorting for non-rotatational media
- * by default
+ * Disable queue sorting for non-rotational media
+ * by default.
*/
if (ata_params->media_rotation_rate == 1)
softc->sort_io_queue = 0;
Modified: user/adrian/net80211_tx/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- user/adrian/net80211_tx/sys/cam/scsi/scsi_xpt.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/cam/scsi/scsi_xpt.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -883,6 +883,7 @@ again:
* routine finish up for us.
*/
start_ccb->csio.data_ptr = NULL;
+ cam_freeze_devq(periph->path);
probedone(periph, start_ccb);
return;
}
@@ -913,6 +914,7 @@ again:
* routine finish up for us.
*/
start_ccb->csio.data_ptr = NULL;
+ cam_freeze_devq(periph->path);
probedone(periph, start_ccb);
return;
}
@@ -952,6 +954,7 @@ again:
* routine finish up for us.
*/
start_ccb->csio.data_ptr = NULL;
+ cam_freeze_devq(periph->path);
probedone(periph, start_ccb);
return;
}
Modified: user/adrian/net80211_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/net80211_tx/sys/dev/ath/if_ath.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/dev/ath/if_ath.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -4519,10 +4519,12 @@ ath_tx_stopdma(struct ath_softc *sc, str
struct ath_hal *ah = sc->sc_ah;
DPRINTF(sc, ATH_DEBUG_RESET,
- "%s: tx queue [%u] %p, flags 0x%08x, link %p\n",
+ "%s: tx queue [%u] %p, active=%d, hwpending=%d, flags 0x%08x, link %p\n",
__func__,
txq->axq_qnum,
(caddr_t)(uintptr_t) ath_hal_gettxbuf(ah, txq->axq_qnum),
+ (int) (!! ath_hal_txqenabled(ah, txq->axq_qnum)),
+ (int) ath_hal_numtxpending(ah, txq->axq_qnum),
txq->axq_flags,
txq->axq_link);
(void) ath_hal_stoptxdma(ah, txq->axq_qnum);
@@ -4564,8 +4566,6 @@ ath_tx_dump(struct ath_softc *sc, struct
if (! (sc->sc_debug & ATH_DEBUG_RESET))
return;
- ATH_TX_LOCK_ASSERT(sc);
-
device_printf(sc->sc_dev, "%s: Q%d: begin\n",
__func__, txq->axq_qnum);
TAILQ_FOREACH(bf, &txq->axq_q, bf_list) {
Modified: user/adrian/net80211_tx/sys/dev/cadence/if_cgem.c
==============================================================================
--- user/adrian/net80211_tx/sys/dev/cadence/if_cgem.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/dev/cadence/if_cgem.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2012-2013 Thomas Skibo.
+ * Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,8 @@
* SUCH DAMAGE.
*/
-/* A network interface driver for Cadence GEM Gigabit Ethernet
+/*
+ * A network interface driver for Cadence GEM Gigabit Ethernet
* interface such as the one used in Xilinx Zynq-7000 SoC.
*
* Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
Modified: user/adrian/net80211_tx/sys/dev/cadence/if_cgem_hw.h
==============================================================================
--- user/adrian/net80211_tx/sys/dev/cadence/if_cgem_hw.h Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/dev/cadence/if_cgem_hw.h Mon Apr 29 08:21:32 2013 (r250042)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2012-2013 Thomas Skibo.
+ * Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -22,10 +22,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
-/* $FreeBSD$ */
-
/*
* Hardware and register defines for Cadence GEM Gigabit Ethernet
* controller such as the one used in Zynq-7000 SoC.
Modified: user/adrian/net80211_tx/sys/dev/ciss/ciss.c
==============================================================================
--- user/adrian/net80211_tx/sys/dev/ciss/ciss.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/dev/ciss/ciss.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -2487,6 +2487,7 @@ ciss_preen_command(struct ciss_request *
cc->header.sg_total = 0;
cc->header.host_tag = cr->cr_tag << 2;
cc->header.host_tag_zeroes = 0;
+ bzero(&(cc->sg[0]), CISS_COMMAND_ALLOC_SIZE - sizeof(struct ciss_command));
cmdphys = cr->cr_ccphys;
cc->error_info.error_info_address = cmdphys + sizeof(struct ciss_command);
cc->error_info.error_info_length = CISS_COMMAND_ALLOC_SIZE - sizeof(struct ciss_command);
@@ -3007,7 +3008,7 @@ ciss_cam_action(struct cam_sim *sim, uni
cpi->protocol = PROTO_SCSI;
cpi->protocol_version = SCSI_REV_2;
if (sc->ciss_cfg->max_sg_length == 0) {
- sg_length = 16;
+ sg_length = 17;
} else {
/* XXX Fix for ZMR cards that advertise max_sg_length == 32
* Confusing bit here. max_sg_length is usually a power of 2. We always
@@ -3375,7 +3376,7 @@ ciss_cam_complete_fixup(struct ciss_soft
cl = &sc->ciss_logical[bus][target];
- padstr(inq->vendor, "COMPAQ",
+ padstr(inq->vendor, "HP",
SID_VENDOR_SIZE);
padstr(inq->product,
ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance),
Modified: user/adrian/net80211_tx/sys/dev/hptrr/hptrr_osm_bsd.c
==============================================================================
--- user/adrian/net80211_tx/sys/dev/hptrr/hptrr_osm_bsd.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/dev/hptrr/hptrr_osm_bsd.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -175,7 +175,8 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_
HPT_ASSERT((f->size & (f->alignment-1))==0);
- for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1) ;
+ for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1)
+ ;
KdPrint(("%s: %d*%d=%d bytes, order %d",
f->tag, f->count, f->size, f->count*f->size, order));
Modified: user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_subr.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_subr.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -166,6 +166,7 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp
char *target, dev_t rdev, struct tmpfs_node **node)
{
struct tmpfs_node *nnode;
+ vm_object_t obj;
/* If the root directory of the 'tmp' file system is not yet
* allocated, this must be the request to do it. */
@@ -227,9 +228,14 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp
break;
case VREG:
- nnode->tn_reg.tn_aobj =
+ obj = nnode->tn_reg.tn_aobj =
vm_pager_allocate(OBJT_SWAP, NULL, 0, VM_PROT_DEFAULT, 0,
NULL /* XXXKIB - tmpfs needs swap reservation */);
+ VM_OBJECT_WLOCK(obj);
+ /* OBJ_TMPFS is set together with the setting of vp->v_object */
+ vm_object_set_flag(obj, OBJ_NOSPLIT);
+ vm_object_clear_flag(obj, OBJ_ONEMAPPING);
+ VM_OBJECT_WUNLOCK(obj);
break;
default:
@@ -434,9 +440,11 @@ int
tmpfs_alloc_vp(struct mount *mp, struct tmpfs_node *node, int lkflag,
struct vnode **vpp)
{
- int error = 0;
struct vnode *vp;
+ vm_object_t object;
+ int error;
+ error = 0;
loop:
TMPFS_NODE_LOCK(node);
if ((vp = node->tn_vnode) != NULL) {
@@ -506,13 +514,22 @@ loop:
/* FALLTHROUGH */
case VLNK:
/* FALLTHROUGH */
- case VREG:
- /* FALLTHROUGH */
case VSOCK:
break;
case VFIFO:
vp->v_op = &tmpfs_fifoop_entries;
break;
+ case VREG:
+ object = node->tn_reg.tn_aobj;
+ VM_OBJECT_WLOCK(object);
+ VI_LOCK(vp);
+ KASSERT(vp->v_object == NULL, ("Not NULL v_object in tmpfs"));
+ vp->v_object = object;
+ object->un_pager.swp.swp_tmpfs = vp;
+ vm_object_set_flag(object, OBJ_TMPFS);
+ VI_UNLOCK(vp);
+ VM_OBJECT_WUNLOCK(object);
+ break;
case VDIR:
MPASS(node->tn_dir.tn_parent != NULL);
if (node->tn_dir.tn_parent == node)
@@ -523,7 +540,6 @@ loop:
panic("tmpfs_alloc_vp: type %p %d", node, (int)node->tn_type);
}
- vnode_pager_setsize(vp, node->tn_size);
error = insmntque(vp, mp);
if (error)
vp = NULL;
@@ -1343,7 +1359,6 @@ retry:
TMPFS_UNLOCK(tmp);
node->tn_size = newsize;
- vnode_pager_setsize(vp, newsize);
return (0);
}
Modified: user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_vnops.c Mon Apr 29 07:28:29 2013 (r250041)
+++ user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_vnops.c Mon Apr 29 08:21:32 2013 (r250042)
@@ -278,8 +278,6 @@ tmpfs_close(struct vop_close_args *v)
{
struct vnode *vp = v->a_vp;
- MPASS(VOP_ISLOCKED(vp));
-
/* Update node times. */
tmpfs_update(vp);
@@ -439,7 +437,6 @@ tmpfs_setattr(struct vop_setattr_args *v
return error;
}
-/* --------------------------------------------------------------------- */
static int
tmpfs_nocacheread(vm_object_t tobj, vm_pindex_t idx,
vm_offset_t offset, size_t tlen, struct uio *uio)
@@ -448,12 +445,35 @@ tmpfs_nocacheread(vm_object_t tobj, vm_p
int error, rv;
VM_OBJECT_WLOCK(tobj);
- m = vm_page_grab(tobj, idx, VM_ALLOC_WIRED |
- VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
+
+ /*
+ * The kern_sendfile() code calls vn_rdwr() with the page
+ * soft-busied. Ignore the soft-busy state here. Parallel
+ * reads of the page content from disk are prevented by
+ * VPO_BUSY.
+ *
+ * Although the tmpfs vnode lock is held here, it is
+ * nonetheless safe to sleep waiting for a free page. The
+ * pageout daemon does not need to acquire the tmpfs vnode
+ * lock to page out tobj's pages because tobj is a OBJT_SWAP
+ * type object.
+ */
+ m = vm_page_grab(tobj, idx, VM_ALLOC_NORMAL | VM_ALLOC_RETRY |
+ VM_ALLOC_IGN_SBUSY);
if (m->valid != VM_PAGE_BITS_ALL) {
if (vm_pager_has_page(tobj, idx, NULL, NULL)) {
rv = vm_pager_get_pages(tobj, &m, 1, 0);
+ m = vm_page_lookup(tobj, idx);
+ if (m == NULL) {
+ printf(
+ "tmpfs: vm_obj %p idx %jd null lookup rv %d\n",
+ tobj, idx, rv);
+ return (EIO);
+ }
if (rv != VM_PAGER_OK) {
+ printf(
+ "tmpfs: vm_obj %p idx %jd valid %x pager error %d\n",
+ tobj, idx, m->valid, rv);
vm_page_lock(m);
vm_page_free(m);
vm_page_unlock(m);
@@ -463,127 +483,38 @@ tmpfs_nocacheread(vm_object_t tobj, vm_p
} else
vm_page_zero_invalid(m, TRUE);
}
+ vm_page_lock(m);
+ vm_page_hold(m);
+ vm_page_wakeup(m);
+ vm_page_unlock(m);
VM_OBJECT_WUNLOCK(tobj);
error = uiomove_fromphys(&m, offset, tlen, uio);
VM_OBJECT_WLOCK(tobj);
vm_page_lock(m);
- vm_page_unwire(m, TRUE);
+ vm_page_unhold(m);
+ vm_page_deactivate(m);
+ /* Requeue to maintain LRU ordering. */
+ vm_page_requeue(m);
vm_page_unlock(m);
- vm_page_wakeup(m);
VM_OBJECT_WUNLOCK(tobj);
return (error);
}
-static __inline int
-tmpfs_nocacheread_buf(vm_object_t tobj, vm_pindex_t idx,
- vm_offset_t offset, size_t tlen, void *buf)
-{
- struct uio uio;
- struct iovec iov;
-
- uio.uio_iovcnt = 1;
- uio.uio_iov = &iov;
- iov.iov_base = buf;
- iov.iov_len = tlen;
-
- uio.uio_offset = 0;
- uio.uio_resid = tlen;
- uio.uio_rw = UIO_READ;
- uio.uio_segflg = UIO_SYSSPACE;
- uio.uio_td = curthread;
-
- return (tmpfs_nocacheread(tobj, idx, offset, tlen, &uio));
-}
-
-static int
-tmpfs_mappedread(vm_object_t vobj, vm_object_t tobj, size_t len, struct uio *uio)
-{
- struct sf_buf *sf;
- vm_pindex_t idx;
- vm_page_t m;
- vm_offset_t offset;
- off_t addr;
- size_t tlen;
- char *ma;
- int error;
-
- addr = uio->uio_offset;
- idx = OFF_TO_IDX(addr);
- offset = addr & PAGE_MASK;
- tlen = MIN(PAGE_SIZE - offset, len);
-
- VM_OBJECT_WLOCK(vobj);
-lookupvpg:
- if (((m = vm_page_lookup(vobj, idx)) != NULL) &&
- vm_page_is_valid(m, offset, tlen)) {
- if ((m->oflags & VPO_BUSY) != 0) {
- /*
- * Reference the page before unlocking and sleeping so
- * that the page daemon is less likely to reclaim it.
- */
- vm_page_reference(m);
- vm_page_sleep(m, "tmfsmr");
- goto lookupvpg;
- }
- vm_page_busy(m);
- VM_OBJECT_WUNLOCK(vobj);
- error = uiomove_fromphys(&m, offset, tlen, uio);
- VM_OBJECT_WLOCK(vobj);
- vm_page_wakeup(m);
- VM_OBJECT_WUNLOCK(vobj);
- return (error);
- } else if (m != NULL && uio->uio_segflg == UIO_NOCOPY) {
- KASSERT(offset == 0,
- ("unexpected offset in tmpfs_mappedread for sendfile"));
- if ((m->oflags & VPO_BUSY) != 0) {
- /*
- * Reference the page before unlocking and sleeping so
- * that the page daemon is less likely to reclaim it.
- */
- vm_page_reference(m);
- vm_page_sleep(m, "tmfsmr");
- goto lookupvpg;
- }
- vm_page_busy(m);
- VM_OBJECT_WUNLOCK(vobj);
- sched_pin();
- sf = sf_buf_alloc(m, SFB_CPUPRIVATE);
- ma = (char *)sf_buf_kva(sf);
- error = tmpfs_nocacheread_buf(tobj, idx, 0, tlen, ma);
- if (error == 0) {
- if (tlen != PAGE_SIZE)
- bzero(ma + tlen, PAGE_SIZE - tlen);
- uio->uio_offset += tlen;
- uio->uio_resid -= tlen;
- }
- sf_buf_free(sf);
- sched_unpin();
- VM_OBJECT_WLOCK(vobj);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list