PERFORCE change 140643 for review
John Birrell
jb at FreeBSD.org
Fri Apr 25 22:38:36 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140643
Change 140643 by jb at freebsd3 on 2008/04/25 22:38:18
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#72 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#17 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#71 integrate
.. //depot/projects/dtrace/ports/MOVED#80 integrate
.. //depot/projects/dtrace/src/sbin/ddb/Makefile#2 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb.8#4 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb.c#4 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb.h#2 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb_capture.c#1 branch
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#41 integrate
.. //depot/projects/dtrace/src/sys/conf/files#86 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_capture.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_thermal.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_82571.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_82571.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_api.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_api.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_defines.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_hw.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_ich8lan.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_ich8lan.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_osdep.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_phy.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_phy.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/if_em.c#20 integrate
.. //depot/projects/dtrace/src/sys/dev/em/if_em.h#14 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_82575.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_api.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_api.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_defines.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_hw.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_mac.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_manage.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_osdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_osdep.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_phy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/if_igb.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/if_igb.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union.h#8 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#16 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#16 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#37 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#22 integrate
.. //depot/projects/dtrace/src/sys/modules/em/Makefile#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#12 integrate
.. //depot/projects/dtrace/www/share/sgml/usergroups.xml#21 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#72 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.787 2008/04/24 05:48:43 osa Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.788 2008/04/25 19:51:43 tabthorpe Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -3349,6 +3349,11 @@
</listitem>
<listitem>
+ <para>Guy Brand
+ <email>gb at isis.u-strasbg.fr</email></para>
+ </listitem>
+
+ <listitem>
<para>Guy Coleman
<email>gtchask at mm.st</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#17 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.388 2008/03/01 09:03:32 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.389 2008/04/25 19:03:56 remko Exp $
-->
<chapter id="install">
@@ -152,7 +152,7 @@
</sect3>
<sect3>
- <title>&os;/&arch.amd64; Architecture</title>
+ <title>&os;/&arch.amd64;</title>
<para>There are two classes of processors capable of running
&os;/&arch.amd64;. The first are AMD64 processors,
@@ -2738,7 +2738,7 @@
<para>To allow anonymous FTP, use the arrow keys to select
&gui.yes; and press <keycap>Enter</keycap>.
- An additionnal confirmation will display:</para>
+ An additional confirmation will display:</para>
<screen> User Confirmation Requested
Anonymous FTP permits un-authenticated users to connect to the system
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#71 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.927 2008/04/23 01:58:05 linimon Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.928 2008/04/25 15:20:29 dfr Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11456,6 +11456,11 @@
</row>
<row>
+ <entry>6.3-STABLE after adding l_sysid to struct flock.</entry>
+ <entry>603102</entry>
+ </row>
+
+ <row>
<entry>7.0-CURRENT.</entry>
<entry>700000</entry>
</row>
==== //depot/projects/dtrace/ports/MOVED#80 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1577 2008/04/22 21:11:12 ehaupt Exp $
+# $FreeBSD: ports/MOVED,v 1.1578 2008/04/25 20:23:33 miwi Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3454,3 +3454,8 @@
multimedia/exportvideo||2008-04-21|Add-on for soon to be removed nuppelvideo port
multimedia/nuppelvideo||2008-04-21|Unmaintained upstream for years. The nuppelvideo format is now supported by mencoder
graphics/ascii0|graphics/asciio|2008-04-22|renamed by delete+add
+misc/kde3-i18n-id||2008-04-25|Has expired: "Distfile no longer available, outdated"
+net/dhcp-agent||2008-04-25|Has expired: Dhcp-agent has not been updated since 2003, it does not build with guile-1.8, and it is unmaintained
+net/ocaml-netclient||2008-04-25|Has expired: is part of ocaml-net
+net/samplicator||2008-04-25|Has expired: Project has vanished
+graphics/entice||2008-04-25|Has expired: Broken and unmaintained
==== //depot/projects/dtrace/src/sbin/ddb/Makefile#2 (text+ko) ====
@@ -1,8 +1,11 @@
-# $FreeBSD: src/sbin/ddb/Makefile,v 1.1 2007/12/26 09:38:22 rwatson Exp $
+# $FreeBSD: src/sbin/ddb/Makefile,v 1.2 2008/04/25 17:34:09 rwatson Exp $
PROG= ddb
-SRCS= ddb.c ddb_script.c
+SRCS= ddb.c ddb_capture.c ddb_script.c
MAN= ddb.8
WARNS= 3
+DPADD= ${LIBKVM}
+LDADD= -lkvm
+
.include <bsd.prog.mk>
==== //depot/projects/dtrace/src/sbin/ddb/ddb.8#4 (text+ko) ====
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2007 Robert N. M. Watson
+.\" Copyright (c) 2007-2008 Robert N. M. Watson
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.4 2008/04/04 07:31:43 ru Exp $
+.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.5 2008/04/25 17:34:09 rwatson Exp $
.\"
-.Dd April 4, 2008
+.Dd April 24, 2008
.Dt DDB 8
.Os
.Sh NAME
@@ -33,6 +33,16 @@
.Nd "configure DDB kernel debugger properties"
.Sh SYNOPSIS
.Nm
+.Cm capture
+.Op Fl M core
+.Op Fl N system
+.Cm print
+.Nm
+.Cm capture
+.Op Fl M core
+.Op Fl N system
+.Cm status
+.Nm
.Cm script
.Ar scriptname
.Nm
@@ -67,6 +77,33 @@
Whitespace at the beginning of lines will be ignored as will lines where the
first non-whitespace character is
.Ql # .
+.Sh OUTPUT CAPTURE
+The
+.Nm
+utility can be used to extract the contents of the
+.Xr ddb 4
+output capture buffer of the current live kernel, or from the crash dump of a
+kernel on disk.
+The following debugger commands are available from the command line:
+.Bl -tag -width indent
+.It Xo
+.Ic Cm capture
+.Op Fl M Ar core
+.Op Fl N Ar system
+.Cm print
+.Xc
+Print the current contents of the
+.Xr ddb 4
+output capture buffer.
+.It Xo
+.Ic Cm capture
+.Op Fl M Ar core
+.Op Fl N Ar system
+.Cm status
+.Xc
+Print the current status of the
+.Xr ddb 4
+output capture buffer.
.Sh SCRIPTING
The
.Nm
==== //depot/projects/dtrace/src/sbin/ddb/ddb.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.3 2008/04/04 07:31:43 ru Exp $");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.4 2008/04/25 17:34:09 rwatson Exp $");
#include <err.h>
#include <stdio.h>
@@ -43,7 +43,9 @@
usage(void)
{
- fprintf(stderr, "usage: ddb script scriptname\n");
+ fprintf(stderr, "usage: ddb capture [-M core] [-N system] print\n");
+ fprintf(stderr, " ddb capture [-M core] [-N system] status\n");
+ fprintf(stderr, " ddb script scriptname\n");
fprintf(stderr, " ddb script scriptname=script\n");
fprintf(stderr, " ddb scripts\n");
fprintf(stderr, " ddb unscript scriptname\n");
@@ -103,7 +105,9 @@
if (argc < 1)
usage();
- if (strcmp(argv[0], "script") == 0)
+ if (strcmp(argv[0], "capture") == 0)
+ ddb_capture(argc, argv);
+ else if (strcmp(argv[0], "script") == 0)
ddb_script(argc, argv);
else if (strcmp(argv[0], "scripts") == 0)
ddb_scripts(argc, argv);
==== //depot/projects/dtrace/src/sbin/ddb/ddb.h#2 (text+ko) ====
@@ -23,12 +23,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/ddb/ddb.h,v 1.1 2007/12/26 09:38:22 rwatson Exp $
+ * $FreeBSD: src/sbin/ddb/ddb.h,v 1.2 2008/04/25 17:34:09 rwatson Exp $
*/
#ifndef DDB_H
#define DDB_H
+void ddb_capture(int argc, char *argv[]);
void ddb_script(int argc, char *argv[]);
void ddb_scripts(int argc, char *argv[]);
void ddb_unscript(int argc, char *argv[]);
==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#41 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
/*
* Manages physical address maps.
@@ -2266,7 +2266,7 @@
* the 2mpage to referencing the page table page.
*/
if ((oldpde & PG_MANAGED) != 0)
- pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+ pmap_pv_demote_pde(pmap, va, oldpde & PG_PS_FRAME);
pmap_pde_demotions++;
CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx"
@@ -2301,10 +2301,10 @@
pmap_invalidate_page(kernel_pmap, sva);
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
if (oldpde & PG_MANAGED) {
- pvh = pa_to_pvh(oldpde & PG_FRAME);
+ pvh = pa_to_pvh(oldpde & PG_PS_FRAME);
pmap_pvh_free(pvh, pmap, sva);
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
vm_page_dirty(m);
@@ -2600,7 +2600,7 @@
oldpde = newpde = *pde;
if (oldpde & PG_MANAGED) {
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
/*
* In contrast to the analogous operation on a 4KB page
@@ -2839,7 +2839,7 @@
* Promote the pv entries.
*/
if ((newpde & PG_MANAGED) != 0)
- pmap_pv_promote_pde(pmap, va, newpde & PG_FRAME);
+ pmap_pv_promote_pde(pmap, va, newpde & PG_PS_FRAME);
/*
* Propagate the PAT index to its proper position.
@@ -3820,7 +3820,7 @@
pc->pc_map[field] |= bitmask;
if ((tpte & PG_PS) != 0) {
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pvh = pa_to_pvh(tpte & PG_FRAME);
+ pvh = pa_to_pvh(tpte & PG_PS_FRAME);
TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
if (TAILQ_EMPTY(&pvh->pv_list)) {
for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
@@ -4029,7 +4029,7 @@
* table page.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
rtval++;
if (rtval > 4) {
@@ -4098,7 +4098,7 @@
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pte = pmap_pde_to_pte(pde, va);
oldpte = *pte;
if ((oldpte & PG_V) != 0) {
@@ -4163,7 +4163,8 @@
* fully populated, this removal never frees
* a page table page.
*/
- va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_FRAME);
+ va += VM_PAGE_TO_PHYS(m) - (oldpde &
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
}
}
==== //depot/projects/dtrace/src/sys/conf/files#86 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -732,6 +732,48 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+ipwbssfw.c optional ipwbssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwbssfw.c"
+ipw_bss.fwo optional ipwbssfw | ipwfw \
+ dependency "ipw_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+ no-implicit-rule \
+ clean "ipw_bss.fwo"
+ipw_bss.fw optional ipwbssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_bss.fw"
+ipwibssfw.c optional ipwibssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwibssfw.c"
+ipw_ibss.fwo optional ipwibssfw | ipwfw \
+ dependency "ipw_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+ no-implicit-rule \
+ clean "ipw_ibss.fwo"
+ipw_ibss.fw optional ipwibssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_ibss.fw"
+ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwmonitorfw.c"
+ipw_monitor.fwo optional ipwmonitorfw | ipwfw \
+ dependency "ipw_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+ no-implicit-rule \
+ clean "ipw_monitor.fwo"
+ipw_monitor.fw optional ipwmonitorfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
@@ -746,6 +788,48 @@
dev/isp/isp_target.c optional isp
dev/ispfw/ispfw.c optional ispfw
dev/iwi/if_iwi.c optional iwi
+iwibssfw.c optional iwibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwibssfw.c"
+iwi_bss.fwo optional iwibssfw | iwifw \
+ dependency "iwi_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+ no-implicit-rule \
+ clean "iwi_bss.fwo"
+iwi_bss.fw optional iwibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_bss.fw"
+iwiibssfw.c optional iwiibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwiibssfw.c"
+iwi_ibss.fwo optional iwiibssfw | iwifw \
+ dependency "iwi_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+ no-implicit-rule \
+ clean "iwi_ibss.fwo"
+iwi_ibss.fw optional iwiibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_ibss.fw"
+iwimonitorfw.c optional iwimonitorfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwimonitorfw.c"
+iwi_monitor.fwo optional iwimonitorfw | iwifw \
+ dependency "iwi_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+ no-implicit-rule \
+ clean "iwi_monitor.fwo"
+iwi_monitor.fw optional iwimonitorfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_monitor.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
@@ -922,6 +1006,62 @@
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
+rt2561fw.c optional rt2561fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561fw.c"
+rt2561fw.fwo optional rt2561fw | ralfw \
+ dependency "rt2561.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+ no-implicit-rule \
+ clean "rt2561.fwo"
+rt2561.fw optional rt2561fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561.fw"
+rt2561sfw.c optional rt2561sfw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561sfw.c"
+rt2561sfw.fwo optional rt2561sfw | ralfw \
+ dependency "rt2561s.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+ no-implicit-rule \
+ clean "rt2561s.fwo"
+rt2561s.fw optional rt2561sfw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561s.fw"
+rt2661fw.c optional rt2661fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2661fw.c"
+rt2661fw.fwo optional rt2661fw | ralfw \
+ dependency "rt2661.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+ no-implicit-rule \
+ clean "rt2661.fwo"
+rt2661.fw optional rt2661fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2661.fw"
+rt2860fw.c optional rt2860fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2860fw.c"
+rt2860fw.fwo optional rt2860fw | ralfw \
+ dependency "rt2860.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+ no-implicit-rule \
+ clean "rt2860.fwo"
+rt2860.fw optional rt2860fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2860.fw"
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
@@ -1183,6 +1323,20 @@
dev/wi/if_wi_pccard.c optional wi pccard
dev/wi/if_wi_pci.c optional wi pci
dev/wl/if_wl.c optional wl isa
+wpifw.c optional wpifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "wpifw.c"
+wpifw.fwo optional wpifw \
+ dependency "wpi.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \
+ no-implicit-rule \
+ clean "wpi.fwo"
+wpi.fw optional wpifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "wpi.fw"
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
fs/coda/coda_fbsd.c optional vcoda
==== //depot/projects/dtrace/src/sys/ddb/db_capture.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5 2008/01/26 23:02:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.6 2008/04/25 13:23:36 rwatson Exp $");
#include "opt_ddb.h"
@@ -83,13 +83,16 @@
static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0,
"DDB capture options");
-SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD,
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD,
&db_capture_bufoff, 0, "Bytes of data in DDB capture buffer");
SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD,
&db_capture_maxbufsize, 0,
"Maximum value for debug.ddb.capture.bufsize");
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
+ &db_capture_inprogress, 0, "DDB output capture in progress");
+
/*
* Boot-time allocation of the DDB capture buffer, if any. Force all buffer
* sizes, including the maximum size, to be rounded to block sizes.
==== //depot/projects/dtrace/src/sys/dev/acpica/acpi_thermal.c#11 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.69 2008/02/16 07:15:34 ume Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.70 2008/04/25 16:45:13 rpaulo Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -90,6 +90,7 @@
int tz_temperature; /*Current temperature*/
int tz_active; /*Current active cooling*/
#define TZ_ACTIVE_NONE -1
+#define TZ_ACTIVE_UNKNOWN -2
int tz_requested; /*Minimum active cooling*/
int tz_thflags; /*Current temp-related flags*/
#define TZ_THFLAG_NONE 0
@@ -202,7 +203,7 @@
sc->tz_dev = dev;
sc->tz_handle = acpi_get_handle(dev);
sc->tz_requested = TZ_ACTIVE_NONE;
- sc->tz_active = TZ_ACTIVE_NONE;
+ sc->tz_active = TZ_ACTIVE_UNKNOWN;
sc->tz_thflags = TZ_THFLAG_NONE;
sc->tz_cooling_proc = NULL;
sc->tz_cooling_proc_running = FALSE;
@@ -520,6 +521,7 @@
* minimum cooling run time if requested.
*/
if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE &&
+ sc->tz_active != TZ_ACTIVE_UNKNOWN &&
(newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) {
getnanotime(&curtime);
@@ -543,6 +545,23 @@
newflags |= TZ_THFLAG_CRT;
/* If the active cooling state has changed, we have to switch things. */
+ if (sc->tz_active == TZ_ACTIVE_UNKNOWN) {
+ /*
+ * We don't know which cooling device is on or off,
+ * so stop them all, because we now know which
+ * should be on (if any).
+ */
+ for (i = 0; i < TZ_NUMLEVELS; i++) {
+ if (sc->tz_zone.al[i].Pointer != NULL) {
+ acpi_ForeachPackageObject(
+ (ACPI_OBJECT *)sc->tz_zone.al[i].Pointer,
+ acpi_tz_switch_cooler_off, sc);
+ }
+ }
+ /* now we know that all devices are off */
+ sc->tz_active = TZ_ACTIVE_NONE;
+ }
+
if (newactive != sc->tz_active) {
/* Turn off the cooling devices that are on, if any are */
if (sc->tz_active != TZ_ACTIVE_NONE)
==== //depot/projects/dtrace/src/sys/dev/em/e1000_82571.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
/* e1000_82571
* e1000_82572
@@ -150,6 +150,25 @@
goto out;
}
break;
+ case e1000_82574:
+ phy->type = e1000_phy_bm;
+ phy->ops.get_cfg_done = e1000_get_cfg_done_generic;
+ phy->ops.get_info = e1000_get_phy_info_m88;
+ phy->ops.commit = e1000_phy_sw_reset_generic;
+ phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88;
+ phy->ops.get_cable_length = e1000_get_cable_length_m88;
+ phy->ops.read_reg = e1000_read_phy_reg_bm2;
+ phy->ops.write_reg = e1000_write_phy_reg_bm2;
+
+ /* This uses above function pointers */
+ ret_val = e1000_get_phy_id_82571(hw);
+ /* Verify PHY ID */
+ if (phy->id != BME1000_E_PHY_ID_R2) {
+ ret_val = -E1000_ERR_PHY;
+ DEBUGOUT1("PHY ID unknown: type = 0x%08x\n", phy->id);
+ goto out;
+ }
+ break;
default:
ret_val = -E1000_ERR_PHY;
goto out;
@@ -193,6 +212,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
if (((eecd >> 15) & 0x3) == 0x3) {
nvm->type = e1000_nvm_flash_hw;
nvm->word_size = 2048;
@@ -374,6 +394,7 @@
{
struct e1000_phy_info *phy = &hw->phy;
s32 ret_val = E1000_SUCCESS;
+ u16 phy_id = 0;
DEBUGFUNC("e1000_get_phy_id_82571");
@@ -391,11 +412,26 @@
case e1000_82573:
ret_val = e1000_get_phy_id(hw);
break;
+ case e1000_82574:
+ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id = (u32)(phy_id << 16);
+ usec_delay(20);
+ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id |= (u32)(phy_id);
+ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+ break;
default:
ret_val = -E1000_ERR_PHY;
break;
}
+out:
return ret_val;
}
@@ -476,7 +512,7 @@
if (ret_val)
goto out;
- if (hw->mac.type != e1000_82573)
+ if (hw->mac.type != e1000_82573 && hw->mac.type != e1000_82574)
ret_val = e1000_acquire_nvm_generic(hw);
if (ret_val)
@@ -521,6 +557,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data);
break;
case e1000_82571:
@@ -825,7 +862,7 @@
* Must acquire the MDIO ownership before MAC reset.
* Ownership defaults to firmware after a reset.
*/
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
extcnf_ctrl = E1000_READ_REG(hw, E1000_EXTCNF_CTRL);
extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
@@ -866,7 +903,7 @@
* Need to wait for Phy configuration completion before accessing
* NVM and Phy.
*/
- if (hw->mac.type == e1000_82573)
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574)
msec_delay(25);
/* Clear any pending interrupt events. */
@@ -934,7 +971,7 @@
E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data);
/* ...for both queues. */
- if (mac->type != e1000_82573) {
+ if (mac->type != e1000_82573 && mac->type != e1000_82574) {
reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1));
reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
E1000_TXDCTL_FULL_TX_DESC_WB |
@@ -1014,14 +1051,14 @@
}
/* Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL);
reg &= ~(1 << 29);
E1000_WRITE_REG(hw, E1000_CTRL, reg);
}
/* Extended Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
reg &= ~(1 << 23);
reg |= (1 << 22);
@@ -1048,7 +1085,7 @@
DEBUGFUNC("e1000_clear_vfta_82571");
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
if (hw->mng_cookie.vlan_id != 0) {
/*
* The VFTA is a 4096b bit-field, each identifying
@@ -1121,7 +1158,8 @@
* the default flow control setting, so we explicitly
* set it to full.
*/
- if (hw->mac.type == e1000_82573 && hw->fc.type == e1000_fc_default)
+ if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) &&
+ hw->fc.type == e1000_fc_default)
hw->fc.type = e1000_fc_full;
return e1000_setup_link_generic(hw);
@@ -1224,11 +1262,10 @@
goto out;
}
- if (hw->mac.type == e1000_82573 &&
+ if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) &&
*data == ID_LED_RESERVED_F746)
*data = ID_LED_DEFAULT_82573;
- else if (*data == ID_LED_RESERVED_0000 ||
- *data == ID_LED_RESERVED_FFFF)
+ else if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
*data = ID_LED_DEFAULT;
out:
return ret_val;
==== //depot/projects/dtrace/src/sys/dev/em/e1000_82571.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_82571.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_82571.h,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
#ifndef _E1000_82571_H_
#define _E1000_82571_H_
@@ -43,4 +43,12 @@
#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000
+/* Intr Throttling - RW */
+#define E1000_EITR_82574(_n) (0x000E8 + (0x4 * (_n)))
+
+#define E1000_EIAC_82574 0x000DC /* Ext. Interrupt Auto Clear - RW */
+#define E1000_EIAC_MASK_82574 0x01500000
+
+#define E1000_RXCFGL 0x0B634 /* TimeSync Rx EtherType & Msg Type Reg - RW */
+
#endif
==== //depot/projects/dtrace/src/sys/dev/em/e1000_api.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_api.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_api.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
#include "e1000_api.h"
#include "e1000_mac.h"
@@ -216,6 +216,9 @@
case E1000_DEV_ID_82573L:
mac->type = e1000_82573;
break;
+ case E1000_DEV_ID_82574L:
+ mac->type = e1000_82574;
+ break;
case E1000_DEV_ID_80003ES2LAN_COPPER_DPT:
case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
case E1000_DEV_ID_80003ES2LAN_COPPER_SPT:
@@ -238,14 +241,24 @@
case E1000_DEV_ID_ICH9_IGP_M_AMT:
case E1000_DEV_ID_ICH9_IGP_M_V:
case E1000_DEV_ID_ICH9_IGP_AMT:
+ case E1000_DEV_ID_ICH9_BM:
case E1000_DEV_ID_ICH9_IGP_C:
+ case E1000_DEV_ID_ICH10_R_BM_LM:
+ case E1000_DEV_ID_ICH10_R_BM_LF:
+ case E1000_DEV_ID_ICH10_R_BM_V:
mac->type = e1000_ich9lan;
break;
+ case E1000_DEV_ID_ICH10_D_BM_LM:
+ case E1000_DEV_ID_ICH10_D_BM_LF:
+ mac->type = e1000_ich10lan;
+ break;
+#ifndef NO_82575_SUPPORT
case E1000_DEV_ID_82575EB_COPPER:
case E1000_DEV_ID_82575EB_FIBER_SERDES:
case E1000_DEV_ID_82575GB_QUAD_COPPER:
mac->type = e1000_82575;
break;
+#endif
default:
/* Should never have loaded on this device */
ret_val = -E1000_ERR_MAC_INIT;
@@ -323,6 +336,7 @@
case e1000_82571:
case e1000_82572:
case e1000_82573:
+ case e1000_82574:
e1000_init_function_pointers_82571(hw);
break;
case e1000_80003es2lan:
@@ -330,11 +344,14 @@
break;
case e1000_ich8lan:
case e1000_ich9lan:
+ case e1000_ich10lan:
e1000_init_function_pointers_ich8lan(hw);
break;
+#ifndef NO_82575_SUPPORT
case e1000_82575:
e1000_init_function_pointers_82575(hw);
break;
+#endif
default:
DEBUGOUT("Hardware not supported\n");
ret_val = -E1000_ERR_CONFIG;
@@ -403,7 +420,7 @@
void e1000_clear_vfta(struct e1000_hw *hw)
{
if (hw->mac.ops.clear_vfta)
- hw->mac.ops.clear_vfta (hw);
+ hw->mac.ops.clear_vfta(hw);
}
/**
==== //depot/projects/dtrace/src/sys/dev/em/e1000_api.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_api.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_api.h,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
#ifndef _E1000_API_H_
#define _E1000_API_H_
@@ -46,7 +46,9 @@
extern void e1000_init_function_pointers_82541(struct e1000_hw *hw);
extern void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw);
extern void e1000_init_function_pointers_ich8lan(struct e1000_hw *hw);
+#ifndef NO_82575_SUPPORT
extern void e1000_init_function_pointers_82575(struct e1000_hw *hw);
+#endif
s32 e1000_set_mac_type(struct e1000_hw *hw);
s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device);
==== //depot/projects/dtrace/src/sys/dev/em/e1000_defines.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_defines.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_defines.h,v 1.7 2008/04/25 21:19:40 jfv Exp $*/
#ifndef _E1000_DEFINES_H_
#define _E1000_DEFINES_H_
@@ -154,6 +154,7 @@
#define E1000_CTRL_EXT_DF_PAREN 0x02000000 /* descriptor FIFO parity error detection enable */
#define E1000_CTRL_EXT_GHOST_PAREN 0x40000000
#define E1000_CTRL_EXT_PBA_CLR 0x80000000 /* PBA Clear */
+#define E1000_CTRL_EXT_LSECCK 0x00001000
#define E1000_I2CCMD_REG_ADDR_SHIFT 16
#define E1000_I2CCMD_REG_ADDR 0x00FF0000
#define E1000_I2CCMD_PHY_ADDR_SHIFT 24
@@ -202,6 +203,13 @@
#define E1000_RXDEXT_STATERR_IPE 0x40000000
#define E1000_RXDEXT_STATERR_RXE 0x80000000
+#define E1000_RXDEXT_LSECH 0x01000000
+#define E1000_RXDEXT_LSECE_MASK 0x60000000
+#define E1000_RXDEXT_LSECE_NO_ERROR 0x00000000
+#define E1000_RXDEXT_LSECE_NO_SA_MATCH 0x20000000
+#define E1000_RXDEXT_LSECE_REPLAY_DETECT 0x40000000
+#define E1000_RXDEXT_LSECE_BAD_SIG 0x60000000
+
/* mask to determine if packets should be dropped due to frame errors */
#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
E1000_RXD_ERR_CE | \
@@ -397,6 +405,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list