PERFORCE change 42670 for review
Sam Leffler
sam at FreeBSD.org
Mon Nov 17 09:37:16 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=42670
Change 42670 by sam at sam_ebb on 2003/11/17 09:37:00
IFC
Affected files ...
.. //depot/projects/netperf/sys/alpha/alpha/machdep.c#8 integrate
.. //depot/projects/netperf/sys/amd64/include/clock.h#4 integrate
.. //depot/projects/netperf/sys/amd64/isa/clock.c#5 integrate
.. //depot/projects/netperf/sys/amd64/isa/intr_machdep.c#3 integrate
.. //depot/projects/netperf/sys/conf/NOTES#19 integrate
.. //depot/projects/netperf/sys/conf/files#26 integrate
.. //depot/projects/netperf/sys/conf/kern.post.mk#4 integrate
.. //depot/projects/netperf/sys/conf/kmod.mk#8 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_pci_link.c#4 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_pcib.c#4 integrate
.. //depot/projects/netperf/sys/dev/an/if_an.c#6 integrate
.. //depot/projects/netperf/sys/dev/an/if_anreg.h#5 integrate
.. //depot/projects/netperf/sys/dev/bfe/if_bfe.c#4 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bge.c#14 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed.c#7 integrate
.. //depot/projects/netperf/sys/dev/em/if_em.c#10 integrate
.. //depot/projects/netperf/sys/dev/em/if_em.h#8 integrate
.. //depot/projects/netperf/sys/dev/em/if_em_hw.c#4 integrate
.. //depot/projects/netperf/sys/dev/em/if_em_hw.h#3 integrate
.. //depot/projects/netperf/sys/dev/isp/isp_ioctl.h#2 integrate
.. //depot/projects/netperf/sys/dev/lge/if_lge.c#6 integrate
.. //depot/projects/netperf/sys/dev/lnc/if_lnc.c#5 integrate
.. //depot/projects/netperf/sys/dev/my/if_my.c#7 integrate
.. //depot/projects/netperf/sys/dev/nge/if_nge.c#6 integrate
.. //depot/projects/netperf/sys/dev/owi/if_owi.c#4 integrate
.. //depot/projects/netperf/sys/dev/owi/if_wivar.h#3 integrate
.. //depot/projects/netperf/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/netperf/sys/dev/sn/if_sn.c#7 integrate
.. //depot/projects/netperf/sys/dev/tx/if_tx.c#7 integrate
.. //depot/projects/netperf/sys/dev/usb/if_aue.c#7 integrate
.. //depot/projects/netperf/sys/dev/usb/if_cue.c#7 integrate
.. //depot/projects/netperf/sys/dev/usb/if_kue.c#5 integrate
.. //depot/projects/netperf/sys/dev/usb/ubsa.c#4 integrate
.. //depot/projects/netperf/sys/dev/usb/usb_ethersubr.c#5 integrate
.. //depot/projects/netperf/sys/dev/wl/if_wl.c#6 integrate
.. //depot/projects/netperf/sys/fs/unionfs/union_vnops.c#3 integrate
.. //depot/projects/netperf/sys/i386/acpica/madt.c#6 integrate
.. //depot/projects/netperf/sys/i386/i386/apic_vector.s#4 integrate
.. //depot/projects/netperf/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/netperf/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/netperf/sys/i386/i386/machdep.c#12 integrate
.. //depot/projects/netperf/sys/i386/i386/mptable.c#6 integrate
.. //depot/projects/netperf/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/netperf/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/netperf/sys/i386/include/mptable.h#2 integrate
.. //depot/projects/netperf/sys/i386/isa/atpic.c#3 integrate
.. //depot/projects/netperf/sys/i386/isa/atpic_vector.s#3 integrate
.. //depot/projects/netperf/sys/i386/isa/icu.h#4 integrate
.. //depot/projects/netperf/sys/kern/init_sysent.c#7 integrate
.. //depot/projects/netperf/sys/kern/kern_event.c#5 integrate
.. //depot/projects/netperf/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/netperf/sys/kern/syscalls.c#7 integrate
.. //depot/projects/netperf/sys/kern/syscalls.master#7 integrate
.. //depot/projects/netperf/sys/kern/vfs_mount.c#6 integrate
.. //depot/projects/netperf/sys/modules/if_gre/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/nfs4client/Makefile#1 branch
.. //depot/projects/netperf/sys/net/if_arcsubr.c#5 integrate
.. //depot/projects/netperf/sys/net/if_ef.c#5 integrate
.. //depot/projects/netperf/sys/net/if_ethersubr.c#11 integrate
.. //depot/projects/netperf/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/netperf/sys/net/if_gre.c#3 integrate
.. //depot/projects/netperf/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/netperf/sys/net/if_ppp.c#8 integrate
.. //depot/projects/netperf/sys/net/pfkeyv2.h#3 integrate
.. //depot/projects/netperf/sys/net/rtsock.c#11 integrate
.. //depot/projects/netperf/sys/netatm/ipatm/ipatm_vcm.c#3 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/hci/ng_hci_misc.h#3 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/hci/ng_hci_prse.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#3 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#2 integrate
.. //depot/projects/netperf/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate
.. //depot/projects/netperf/sys/netinet/in_rmx.c#14 integrate
.. //depot/projects/netperf/sys/netinet/in_var.h#5 integrate
.. //depot/projects/netperf/sys/netinet/ip_fastfwd.c#1 branch
.. //depot/projects/netperf/sys/netinet/ip_flow.c#9 delete
.. //depot/projects/netperf/sys/netinet/ip_fw2.c#16 integrate
.. //depot/projects/netperf/sys/netinet/ip_icmp.c#10 integrate
.. //depot/projects/netperf/sys/netinet/ip_input.c#22 integrate
.. //depot/projects/netperf/sys/netinet/ip_output.c#16 integrate
.. //depot/projects/netperf/sys/netinet/ip_var.h#13 integrate
.. //depot/projects/netperf/sys/nfs/nfsproto.h#2 integrate
.. //depot/projects/netperf/sys/nfs/rpcv2.h#2 integrate
.. //depot/projects/netperf/sys/nfs4client/nfs4.h#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_dev.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_dev.h#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_idmap.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_idmap.h#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_socket.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_subs.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_vfs.h#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_vfs_subs.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_vfsops.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_vn.h#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_vn_subs.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4_vnops.c#1 branch
.. //depot/projects/netperf/sys/nfs4client/nfs4m_subs.h#1 branch
.. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#9 integrate
.. //depot/projects/netperf/sys/nfsclient/krpc_subr.c#5 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_bio.c#5 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_diskless.c#4 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_lock.c#3 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_node.c#4 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_subs.c#5 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_vfsops.c#10 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_vnops.c#8 integrate
.. //depot/projects/netperf/sys/nfsclient/nfsargs.h#2 integrate
.. //depot/projects/netperf/sys/nfsclient/nfsm_subs.h#2 integrate
.. //depot/projects/netperf/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/netperf/sys/nfsclient/nfsnode.h#3 integrate
.. //depot/projects/netperf/sys/pci/if_dc.c#14 integrate
.. //depot/projects/netperf/sys/pci/if_dcreg.h#4 integrate
.. //depot/projects/netperf/sys/pci/if_pcn.c#6 integrate
.. //depot/projects/netperf/sys/pci/if_pcnreg.h#2 integrate
.. //depot/projects/netperf/sys/pci/if_rl.c#13 integrate
.. //depot/projects/netperf/sys/pci/if_rlreg.h#8 integrate
.. //depot/projects/netperf/sys/pci/if_sf.c#6 integrate
.. //depot/projects/netperf/sys/pci/if_sfreg.h#3 integrate
.. //depot/projects/netperf/sys/pci/if_sis.c#17 integrate
.. //depot/projects/netperf/sys/pci/if_sisreg.h#6 integrate
.. //depot/projects/netperf/sys/pci/if_sk.c#9 integrate
.. //depot/projects/netperf/sys/pci/if_skreg.h#6 integrate
.. //depot/projects/netperf/sys/pci/if_ste.c#6 integrate
.. //depot/projects/netperf/sys/pci/if_stereg.h#3 integrate
.. //depot/projects/netperf/sys/pci/if_ti.c#7 integrate
.. //depot/projects/netperf/sys/pci/if_tireg.h#3 integrate
.. //depot/projects/netperf/sys/pci/if_tl.c#6 integrate
.. //depot/projects/netperf/sys/pci/if_tlreg.h#3 integrate
.. //depot/projects/netperf/sys/pci/if_vr.c#6 integrate
.. //depot/projects/netperf/sys/pci/if_vrreg.h#3 integrate
.. //depot/projects/netperf/sys/pci/if_wb.c#6 integrate
.. //depot/projects/netperf/sys/pci/if_wbreg.h#3 integrate
.. //depot/projects/netperf/sys/pci/if_xl.c#12 integrate
.. //depot/projects/netperf/sys/pci/if_xlreg.h#4 integrate
.. //depot/projects/netperf/sys/rpc/rpcclnt.c#1 branch
.. //depot/projects/netperf/sys/rpc/rpcclnt.h#1 branch
.. //depot/projects/netperf/sys/rpc/rpcm_subs.h#1 branch
.. //depot/projects/netperf/sys/rpc/rpcv2.h#1 branch
.. //depot/projects/netperf/sys/security/mac/mac_internal.h#6 integrate
.. //depot/projects/netperf/sys/security/mac_test/mac_test.c#4 integrate
.. //depot/projects/netperf/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/netperf/sys/sys/mbuf.h#7 integrate
.. //depot/projects/netperf/sys/sys/proc.h#13 integrate
.. //depot/projects/netperf/sys/sys/reboot.h#2 integrate
.. //depot/projects/netperf/sys/sys/socket.h#2 integrate
.. //depot/projects/netperf/sys/sys/syscall.h#7 integrate
.. //depot/projects/netperf/sys/sys/syscall.mk#7 integrate
.. //depot/projects/netperf/sys/sys/sysctl.h#5 integrate
.. //depot/projects/netperf/sys/sys/sysproto.h#7 integrate
.. //depot/projects/netperf/sys/vm/uma_core.c#8 integrate
.. //depot/projects/netperf/sys/vm/vm_map.c#14 integrate
.. //depot/projects/netperf/sys/vm/vm_mmap.c#8 integrate
Differences ...
==== //depot/projects/netperf/sys/alpha/alpha/machdep.c#8 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.214 2003/11/09 20:31:02 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.215 2003/11/14 04:04:14 jeff Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -1901,9 +1901,10 @@
if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2))
panic("ptrace_single_step: step breakpoints not removed");
+ PROC_UNLOCK(td->td_proc);
error = ptrace_read_int(td, pc, &ins.bits);
if (error)
- return error;
+ goto err;
switch (ins.branch_format.opcode) {
@@ -1943,19 +1944,21 @@
td->td_md.md_sstep[0].addr = addr[0];
error = ptrace_set_bpt(td, &td->td_md.md_sstep[0]);
if (error)
- return error;
+ goto err;
if (count == 2) {
td->td_md.md_sstep[1].addr = addr[1];
error = ptrace_set_bpt(td, &td->td_md.md_sstep[1]);
if (error) {
ptrace_clear_bpt(td, &td->td_md.md_sstep[0]);
- return error;
+ goto err;
}
td->td_md.md_flags |= MDTD_STEP2;
} else
td->td_md.md_flags |= MDTD_STEP1;
- return 0;
+err:
+ PROC_LOCK(td->td_proc);
+ return (error);
}
int
==== //depot/projects/netperf/sys/amd64/include/clock.h#4 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.47 2003/09/30 06:38:11 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.48 2003/11/14 22:34:43 peter Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -30,10 +30,6 @@
*/
struct clockframe;
-#ifndef BURN_BRIDGES
-int acquire_timer0(int rate, void (*function)(struct clockframe *frame));
-int release_timer0(void);
-#endif
int acquire_timer2(int mode);
int release_timer2(void);
int rtcin(int val);
==== //depot/projects/netperf/sys/amd64/isa/clock.c#5 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.204 2003/09/30 06:42:47 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.205 2003/11/14 22:34:43 peter Exp $");
/*
* Routines to handle clock hardware.
@@ -92,24 +92,6 @@
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
-#ifndef BURN_BRIDGES
-/*
- * Time in timer cycles that it takes for microtime() to disable interrupts
- * and latch the count. microtime() currently uses "cli; outb ..." so it
- * normally takes less than 2 timer cycles. Add a few for cache misses.
- * Add a few more to allow for latency in bogus calls to microtime() with
- * interrupts already disabled.
- */
-#define TIMER0_LATCH_COUNT 20
-
-/*
- * Maximum frequency that we are willing to allow for timer0. Must be
- * low enough to guarantee that the timer interrupt handler returns
- * before the next timer interrupt.
- */
-#define TIMER0_MAX_FREQ 20000
-#endif
-
int adjkerntz; /* local offset from GMT in seconds */
int clkintr_pending;
int disable_rtc_set; /* disable resettodr() if != 0 */
@@ -130,18 +112,6 @@
static u_int32_t i8254_lastcount;
static u_int32_t i8254_offset;
static int i8254_ticked;
-#ifndef BURN_BRIDGES
-/*
- * XXX new_function and timer_func should not handle clockframes, but
- * timer_func currently needs to hold hardclock to handle the
- * timer0_state == 0 case. We should use inthand_add()/inthand_remove()
- * to switch between clkintr() and a slightly different timerintr().
- */
-static void (*new_function)(struct clockframe *frame);
-static u_int new_rate;
-static u_int timer0_prescaler_count;
-static u_char timer0_state;
-#endif
static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR;
@@ -182,94 +152,9 @@
mtx_unlock_spin(&clock_lock);
}
timer_func(&frame);
-#ifndef BURN_BRIDGES
- switch (timer0_state) {
-
- case RELEASED:
- break;
-
- case ACQUIRED:
- if ((timer0_prescaler_count += timer0_max_count)
- >= hardclock_max_count) {
- timer0_prescaler_count -= hardclock_max_count;
- hardclock(&frame);
- }
- break;
-
- case ACQUIRE_PENDING:
- mtx_lock_spin(&clock_lock);
- i8254_offset = i8254_get_timecount(NULL);
- i8254_lastcount = 0;
- timer0_max_count = TIMER_DIV(new_rate);
- outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
- outb(TIMER_CNTR0, timer0_max_count & 0xff);
- outb(TIMER_CNTR0, timer0_max_count >> 8);
- mtx_unlock_spin(&clock_lock);
- timer_func = new_function;
- timer0_state = ACQUIRED;
- break;
-
- case RELEASE_PENDING:
- if ((timer0_prescaler_count += timer0_max_count)
- >= hardclock_max_count) {
- mtx_lock_spin(&clock_lock);
- i8254_offset = i8254_get_timecount(NULL);
- i8254_lastcount = 0;
- timer0_max_count = hardclock_max_count;
- outb(TIMER_MODE,
- TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
- outb(TIMER_CNTR0, timer0_max_count & 0xff);
- outb(TIMER_CNTR0, timer0_max_count >> 8);
- mtx_unlock_spin(&clock_lock);
- timer0_prescaler_count = 0;
- timer_func = hardclock;
- timer0_state = RELEASED;
- hardclock(&frame);
- }
- break;
- }
-#endif
}
-#ifndef BURN_BRIDGES
-/*
- * The acquire and release functions must be called at ipl >= splclock().
- */
int
-acquire_timer0(int rate, void (*function)(struct clockframe *frame))
-{
- static int old_rate;
-
- if (rate <= 0 || rate > TIMER0_MAX_FREQ)
- return (-1);
- switch (timer0_state) {
-
- case RELEASED:
- timer0_state = ACQUIRE_PENDING;
- break;
-
- case RELEASE_PENDING:
- if (rate != old_rate)
- return (-1);
- /*
- * The timer has been released recently, but is being
- * re-acquired before the release completed. In this
- * case, we simply reclaim it as if it had not been
- * released at all.
- */
- timer0_state = ACQUIRED;
- break;
-
- default:
- return (-1); /* busy */
- }
- new_function = function;
- old_rate = new_rate = rate;
- return (0);
-}
-#endif
-
-int
acquire_timer2(int mode)
{
@@ -289,29 +174,7 @@
return (0);
}
-#ifndef BURN_BRIDGES
int
-release_timer0()
-{
- switch (timer0_state) {
-
- case ACQUIRED:
- timer0_state = RELEASE_PENDING;
- break;
-
- case ACQUIRE_PENDING:
- /* Nothing happened yet, release quickly. */
- timer0_state = RELEASED;
- break;
-
- default:
- return (-1);
- }
- return (0);
-}
-#endif
-
-int
release_timer2()
{
@@ -942,10 +805,6 @@
freq = timer_freq;
error = sysctl_handle_int(oidp, &freq, sizeof(freq), req);
if (error == 0 && req->newptr != NULL) {
-#ifndef BURN_BRIDGES
- if (timer0_state != RELEASED)
- return (EBUSY); /* too much trouble to handle */
-#endif
set_timer_freq(freq, hz);
i8254_timecounter.tc_frequency = freq;
}
==== //depot/projects/netperf/sys/amd64/isa/intr_machdep.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.76 2003/07/25 21:18:52 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.77 2003/11/14 18:20:20 peter Exp $");
#include "opt_isa.h"
@@ -239,7 +239,7 @@
outb(IO_ICU1+ICU_IMR_OFFSET, IRQ_SLAVE);/* slave on line 2 */
outb(IO_ICU1+ICU_IMR_OFFSET, ICW4_8086);/* 8086 mode */
outb(IO_ICU1+ICU_IMR_OFFSET, 0xff); /* leave interrupts masked */
- outb(IO_ICU1, OCW3_SEL | OCW3_RIS); /* default to IRR on read */
+ outb(IO_ICU1, OCW3_SEL | OCW3_RR); /* default to IRR on read */
outb(IO_ICU1, ICU_SETPRI | 0x2);/* pri order 3-7, 0-2 (com2 first) */
outb(IO_ICU2, ICW1_RESET | ICW1_IC4); /* reset; program device, four bytes */
@@ -248,7 +248,7 @@
outb(IO_ICU2+ICU_IMR_OFFSET, ICU_SLAVEID); /* my slave id is 2 */
outb(IO_ICU2+ICU_IMR_OFFSET, ICW4_8086); /* 8086 mode */
outb(IO_ICU2+ICU_IMR_OFFSET, 0xff); /* leave interrupts masked */
- outb(IO_ICU2, OCW3_SEL | OCW3_RIS); /* default to IRR on read */
+ outb(IO_ICU2, OCW3_SEL | OCW3_RR); /* default to IRR on read */
}
/*
@@ -268,7 +268,7 @@
if (intr == 7) {
outb(IO_ICU1, OCW3_SEL); /* select IS register */
isr = inb(IO_ICU1);
- outb(IO_ICU1, OCW3_SEL | OCW3_RIS); /* reselect IIR */
+ outb(IO_ICU1, OCW3_SEL | OCW3_RR | OCW3_RIS); /* reselect IIR */
if ((isr & 0x80) == 0) {
isaglitch7++;
return;
@@ -277,7 +277,7 @@
if (intr == 15) {
outb(IO_ICU2, OCW3_SEL); /* select IS register */
isr = inb(IO_ICU2);
- outb(IO_ICU2, OCW3_SEL | OCW3_RIS); /* reselect IIR */
+ outb(IO_ICU2, OCW3_SEL | OCW3_RR); /* reselect IIR */
if ((isr & 0x80) == 0) {
isaglitch15++;
return;
==== //depot/projects/netperf/sys/conf/NOTES#19 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1187 2003/11/07 09:18:52 harti Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1188 2003/11/14 11:54:49 simokawa Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2240,6 +2240,7 @@
device firewire # FireWire bus code
device sbp # SCSI over Firewire (Requires scbus and da)
+device sbp_targ # SBP-2 Target mode (Requires scbus and targ)
device fwe # Ethernet over FireWire (non-standard!)
#####################################################################
==== //depot/projects/netperf/sys/conf/files#26 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.850 2003/11/12 04:22:36 ume Exp $
+# $FreeBSD: src/sys/conf/files,v 1.852 2003/11/14 21:02:22 andre Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1449,7 +1449,7 @@
netinet/ip_ecn.c optional inet6
netinet/ip_encap.c optional inet
netinet/ip_encap.c optional inet6
-netinet/ip_flow.c optional inet
+netinet/ip_fastfwd.c optional inet
netinet/ip_fw2.c optional ipfirewall
netinet/ip_icmp.c optional inet
netinet/ip_input.c optional inet
@@ -1563,6 +1563,15 @@
nfsclient/nfs_vfsops.c optional nfsclient
nfsclient/nfs_vnops.c optional nfsclient
nfsclient/nfs_lock.c optional nfsclient
+nfs4client/nfs4_socket.c optional nfsclient
+nfs4client/nfs4_vfsops.c optional nfsclient
+nfs4client/nfs4_vnops.c optional nfsclient
+nfs4client/nfs4_subs.c optional nfsclient
+nfs4client/nfs4_vfs_subs.c optional nfsclient
+nfs4client/nfs4_vn_subs.c optional nfsclient
+nfs4client/nfs4_dev.c optional nfsclient
+nfs4client/nfs4_idmap.c optional nfsclient
+rpc/rpcclnt.c optional nfsclient
nfsserver/nfs_serv.c optional nfsserver
nfsserver/nfs_srvsock.c optional nfsserver
nfsserver/nfs_srvcache.c optional nfsserver
==== //depot/projects/netperf/sys/conf/kern.post.mk#4 (text+ko) ====
@@ -1,18 +1,18 @@
-# Part of unified Makefile for building kernels. This includes all
-# the definitions that need to be included after all the % directives,
-# except %RULES and things that act like they are part of %RULES
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.52 2003/11/14 23:09:38 bde Exp $
+
+# Part of a unified Makefile for building kernels. This part includes all
+# the definitions that need to be after all the % directives except %RULES
+# and ones that act like they are part of %RULES.
#
# Most make variables should not be defined in this file. Instead, they
# should be defined in the kern.pre.mk so that port makefiles can
# override or augment them.
-#
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.50 2003/11/04 06:38:37 green Exp $
-#
# In case the config had a makeoptions DESTDIR...
.if defined(DESTDIR)
MKMODULESENV+= DESTDIR="${DESTDIR}"
.endif
+MKMODULESENV+= KERNBUILDDIR="${.CURDIR}"
.MAIN: all
==== //depot/projects/netperf/sys/conf/kmod.mk#8 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.144 2003/11/04 23:29:17 peter Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.145 2003/11/14 16:04:11 green Exp $
#
# The include file <bsd.kmod.mk> handles installing Kernel Loadable Device
# drivers (KLD's).
@@ -79,6 +79,9 @@
# add to the front of `make' variable.
_ICFLAGS:= ${CFLAGS:M-I*}
CFLAGS+= -nostdinc -I- ${INCLMAGIC} ${_ICFLAGS}
+.if defined(KERNBUILDDIR)
+CFLAGS+= -include ${KERNBUILDDIR}/opt_global.h
+.endif
# Add -I paths for system headers. Individual KLD makefiles don't
# need any -I paths for this. Similar defaults for .PATH can't be
==== //depot/projects/netperf/sys/dev/acpica/acpi_pci_link.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.8 2003/11/12 19:46:17 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.9 2003/11/14 21:36:09 jhb Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -87,10 +87,68 @@
*/
static void
+acpi_pci_link_dump_polarity(UINT32 ActiveHighLow)
+{
+
+ switch (ActiveHighLow) {
+ case ACPI_ACTIVE_HIGH:
+ printf("high,");
+ break;
+
+ case ACPI_ACTIVE_LOW:
+ printf("low,");
+ break;
+
+ default:
+ printf("unknown,");
+ break;
+ }
+}
+
+static void
+acpi_pci_link_dump_trigger(UINT32 EdgeLevel)
+{
+
+ switch (EdgeLevel) {
+ case ACPI_EDGE_SENSITIVE:
+ printf("edge,");
+ break;
+
+ case ACPI_LEVEL_SENSITIVE:
+ printf("level,");
+ break;
+
+ default:
+ printf("unknown,");
+ break;
+ }
+}
+
+static void
+acpi_pci_link_dump_sharemode(UINT32 SharedExclusive)
+{
+
+ switch (SharedExclusive) {
+ case ACPI_EXCLUSIVE:
+ printf("exclusive");
+ break;
+
+ case ACPI_SHARED:
+ printf("sharable");
+ break;
+
+ default:
+ printf("unknown");
+ break;
+ }
+}
+
+static void
acpi_pci_link_entry_dump(struct acpi_prt_entry *entry)
{
UINT8 i;
ACPI_RESOURCE_IRQ *Irq;
+ ACPI_RESOURCE_EXT_IRQ *ExtIrq;
if (entry == NULL || entry->pci_link == NULL) {
return;
@@ -105,57 +163,21 @@
}
printf("] ");
- Irq = NULL;
switch (entry->pci_link->possible_resources.Id) {
case ACPI_RSTYPE_IRQ:
Irq = &entry->pci_link->possible_resources.Data.Irq;
- switch (Irq->ActiveHighLow) {
- case ACPI_ACTIVE_HIGH:
- printf("high,");
- break;
-
- case ACPI_ACTIVE_LOW:
- printf("low,");
- break;
-
- default:
- printf("unknown,");
- break;
- }
-
- switch (Irq->EdgeLevel) {
- case ACPI_EDGE_SENSITIVE:
- printf("edge,");
- break;
-
- case ACPI_LEVEL_SENSITIVE:
- printf("level,");
- break;
-
- default:
- printf("unknown,");
- break;
- }
-
- switch (Irq->SharedExclusive) {
- case ACPI_EXCLUSIVE:
- printf("exclusive");
- break;
-
- case ACPI_SHARED:
- printf("sharable");
- break;
-
- default:
- printf("unknown");
- break;
- }
-
+ acpi_pci_link_dump_polarity(Irq->ActiveHighLow);
+ acpi_pci_link_dump_trigger(Irq->EdgeLevel);
+ acpi_pci_link_dump_sharemode(Irq->SharedExclusive);
break;
case ACPI_RSTYPE_EXT_IRQ:
- /* TBD */
+ ExtIrq = &entry->pci_link->possible_resources.Data.ExtendedIrq;
+
+ acpi_pci_link_dump_polarity(ExtIrq->ActiveHighLow);
+ acpi_pci_link_dump_trigger(ExtIrq->EdgeLevel);
+ acpi_pci_link_dump_sharemode(ExtIrq->SharedExclusive);
break;
}
@@ -565,34 +587,35 @@
bzero(&resbuf, sizeof(resbuf));
crsbuf.Pointer = NULL;
- resbuf.Id = ACPI_RSTYPE_IRQ;
- resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_IRQ);
- if (link->possible_resources.Id != ACPI_RSTYPE_IRQ &&
- link->possible_resources.Id != ACPI_RSTYPE_EXT_IRQ) {
+ switch (link->possible_resources.Id) {
+ default:
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Resource is not an IRQ entry %s - %d\n",
acpi_name(link->handle), link->possible_resources.Id));
return_ACPI_STATUS (AE_TYPE);
- }
- switch (link->possible_resources.Id) {
case ACPI_RSTYPE_IRQ:
+ resbuf.Id = ACPI_RSTYPE_IRQ;
+ resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_IRQ);
+
/* structure copy other fields */
resbuf.Data.Irq = link->possible_resources.Data.Irq;
+ resbuf.Data.Irq.NumberOfInterrupts = 1;
+ resbuf.Data.Irq.Interrupts[0] = irq;
break;
case ACPI_RSTYPE_EXT_IRQ:
- /* XXX */
- resbuf.Data.Irq.EdgeLevel = ACPI_LEVEL_SENSITIVE;
- resbuf.Data.Irq.ActiveHighLow = ACPI_ACTIVE_LOW;
- resbuf.Data.Irq.SharedExclusive = ACPI_SHARED;
+ resbuf.Id = ACPI_RSTYPE_EXT_IRQ;
+ resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_EXT_IRQ);
+
+ /* structure copy other fields */
+ resbuf.Data.ExtendedIrq = link->possible_resources.Data.ExtendedIrq;
+ resbuf.Data.ExtendedIrq.NumberOfInterrupts = 1;
+ resbuf.Data.ExtendedIrq.Interrupts[0] = irq;
break;
}
- resbuf.Data.Irq.NumberOfInterrupts = 1;
- resbuf.Data.Irq.Interrupts[0] = irq;
-
error = acpi_AppendBufferResource(&crsbuf, &resbuf);
if (ACPI_FAILURE(error)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
==== //depot/projects/netperf/sys/dev/acpica/acpi_pcib.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.32 2003/08/24 17:48:01 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.33 2003/11/14 21:36:09 jhb Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -118,6 +118,8 @@
ACPI_DEVICE_INFO devinfo;
ACPI_BUFFER buf = {sizeof(devinfo), &devinfo};
ACPI_STATUS status;
+ UINT32 NumberOfInterrupts;
+ UINT32 *Interrupts;
u_int8_t *prtp;
int interrupt;
int i;
@@ -234,16 +236,25 @@
}
/* type-check the resource we've got */
- if (crsres->Id != ACPI_RSTYPE_IRQ) { /* XXX ACPI_RSTYPE_EXT_IRQ */
+ if (crsres->Id != ACPI_RSTYPE_IRQ && crsres->Id != ACPI_RSTYPE_EXT_IRQ) {
device_printf(pcib, "_CRS resource entry has unsupported type %d\n",
crsres->Id);
goto out;
}
+ /* set variables based on resource type */
+ if (crsres->Id == ACPI_RSTYPE_IRQ) {
+ NumberOfInterrupts = crsres->Data.Irq.NumberOfInterrupts;
+ Interrupts = crsres->Data.Irq.Interrupts;
+ } else {
+ NumberOfInterrupts = crsres->Data.ExtendedIrq.NumberOfInterrupts;
+ Interrupts = crsres->Data.ExtendedIrq.Interrupts;
+ }
+
/* if there's more than one interrupt, we are confused */
- if (crsres->Data.Irq.NumberOfInterrupts > 1) {
+ if (NumberOfInterrupts > 1) {
device_printf(pcib, "device has too many interrupts (%d)\n",
- crsres->Data.Irq.NumberOfInterrupts);
+ NumberOfInterrupts);
goto out;
}
@@ -255,10 +266,10 @@
*
* XXX check ASL examples to see if this is an acceptable set of tests
*/
- if ((crsres->Data.Irq.NumberOfInterrupts == 1) && (crsres->Data.Irq.Interrupts[0] != 0)) {
+ if ((NumberOfInterrupts == 1) && (Interrupts[0] != 0)) {
device_printf(pcib, "slot %d INT%c is routed to irq %d\n",
- pci_get_slot(dev), 'A' + pin, crsres->Data.Irq.Interrupts[0]);
- interrupt = crsres->Data.Irq.Interrupts[0];
+ pci_get_slot(dev), 'A' + pin, Interrupts[0]);
+ interrupt = Interrupts[0];
goto out;
}
@@ -276,14 +287,23 @@
}
/* type-check the resource we've got */
- if (prsres->Id != ACPI_RSTYPE_IRQ) { /* XXX ACPI_RSTYPE_EXT_IRQ */
+ if (prsres->Id != ACPI_RSTYPE_IRQ || prsres->Id != ACPI_RSTYPE_EXT_IRQ) {
device_printf(pcib, "_PRS resource entry has unsupported type %d\n",
prsres->Id);
goto out;
}
+ /* set variables based on resource type */
+ if (prsres->Id == ACPI_RSTYPE_IRQ) {
+ NumberOfInterrupts = prsres->Data.Irq.NumberOfInterrupts;
+ Interrupts = prsres->Data.Irq.Interrupts;
+ } else {
+ NumberOfInterrupts = prsres->Data.ExtendedIrq.NumberOfInterrupts;
+ Interrupts = prsres->Data.ExtendedIrq.Interrupts;
+ }
+
/* there has to be at least one interrupt available */
- if (prsres->Data.Irq.NumberOfInterrupts < 1) {
+ if (NumberOfInterrupts < 1) {
device_printf(pcib, "device has no interrupts\n");
goto out;
}
@@ -300,34 +320,41 @@
* new interrupt.
*/
device_printf(pcib, "possible interrupts:");
- for (i = 0; i < prsres->Data.Irq.NumberOfInterrupts; i++)
- printf(" %d", prsres->Data.Irq.Interrupts[i]);
+ for (i = 0; i < NumberOfInterrupts; i++)
+ printf(" %d", Interrupts[i]);
printf("\n");
if (crsbuf.Pointer != NULL) /* should never happen */
AcpiOsFree(crsbuf.Pointer);
crsbuf.Pointer = NULL;
- resbuf.Id = ACPI_RSTYPE_IRQ;
- resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_IRQ);
- resbuf.Data.Irq = prsres->Data.Irq; /* structure copy other fields */
- resbuf.Data.Irq.NumberOfInterrupts = 1;
- resbuf.Data.Irq.Interrupts[0] = prsres->Data.Irq.Interrupts[0]; /* just take first... */
+ if (prsres->Id == ACPI_RSTYPE_IRQ) {
+ resbuf.Id = ACPI_RSTYPE_IRQ;
+ resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_IRQ);
+ resbuf.Data.Irq = prsres->Data.Irq; /* structure copy other fields */
+ resbuf.Data.Irq.NumberOfInterrupts = 1;
+ resbuf.Data.Irq.Interrupts[0] = Interrupts[0]; /* just take first... */
+ } else {
+ resbuf.Id = ACPI_RSTYPE_EXT_IRQ;
+ resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_IRQ);
+ resbuf.Data.ExtendedIrq = prsres->Data.ExtendedIrq; /* structure copy other fields */
+ resbuf.Data.ExtendedIrq.NumberOfInterrupts = 1;
+ resbuf.Data.ExtendedIrq.Interrupts[0] = Interrupts[0]; /* just take first... */
+ }
if (ACPI_FAILURE(status = acpi_AppendBufferResource(&crsbuf, &resbuf))) {
device_printf(pcib, "couldn't route interrupt %d via %s, interrupt resource build failed - %s\n",
- prsres->Data.Irq.Interrupts[0], acpi_name(lnkdev), AcpiFormatException(status));
+ Interrupts[0], acpi_name(lnkdev), AcpiFormatException(status));
goto out;
}
if (ACPI_FAILURE(status = AcpiSetCurrentResources(lnkdev, &crsbuf))) {
device_printf(pcib, "couldn't route interrupt %d via %s - %s\n",
- prsres->Data.Irq.Interrupts[0], acpi_name(lnkdev), AcpiFormatException(status));
+ Interrupts[0], acpi_name(lnkdev), AcpiFormatException(status));
goto out;
}
/* successful, return the interrupt we just routed */
device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n",
- pci_get_slot(dev), 'A' + pin, prsres->Data.Irq.Interrupts[0],
- acpi_name(lnkdev));
- interrupt = prsres->Data.Irq.Interrupts[0];
+ pci_get_slot(dev), 'A' + pin, Interrupts[0], acpi_name(lnkdev));
+ interrupt = Interrupts[0];
out:
if (crsbuf.Pointer != NULL)
==== //depot/projects/netperf/sys/dev/an/if_an.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.55 2003/10/31 18:31:56 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.56 2003/11/14 19:00:29 sam Exp $");
/*
* The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
==== //depot/projects/netperf/sys/dev/an/if_anreg.h#5 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/an/if_anreg.h,v 1.19 2003/08/24 17:48:04 obrien Exp $
+ * $FreeBSD: src/sys/dev/an/if_anreg.h,v 1.20 2003/11/14 19:00:30 sam Exp $
*/
#define AN_TIMEOUT 65536
==== //depot/projects/netperf/sys/dev/bfe/if_bfe.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.3 2003/10/31 18:31:57 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.4 2003/11/14 19:00:30 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/netperf/sys/dev/bge/if_bge.c#14 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.59 2003/11/13 20:55:47 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.60 2003/11/14 17:16:56 obrien Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -66,9 +66,6 @@
* ring.
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.59 2003/11/13 20:55:47 obrien Exp $");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
==== //depot/projects/netperf/sys/dev/ed/if_ed.c#7 (text+ko) ====
@@ -23,10 +23,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.222 2003/11/13 20:55:48 obrien Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.223 2003/11/14 17:16:56 obrien Exp $");
+
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
* adapters. By David Greenman, 29-April-1993
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list