PERFORCE change 146340 for review
John Baldwin
jhb at FreeBSD.org
Thu Jul 31 20:12:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=146340
Change 146340 by jhb at jhb_mutex on 2008/07/31 20:12:34
IFC @146334
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#20 integrate
.. //depot/projects/smpng/sys/amd64/amd64/genassym.c#23 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#83 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#64 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#18 integrate
.. //depot/projects/smpng/sys/amd64/include/pcb.h#13 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#27 integrate
.. //depot/projects/smpng/sys/bsm/audit.h#10 integrate
.. //depot/projects/smpng/sys/bsm/audit_internal.h#8 integrate
.. //depot/projects/smpng/sys/bsm/audit_kevents.h#10 integrate
.. //depot/projects/smpng/sys/bsm/audit_record.h#10 integrate
.. //depot/projects/smpng/sys/conf/NOTES#151 integrate
.. //depot/projects/smpng/sys/conf/files#217 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#30 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#10 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate
.. //depot/projects/smpng/sys/dev/e1000/LICENSE#1 branch
.. //depot/projects/smpng/sys/dev/e1000/README#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_80003es2lan.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_80003es2lan.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82540.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82541.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82541.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82542.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82543.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82543.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82571.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82571.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82575.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_82575.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_api.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_api.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_defines.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_hw.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_ich8lan.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_ich8lan.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_mac.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_mac.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_manage.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_manage.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_nvm.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_nvm.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_osdep.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_osdep.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_phy.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_phy.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/e1000_regs.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/if_em.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/if_em.h#1 branch
.. //depot/projects/smpng/sys/dev/e1000/if_igb.c#1 branch
.. //depot/projects/smpng/sys/dev/e1000/if_igb.h#1 branch
.. //depot/projects/smpng/sys/dev/em/LICENSE#7 delete
.. //depot/projects/smpng/sys/dev/em/README#16 delete
.. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.h#5 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82540.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82541.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82541.h#5 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82542.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82543.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82543.h#5 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82571.c#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_82571.h#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_api.c#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_api.h#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_defines.h#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_hw.h#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.c#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.h#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_mac.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_mac.h#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_manage.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_manage.h#5 delete
.. //depot/projects/smpng/sys/dev/em/e1000_nvm.c#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_nvm.h#6 delete
.. //depot/projects/smpng/sys/dev/em/e1000_osdep.c#2 delete
.. //depot/projects/smpng/sys/dev/em/e1000_osdep.h#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_phy.c#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_phy.h#7 delete
.. //depot/projects/smpng/sys/dev/em/e1000_regs.h#5 delete
.. //depot/projects/smpng/sys/dev/em/if_em.c#88 delete
.. //depot/projects/smpng/sys/dev/em/if_em.h#46 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_82575.c#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_82575.h#2 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_api.c#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_api.h#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_defines.h#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_hw.h#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_mac.c#4 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_mac.h#2 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_manage.c#2 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_manage.h#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_nvm.c#2 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_nvm.h#2 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_osdep.c#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_osdep.h#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_phy.c#3 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_phy.h#2 delete
.. //depot/projects/smpng/sys/dev/igb/e1000_regs.h#2 delete
.. //depot/projects/smpng/sys/dev/igb/if_igb.c#4 delete
.. //depot/projects/smpng/sys/dev/igb/if_igb.h#3 delete
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_82598.c#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_api.c#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_api.h#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_common.c#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_common.h#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_phy.c#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_phy.h#3 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_type.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#26 integrate
.. //depot/projects/smpng/sys/dev/usb/ehcireg.h#9 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rum.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/if_ural.c#28 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#95 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#87 integrate
.. //depot/projects/smpng/sys/kern/subr_clist.c#2 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#41 integrate
.. //depot/projects/smpng/sys/kern/vfs_cache.c#41 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#152 integrate
.. //depot/projects/smpng/sys/modules/em/Makefile#11 integrate
.. //depot/projects/smpng/sys/modules/et/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/igb/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/socket/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/nfslockd/Makefile#3 integrate
.. //depot/projects/smpng/sys/net/if.h#37 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#22 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_sco.h#1 branch
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#14 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp.h#9 integrate
.. //depot/projects/smpng/sys/netinet/sctp_asconf.c#13 integrate
.. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#10 integrate
.. //depot/projects/smpng/sys/netinet/sctp_constants.h#15 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#18 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#18 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#18 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.h#14 integrate
.. //depot/projects/smpng/sys/netinet/sctp_timer.c#14 integrate
.. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#18 integrate
.. //depot/projects/smpng/sys/netinet/sctp_var.h#10 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#20 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#112 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#55 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#63 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#68 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#58 integrate
.. //depot/projects/smpng/sys/netinet6/icmp6.c#44 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#54 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#50 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#65 integrate
.. //depot/projects/smpng/sys/security/audit/audit.c#14 integrate
.. //depot/projects/smpng/sys/security/audit/audit.h#8 integrate
.. //depot/projects/smpng/sys/security/audit/audit_arg.c#14 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#10 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#10 integrate
.. //depot/projects/smpng/sys/security/audit/audit_pipe.c#10 integrate
.. //depot/projects/smpng/sys/security/audit/audit_private.h#11 integrate
.. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#15 integrate
.. //depot/projects/smpng/sys/security/audit/audit_worker.c#9 integrate
.. //depot/projects/smpng/sys/sys/procfs.h#5 integrate
.. //depot/projects/smpng/sys/sys/sockbuf.h#1 branch
.. //depot/projects/smpng/sys/sys/socketvar.h#61 integrate
.. //depot/projects/smpng/sys/sys/sockio.h#13 integrate
.. //depot/projects/smpng/sys/sys/sockopt.h#1 branch
.. //depot/projects/smpng/sys/sys/sockstate.h#1 branch
.. //depot/projects/smpng/sys/sys/vnode.h#87 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#31 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#75 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#100 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#66 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#20 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.161 2008/03/23 23:09:06 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $
*/
#include <machine/asmacros.h>
@@ -113,8 +113,8 @@
movq PCB_GSBASE(%r8),%r10
testl $PCB_32BIT,PCB_FLAGS(%r8)
- jnz store_gs /* static predict not taken */
-done_store_gs:
+ jnz store_seg
+done_store_seg:
testl $PCB_DBREGS,PCB_FLAGS(%r8)
jnz store_dr /* static predict not taken */
@@ -176,6 +176,10 @@
testl $TDP_KTHREAD,TD_PFLAGS(%rsi)
jnz do_kthread
+ testl $PCB_32BIT,PCB_FLAGS(%r8)
+ jnz load_seg
+done_load_seg:
+
cmpq PCB_FSBASE(%r8),%r9
jz 1f
/* Restore userland %fs */
@@ -184,7 +188,6 @@
movl PCB_FSBASE+4(%r8),%edx
wrmsr
1:
-
cmpq PCB_GSBASE(%r8),%r10
jz 2f
/* Restore userland %gs */
@@ -193,8 +196,8 @@
movl PCB_GSBASE+4(%r8),%edx
wrmsr
2:
+
do_tss:
-
/* Update the TSS_RSP0 pointer for the next interrupt */
movq PCPU(TSSP), %rax
movq %r8, PCPU(RSP0)
@@ -208,10 +211,6 @@
jnz load_dr /* static predict not taken */
done_load_dr:
- testl $PCB_32BIT,PCB_FLAGS(%r8)
- jnz load_gs /* static predict not taken */
-done_load_gs:
-
/* Restore context. */
movq PCB_R15(%r8),%r15
movq PCB_R14(%r8),%r14
@@ -243,23 +242,35 @@
movq %r10,PCB_GSBASE(%r8)
jmp do_tss
-store_gs:
+store_seg:
movl %gs,PCB_GS(%r8)
- movq PCB_GS32P(%r8),%rax
+ testl $PCB_GS32BIT,PCB_FLAGS(%r8)
+ jnz 2f
+1: movl %ds,PCB_DS(%r8)
+ movl %es,PCB_ES(%r8)
+ movl %fs,PCB_FS(%r8)
+ jmp done_store_seg
+2: movq PCB_GS32P(%r8),%rax
movq (%rax),%rax
movq %rax,PCB_GS32SD(%r8)
- jmp done_store_gs
+ jmp 1b
-load_gs:
+load_seg:
+ testl $PCB_GS32BIT,PCB_FLAGS(%r8)
+ jnz 2f
+1: movl $MSR_GSBASE,%ecx
+ rdmsr
+ movl PCB_GS(%r8),%gs
+ wrmsr
+ movl PCB_DS(%r8),%ds
+ movl PCB_ES(%r8),%es
+ movl PCB_FS(%r8),%fs
+ jmp done_load_seg
/* Restore userland %gs while preserving kernel gsbase */
- movq PCB_GS32P(%r8),%rax
+2: movq PCB_GS32P(%r8),%rax
movq PCB_GS32SD(%r8),%rcx
movq %rcx,(%rax)
- movl $MSR_GSBASE,%ecx
- rdmsr
- movl PCB_GS(%r8),%gs
- wrmsr
- jmp done_load_gs
+ jmp 1b
store_dr:
movq %dr7,%rax /* yes, do the save */
==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#23 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.168 2008/05/16 13:23:47 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $");
#include "opt_compat.h"
#include "opt_kstack_pages.h"
@@ -140,6 +140,7 @@
ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7));
ASSYM(PCB_DBREGS, PCB_DBREGS);
ASSYM(PCB_32BIT, PCB_32BIT);
+ASSYM(PCB_GS32BIT, PCB_GS32BIT);
ASSYM(PCB_FULLCTX, PCB_FULLCTX);
ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags));
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#83 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.638 2008/07/28 04:59:48 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.639 2008/07/31 04:42:42 alc Exp $");
/*
* Manages physical address maps.
@@ -4270,13 +4270,10 @@
/* Adjust the cache mode for a 2MB page mapped via a PDE. */
static __inline void
-pmap_pde_attr(vm_offset_t va, int mode)
+pmap_pde_attr(pd_entry_t *pde, int mode)
{
- pd_entry_t *pde;
u_int opde, npde;
- pde = pmap_pde(kernel_pmap, va);
-
/*
* The cache mode bits are all in the low 32-bits of the
* PDE, so we can just spin on updating the low 32-bits.
@@ -4420,7 +4417,7 @@
for (tmpva = base; size > 0; ) {
pde = pmap_pde(kernel_pmap, tmpva);
if (*pde & PG_PS) {
- pmap_pde_attr(tmpva, mode);
+ pmap_pde_attr(pde, mode);
tmpva += NBPDR;
size -= NBPDR;
} else {
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#64 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.504 2008/07/13 07:20:14 ed Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.505 2008/07/30 22:27:38 jfv Exp $
cpu HAMMER
ident GENERIC
@@ -189,7 +189,8 @@
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
-device em # Intel PRO/1000 adapter Gigabit Ethernet Card
+device em # Intel PRO/1000 Gigabit Ethernet Family
+device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
device ti # Alteon Networks Tigon I/II gigabit Ethernet
==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#18 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.17 2008/03/23 22:44:56 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $");
#include "opt_compat.h"
@@ -741,6 +741,6 @@
fpstate_drop(td);
/* Return via doreti so that we can change to a different %cs */
- pcb->pcb_flags |= PCB_FULLCTX;
+ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT;
td->td_retval[1] = 0;
}
==== //depot/projects/smpng/sys/amd64/include/pcb.h#13 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)pcb.h 5.10 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.64 2008/03/23 22:45:51 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.65 2008/07/30 11:30:55 kib Exp $
*/
#ifndef _AMD64_PCB_H_
@@ -70,6 +70,7 @@
struct savefpu pcb_save;
#define PCB_DBREGS 0x02 /* process using debug registers */
#define PCB_FPUINITDONE 0x08 /* fpu state is initialized */
+#define PCB_GS32BIT 0x20 /* linux gs switch */
#define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */
#define PCB_FULLCTX 0x80 /* full context restore on sysret */
==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#27 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.46 2008/02/11 19:35:03 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.47 2008/07/30 11:30:55 kib Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -696,7 +696,7 @@
td2->td_pcb->pcb_gs32sd = sd;
td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL];
td2->td_pcb->pcb_gs = GSEL(GUGS32_SEL, SEL_UPL);
- td2->td_pcb->pcb_flags |= PCB_32BIT;
+ td2->td_pcb->pcb_flags |= PCB_GS32BIT | PCB_32BIT;
}
}
==== //depot/projects/smpng/sys/bsm/audit.h#10 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 Apple Computer, Inc.
+ * Copyright (c) 2005 Apple Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#40
- * $FreeBSD: src/sys/bsm/audit.h,v 1.10 2007/10/29 18:47:25 rwatson Exp $
+ * $FreeBSD: src/sys/bsm/audit.h,v 1.11 2008/07/31 09:54:35 rwatson Exp $
*/
#ifndef _BSM_AUDIT_H
==== //depot/projects/smpng/sys/bsm/audit_internal.h#8 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 Apple Computer, Inc.
+ * Copyright (c) 2005 Apple Inc.
* Copyright (c) 2005 SPARTA, Inc.
* All rights reserved.
*
@@ -31,7 +31,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#18
- * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.8 2007/07/22 12:28:12 rwatson Exp $
+ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.9 2008/07/31 09:54:35 rwatson Exp $
*/
#ifndef _AUDIT_INTERNAL_H
==== //depot/projects/smpng/sys/bsm/audit_kevents.h#10 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 Apple Computer, Inc.
+ * Copyright (c) 2005 Apple Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34
- * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.12 2007/07/22 12:28:12 rwatson Exp $
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
==== //depot/projects/smpng/sys/bsm/audit_record.h#10 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 Apple Computer, Inc.
+ * Copyright (c) 2005 Apple Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#26
- * $FreeBSD: src/sys/bsm/audit_record.h,v 1.10 2007/07/22 12:28:13 rwatson Exp $
+ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.11 2008/07/31 09:54:35 rwatson Exp $
*/
#ifndef _BSM_AUDIT_RECORD_H_
==== //depot/projects/smpng/sys/conf/NOTES#151 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1499 2008/07/18 14:44:51 dwmalone Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1502 2008/07/30 00:39:25 yongari Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1785,6 +1785,7 @@
# pcn(4) driver is left out of the kernel. The le(4) driver does not
# support the additional features like the MII bus and burst mode of
# the PCnet-FAST and greater chipsets though.
+# re: RealTek 8139C+/8169/816xS/811xS/8101E PCI/PCIe Ethernet adapter
# rl: Support for PCI fast ethernet adapters based on the RealTek 8129/8139
# chipset. Note that the RealTek driver defaults to using programmed
# I/O to do register accesses because memory mapped mode seems to cause
@@ -1879,15 +1880,19 @@
hint.fxp.0.prefer_iomap="0"
device gem # Apple GMAC/Sun ERI/Sun GEM
device hme # Sun HME (Happy Meal Ethernet)
+device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
+device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
device my # Myson Fast Ethernet (MTD80X, MTD89X)
device nge # NatSemi DP83820 gigabit Ethernet
+device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
device pcn # AMD Am79C97x PCI 10/100 NICs
device sf # Adaptec AIC-6915 (``Starfire'')
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
+device stge # Sundance/Tamarack TC9021 gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
@@ -1896,8 +1901,8 @@
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
-#device em # Intel Pro/1000 Gigabit Ethernet
-#device igb # Intel Pro/1000 PCIE Gigabit Ethernet
+device em # Intel Pro/1000 Gigabit Ethernet
+device igb # Intel Pro/1000 PCIE Gigabit Ethernet
#device ixgbe # Intel Pro/10Gbe PCIE Ethernet
device le # AMD Am7900 LANCE and Am79C9xx PCnet
device mxge # Myricom Myri-10G 10GbE NIC
==== //depot/projects/smpng/sys/conf/files#217 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1318 2008/07/25 19:35:40 stas Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1321 2008/07/31 03:51:53 emax Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -608,34 +608,38 @@
dev/ed/if_ed_pci.c optional ed pci
dev/eisa/eisa_if.m standard
dev/eisa/eisaconf.c optional eisa
-dev/em/if_em.c optional em \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_80003es2lan.c optional em \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82540.c optional em \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82541.c optional em \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82542.c optional em \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82543.c optional em \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_82571.c optional em \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_api.c optional em | igb \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_ich8lan.c optional em | igb \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_mac.c optional em | igb \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_manage.c optional em | igb \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_nvm.c optional em | igb \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_phy.c optional em | igb \
- compile-with "${NORMAL_C} -I$S/dev/em"
-dev/em/e1000_osdep.c optional em | igb \
- compile-with "${NORMAL_C} -I$S/dev/em"
+dev/e1000/if_em.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/if_igb.c optional igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_80003es2lan.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82540.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82541.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82542.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82543.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82571.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82575.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/igb"
+dev/e1000/e1000_ich8lan.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_api.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_mac.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_manage.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_nvm.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_phy.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_osdep.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
dev/et/if_et.c optional et
dev/en/if_en_pci.c optional en pci
dev/en/midway.c optional en
@@ -692,10 +696,6 @@
dev/ieee488/pcii.c optional pcii
dev/ieee488/tnt4882.c optional tnt4882
dev/ieee488/upd7210.c optional pcii | tnt4882
-dev/igb/if_igb.c optional igb \
- compile-with "${NORMAL_C} -I$S/dev/igb"
-dev/igb/e1000_82575.c optional igb | em \
- compile-with "${NORMAL_C} -I$S/dev/igb"
dev/iicbus/ad7418.c optional ad7418
dev/iicbus/ds1339.c optional ds1339
dev/iicbus/ds1672.c optional ds1672
@@ -836,8 +836,6 @@
dev/ixgb/ixgb_hw.c optional ixgb
dev/ixgbe/ixgbe.c optional ixgbe \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/tcp_lro.c optional ixgbe \
- compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/ixgbe/ixgbe_phy.c optional ixgbe \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/ixgbe/ixgbe_api.c optional ixgbe \
@@ -1859,6 +1857,7 @@
netgraph/bluetooth/socket/ng_btsocket_l2cap.c optional netgraph_bluetooth_socket
netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c optional netgraph_bluetooth_socket
netgraph/bluetooth/socket/ng_btsocket_rfcomm.c optional netgraph_bluetooth_socket
+netgraph/bluetooth/socket/ng_btsocket_sco.c optional netgraph_bluetooth_socket
netgraph/netflow/netflow.c optional netgraph_netflow
netgraph/netflow/ng_netflow.c optional netgraph_netflow
netgraph/ng_UI.c optional netgraph_UI
==== //depot/projects/smpng/sys/dev/bfe/if_bfe.c#30 (text+ko) ====
@@ -26,7 +26,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.45 2008/04/30 02:49:24 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.48 2008/07/29 09:02:00 yongari Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,18 +171,14 @@
bfe_probe(device_t dev)
{
struct bfe_type *t;
- struct bfe_softc *sc;
+ uint16_t vendor, devid;
t = bfe_devs;
+ vendor = pci_get_vendor(dev);
+ devid = pci_get_device(dev);
- sc = device_get_softc(dev);
- bzero(sc, sizeof(struct bfe_softc));
- sc->bfe_unit = device_get_unit(dev);
- sc->bfe_dev = dev;
-
- while(t->bfe_name != NULL) {
- if ((pci_get_vendor(dev) == t->bfe_vid) &&
- (pci_get_device(dev) == t->bfe_did)) {
+ while (t->bfe_name != NULL) {
+ if (vendor == t->bfe_vid && devid == t->bfe_did) {
device_set_desc_copy(dev, t->bfe_name);
return (BUS_PROBE_DEFAULT);
}
@@ -294,7 +290,7 @@
error = bus_dmamem_alloc(sc->bfe_rx_tag, (void *)&sc->bfe_rx_list,
BUS_DMA_NOWAIT, &sc->bfe_rx_map);
- if(error)
+ if (error)
return (ENOMEM);
bzero(sc->bfe_rx_list, BFE_RX_LIST_SIZE);
@@ -302,7 +298,7 @@
sc->bfe_rx_list, sizeof(struct bfe_desc),
bfe_dma_map, &sc->bfe_rx_dma, BUS_DMA_NOWAIT);
- if(error)
+ if (error)
return (ENOMEM);
bus_dmamap_sync(sc->bfe_rx_tag, sc->bfe_rx_map, BUS_DMASYNC_PREWRITE);
@@ -316,7 +312,7 @@
error = bus_dmamap_load(sc->bfe_tx_tag, sc->bfe_tx_map,
sc->bfe_tx_list, sizeof(struct bfe_desc),
bfe_dma_map, &sc->bfe_tx_dma, BUS_DMA_NOWAIT);
- if(error)
+ if (error)
return (ENOMEM);
bzero(sc->bfe_tx_list, BFE_TX_LIST_SIZE);
@@ -330,16 +326,14 @@
{
struct ifnet *ifp = NULL;
struct bfe_softc *sc;
- int unit, error = 0, rid;
+ int error = 0, rid;
sc = device_get_softc(dev);
mtx_init(&sc->bfe_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF);
callout_init_mtx(&sc->bfe_stat_co, &sc->bfe_mtx, 0);
- unit = device_get_unit(dev);
sc->bfe_dev = dev;
- sc->bfe_unit = unit;
/*
* Map control/status registers.
@@ -350,7 +344,7 @@
sc->bfe_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
RF_ACTIVE);
if (sc->bfe_res == NULL) {
- printf ("bfe%d: couldn't map memory\n", unit);
+ device_printf(dev, "couldn't map memory\n");
error = ENXIO;
goto fail;
}
@@ -365,14 +359,13 @@
sc->bfe_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
RF_SHAREABLE | RF_ACTIVE);
if (sc->bfe_irq == NULL) {
- printf("bfe%d: couldn't map interrupt\n", unit);
+ device_printf(dev, "couldn't map interrupt\n");
error = ENXIO;
goto fail;
}
if (bfe_dma_alloc(dev)) {
- printf("bfe%d: failed to allocate DMA resources\n",
- sc->bfe_unit);
+ device_printf(dev, "failed to allocate DMA resources\n");
error = ENXIO;
goto fail;
}
@@ -380,7 +373,7 @@
/* Set up ifnet structure */
ifp = sc->bfe_ifp = if_alloc(IFT_ETHER);
if (ifp == NULL) {
- printf("bfe%d: failed to if_alloc()\n", sc->bfe_unit);
+ device_printf(dev, "failed to if_alloc()\n");
error = ENOSPC;
goto fail;
}
@@ -404,7 +397,7 @@
if (mii_phy_probe(dev, &sc->bfe_miibus,
bfe_ifmedia_upd, bfe_ifmedia_sts)) {
- printf("bfe%d: MII without any PHY!\n", sc->bfe_unit);
+ device_printf(dev, "MII without any PHY!\n");
error = ENXIO;
goto fail;
}
@@ -425,7 +418,7 @@
NULL, bfe_intr, sc, &sc->bfe_intrhand);
if (error) {
- printf("bfe%d: couldn't set up irq\n", unit);
+ device_printf(dev, "couldn't set up irq\n");
goto fail;
}
fail:
@@ -458,7 +451,7 @@
bfe_chip_reset(sc);
bus_generic_detach(dev);
- if(sc->bfe_miibus != NULL)
+ if (sc->bfe_miibus != NULL)
device_delete_child(dev, sc->bfe_miibus);
bfe_release_resources(sc);
@@ -526,7 +519,7 @@
u_int32_t ret;
sc = device_get_softc(dev);
- if(phy != sc->bfe_phyaddr)
+ if (phy != sc->bfe_phyaddr)
return (0);
bfe_readphy(sc, reg, &ret);
@@ -539,7 +532,7 @@
struct bfe_softc *sc;
sc = device_get_softc(dev);
- if(phy != sc->bfe_phyaddr)
+ if (phy != sc->bfe_phyaddr)
return (0);
bfe_writephy(sc, reg, val);
@@ -593,7 +586,7 @@
int i;
for(i = 0; i < BFE_TX_LIST_CNT; i++) {
- if(sc->bfe_tx_ring[i].bfe_mbuf != NULL) {
+ if (sc->bfe_tx_ring[i].bfe_mbuf != NULL) {
m_freem(sc->bfe_tx_ring[i].bfe_mbuf);
sc->bfe_tx_ring[i].bfe_mbuf = NULL;
bus_dmamap_unload(sc->bfe_tag,
@@ -627,7 +620,7 @@
int i;
for(i = 0; i < BFE_RX_LIST_CNT; i++) {
- if(bfe_list_newbuf(sc, i, NULL) == ENOBUFS)
+ if (bfe_list_newbuf(sc, i, NULL) == ENOBUFS)
return (ENOBUFS);
}
@@ -652,9 +645,9 @@
return (EINVAL);
allocated = 0;
- if(m == NULL) {
+ if (m == NULL) {
m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
- if(m == NULL)
+ if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES;
allocated++;
@@ -676,15 +669,15 @@
if (allocated != 0)
m_free(m);
if (error != ENOMEM)
- printf("bfe%d: failed to map RX buffer, error %d\n",
- sc->bfe_unit, error);
+ device_printf(sc->bfe_dev,
+ "failed to map RX buffer, error %d\n", error);
return (ENOBUFS);
}
bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREWRITE);
ctrl = ETHER_MAX_LEN + 32;
- if(c == BFE_RX_LIST_CNT - 1)
+ if (c == BFE_RX_LIST_CNT - 1)
ctrl |= BFE_DESC_EOT;
d->bfe_ctrl = ctrl;
@@ -757,7 +750,7 @@
DELAY(100);
bfe_readphy(sc, 0, &val);
if (val & BMCR_RESET) {
- printf("bfe%d: PHY Reset would not complete.\n", sc->bfe_unit);
+ device_printf(sc->bfe_dev, "PHY Reset would not complete.\n");
return (ENXIO);
}
return (0);
@@ -820,9 +813,9 @@
/* Internal or external PHY? */
val = CSR_READ_4(sc, BFE_DEVCTRL);
- if(!(val & BFE_IPP))
+ if (!(val & BFE_IPP))
CSR_WRITE_4(sc, BFE_ENET_CTRL, BFE_ENET_EPSEL);
- else if(CSR_READ_4(sc, BFE_DEVCTRL) & BFE_EPR) {
+ else if (CSR_READ_4(sc, BFE_DEVCTRL) & BFE_EPR) {
BFE_AND(sc, BFE_DEVCTRL, ~BFE_EPR);
DELAY(100);
}
@@ -867,7 +860,7 @@
static void
bfe_core_disable(struct bfe_softc *sc)
{
- if((CSR_READ_4(sc, BFE_SBTMSLOW)) & BFE_RESET)
+ if ((CSR_READ_4(sc, BFE_SBTMSLOW)) & BFE_RESET)
return;
/*
@@ -1023,7 +1016,7 @@
if (sc->bfe_ifp != NULL)
if_free(sc->bfe_ifp);
- if(sc->bfe_tx_tag != NULL) {
+ if (sc->bfe_tx_tag != NULL) {
bus_dmamap_unload(sc->bfe_tx_tag, sc->bfe_tx_map);
bus_dmamem_free(sc->bfe_tx_tag, sc->bfe_tx_list,
sc->bfe_tx_map);
@@ -1031,7 +1024,7 @@
sc->bfe_tx_tag = NULL;
}
- if(sc->bfe_rx_tag != NULL) {
+ if (sc->bfe_rx_tag != NULL) {
bus_dmamap_unload(sc->bfe_rx_tag, sc->bfe_rx_map);
bus_dmamem_free(sc->bfe_rx_tag, sc->bfe_rx_list,
sc->bfe_rx_map);
@@ -1039,7 +1032,7 @@
sc->bfe_rx_tag = NULL;
}
- if(sc->bfe_tag != NULL) {
+ if (sc->bfe_tag != NULL) {
for(i = 0; i < BFE_TX_LIST_CNT; i++) {
bus_dmamap_destroy(sc->bfe_tag,
sc->bfe_tx_ring[i].bfe_map);
@@ -1052,7 +1045,7 @@
sc->bfe_tag = NULL;
}
- if(sc->bfe_parent_tag != NULL)
+ if (sc->bfe_parent_tag != NULL)
bus_dma_tag_destroy(sc->bfe_parent_tag);
return;
@@ -1084,9 +1077,9 @@
DELAY(10);
}
if (i == timeout) {
- printf("bfe%d: BUG! Timeout waiting for bit %08x of register "
- "%x to %s.\n", sc->bfe_unit, bit, reg,
- (clear ? "clear" : "set"));
+ device_printf(sc->bfe_dev,
+ "BUG! Timeout waiting for bit %08x of register "
+ "%x to %s.\n", bit, reg, (clear ? "clear" : "set"));
return (-1);
}
return (0);
@@ -1179,9 +1172,9 @@
i = sc->bfe_tx_cons;
/* Go through the mbufs and free those that have been transmitted */
- while(i != chipidx) {
+ while (i != chipidx) {
struct bfe_data *r = &sc->bfe_tx_ring[i];
- if(r->bfe_mbuf != NULL) {
+ if (r->bfe_mbuf != NULL) {
ifp->if_opackets++;
m_freem(r->bfe_mbuf);
r->bfe_mbuf = NULL;
@@ -1191,7 +1184,7 @@
BFE_INC(i, BFE_TX_LIST_CNT);
}
- if(i != sc->bfe_tx_cons) {
+ if (i != sc->bfe_tx_cons) {
/* we freed up some mbufs */
sc->bfe_tx_cons = i;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -1219,7 +1212,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list