PERFORCE change 41664 for review
Sam Leffler
sam at FreeBSD.org
Fri Nov 7 13:18:43 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=41664
Change 41664 by sam at sam_ebb on 2003/11/07 13:17:49
IFC
Affected files ...
.. //depot/projects/netperf/sys/boot/i386/btx/btxldr/btxldr.s#2 integrate
.. //depot/projects/netperf/sys/conf/NOTES#18 integrate
.. //depot/projects/netperf/sys/conf/files#22 integrate
.. //depot/projects/netperf/sys/conf/options#18 integrate
.. //depot/projects/netperf/sys/conf/options.i386#5 integrate
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/genfiles#2 integrate
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_call.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_coord.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_party.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_print.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_reset.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_uni.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/sig_verify.c#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/uni.h#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/unidef.h#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/unipriv.h#1 branch
.. //depot/projects/netperf/sys/contrib/ngatm/netnatm/sig/unisig.h#1 branch
.. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#11 integrate
.. //depot/projects/netperf/sys/dev/ciss/ciss.c#6 integrate
.. //depot/projects/netperf/sys/dev/firewire/firewire.h#5 integrate
.. //depot/projects/netperf/sys/dev/firewire/fwdev.c#5 integrate
.. //depot/projects/netperf/sys/dev/firewire/fwmem.c#5 integrate
.. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#8 integrate
.. //depot/projects/netperf/sys/dev/twe/twereg.h#3 integrate
.. //depot/projects/netperf/sys/dev/xe/if_xe.c#7 integrate
.. //depot/projects/netperf/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/netperf/sys/ia64/ia64/unaligned.c#5 integrate
.. //depot/projects/netperf/sys/kern/sched_ule.c#17 integrate
.. //depot/projects/netperf/sys/kern/sys_pipe.c#10 integrate
.. //depot/projects/netperf/sys/kern/sysv_msg.c#4 integrate
.. //depot/projects/netperf/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/netperf/sys/kern/sysv_shm.c#5 integrate
.. //depot/projects/netperf/sys/modules/Makefile#9 integrate
.. //depot/projects/netperf/sys/modules/netgraph/atm/Makefile#4 integrate
.. //depot/projects/netperf/sys/modules/netgraph/atm/uni/Makefile#1 branch
.. //depot/projects/netperf/sys/modules/udf_iconv/Makefile#1 branch
.. //depot/projects/netperf/sys/netgraph/atm/ng_uni.h#1 branch
.. //depot/projects/netperf/sys/netgraph/atm/uni/ng_uni.c#1 branch
.. //depot/projects/netperf/sys/netgraph/atm/uni/ng_uni_cust.h#1 branch
.. //depot/projects/netperf/sys/netinet/ip_input.c#20 integrate
.. //depot/projects/netperf/sys/netinet6/ip6_output.c#23 integrate
.. //depot/projects/netperf/sys/security/mac/mac_internal.h#4 integrate
.. //depot/projects/netperf/sys/sys/proc.h#10 integrate
Differences ...
==== //depot/projects/netperf/sys/boot/i386/btx/btxldr/btxldr.s#2 (text+ko) ====
@@ -13,7 +13,7 @@
# purpose.
#
-# $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.s,v 1.12 2002/10/08 18:19:02 jhb Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.s,v 1.13 2003/11/06 21:33:17 jhb Exp $
#
# Prototype BTX loader program, written in a couple of hours. The
@@ -78,7 +78,7 @@
#
# Relocate caller's arguments.
#
-ifdef('BTXLDR_VERBOSE',`
+ifdef(`BTXLDR_VERBOSE',`
movl $m_esp,%esi # Display
movl %esp,%eax # caller
call hexout # stack
==== //depot/projects/netperf/sys/conf/NOTES#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1186 2003/11/05 14:32:27 bde Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1187 2003/11/07 09:18:52 harti Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -456,6 +456,7 @@
options NGATM_ATMBASE
options NGATM_SSCOP
options NGATM_SSCFU
+options NGATM_UNI
device mn # Munich32x/Falc54 Nx64kbit/sec cards.
device lmc # tulip based LanMedia WAN cards
==== //depot/projects/netperf/sys/conf/files#22 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.844 2003/11/05 06:38:14 scottl Exp $
+# $FreeBSD: src/sys/conf/files,v 1.845 2003/11/07 09:18:52 harti Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1383,6 +1383,15 @@
contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu
netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop
contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop
+netgraph/atm/uni/ng_uni.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni
netgraph/ng_UI.c optional netgraph_UI
netgraph/ng_async.c optional netgraph_async
netgraph/ng_base.c optional netgraph
==== //depot/projects/netperf/sys/conf/options#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.424 2003/11/05 14:37:48 bde Exp $
+# $FreeBSD: src/sys/conf/options,v 1.425 2003/11/07 09:18:53 harti Exp $
#
# On the handling of kernel options
#
@@ -406,6 +406,7 @@
NGATM_ATMBASE opt_netgraph.h
NGATM_SSCOP opt_netgraph.h
NGATM_SSCFU opt_netgraph.h
+NGATM_UNI opt_netgraph.h
# DRM options
DRM_DEBUG opt_drm.h
==== //depot/projects/netperf/sys/conf/options.i386#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.200 2003/11/03 22:45:54 jhb Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.201 2003/11/07 15:14:53 bde Exp $
# Options specific to the i386 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
@@ -38,15 +38,17 @@
CLK_USE_TSC_CALIBRATION opt_clock.h
TIMER_FREQ opt_clock.h
-NO_F00F_HACK opt_cpu.h
+CPU_ATHLON_SSE_HACK opt_cpu.h
+CPU_BLUELIGHTNING_3X opt_cpu.h
CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h
-CPU_BLUELIGHTNING_3X opt_cpu.h
CPU_BTB_EN opt_cpu.h
CPU_CYRIX_NO_LOCK opt_cpu.h
CPU_DIRECT_MAPPED_CACHE opt_cpu.h
CPU_DISABLE_5X86_LSSER opt_cpu.h
+CPU_DISABLE_CMPXCHG opt_global.h # XXX global, unlike other CPU_*
+CPU_DISABLE_SSE opt_cpu.h
CPU_ELAN opt_cpu.h
-CPU_SOEKRIS opt_cpu.h
+CPU_ENABLE_SSE opt_cpu.h
CPU_FASTER_5X86_FPU opt_cpu.h
CPU_GEODE opt_cpu.h
CPU_I486_ON_386 opt_cpu.h
@@ -55,20 +57,16 @@
CPU_LOOP_EN opt_cpu.h
CPU_PPRO2CELERON opt_cpu.h
CPU_RSTK_EN opt_cpu.h
+CPU_SOEKRIS opt_cpu.h
CPU_SUSP_HLT opt_cpu.h
CPU_UPGRADE_HW_CACHE opt_cpu.h
CPU_WT_ALLOC opt_cpu.h
+CYRIX_CACHE_REALLY_WORKS opt_cpu.h
CYRIX_CACHE_WORKS opt_cpu.h
-CYRIX_CACHE_REALLY_WORKS opt_cpu.h
+ELAN_PPS opt_cpu.h # XXX should be named CPU_*
+ELAN_XTAL opt_cpu.h # XXX should be named CPU_*
+NO_F00F_HACK opt_cpu.h
NO_MEMORY_HOLE opt_cpu.h
-CPU_ENABLE_SSE opt_cpu.h
-CPU_ATHLON_SSE_HACK opt_cpu.h
-CPU_DISABLE_SSE opt_cpu.h
-CPU_DISABLE_CMPXCHG opt_global.h
-
-# Options for the AMD Elan CPU
-ELAN_PPS opt_cpu.h
-ELAN_XTAL opt_cpu.h
# The CPU type affects the endian conversion functions all over the kernel.
I386_CPU opt_global.h
==== //depot/projects/netperf/sys/contrib/ngatm/netnatm/genfiles#2 (text+ko) ====
@@ -11,5 +11,5 @@
awk -f ${SRC}msg/parseie.awk -f ${SRC}msg/genieh.awk ${SRC}msg/ie.def >${DST}msg/uni_ie.h
awk -f ${SRC}msg/parsemsg.awk -f ${SRC}msg/genmsgc.awk ${SRC}msg/msg.def >${DST}msg/uni_msg.c
awk -f ${SRC}msg/parsemsg.awk -f ${SRC}msg/genmsgh.awk ${SRC}msg/msg.def >${DST}msg/uni_msg.h
-# awk -f ${SRC}msg/parsemsg.awk -f ${SRC}sig/genmsgcpyh.awk ${SRC}msg/msg.def >${DST}sig/unimsgcpy.h
-# awk -f ${SRC}msg/parsemsg.awk -f ${SRC}sig/genmsgcpyc.awk ${SRC}msg/msg.def >${DST}sig/sig_unimsgcpy.c
+awk -f ${SRC}msg/parsemsg.awk -f ${SRC}sig/genmsgcpyh.awk ${SRC}msg/msg.def >${DST}sig/unimsgcpy.h
+awk -f ${SRC}msg/parsemsg.awk -f ${SRC}sig/genmsgcpyc.awk ${SRC}msg/msg.def >${DST}sig/sig_unimsgcpy.c
==== //depot/projects/netperf/sys/dev/ata/atapi-cd.c#11 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.151 2003/11/02 22:24:47 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.152 2003/11/07 08:31:09 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -233,7 +233,6 @@
cdp->device = atadev;
cdp->lun = ata_get_lun(&acd_lun_map);
cdp->block_size = 2048;
- cdp->disk_size = -1; /* hack for GEOM SOS */
cdp->slot = -1;
cdp->changer_info = NULL;
return cdp;
@@ -1201,6 +1200,7 @@
return;
cdp->device->flags &= ~ATA_D_MEDIA_CHANGED;
+ cdp->disk_size = -1; /* hack for GEOM SOS */
len = sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry);
ccb[0] = ATAPI_READ_TOC;
==== //depot/projects/netperf/sys/dev/ciss/ciss.c#6 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.30 2003/10/15 18:52:44 ps Exp $
+ * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.31 2003/11/07 03:01:48 ps Exp $
*/
/*
@@ -243,6 +243,7 @@
{ 0x0e11, 0x4080, CISS_BOARD_SA5B, "Compaq Smart Array 5i" },
{ 0x0e11, 0x4082, CISS_BOARD_SA5B, "Compaq Smart Array 532" },
{ 0x0e11, 0x4083, CISS_BOARD_SA5B, "HP Smart Array 5312" },
+ { 0x0e11, 0x4091, CISS_BOARD_SA5, "HP Smart Array 6i" },
{ 0x0e11, 0x409A, CISS_BOARD_SA5, "HP Smart Array 641" },
{ 0x0e11, 0x409B, CISS_BOARD_SA5, "HP Smart Array 642" },
{ 0x0e11, 0x409C, CISS_BOARD_SA5, "HP Smart Array 6400" },
==== //depot/projects/netperf/sys/dev/firewire/firewire.h#5 (text+ko) ====
@@ -31,7 +31,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.16 2003/10/02 04:06:55 simokawa Exp $
+ * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.17 2003/11/07 09:01:41 simokawa Exp $
*
*/
@@ -71,7 +71,7 @@
#define MAXREC(x) (2 << (x))
#define FWPMAX_S400 (2048 + 20) /* MAXREC plus space for control data */
-#define FWMAXQUEUE 64
+#define FWMAXQUEUE 128
#define FWLOCALBUS 0xffc0
==== //depot/projects/netperf/sys/dev/firewire/fwdev.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.34 2003/10/24 13:55:51 simokawa Exp $
+ * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.35 2003/11/07 12:30:57 simokawa Exp $
*
*/
@@ -170,12 +170,12 @@
{
int err = 0;
+ if (DEV_FWMEM(dev))
+ return fwmem_open(dev, flags, fmt, td);
+
if (dev->si_drv1 != NULL)
return (EBUSY);
- if (DEV_FWMEM(dev))
- return fwmem_open(dev, flags, fmt, td);
-
#if __FreeBSD_version >= 500000
if ((dev->si_flags & SI_NAMED) == 0) {
int unit = DEV2UNIT(dev);
==== //depot/projects/netperf/sys/dev/firewire/fwmem.c#5 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.24 2003/10/23 01:55:03 simokawa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.25 2003/11/07 12:39:39 simokawa Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,6 +56,7 @@
#include <sys/signal.h>
#include <sys/mman.h>
#include <sys/ioccom.h>
+#include <sys/fcntl.h>
#include <dev/firewire/firewire.h>
#include <dev/firewire/firewirereg.h>
@@ -77,6 +78,11 @@
#define MAXLEN (512 << fwmem_speed)
+struct fwmem_softc {
+ struct fw_eui64 eui;
+ int refcount;
+};
+
static struct fw_xfer *
fwmem_xfer_req(
struct fw_device *fwdev,
@@ -260,18 +266,25 @@
int
fwmem_open (dev_t dev, int flags, int fmt, fw_proc *td)
{
- struct fw_eui64 *eui;
+ struct fwmem_softc *fms;
- if (dev->si_drv1 != NULL)
- return (EBUSY);
-
- eui = (struct fw_eui64 *)malloc(sizeof(struct fw_eui64),
+ if (dev->si_drv1 != NULL) {
+ if ((flags & FWRITE) != 0)
+ return (EBUSY);
+ fms = (struct fwmem_softc *)dev->si_drv1;
+ fms->refcount ++;
+ } else {
+ fms = (struct fwmem_softc *)malloc(sizeof(struct fwmem_softc),
M_FW, M_WAITOK);
- if (eui == NULL)
- return ENOMEM;
- bcopy(&fwmem_eui64, eui, sizeof(struct fw_eui64));
- dev->si_drv1 = (void *)eui;
- dev->si_iosize_max = DFLTPHYS;
+ if (fms == NULL)
+ return ENOMEM;
+ bcopy(&fwmem_eui64, &fms->eui, sizeof(struct fw_eui64));
+ dev->si_drv1 = (void *)fms;
+ dev->si_iosize_max = DFLTPHYS;
+ fms->refcount = 1;
+ }
+ if (fwmem_debug)
+ printf("%s: refcount=%d\n", __FUNCTION__, fms->refcount);
return (0);
}
@@ -279,8 +292,16 @@
int
fwmem_close (dev_t dev, int flags, int fmt, fw_proc *td)
{
- free(dev->si_drv1, M_FW);
- dev->si_drv1 = NULL;
+ struct fwmem_softc *fms;
+
+ fms = (struct fwmem_softc *)dev->si_drv1;
+ fms->refcount --;
+ if (fwmem_debug)
+ printf("%s: refcount=%d\n", __FUNCTION__, fms->refcount);
+ if (fms->refcount < 1) {
+ free(dev->si_drv1, M_FW);
+ dev->si_drv1 = NULL;
+ }
return (0);
}
@@ -309,6 +330,7 @@
fwmem_strategy(struct bio *bp)
{
struct firewire_softc *sc;
+ struct fwmem_softc *fms;
struct fw_device *fwdev;
struct fw_xfer *xfer;
dev_t dev;
@@ -321,11 +343,12 @@
sc = devclass_get_softc(firewire_devclass, unit);
s = splfw();
- fwdev = fw_noderesolve_eui64(sc->fc, (struct fw_eui64 *)dev->si_drv1);
+ fms = (struct fwmem_softc *)dev->si_drv1;
+ fwdev = fw_noderesolve_eui64(sc->fc, &fms->eui);
if (fwdev == NULL) {
if (fwmem_debug)
printf("fwmem: no such device ID:%08x%08x\n",
- fwmem_eui64.hi, fwmem_eui64.lo);
+ fms->eui.hi, fms->eui.lo);
err = EINVAL;
goto error;
}
@@ -375,13 +398,16 @@
int
fwmem_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
{
+ struct fwmem_softc *fms;
int err = 0;
+
+ fms = (struct fwmem_softc *)dev->si_drv1;
switch (cmd) {
case FW_SDEUI64:
- bcopy(data, dev->si_drv1, sizeof(struct fw_eui64));
+ bcopy(data, &fms->eui, sizeof(struct fw_eui64));
break;
case FW_GDEUI64:
- bcopy(dev->si_drv1, data, sizeof(struct fw_eui64));
+ bcopy(&fms->eui, data, sizeof(struct fw_eui64));
break;
default:
err = EINVAL;
==== //depot/projects/netperf/sys/dev/firewire/if_fwe.c#8 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.23 2003/11/06 04:19:15 simokawa Exp $
+ * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.24 2003/11/07 08:59:35 simokawa Exp $
*/
#include "opt_inet.h"
@@ -186,7 +186,12 @@
ifp = &fwe->fwe_if;
ifp->if_softc = &fwe->eth_softc;
+#if __FreeBSD_version >= 501113
if_initname(ifp, device_get_name(dev), unit);
+#else
+ ifp->if_unit = unit;
+ ifp->if_name = "fwe";
+#endif
ifp->if_init = fwe_init;
ifp->if_output = ether_output;
ifp->if_start = fwe_start;
==== //depot/projects/netperf/sys/dev/twe/twereg.h#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/twe/twereg.h,v 1.8 2003/08/05 19:55:21 ps Exp $
+ * $FreeBSD: src/sys/dev/twe/twereg.h,v 1.9 2003/11/06 08:09:29 ps Exp $
*/
/*
@@ -160,7 +160,7 @@
{
u_int32_t address;
u_int32_t length;
-} TWE_SG_Entry __packed;
+} __packed TWE_SG_Entry;
typedef struct {
u_int8_t opcode:5; /* TWE_OP_INITCONNECTION */
@@ -173,7 +173,7 @@
u_int8_t flags;
u_int16_t message_credits;
u_int32_t response_queue_pointer;
-} TWE_Command_INITCONNECTION __packed;
+} __packed TWE_Command_INITCONNECTION;
typedef struct
{
@@ -188,7 +188,7 @@
u_int16_t block_count;
u_int32_t lba;
TWE_SG_Entry sgl[TWE_MAX_SGL_LENGTH];
-} TWE_Command_IO __packed;
+} __packed TWE_Command_IO;
typedef struct
{
@@ -205,7 +205,7 @@
#define TWE_OP_HOTSWAP_ADD_CBOD 0x01 /* add CBOD to empty port */
#define TWE_OP_HOTSWAP_ADD_SPARE 0x02 /* add spare to empty port */
u_int8_t aport;
-} TWE_Command_HOTSWAP __packed;
+} __packed TWE_Command_HOTSWAP;
typedef struct
{
@@ -223,7 +223,7 @@
u_int8_t feature_mode;
u_int16_t all_units;
u_int16_t persistence;
-} TWE_Command_SETATAFEATURE __packed;
+} __packed TWE_Command_SETATAFEATURE;
typedef struct
{
@@ -236,7 +236,7 @@
u_int8_t status;
u_int8_t flags;
u_int16_t target_status; /* set low byte to target request's ID */
-} TWE_Command_CHECKSTATUS __packed;
+} __packed TWE_Command_CHECKSTATUS;
typedef struct
{
@@ -250,7 +250,7 @@
u_int8_t flags;
u_int16_t param_count;
TWE_SG_Entry sgl[TWE_MAX_SGL_LENGTH];
-} TWE_Command_PARAM __packed;
+} __packed TWE_Command_PARAM;
typedef struct
{
@@ -269,7 +269,7 @@
#define TWE_OP_REBUILDUNIT_STARTUNIT 5 /* rebuild src_unit (not supported) */
u_int8_t cs:1; /* request state change on src_unit */
u_int8_t logical_subunit; /* for RAID10 rebuild of logical subunit */
-} TWE_Command_REBUILDUNIT __packed;
+} __packed TWE_Command_REBUILDUNIT;
typedef struct
{
@@ -289,7 +289,7 @@
u_int8_t drive_head;
u_int8_t command;
TWE_SG_Entry sgl[TWE_MAX_ATA_SGL_LENGTH];
-} TWE_Command_ATA __packed;
+} __packed TWE_Command_ATA;
typedef struct
{
@@ -307,7 +307,7 @@
#define TWE_FLAGS_FATAL 0x03
#define TWE_FLAGS_PERCENTAGE (1<<8) /* bits 0-6 indicate completion percentage */
u_int16_t count; /* block count, parameter count, message credits */
-} TWE_Command_Generic __packed;
+} __packed TWE_Command_Generic;
/* command packet - must be TWE_ALIGNMENT aligned */
typedef union
@@ -451,7 +451,7 @@
u_int8_t log_drv_num; /* must be zero for configuration == 0x0f */
u_int32_t start_lba;
u_int32_t block_count; /* actual drive size if configuration == 0x0f, otherwise less DCB size */
-} TWE_Unit_Descriptor __packed;
+} __packed TWE_Unit_Descriptor;
typedef struct
{
@@ -459,7 +459,7 @@
u_int8_t res1;
u_int8_t mirunit_status[4]; /* bitmap of functional subunits in each mirror */
u_int8_t res2[6];
-} TWE_Mirror_Descriptor __packed;
+} __packed TWE_Mirror_Descriptor;
typedef struct
{
@@ -480,7 +480,7 @@
u_int32_t start_lba;
u_int32_t block_count; /* actual drive size if configuration == 0x0f, otherwise less DCB size */
TWE_Unit_Descriptor subunit[0]; /* subunit descriptors, in RAID10 mode is [mirunit][subunit] */
-} TWE_Array_Descriptor __packed;
+} __packed TWE_Array_Descriptor;
typedef struct
{
@@ -488,5 +488,5 @@
u_int8_t parameter_id;
u_int8_t parameter_size_bytes;
u_int8_t data[0];
-} TWE_Param __packed;
+} __packed TWE_Param;
==== //depot/projects/netperf/sys/dev/xe/if_xe.c#7 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.43 2003/11/05 08:27:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.44 2003/11/06 08:54:43 rsm Exp $");
/*
* Portions of this software were derived from Werner Koch's xirc2ps driver
@@ -184,7 +184,9 @@
* Debugging functions
*/
static void xe_mii_dump (struct xe_softc *scp);
-void xe_reg_dump (struct xe_softc *scp);
+#if 0
+static void xe_reg_dump (struct xe_softc *scp);
+#endif
/*
* Debug logging levels - set with hw.xe.debug sysctl
@@ -206,13 +208,17 @@
#define DEVPRINTF(level, arg) if (xe_debug >= (level)) device_printf arg
#define DPRINTF(level, arg) if (xe_debug >= (level)) printf arg
#define XE_MII_DUMP(scp) if (xe_debug >= 3) xe_mii_dump(scp)
+#if 0
#define XE_REG_DUMP(scp) if (xe_debug >= 3) xe_reg_dump(scp)
+#endif
#else
#define DEVPRINTF(level, arg)
#define DPRINTF(level, arg)
#define XE_MII_DUMP(scp)
+#if 0
#define XE_REG_DUMP(scp)
#endif
+#endif
/*
@@ -1828,6 +1834,7 @@
(void)splx(s);
}
+#if 0
void
xe_reg_dump(struct xe_softc *scp) {
int page, i, s;
@@ -1865,6 +1872,7 @@
(void)splx(s);
}
+#endif
int
xe_activate(device_t dev)
==== //depot/projects/netperf/sys/i386/acpica/madt.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.3 2003/11/05 23:15:51 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.4 2003/11/06 14:47:53 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -541,7 +541,8 @@
&old_pin) != 0)
printf("MADT: Could not find APIC for source IRQ %d\n",
intr->Source);
- else
+ else if (ioapic_get_vector(old_ioapic, old_pin) ==
+ intr->Source)
ioapic_disable_pin(old_ioapic, old_pin);
}
ioapic_set_triggermode(new_ioapic, new_pin,
==== //depot/projects/netperf/sys/ia64/ia64/unaligned.c#5 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia64/unaligned.c,v 1.7 2003/11/03 08:04:04 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/unaligned.c,v 1.8 2003/11/06 04:26:40 marcel Exp $
*/
#include <sys/param.h>
@@ -74,12 +74,16 @@
greg_ptr(mcontext_t *mc, int gr)
{
uint64_t *p;
+ int bias, nslots;
if (gr <= 0 || gr >= 32 + (mc->mc_special.cfm & 0x7f))
return (NULL);
if (gr >= 32) {
p = (void*)mc->mc_special.bspstore;
- p += gr - 32;
+ nslots = (mc->mc_special.cfm & 0x7f) - gr + 32;
+ bias = (0x1f8 - (mc->mc_special.bspstore & 0x1f8)) >> 3;
+ nslots += (nslots + bias) / 63;
+ p -= nslots;
gr = 0;
} else if (gr >= 14) {
p = &mc->mc_scratch.gr14;
@@ -134,6 +138,13 @@
uint64_t postinc;
switch (i->i_op) {
+ case ASM_OP_LD2:
+ copyin((void*)va, (void*)&buf.i, 2);
+ reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ wrreg(reg, buf.i & 0xffffU);
+ break;
case ASM_OP_LD4:
copyin((void*)va, (void*)&buf.i, 4);
reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
@@ -155,6 +166,27 @@
return (EINVAL);
spillfd((void*)&buf.d, reg);
break;
+ case ASM_OP_ST2:
+ reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ buf.i = rdreg(reg);
+ copyout((void*)&buf.i, (void*)va, 2);
+ break;
+ case ASM_OP_ST4:
+ reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ buf.i = rdreg(reg);
+ copyout((void*)&buf.i, (void*)va, 4);
+ break;
+ case ASM_OP_ST8:
+ reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ buf.i = rdreg(reg);
+ copyout((void*)&buf.i, (void*)va, 8);
+ break;
default:
return (ENOENT);
}
==== //depot/projects/netperf/sys/kern/sched_ule.c#17 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.79 2003/11/06 03:09:51 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.80 2003/11/06 07:56:01 jeff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -267,7 +267,7 @@
static struct kse *kseq_steal(struct kseq *kseq);
#define KSE_CAN_MIGRATE(ke, class) \
((class) != PRI_ITHD && (ke)->ke_thread->td_pinned == 0 && \
- (ke)->ke_flags & KEF_BOUND) == 0)
+ ((ke)->ke_flags & KEF_BOUND) == 0)
#endif
void
==== //depot/projects/netperf/sys/kern/sys_pipe.c#10 (text+ko) ====
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.155 2003/11/03 17:58:23 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.157 2003/11/06 05:58:26 alc Exp $");
#include "opt_mac.h"
@@ -222,13 +222,10 @@
struct mtx *pmtx;
int fd, error;
- pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
-
rpipe = wpipe = NULL;
if (pipe_create(&rpipe) || pipe_create(&wpipe)) {
pipeclose(rpipe);
pipeclose(wpipe);
- free(pmtx, M_TEMP);
return (ENFILE);
}
@@ -239,7 +236,6 @@
if (error) {
pipeclose(rpipe);
pipeclose(wpipe);
- free(pmtx, M_TEMP);
return (error);
}
/* An extra reference on `rf' has been held for us by falloc(). */
@@ -269,7 +265,6 @@
fdrop(rf, td);
/* rpipe has been closed by fdrop(). */
pipeclose(wpipe);
- free(pmtx, M_TEMP);
return (error);
}
/* An extra reference on `wf' has been held for us by falloc(). */
@@ -293,6 +288,7 @@
mac_init_pipe(rpipe);
mac_create_pipe(td->td_ucred, rpipe);
#endif
+ pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
mtx_init(pmtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE);
rpipe->pipe_mtxp = wpipe->pipe_mtxp = pmtx;
fdrop(rf, td);
@@ -311,9 +307,8 @@
struct pipe *cpipe;
int size;
{
- struct vm_object *object;
caddr_t buffer;
- int npages, error;
+ int error;
static int curfail = 0;
static struct timeval lastfail;
@@ -321,26 +316,19 @@
("pipespace: pipe mutex locked"));
size = round_page(size);
- npages = size / PAGE_SIZE;
/*
- * Create an object, I don't like the idea of paging to/from
- * kernel_object.
* XXX -- minor change needed here for NetBSD/OpenBSD VM systems.
*/
- object = vm_object_allocate(OBJT_DEFAULT, npages);
buffer = (caddr_t) vm_map_min(pipe_map);
/*
- * Insert the object into the kernel map, and allocate kva for it.
* The map entry is, by default, pageable.
* XXX -- minor change needed here for NetBSD/OpenBSD VM systems.
*/
- error = vm_map_find(pipe_map, object, 0,
+ error = vm_map_find(pipe_map, NULL, 0,
(vm_offset_t *) &buffer, size, 1,
VM_PROT_ALL, VM_PROT_ALL, 0);
-
if (error != KERN_SUCCESS) {
- vm_object_deallocate(object);
if (ppsratecheck(&lastfail, &curfail, 1))
printf("kern.maxpipekva exceeded, please see tuning(7).\n");
return (ENOMEM);
==== //depot/projects/netperf/sys/kern/sysv_msg.c#4 (text+ko) ====
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sysv_msg.c,v 1.51 2003/10/21 18:28:35 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_msg.c,v 1.52 2003/11/07 04:47:14 rwatson Exp $");
#include "opt_sysvipc.h"
@@ -504,7 +504,7 @@
error = EEXIST;
goto done2;
}
- if ((error = ipcperm(td, &msqptr->msg_perm, msgflg & 0700 ))) {
+ if ((error = ipcperm(td, &msqptr->msg_perm, msgflg & 0700))) {
DPRINTF(("requester doesn't have 0%o access\n",
msgflg & 0700));
goto done2;
==== //depot/projects/netperf/sys/kern/sysv_sem.c#4 (text+ko) ====
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.64 2003/10/21 18:28:35 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.65 2003/11/07 04:47:14 rwatson Exp $");
#include "opt_sysvipc.h"
@@ -51,7 +51,7 @@
#endif
static struct sem_undo *semu_alloc(struct thread *td);
-static int semundo_adjust(struct thread *td, struct sem_undo **supptr,
+static int semundo_adjust(struct thread *td, struct sem_undo **supptr,
int semid, int semnum, int adjval);
static void semundo_clear(int semid, int semnum);
@@ -527,7 +527,7 @@
semaptr = &sema[semid];
sema_mtxp = &sema_mtx[semid];
mtx_lock(sema_mtxp);
- if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0 ) {
+ if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0) {
error = EINVAL;
goto done2;
}
==== //depot/projects/netperf/sys/kern/sysv_shm.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.88 2003/11/05 01:53:10 fjoe Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.89 2003/11/07 04:47:14 rwatson Exp $");
#include "opt_compat.h"
#include "opt_sysvipc.h"
@@ -395,7 +395,7 @@
return (error);
}
-int
+int
shmat(td, uap)
struct thread *td;
struct shmat_args *uap;
==== //depot/projects/netperf/sys/modules/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.353 2003/11/03 22:44:09 jhb Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.355 2003/11/07 09:38:05 scottl Exp $
.if !defined(NOCRYPT) || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
@@ -137,6 +137,7 @@
ucom \
udbp \
udf \
+ udf_iconv \
ufm \
uftdi \
ugen \
@@ -324,6 +325,10 @@
SUBDIR=${MODULES_OVERRIDE}
.endif
+# pcic -- currently broken and being worked on out of tree.
+# oldcard -- specialized use for debugging only.
+# owi -- totally unsupported for debugging only.
+
# Calling kldxref(8) for each module is expensive.
.if !defined(NO_XREF)
.MAKEFLAGS+= -DNO_XREF
==== //depot/projects/netperf/sys/modules/netgraph/atm/Makefile#4 (text+ko) ====
@@ -1,11 +1,12 @@
-# $FreeBSD: src/sys/modules/netgraph/atm/Makefile,v 1.3 2003/10/24 07:42:08 harti Exp $
+# $FreeBSD: src/sys/modules/netgraph/atm/Makefile,v 1.4 2003/11/07 09:15:14 harti Exp $
SUBDIR= \
atm \
atmbase \
atmpif \
sscfu \
- sscop
+ sscop \
+ uni
.include <bsd.subdir.mk>
==== //depot/projects/netperf/sys/netinet/ip_input.c#20 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_input.c,v 1.249 2003/11/04 16:02:01 ume Exp $
+ * $FreeBSD: src/sys/netinet/ip_input.c,v 1.250 2003/11/07 01:47:52 sam Exp $
*/
#include "opt_bootp.h"
==== //depot/projects/netperf/sys/netinet6/ip6_output.c#23 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/ip6_output.c,v 1.66 2003/11/04 16:02:02 ume Exp $ */
+/* $FreeBSD: src/sys/netinet6/ip6_output.c,v 1.67 2003/11/06 16:42:59 ume Exp $ */
/* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */
/*
@@ -2651,8 +2651,8 @@
/*
* If the interface is specified, validate it.
*/
- if (mreq->ipv6mr_interface < 0
- || if_index < mreq->ipv6mr_interface) {
+ if (mreq->ipv6mr_interface < 0 ||
+ if_index < mreq->ipv6mr_interface) {
error = ENXIO; /* XXX EINVAL? */
break;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list