PERFORCE change 1187365 for review
Brooks Davis
brooks at FreeBSD.org
Thu Oct 24 23:47:35 UTC 2013
http://p4web.freebsd.org/@@1187365?ac=10
Change 1187365 by brooks at brooks_zenith on 2013/10/24 23:47:18
IFC @ 1187364 syncs with github update.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#18 integrate
.. //depot/projects/ctsrd/beribsd/src/ObsoleteFiles.inc#13 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/mtree/BSD.usr.dist#10 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/ea.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/growfs/debug.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/mdconfig/mdconfig.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/share/man/man5/src.conf.5#11 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/broadcom/bcm2835/bcm2835_spi.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/arm/broadcom/bcm2835/bcm2835_spireg.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/arm/broadcom/bcm2835/bcm2835_spivar.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/arm/broadcom/bcm2835/files.bcm2835#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/conf/RPI-B#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/mv/gpio.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/bcm2835.dtsi#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ata/ata_da.c#13 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_da.c#14 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/NOTES#13 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files#26 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files.powerpc#13 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_common.c#12 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/iscsi/icl.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/iwn/if_iwn.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/iwn/if_iwn_debug.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/iwn/if_iwnreg.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ofw/ofw_nexus.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ofw/ofw_nexus.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pci.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pci_private.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pcireg.h#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pcivar.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/spibus/ofw_spibus.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/spibus/spibus.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/spibus/spibusvar.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/uart/uart_dev_imx.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/fs/ext2fs/ext2_vnops.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/dtio_kdtrace.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/kern/subr_devstat.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/include/pte.h#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/dtrace/Makefile#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/dtrace/dtio/Makefile#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/modules/dtrace/dtraceall/dtraceall.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net/if_tap.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net80211/ieee80211_output.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net80211/ieee80211_proto.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net80211/ieee80211_proto.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/mpc85xx/atpic.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/ofw/openpic_ofw.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powerpc/nexus.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powerpc/pic_if.m#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sparc64/include/bus.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sparc64/include/bus_private.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sparc64/pci/fire.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sparc64/pci/schizo.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sparc64/sparc64/bus_machdep.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ffs/ffs_vnops.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ufs/dinode.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/x86/x86/io_apic.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/bhyverun.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyveload/bhyveload.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/pkg/config.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/pkg/config.h#2 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/pkg/pkg.c#7 integrate
Differences ...
==== //depot/projects/ctsrd/beribsd/src/Makefile.inc1#18 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/Makefile.inc1 256921 2013-10-22 18:36:39Z cperciva $
+# $FreeBSD: head/Makefile.inc1 257079 2013-10-24 22:55:15Z gjb $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -58,6 +58,7 @@
# use that new version. And the new (dynamically-linked) /bin/sh
# will expect to find appropriate libraries in /lib and /libexec.
#
+SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
@@ -128,10 +129,10 @@
.endif
.if !defined(VERSION)
-REVISION!= make -C ${.CURDIR}/release -V REVISION
-BRANCH!= make -C ${.CURDIR}/release -V BRANCH
+REVISION!= make -C ${SRCDIR}/release -V REVISION
+BRANCH!= make -C ${SRCDIR}/release -V BRANCH
SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
- ${.CURDIR}/sys/sys/param.h
+ ${SRCDIR}/sys/sys/param.h
VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE}
.endif
==== //depot/projects/ctsrd/beribsd/src/ObsoleteFiles.inc#13 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/ObsoleteFiles.inc 256787 2013-10-20 13:41:42Z antoine $
+# $FreeBSD: head/ObsoleteFiles.inc 257077 2013-10-24 21:58:14Z zont $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131023: remove never used iscsi directory
+OLD_DIRS+=usr/share/examples/iscsi
# 20131014: libbsdyml becomes private
OLD_FILES+=usr/lib/libbsdyml.a
OLD_FILES+=usr/lib/libbsdyml.so
@@ -2491,6 +2493,7 @@
OLD_FILES+=usr/sbin/zpool
# 20070423: rc.bluetooth (examples) removed
OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
+OLD_DIRS+=usr/share/examples/netgraph/bluetooth
# 20070421: worm.4 removed
OLD_FILES+=usr/share/man/man4/worm.4.gz
# 20070417: trunk(4) renamed to lagg(4)
==== //depot/projects/ctsrd/beribsd/src/etc/mtree/BSD.usr.dist#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/etc/mtree/BSD.usr.dist 256769 2013-10-19 10:00:51Z des $
+# $FreeBSD: head/etc/mtree/BSD.usr.dist 257077 2013-10-24 21:58:14Z zont $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -325,8 +325,6 @@
..
ipfw
..
- iscsi
- ..
jails
..
kld
@@ -360,8 +358,6 @@
mdoc
..
netgraph
- bluetooth
- ..
..
pc-sysinstall
..
==== //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/ea.c#4 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sbin/fsck_ffs/ea.c 247212 2013-02-24 06:44:29Z mckusick $");
+__FBSDID("$FreeBSD: head/sbin/fsck_ffs/ea.c 257029 2013-10-24 00:33:29Z pfg $");
#include <sys/param.h>
#include <sys/time.h>
@@ -65,7 +65,7 @@
char dbuf[DIRBLKSIZ];
printf("Inode %ju extsize %ju\n",
- (intmax_t)idesc->id_number, (intmax_t)dp->di_extsize);
+ (intmax_t)idesc->id_number, (uintmax_t)dp->di_extsize);
if (dp->di_extsize == 0)
return 0;
if (dp->di_extsize <= sblock.fs_fsize)
==== //depot/projects/ctsrd/beribsd/src/sbin/growfs/debug.c#4 (text+ko) ====
@@ -41,7 +41,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: head/sbin/growfs/debug.c 234312 2012-04-15 15:13:29Z trasz $";
+ "$FreeBSD: head/sbin/growfs/debug.c 257029 2013-10-24 00:33:29Z pfg $";
#endif /* not lint */
#include <sys/param.h>
@@ -765,7 +765,7 @@
fprintf(dbg_log, "gen int32_t 0x%08x\n", ino->di_gen);
fprintf(dbg_log, "kernflags u_int32_t 0x%08x\n", ino->di_kernflags);
fprintf(dbg_log, "flags u_int32_t 0x%08x\n", ino->di_flags);
- fprintf(dbg_log, "extsize int32_t 0x%08x\n", ino->di_extsize);
+ fprintf(dbg_log, "extsize u_int32_t 0x%08x\n", ino->di_extsize);
/* XXX: What do we do with di_extb[NXADDR]? */
==== //depot/projects/ctsrd/beribsd/src/sbin/mdconfig/mdconfig.c#5 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sbin/mdconfig/mdconfig.c 253833 2013-07-31 07:06:58Z delphij $
+ * $FreeBSD: head/sbin/mdconfig/mdconfig.c 257036 2013-10-24 01:06:44Z hrs $
*/
#include <sys/param.h>
@@ -481,12 +481,18 @@
printf("\n");
/* XXX: Check if it's enough to clean everything. */
geom_stats_snapshot_free(sq);
- if (((opt & OPT_UNIT) && (fflag == NULL) && ufound) ||
- ((opt & OPT_UNIT) == 0 && (fflag != NULL) && ffound) ||
- ((opt & OPT_UNIT) && (fflag != NULL) && ufound && ffound))
- return (0);
- else
- return (-1);
+ if (opt & OPT_UNIT) {
+ if (((fflag == NULL) && ufound) ||
+ ((fflag == NULL) && (units != NULL) && ufound) ||
+ ((fflag != NULL) && ffound) ||
+ ((fflag != NULL) && (units != NULL) && ufound && ffound))
+ return (0);
+ } else if (opt & OPT_LIST) {
+ if ((fflag == NULL) ||
+ ((fflag != NULL) && ffound))
+ return (0);
+ }
+ return (-1);
}
/*
==== //depot/projects/ctsrd/beribsd/src/share/man/man5/src.conf.5#11 (text) ====
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
-.\" $FreeBSD: head/share/man/man5/src.conf.5 256198 2013-10-09 17:07:20Z gjb $
-.Dd October 6, 2013
+.\" $FreeBSD: head/share/man/man5/src.conf.5 257057 2013-10-24 15:11:30Z brooks $
+.Dd October 24, 2013
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -208,10 +208,6 @@
.Va WITHOUT_CLANG_EXTRAS
.It
.Va WITHOUT_CLANG_FULL
-.It
-.Va WITHOUT_CLANG_IS_CC
-.It
-.Va WITHOUT_LLDB
.El
.It Va WITH_CLANG
.\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru
@@ -323,11 +319,7 @@
.It
.Va WITHOUT_CLANG_FULL
.It
-.Va WITHOUT_CLANG_IS_CC
-.It
.Va WITHOUT_GROFF
-.It
-.Va WITHOUT_LLDB
.El
.It Va WITH_DEBUG_FILES
.\" from FreeBSD: head/tools/build/options/WITH_DEBUG_FILES 251512 2013-06-07 21:40:02Z emaste
@@ -910,7 +902,7 @@
.Xr rsh 1 ,
etc.
.It Va WITHOUT_RCS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 256198 2013-10-09 17:07:20Z gjb
Set to not build
.Xr rcs 1
and related utilities.
@@ -1030,13 +1022,9 @@
.It
.Va WITHOUT_CLANG_FULL
.It
-.Va WITHOUT_CLANG_IS_CC
-.It
.Va WITHOUT_GCC
.It
.Va WITHOUT_GDB
-.It
-.Va WITHOUT_LLDB
.El
.It Va WITHOUT_UNBOUND
.\" from FreeBSD: head/tools/build/options/WITHOUT_UNBOUND 255597 2013-09-15 14:51:23Z des
==== //depot/projects/ctsrd/beribsd/src/sys/arm/broadcom/bcm2835/files.bcm2835#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/arm/broadcom/bcm2835/files.bcm2835 256959 2013-10-23 12:29:39Z loos $
+# $FreeBSD: head/sys/arm/broadcom/bcm2835/files.bcm2835 257062 2013-10-24 16:27:33Z loos $
arm/broadcom/bcm2835/bcm2835_bsc.c optional bcm2835_bsc
arm/broadcom/bcm2835/bcm2835_dma.c standard
@@ -8,6 +8,7 @@
arm/broadcom/bcm2835/bcm2835_machdep.c standard
arm/broadcom/bcm2835/bcm2835_mbox.c standard
arm/broadcom/bcm2835/bcm2835_sdhci.c optional sdhci
+arm/broadcom/bcm2835/bcm2835_spi.c optional bcm2835_spi
arm/broadcom/bcm2835/bcm2835_systimer.c standard
arm/broadcom/bcm2835/bcm2835_wdog.c standard
arm/broadcom/bcm2835/bus_space.c optional fdt
==== //depot/projects/ctsrd/beribsd/src/sys/arm/conf/RPI-B#6 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/RPI-B 256959 2013-10-23 12:29:39Z loos $
+# $FreeBSD: head/sys/arm/conf/RPI-B 257062 2013-10-24 16:27:33Z loos $
ident RPI-B
@@ -107,6 +107,10 @@
device mii
device smsc
+# SPI
+device spibus
+device bcm2835_spi
+
# Flattened Device Tree
options FDT
# Note: DTB is normally loaded and modified by RPi boot loader, then
==== //depot/projects/ctsrd/beribsd/src/sys/arm/mv/gpio.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 256967 2013-10-23 14:04:09Z nwhitehorn $");
+__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 257015 2013-10-23 19:56:13Z nwhitehorn $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -638,7 +638,7 @@
* contain a ref. to a node defining GPIO
* controller.
*/
- ctrl = OF_xref_handle(fdt32_to_cpu(gpios[0]));
+ ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0]));
if (fdt_is_compatible(ctrl, e->compat))
/* Call a handler. */
==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/bcm2835.dtsi#3 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/boot/fdt/dts/bcm2835.dtsi 256959 2013-10-23 12:29:39Z loos $
+ * $FreeBSD: head/sys/boot/fdt/dts/bcm2835.dtsi 257062 2013-10-24 16:27:33Z loos $
*/
/ {
@@ -412,6 +412,14 @@
interrupt-parent = <&intc>;
};
+ spi0 {
+ compatible = "broadcom,bcm2835-spi",
+ "broadcom,bcm2708-spi";
+ reg = <0x204000 0x20>;
+ interrupts = <62>;
+ interrupt-parent = <&intc>;
+ };
+
dma: dma {
compatible = "broadcom,bcm2835-dma",
"broadcom,bcm2708-dma";
==== //depot/projects/ctsrd/beribsd/src/sys/cam/ata/ata_da.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 256956 2013-10-23 09:54:58Z smh $");
+__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 257054 2013-10-24 14:05:44Z mav $");
#include "opt_ada.h"
@@ -80,7 +80,7 @@
ADA_FLAG_CAN_NCQ = 0x0008,
ADA_FLAG_CAN_DMA = 0x0010,
ADA_FLAG_NEED_OTAG = 0x0020,
- ADA_FLAG_WENT_IDLE = 0x0040,
+ ADA_FLAG_WAS_OTAG = 0x0040,
ADA_FLAG_CAN_TRIM = 0x0080,
ADA_FLAG_OPEN = 0x0100,
ADA_FLAG_SCTX_INIT = 0x0200,
@@ -130,12 +130,12 @@
struct ada_softc {
struct bio_queue_head bio_queue;
struct bio_queue_head trim_queue;
+ int outstanding_cmds; /* Number of active commands */
+ int refcount; /* Active xpt_action() calls */
ada_state state;
- ada_flags flags;
+ ada_flags flags;
ada_quirks quirks;
int sort_io_queue;
- int ordered_tag_count;
- int outstanding_cmds;
int trim_max_ranges;
int trim_running;
int read_ahead;
@@ -153,7 +153,6 @@
struct sysctl_oid *sysctl_tree;
struct callout sendordered_c;
struct trim_request trim_req;
- int refcount;
};
struct ada_quirk_entry {
@@ -1489,7 +1488,7 @@
if ((bp->bio_flags & BIO_ORDERED) != 0
|| (softc->flags & ADA_FLAG_NEED_OTAG) != 0) {
softc->flags &= ~ADA_FLAG_NEED_OTAG;
- softc->ordered_tag_count++;
+ softc->flags |= ADA_FLAG_WAS_OTAG;
tag_code = 0;
} else {
tag_code = 1;
@@ -1743,7 +1742,7 @@
}
softc->outstanding_cmds--;
if (softc->outstanding_cmds == 0)
- softc->flags |= ADA_FLAG_WENT_IDLE;
+ softc->flags |= ADA_FLAG_WAS_OTAG;
xpt_release_ccb(done_ccb);
if (state == ADA_CCB_TRIM) {
TAILQ_HEAD(, bio) queue;
@@ -1905,14 +1904,11 @@
struct ada_softc *softc = arg;
if (ada_send_ordered) {
- if ((softc->ordered_tag_count == 0)
- && ((softc->flags & ADA_FLAG_WENT_IDLE) == 0)) {
- softc->flags |= ADA_FLAG_NEED_OTAG;
+ if (softc->outstanding_cmds > 0) {
+ if ((softc->flags & ADA_FLAG_WAS_OTAG) == 0)
+ softc->flags |= ADA_FLAG_NEED_OTAG;
+ softc->flags &= ~ADA_FLAG_WAS_OTAG;
}
- if (softc->outstanding_cmds > 0)
- softc->flags &= ~ADA_FLAG_WENT_IDLE;
-
- softc->ordered_tag_count = 0;
}
/* Queue us up again */
callout_reset(&softc->sendordered_c,
==== //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_da.c#14 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 256956 2013-10-23 09:54:58Z smh $");
+__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 257054 2013-10-24 14:05:44Z mav $");
#include <sys/param.h>
@@ -84,7 +84,7 @@
DA_FLAG_PACK_LOCKED = 0x004,
DA_FLAG_PACK_REMOVABLE = 0x008,
DA_FLAG_NEED_OTAG = 0x020,
- DA_FLAG_WENT_IDLE = 0x040,
+ DA_FLAG_WAS_OTAG = 0x040,
DA_FLAG_RETRY_UA = 0x080,
DA_FLAG_OPEN = 0x100,
DA_FLAG_SCTX_INIT = 0x200,
@@ -198,19 +198,17 @@
struct bio_queue_head bio_queue;
struct bio_queue_head delete_queue;
struct bio_queue_head delete_run_queue;
- SLIST_ENTRY(da_softc) links;
LIST_HEAD(, ccb_hdr) pending_ccbs;
+ int tur; /* TEST UNIT READY should be sent */
+ int refcount; /* Active xpt_action() calls */
da_state state;
da_flags flags;
da_quirks quirks;
int sort_io_queue;
int minimum_cmd_size;
int error_inject;
- int ordered_tag_count;
- int outstanding_cmds;
int trim_max_ranges;
int delete_running;
- int tur;
int delete_available; /* Delete methods possibly available */
uint32_t unmap_max_ranges;
uint32_t unmap_max_lba;
@@ -228,7 +226,6 @@
uint8_t unmap_buf[UNMAP_BUF_SIZE];
struct scsi_read_capacity_data_long rcaplong;
struct callout mediapoll_c;
- int refcount;
};
#define dadeleteflag(softc, delete_method, enable) \
@@ -2244,7 +2241,7 @@
if ((bp->bio_flags & BIO_ORDERED) != 0 ||
(softc->flags & DA_FLAG_NEED_OTAG) != 0) {
softc->flags &= ~DA_FLAG_NEED_OTAG;
- softc->ordered_tag_count++;
+ softc->flags |= DA_FLAG_WAS_OTAG;
tag_code = MSG_ORDERED_Q_TAG;
} else {
tag_code = MSG_SIMPLE_Q_TAG;
@@ -2297,13 +2294,8 @@
start_ccb->ccb_h.flags |= CAM_UNLOCKED;
out:
- /*
- * Block out any asynchronous callbacks
- * while we touch the pending ccb list.
- */
LIST_INSERT_HEAD(&softc->pending_ccbs,
&start_ccb->ccb_h, periph_links.le);
- softc->outstanding_cmds++;
/* We expect a unit attention from this device */
if ((softc->flags & DA_FLAG_RETRY_UA) != 0) {
@@ -2969,14 +2961,9 @@
}
}
- /*
- * Block out any asynchronous callbacks
- * while we touch the pending ccb list.
- */
LIST_REMOVE(&done_ccb->ccb_h, periph_links.le);
- softc->outstanding_cmds--;
- if (softc->outstanding_cmds == 0)
- softc->flags |= DA_FLAG_WENT_IDLE;
+ if (LIST_EMPTY(&softc->pending_ccbs))
+ softc->flags |= DA_FLAG_WAS_OTAG;
xpt_release_ccb(done_ccb);
if (state == DA_CCB_DELETE) {
@@ -3583,7 +3570,7 @@
struct cam_periph *periph = arg;
struct da_softc *softc = periph->softc;
- if (!softc->tur && softc->outstanding_cmds == 0) {
+ if (!softc->tur && LIST_EMPTY(&softc->pending_ccbs)) {
if (cam_periph_acquire(periph) == CAM_REQ_CMP) {
softc->tur = 1;
daschedule(periph);
@@ -3755,14 +3742,11 @@
struct da_softc *softc = arg;
if (da_send_ordered) {
- if ((softc->ordered_tag_count == 0)
- && ((softc->flags & DA_FLAG_WENT_IDLE) == 0)) {
- softc->flags |= DA_FLAG_NEED_OTAG;
+ if (!LIST_EMPTY(&softc->pending_ccbs)) {
+ if ((softc->flags & DA_FLAG_WAS_OTAG) == 0)
+ softc->flags |= DA_FLAG_NEED_OTAG;
+ softc->flags &= ~DA_FLAG_WAS_OTAG;
}
- if (softc->outstanding_cmds > 0)
- softc->flags &= ~DA_FLAG_WENT_IDLE;
-
- softc->ordered_tag_count = 0;
}
/* Queue us up again */
callout_reset(&softc->sendordered_c,
==== //depot/projects/ctsrd/beribsd/src/sys/conf/NOTES#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/NOTES 256377 2013-10-12 12:57:57Z markm $
+# $FreeBSD: head/sys/conf/NOTES 257068 2013-10-24 19:49:55Z pluknet $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -127,7 +127,7 @@
# devices and DFLTPHYS for the rest. Some applications have better
# performance with larger raw I/O access sizes. Note that certain VM
# parameters are derived from these values and making them too large
-# can make an an unbootable kernel.
+# can make an unbootable kernel.
#
# The defaults are 64K and 128K respectively.
options DFLTPHYS=(64*1024)
@@ -1281,8 +1281,7 @@
# to incoming commands that do not otherwise have a logical unit assigned
# to them.
#
-# The "unknown" device (uk? in pre-2.0.5) is now part of the base SCSI
-# configuration as the "pass" driver.
+# The pass driver provides a passthrough API to access the CAM subsystem.
device scbus #base SCSI code
device ch #SCSI media changers
==== //depot/projects/ctsrd/beribsd/src/sys/conf/files#26 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/files 256961 2013-10-23 13:09:57Z loos $
+# $FreeBSD: head/sys/conf/files 257064 2013-10-24 16:56:38Z loos $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -2177,6 +2177,7 @@
dev/sound/midi/mpufoi_if.m optional sound
dev/sound/midi/sequencer.c optional sound
dev/sound/midi/synth_if.m optional sound
+dev/spibus/ofw_spibus.c optional fdt spibus
dev/spibus/spibus.c optional spibus \
dependency "spibus_if.h"
dev/spibus/spibus_if.m optional spibus
==== //depot/projects/ctsrd/beribsd/src/sys/conf/files.powerpc#13 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.powerpc 256898 2013-10-22 14:07:57Z nwhitehorn $
+# $FreeBSD: head/sys/conf/files.powerpc 257016 2013-10-23 20:00:14Z nwhitehorn $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -46,6 +46,7 @@
dev/ofw/ofw_console.c optional aim
dev/ofw/ofw_disk.c optional ofwd aim
dev/ofw/ofw_iicbus.c optional iicbus aim
+dev/ofw/ofw_nexus.c optional aim | fdt
dev/ofw/ofw_standard.c optional aim powerpc
dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac
dev/quicc/quicc_bfe_fdt.c optional quicc mpc85xx
==== //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_common.c#12 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/fdt/fdt_common.c 256967 2013-10-23 14:04:09Z nwhitehorn $");
+__FBSDID("$FreeBSD: head/sys/dev/fdt/fdt_common.c 257060 2013-10-24 15:44:29Z nwhitehorn $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -514,7 +514,7 @@
pcell_t *intr;
pcell_t intr_cells;
int interrupt, trig, pol;
- int i, intr_num, irq, rv;
+ int i, intr_num, rv;
if (OF_getproplen(node, "interrupts") <= 0)
/* Node does not have 'interrupts' property. */
@@ -566,8 +566,7 @@
intr_sl[i].trig = trig;
intr_sl[i].pol = pol;
- irq = FDT_MAP_IRQ(iph, interrupt);
- resource_list_add(rl, SYS_RES_IRQ, i, irq, irq, 1);
+ resource_list_add(rl, SYS_RES_IRQ, i, interrupt, interrupt, 1);
}
out:
==== //depot/projects/ctsrd/beribsd/src/sys/dev/iscsi/icl.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/iscsi/icl.c 256228 2013-10-09 19:28:56Z trasz $
+ * $FreeBSD: head/sys/dev/iscsi/icl.c 257061 2013-10-24 15:54:06Z trasz $
*/
/*
@@ -723,11 +723,7 @@
for (;;) {
if (ic->ic_disconnecting) {
//ICL_DEBUG("terminating");
- ICL_CONN_LOCK(ic);
- ic->ic_receive_running = false;
- ICL_CONN_UNLOCK(ic);
- kthread_exit();
- return;
+ break;
}
SOCKBUF_LOCK(&so->so_rcv);
@@ -740,6 +736,11 @@
icl_conn_receive_pdus(ic, available);
}
+
+ ICL_CONN_LOCK(ic);
+ ic->ic_receive_running = false;
+ ICL_CONN_UNLOCK(ic);
+ kthread_exit();
}
static int
@@ -879,22 +880,19 @@
ICL_CONN_LOCK(ic);
ic->ic_send_running = true;
- ICL_CONN_UNLOCK(ic);
for (;;) {
- ICL_CONN_LOCK(ic);
if (ic->ic_disconnecting) {
//ICL_DEBUG("terminating");
- ic->ic_send_running = false;
- ICL_CONN_UNLOCK(ic);
- kthread_exit();
- return;
+ break;
}
- if (TAILQ_EMPTY(&ic->ic_to_send))
- cv_wait(&ic->ic_send_cv, &ic->ic_lock);
icl_conn_send_pdus(ic);
- ICL_CONN_UNLOCK(ic);
+ cv_wait(&ic->ic_send_cv, &ic->ic_lock);
}
+
+ ic->ic_send_running = false;
+ ICL_CONN_UNLOCK(ic);
+ kthread_exit();
}
static int
==== //depot/projects/ctsrd/beribsd/src/sys/dev/iwn/if_iwn.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/iwn/if_iwn.c 255023 2013-08-29 13:56:44Z adrian $");
+__FBSDID("$FreeBSD: head/sys/dev/iwn/if_iwn.c 257035 2013-10-24 01:03:42Z adrian $");
#include "opt_wlan.h"
#include "opt_iwn.h"
@@ -77,6 +77,7 @@
#include <dev/iwn/if_iwnreg.h>
#include <dev/iwn/if_iwnvar.h>
#include <dev/iwn/if_iwn_devid.h>
+#include <dev/iwn/if_iwn_debug.h>
struct iwn_ident {
uint16_t vendor;
@@ -331,80 +332,6 @@
static void iwn_debug_register(struct iwn_softc *);
#endif
-#ifdef IWN_DEBUG
-enum {
- IWN_DEBUG_XMIT = 0x00000001, /* basic xmit operation */
- IWN_DEBUG_RECV = 0x00000002, /* basic recv operation */
- IWN_DEBUG_STATE = 0x00000004, /* 802.11 state transitions */
- IWN_DEBUG_TXPOW = 0x00000008, /* tx power processing */
- IWN_DEBUG_RESET = 0x00000010, /* reset processing */
- IWN_DEBUG_OPS = 0x00000020, /* iwn_ops processing */
- IWN_DEBUG_BEACON = 0x00000040, /* beacon handling */
- IWN_DEBUG_WATCHDOG = 0x00000080, /* watchdog timeout */
- IWN_DEBUG_INTR = 0x00000100, /* ISR */
- IWN_DEBUG_CALIBRATE = 0x00000200, /* periodic calibration */
- IWN_DEBUG_NODE = 0x00000400, /* node management */
- IWN_DEBUG_LED = 0x00000800, /* led management */
- IWN_DEBUG_CMD = 0x00001000, /* cmd submission */
- IWN_DEBUG_TXRATE = 0x00002000, /* TX rate debugging */
- IWN_DEBUG_PWRSAVE = 0x00004000, /* Power save operations */
- IWN_DEBUG_REGISTER = 0x20000000, /* print chipset register */
- IWN_DEBUG_TRACE = 0x40000000, /* Print begin and start driver function */
- IWN_DEBUG_FATAL = 0x80000000, /* fatal errors */
- IWN_DEBUG_ANY = 0xffffffff
-};
-
-#define DPRINTF(sc, m, fmt, ...) do { \
- if (sc->sc_debug & (m)) \
- printf(fmt, __VA_ARGS__); \
-} while (0)
-
-static const char *
-iwn_intr_str(uint8_t cmd)
-{
- switch (cmd) {
- /* Notifications */
- case IWN_UC_READY: return "UC_READY";
- case IWN_ADD_NODE_DONE: return "ADD_NODE_DONE";
- case IWN_TX_DONE: return "TX_DONE";
- case IWN_START_SCAN: return "START_SCAN";
- case IWN_STOP_SCAN: return "STOP_SCAN";
- case IWN_RX_STATISTICS: return "RX_STATS";
- case IWN_BEACON_STATISTICS: return "BEACON_STATS";
- case IWN_STATE_CHANGED: return "STATE_CHANGED";
- case IWN_BEACON_MISSED: return "BEACON_MISSED";
- case IWN_RX_PHY: return "RX_PHY";
- case IWN_MPDU_RX_DONE: return "MPDU_RX_DONE";
- case IWN_RX_DONE: return "RX_DONE";
-
- /* Command Notifications */
- case IWN_CMD_RXON: return "IWN_CMD_RXON";
- case IWN_CMD_RXON_ASSOC: return "IWN_CMD_RXON_ASSOC";
- case IWN_CMD_EDCA_PARAMS: return "IWN_CMD_EDCA_PARAMS";
- case IWN_CMD_TIMING: return "IWN_CMD_TIMING";
- case IWN_CMD_LINK_QUALITY: return "IWN_CMD_LINK_QUALITY";
- case IWN_CMD_SET_LED: return "IWN_CMD_SET_LED";
- case IWN5000_CMD_WIMAX_COEX: return "IWN5000_CMD_WIMAX_COEX";
- case IWN5000_CMD_CALIB_CONFIG: return "IWN5000_CMD_CALIB_CONFIG";
- case IWN5000_CMD_CALIB_RESULT: return "IWN5000_CMD_CALIB_RESULT";
- case IWN5000_CMD_CALIB_COMPLETE: return "IWN5000_CMD_CALIB_COMPLETE";
- case IWN_CMD_SET_POWER_MODE: return "IWN_CMD_SET_POWER_MODE";
- case IWN_CMD_SCAN: return "IWN_CMD_SCAN";
- case IWN_CMD_SCAN_RESULTS: return "IWN_CMD_SCAN_RESULTS";
- case IWN_CMD_TXPOWER: return "IWN_CMD_TXPOWER";
- case IWN_CMD_TXPOWER_DBM: return "IWN_CMD_TXPOWER_DBM";
- case IWN5000_CMD_TX_ANT_CONFIG: return "IWN5000_CMD_TX_ANT_CONFIG";
- case IWN_CMD_BT_COEX: return "IWN_CMD_BT_COEX";
- case IWN_CMD_SET_CRITICAL_TEMP: return "IWN_CMD_SET_CRITICAL_TEMP";
- case IWN_CMD_SET_SENSITIVITY: return "IWN_CMD_SET_SENSITIVITY";
- case IWN_CMD_PHY_CALIB: return "IWN_CMD_PHY_CALIB";
- }
- return "UNKNOWN INTR NOTIF/CMD";
-}
-#else
-#define DPRINTF(sc, m, fmt, ...) do { (void) sc; } while (0)
-#endif
-
static device_method_t iwn_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, iwn_probe),
==== //depot/projects/ctsrd/beribsd/src/sys/dev/iwn/if_iwnreg.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/dev/iwn/if_iwnreg.h 253898 2013-08-02 21:28:36Z adrian $ */
+/* $FreeBSD: head/sys/dev/iwn/if_iwnreg.h 257034 2013-10-24 01:02:54Z adrian $ */
/* $OpenBSD: if_iwnreg.h,v 1.40 2010/05/05 19:41:57 damien Exp $ */
/*-
@@ -17,6 +17,8 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef __IF_IWNREG_H__
+#define __IF_IWNREG_H__
#define IWN_CT_KILL_THRESHOLD 114 /* in Celsius */
#define IWN_CT_KILL_EXIT_THRESHOLD 95 /* in Celsius */
@@ -2052,3 +2054,5 @@
#define IWN_BARRIER_READ_WRITE(sc) \
bus_space_barrier((sc)->sc_st, (sc)->sc_sh, 0, (sc)->sc_sz, \
BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE)
+
+#endif /* __IF_IWNREG_H__ */
==== //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pci.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 253450 2013-07-18 15:17:11Z jhb $");
+__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 257072 2013-10-24 20:29:29Z kib $");
#include "opt_bus.h"
@@ -70,10 +70,6 @@
#include "pcib_if.h"
#include "pci_if.h"
-#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF)
-#define PCI_DMA_BOUNDARY 0x100000000
-#endif
-
#define PCIR_IS_BIOS(cfg, reg) \
(((cfg)->hdrtype == PCIM_HDRTYPE_NORMAL && reg == PCIR_BIOS) || \
((cfg)->hdrtype == PCIM_HDRTYPE_BRIDGE && reg == PCIR_BIOS_1))
@@ -100,7 +96,6 @@
static int pci_describe_parse_line(char **ptr, int *vendor,
int *device, char **desc);
static char *pci_describe_device(device_t dev);
-static bus_dma_tag_t pci_get_dma_tag(device_t bus, device_t dev);
static int pci_modevent(module_t mod, int what, void *arg);
static void pci_hdrtypedata(device_t pcib, int b, int s, int f,
pcicfgregs *cfg);
==== //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pci_private.h#6 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/pci/pci_private.h 253450 2013-07-18 15:17:11Z jhb $
+ * $FreeBSD: head/sys/dev/pci/pci_private.h 257072 2013-10-24 20:29:29Z kib $
*
*/
@@ -116,6 +116,7 @@
int pci_assign_interrupt_method(device_t dev, device_t child);
int pci_resume(device_t dev);
int pci_suspend(device_t dev);
+bus_dma_tag_t pci_get_dma_tag(device_t bus, device_t dev);
/** Restore the config register state. The state must be previously
* saved with pci_cfg_save. However, the pci bus driver takes care of
==== //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pcireg.h#7 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/pci/pcireg.h 250740 2013-05-17 14:04:31Z kib $
+ * $FreeBSD: head/sys/dev/pci/pcireg.h 257071 2013-10-24 20:25:29Z kib $
*
*/
@@ -762,8 +762,17 @@
#define PCIEM_SLOT_STA_EIS 0x0080
#define PCIEM_SLOT_STA_DLLSC 0x0100
#define PCIER_ROOT_CTL 0x1c
+#define PCIEM_ROOT_CTL_SERR_CORR 0x0001
+#define PCIEM_ROOT_CTL_SERR_NONFATAL 0x0002
+#define PCIEM_ROOT_CTL_SERR_FATAL 0x0004
+#define PCIEM_ROOT_CTL_PME 0x0008
+#define PCIEM_ROOT_CTL_CRS_VIS 0x0010
#define PCIER_ROOT_CAP 0x1e
+#define PCIEM_ROOT_CAP_CRS_VIS 0x0001
#define PCIER_ROOT_STA 0x20
+#define PCIEM_ROOT_STA_PME_REQID_MASK 0x0000ffff
+#define PCIEM_ROOT_STA_PME_STATUS 0x00010000
+#define PCIEM_ROOT_STA_PME_PEND 0x00020000
#define PCIER_DEVICE_CAP2 0x24
#define PCIER_DEVICE_CTL2 0x28
#define PCIEM_CTL2_COMP_TIMEOUT_VAL 0x000f
==== //depot/projects/ctsrd/beribsd/src/sys/dev/pci/pcivar.h#6 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/pci/pcivar.h 254882 2013-08-25 18:09:11Z dumbbell $
+ * $FreeBSD: head/sys/dev/pci/pcivar.h 257070 2013-10-24 20:21:37Z kib $
*
*/
@@ -499,6 +499,15 @@
void pci_save_state(device_t dev);
int pci_set_max_read_req(device_t dev, int size);
+
+#ifdef BUS_SPACE_MAXADDR
+#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF)
+#define PCI_DMA_BOUNDARY 0x100000000
+#else
+#define PCI_DMA_BOUNDARY 0
+#endif
+#endif
+
#endif /* _SYS_BUS_H_ */
/*
==== //depot/projects/ctsrd/beribsd/src/sys/dev/spibus/spibus.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/spibus/spibus.c 239626 2012-08-23 22:38:37Z imp $");
+__FBSDID("$FreeBSD: head/sys/dev/spibus/spibus.c 257064 2013-10-24 16:56:38Z loos $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -23,7 +23,7 @@
spibus_probe(device_t dev)
{
device_set_desc(dev, "spibus bus");
- return (0);
+ return (BUS_PROBE_GENERIC);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list