PERFORCE change 141069 for review
Diego Giagio
diego at FreeBSD.org
Fri May 2 22:35:52 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=141069
Change 141069 by diego at diego_black on 2008/05/02 22:35:22
IFC
Affected files ...
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/FREEBSD-upgrade#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/HISTORY#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/LICENSE#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/README#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/TODO#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/VERSION#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/aclocal.m4#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/autogen.sh#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/audit/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/audit/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/audit/audit.8#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/audit/audit.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditd/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditd/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditd/audit_warn.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditd/auditd.8#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditd/auditd.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditd/auditd.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/praudit/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/praudit/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/praudit/praudit.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bin/praudit/praudit.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bsm/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bsm/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bsm/audit_filter.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bsm/audit_uevents.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bsm/libbsm.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/compat/clock_gettime.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/compat/endian.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/compat/queue.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/compat/strlcat.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/config.guess#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/config.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/config.h.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/config.sub#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/depcomp#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/install-sh#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/ltmain.sh#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/config/missing#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/configure#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/configure.ac#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_class#1 add
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_control#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_event#1 add
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_filter#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_user#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_warn#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_class.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_control.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_event.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_free_token.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_io.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_mask.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_open.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_token.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/au_user.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/audit_submit.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_audit.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_class.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_control.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_event.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_flags.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_io.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_mask.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_notify.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_token.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_user.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/libbsm.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/audit.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/audit.log.5#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/audit_class.5#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/audit_control.5#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/audit_event.5#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/audit_user.5#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/audit_warn.5#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/auditctl.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/auditon.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/getaudit.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/getauid.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/setaudit.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/man/setauid.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/modules/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/modules/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/bsm/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/bsm/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/bsm/generate.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/arg32_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/arg32_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/data_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/data_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/file_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/file_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/header32_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/in_addr_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/in_addr_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/ip_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/ip_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/ipc_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/ipc_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/iport_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/iport_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/opaque_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/opaque_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/path_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/path_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process32_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process32_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process64_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process64_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/return32_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/return32_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/seq_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/seq_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/subject32_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/subject32_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/subject32ex_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/text_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/text_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/trailer_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/zonename_record#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/reference/zonename_token#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/test/samples/execve-long-args.trail#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/tools/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/tools/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/tools/audump.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files.powerpc#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files.sun4v#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/kern.mk#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/ldscript.mips#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/options#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/iwn/LICENSE#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/hme/if_hme_pci.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/hme/if_hme_sbus.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/iwn/if_iwn.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/iwn/if_iwnreg.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/iwn/if_iwnvar.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/scc/scc_bfe.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/scc/scc_bfe_macio.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/scc/scc_bfe_quicc.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/scc/scc_core.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/if_zyd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/mips/include/am29lv081b.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/mips/include/pmap.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/iwn/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/iwnfw/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/scc/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/bpf.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/clock.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/machdep.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/mp_cpudep.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/swtch.S#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/trap_subr.S#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/vm_machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/include/smp.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/include/spr.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/mpc85xx/mpc85xx.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/maciovar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sun4v/include/bus_common.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/mbuf.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/mount.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/umtx.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/user.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/vm/vm_map.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/vm/vm_map.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/vm/vm_mmap.c#2 integrate
Differences ...
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/NOTES#2 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.79 2008/04/29 21:36:15 sam Exp $
#
#
@@ -302,6 +302,7 @@
# (requires miibus)
# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter
# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters
# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
# nve: nVidia nForce MCP on-board Ethernet Networking
# ral: Ralink Technology IEEE 802.11 wireless adapter
@@ -313,6 +314,7 @@
options ED_HPP
options ED_SIC
device iwi
+device iwn
device ipw
device nfe # nVidia nForce MCP on-board Ethernet Networking
device nve # nVidia nForce MCP on-board Ethernet Networking
==== //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1481 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1482 2008/04/29 21:23:21 julian Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -868,7 +868,12 @@
# The MBUF_STRESS_TEST option enables options which create
# various random failures / extreme cases related to mbuf
# functions. See mbuf(9) for a list of available test cases.
+# MBUF_PROFILING enables code to profile teh mbif chains
+# exiting the system (via participating interfaces) and
+# return a logarithmic histogram of monitored parameters
+# (e.g. packet size, wasted space, number of mbufs in chain).
options MBUF_STRESS_TEST
+options MBUF_PROFILING
# Statically Link in accept filters
options ACCEPT_FILTER_DATA
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1296 2008/04/29 21:36:16 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -830,6 +830,21 @@
compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
no-obj no-implicit-rule \
clean "iwi_monitor.fw"
+dev/iwn/if_iwn.c optional iwn
+iwnfw.c optional iwnfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwnfw.c"
+iwnfw.fwo optional iwnfw \
+ dependency "iwn.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+ no-implicit-rule \
+ clean "iwn.fwo"
+iwn.fw optional iwnfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwn.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.powerpc#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.powerpc,v 1.74 2008/03/03 20:40:19 raj Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.77 2008/04/30 00:50:50 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -68,6 +68,7 @@
powerpc/aim/locore.S optional aim no-obj
powerpc/aim/machdep.c optional aim
powerpc/aim/mmu_oea.c optional aim
+powerpc/aim/mp_cpudep.c optional aim smp
powerpc/aim/nexus.c optional aim
powerpc/aim/ofw_machdep.c optional aim
powerpc/aim/ofwmagic.S optional aim
@@ -96,6 +97,7 @@
powerpc/fpu/fpu_mul.c optional fpu_emu
powerpc/fpu/fpu_sqrt.c optional fpu_emu
powerpc/fpu/fpu_subr.c optional fpu_emu
+powerpc/mpc85xx/mpc85xx.c optional mpc85xx
powerpc/mpc85xx/nexus.c optional mpc85xx
powerpc/mpc85xx/ocpbus.c optional mpc85xx
powerpc/mpc85xx/opic.c optional mpc85xx
@@ -130,7 +132,7 @@
powerpc/powerpc/intr_machdep.c standard
powerpc/powerpc/mem.c optional mem
powerpc/powerpc/mmu_if.m standard
-powerpc/powerpc/mp_machdep.c optional smp aim
+powerpc/powerpc/mp_machdep.c optional smp
powerpc/powerpc/openpic.c standard
powerpc/powerpc/pic_if.m standard
powerpc/powerpc/pmap_dispatch.c standard
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.sun4v#3 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sun4v,v 1.14 2008/04/26 11:01:37 marius Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.15 2008/05/02 17:41:52 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -35,7 +35,6 @@
sparc64/sparc64/autoconf.c standard
sun4v/sun4v/bus_machdep.c standard
sparc64/sparc64/clock.c standard
-sparc64/sparc64/counter.c standard
sparc64/sparc64/db_disasm.c optional ddb
sun4v/sun4v/db_interface.c optional ddb
sun4v/sun4v/db_trace.c optional ddb
==== //depot/projects/soc2008/diego-audit/src/sys/conf/kern.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.53 2008/04/29 11:28:10 gonzo Exp $
#
# Warning flags for compiling the kernel and components of the kernel.
@@ -85,6 +85,15 @@
.endif
#
+# For MIPS we also tell gcc to use floating point emulation and
+# disable MIPS DSP ASE Instruction set.
+#
+.if ${MACHINE_ARCH} == "mips"
+CFLAGS+= -msoft-float -mno-dsp
+INLINE_LIMIT?= 15000
+.endif
+
+#
# GCC 3.0 and above like to do certain optimizations based on the
# assumption that the program is linked against libc. Stop this.
#
==== //depot/projects/soc2008/diego-audit/src/sys/conf/ldscript.mips#2 (text+ko) ====
@@ -1,5 +1,5 @@
-/* $FreeBSD: src/sys/conf/ldscript.mips,v 1.1 2008/04/13 06:25:43 imp Exp $ */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+/* $FreeBSD: src/sys/conf/ldscript.mips,v 1.2 2008/04/30 12:44:58 gonzo Exp $ */
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
OUTPUT_ARCH(mips)
ENTRY(_start)
SEARCH_DIR(/usr/lib);
==== //depot/projects/soc2008/diego-audit/src/sys/conf/ldscript.mips.cfe#2 (text+ko) ====
@@ -2,8 +2,8 @@
* This linker script is needed to build a kernel for use by Broadcom CFE.
*/
-/* $FreeBSD: src/sys/conf/ldscript.mips.cfe,v 1.1 2008/04/13 06:25:43 imp Exp $ */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+/* $FreeBSD: src/sys/conf/ldscript.mips.cfe,v 1.2 2008/04/30 12:44:58 gonzo Exp $ */
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
OUTPUT_ARCH(mips)
ENTRY(_start)
SEARCH_DIR(/usr/lib);
==== //depot/projects/soc2008/diego-audit/src/sys/conf/options#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.626 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.627 2008/04/29 21:23:21 julian Exp $
#
# On the handling of kernel options
#
@@ -388,6 +388,7 @@
LIBMCHAIN
LIBALIAS
MBUF_STRESS_TEST
+MBUF_PROFILING
NCP
NETATALK opt_atalk.h
PPP_BSDCOMP opt_ppp.h
==== //depot/projects/soc2008/diego-audit/src/sys/dev/ath/if_ath.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.180 2008/04/20 20:35:35 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.183 2008/05/01 04:54:58 thompsa Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -5920,7 +5920,12 @@
ath_hal_setregdomain(ah, 0);
/* XXX not quite right but close enough for now */
getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE, AH_FALSE);
+
+ /* NB: restore previous state */
ath_hal_setregdomain(ah, ord);
+ (void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
+ ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
+ ic->ic_regdomain.location == 'O' ? AH_TRUE : AH_FALSE);
}
static int
@@ -6272,9 +6277,9 @@
struct ifreq *ifr = (struct ifreq *)data;
int error = 0;
- ATH_LOCK(sc);
switch (cmd) {
case SIOCSIFFLAGS:
+ ATH_LOCK(sc);
if (IS_RUNNING(ifp)) {
/*
* To avoid rescanning another access point,
@@ -6296,17 +6301,8 @@
ath_init(sc); /* XXX lose error */
} else
ath_stop_locked(ifp);
+ ATH_UNLOCK(sc);
break;
- case SIOCADDMULTI:
- case SIOCDELMULTI:
- /*
- * The upper layer has already installed/removed
- * the multicast address(es), just recalculate the
- * multicast filter for the card.
- */
- if (ifp->if_drv_flags & IFF_DRV_RUNNING)
- ath_mode_init(sc);
- break;
case SIOCGIFMEDIA:
case SIOCSIFMEDIA:
error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd);
@@ -6320,27 +6316,20 @@
&sc->sc_stats.ast_rx_noise);
#endif
sc->sc_stats.ast_tx_rate = sc->sc_hwmap[sc->sc_txrate].ieeerate;
- ATH_UNLOCK(sc);
- /*
- * NB: Drop the softc lock in case of a page fault;
- * we'll accept any potential inconsisentcy in the
- * statistics. The alternative is to copy the data
- * to a local structure.
- */
return copyout(&sc->sc_stats,
- ifr->ifr_data, sizeof (sc->sc_stats));
+ ifr->ifr_data, sizeof (sc->sc_stats));
#ifdef ATH_DIAGAPI
case SIOCGATHDIAG:
- ATH_UNLOCK(sc);
error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
- ATH_LOCK(sc);
break;
#endif
+ case SIOCGIFADDR:
+ error = ether_ioctl(ifp, cmd, data);
+ break;
default:
- error = ether_ioctl(ifp, cmd, data);
+ error = EINVAL;
break;
}
- ATH_UNLOCK(sc);
return error;
#undef IS_RUNNING
}
==== //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#2 (text) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.37 2008/04/11 23:10:40 davidch Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.38 2008/04/26 14:13:48 marius Exp $");
/*
* The following controllers are supported by this driver:
@@ -502,7 +502,7 @@
/* Allocate PCI memory resources. */
rid = PCIR_BAR(0);
sc->bce_res_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
- &rid, RF_ACTIVE | PCI_RF_DENSE);
+ &rid, RF_ACTIVE);
if (sc->bce_res_mem == NULL) {
BCE_PRINTF("%s(%d): PCI memory allocation failed\n",
==== //depot/projects/soc2008/diego-audit/src/sys/dev/bfe/if_bfe.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.44 2008/01/29 02:15:11 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.45 2008/04/30 02:49:24 yongari Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -646,16 +646,18 @@
struct bfe_desc *d;
struct bfe_data *r;
u_int32_t ctrl;
- int error;
+ int allocated, error;
if ((c < 0) || (c >= BFE_RX_LIST_CNT))
return (EINVAL);
+ allocated = 0;
if(m == NULL) {
m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
if(m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES;
+ allocated++;
}
else
m->m_data = m->m_ext.ext_buf;
@@ -670,8 +672,14 @@
r = &sc->bfe_rx_ring[c];
error = bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void *),
MCLBYTES, bfe_dma_map_desc, d, BUS_DMA_NOWAIT);
- if (error)
- printf("Serious error: bfe failed to map RX buffer\n");
+ if (error != 0) {
+ if (allocated != 0)
+ m_free(m);
+ if (error != ENOMEM)
+ printf("bfe%d: failed to map RX buffer, error %d\n",
+ sc->bfe_unit, error);
+ return (ENOBUFS);
+ }
bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREWRITE);
ctrl = ETHER_MAX_LEN + 32;
==== //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bge.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.206 2008/04/26 10:54:17 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.209 2008/05/01 13:10:03 bz Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -196,6 +196,8 @@
{ BCOM_VENDORID, BCOM_DEVICEID_BCM5901 },
{ BCOM_VENDORID, BCOM_DEVICEID_BCM5901A2 },
{ BCOM_VENDORID, BCOM_DEVICEID_BCM5903M },
+ { BCOM_VENDORID, BCOM_DEVICEID_BCM5906 },
+ { BCOM_VENDORID, BCOM_DEVICEID_BCM5906M },
{ SK_VENDORID, SK_DEVICEID_ALTIMA },
@@ -273,6 +275,8 @@
{ BGE_CHIPID_BCM5787_A0, "BCM5754/5787 A0" },
{ BGE_CHIPID_BCM5787_A1, "BCM5754/5787 A1" },
{ BGE_CHIPID_BCM5787_A2, "BCM5754/5787 A2" },
+ { BGE_CHIPID_BCM5906_A1, "BCM5906 A1" },
+ { BGE_CHIPID_BCM5906_A2, "BCM5906 A2" },
{ 0, NULL }
};
@@ -295,6 +299,7 @@
{ BGE_ASICREV_BCM5755, "unknown BCM5755" },
/* 5754 and 5787 share the same ASIC ID */
{ BGE_ASICREV_BCM5787, "unknown BCM5754/5787" },
+ { BGE_ASICREV_BCM5906, "unknown BCM5906" },
{ 0, NULL }
};
@@ -307,6 +312,9 @@
const struct bge_revision * bge_lookup_rev(uint32_t);
const struct bge_vendor * bge_lookup_vendor(uint16_t);
+
+typedef int (*bge_eaddr_fcn_t)(struct bge_softc *, uint8_t[]);
+
static int bge_probe(device_t);
static int bge_attach(device_t);
static int bge_detach(device_t);
@@ -317,6 +325,11 @@
static int bge_dma_alloc(device_t);
static void bge_dma_free(struct bge_softc *);
+static int bge_get_eaddr_mem(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr_nvram(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr_eeprom(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr(struct bge_softc *, uint8_t[]);
+
static void bge_txeof(struct bge_softc *);
static void bge_rxeof(struct bge_softc *);
@@ -339,6 +352,9 @@
static int bge_ifmedia_upd(struct ifnet *);
static void bge_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+static uint8_t bge_nvram_getbyte(struct bge_softc *, int, uint8_t *);
+static int bge_read_nvram(struct bge_softc *, caddr_t, int, int);
+
static uint8_t bge_eeprom_getbyte(struct bge_softc *, int, uint8_t *);
static int bge_read_eeprom(struct bge_softc *, caddr_t, int, int);
@@ -361,6 +377,7 @@
static int bge_has_eeprom(struct bge_softc *);
static uint32_t bge_readmem_ind(struct bge_softc *, int);
static void bge_writemem_ind(struct bge_softc *, int, int);
+static void bge_writembx(struct bge_softc *, int, int);
#ifdef notdef
static uint32_t bge_readreg_ind(struct bge_softc *, int);
#endif
@@ -476,6 +493,10 @@
return (0);
}
#endif
+
+ if (sc->bge_asicrev == BGE_ASICREV_BCM5906)
+ return (0);
+
return (1);
}
@@ -535,6 +556,15 @@
CSR_WRITE_4(sc, off, val);
}
+static void
+bge_writembx(struct bge_softc *sc, int off, int val)
+{
+ if (sc->bge_asicrev == BGE_ASICREV_BCM5906)
+ off += BGE_LPMBX_IRQ0_HI - BGE_MBX_IRQ0_HI;
+
+ CSR_WRITE_4(sc, off, val);
+}
+
/*
* Map a single buffer address.
*/
@@ -557,7 +587,79 @@
ctx->bge_busaddr = segs->ds_addr;
}
+static uint8_t
+bge_nvram_getbyte(struct bge_softc *sc, int addr, uint8_t *dest)
+{
+ uint32_t access, byte = 0;
+ int i;
+
+ /* Lock. */
+ CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_SET1);
+ for (i = 0; i < 8000; i++) {
+ if (CSR_READ_4(sc, BGE_NVRAM_SWARB) & BGE_NVRAMSWARB_GNT1)
+ break;
+ DELAY(20);
+ }
+ if (i == 8000)
+ return (1);
+
+ /* Enable access. */
+ access = CSR_READ_4(sc, BGE_NVRAM_ACCESS);
+ CSR_WRITE_4(sc, BGE_NVRAM_ACCESS, access | BGE_NVRAMACC_ENABLE);
+
+ CSR_WRITE_4(sc, BGE_NVRAM_ADDR, addr & 0xfffffffc);
+ CSR_WRITE_4(sc, BGE_NVRAM_CMD, BGE_NVRAM_READCMD);
+ for (i = 0; i < BGE_TIMEOUT * 10; i++) {
+ DELAY(10);
+ if (CSR_READ_4(sc, BGE_NVRAM_CMD) & BGE_NVRAMCMD_DONE) {
+ DELAY(10);
+ break;
+ }
+ }
+
+ if (i == BGE_TIMEOUT * 10) {
+ if_printf(sc->bge_ifp, "nvram read timed out\n");
+ return (1);
+ }
+
+ /* Get result. */
+ byte = CSR_READ_4(sc, BGE_NVRAM_RDDATA);
+
+ *dest = (bswap32(byte) >> ((addr % 4) * 8)) & 0xFF;
+
+ /* Disable access. */
+ CSR_WRITE_4(sc, BGE_NVRAM_ACCESS, access);
+
+ /* Unlock. */
+ CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_CLR1);
+ CSR_READ_4(sc, BGE_NVRAM_SWARB);
+
+ return (0);
+}
+
/*
+ * Read a sequence of bytes from NVRAM.
+ */
+static int
+bge_read_nvram(struct bge_softc *sc, caddr_t dest, int off, int cnt)
+{
+ int err = 0, i;
+ uint8_t byte = 0;
+
+ if (sc->bge_asicrev != BGE_ASICREV_BCM5906)
+ return (1);
+
+ for (i = 0; i < cnt; i++) {
+ err = bge_nvram_getbyte(sc, off + i, &byte);
+ if (err)
+ break;
+ *(dest + i) = byte;
+ }
+
+ return (err ? 1 : 0);
+}
+
+/*
* Read a byte of data stored in the EEPROM at address 'addr.' The
* BCM570x supports both the traditional bitbang interface and an
* auto access interface for reading the EEPROM. We use the auto
@@ -661,11 +763,13 @@
}
if (i == BGE_TIMEOUT) {
- device_printf(sc->bge_dev, "PHY read timed out\n");
+ device_printf(sc->bge_dev, "PHY read timed out "
+ "(phy %d, reg %d, val 0x%08x)\n", phy, reg, val);
val = 0;
goto done;
}
+ DELAY(5);
val = CSR_READ_4(sc, BGE_MI_COMM);
done:
@@ -689,6 +793,10 @@
sc = device_get_softc(dev);
+ if (sc->bge_asicrev == BGE_ASICREV_BCM5906 &&
+ (reg == BRGPHY_MII_1000CTL || reg == BRGPHY_MII_AUXCTL))
+ return(0);
+
/* Reading with autopolling on may trigger PCI errors */
autopoll = CSR_READ_4(sc, BGE_MI_MODE);
if (autopoll & BGE_MIMODE_AUTOPOLL) {
@@ -701,12 +809,17 @@
for (i = 0; i < BGE_TIMEOUT; i++) {
DELAY(10);
- if (!(CSR_READ_4(sc, BGE_MI_COMM) & BGE_MICOMM_BUSY))
+ if (!(CSR_READ_4(sc, BGE_MI_COMM) & BGE_MICOMM_BUSY)) {
+ DELAY(5);
+ CSR_READ_4(sc, BGE_MI_COMM); /* dummy read */
break;
+ }
}
if (i == BGE_TIMEOUT) {
- device_printf(sc->bge_dev, "PHY write timed out\n");
+ device_printf(sc->bge_dev,
+ "PHY write timed out (phy %d, reg %d, val %d)\n",
+ phy, reg, val);
return (0);
}
@@ -889,7 +1002,7 @@
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
sc->bge_std = i - 1;
- CSR_WRITE_4(sc, BGE_MBX_RX_STD_PROD_LO, sc->bge_std);
+ bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, sc->bge_std);
return (0);
}
@@ -936,7 +1049,7 @@
BGE_RCB_FLAG_USE_EXT_RX_BD);
CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags);
- CSR_WRITE_4(sc, BGE_MBX_RX_JUMBO_PROD_LO, sc->bge_jumbo);
+ bge_writembx(sc, BGE_MBX_RX_JUMBO_PROD_LO, sc->bge_jumbo);
return (0);
}
@@ -992,17 +1105,17 @@
/* Initialize transmit producer index for host-memory send ring. */
sc->bge_tx_prodidx = 0;
- CSR_WRITE_4(sc, BGE_MBX_TX_HOST_PROD0_LO, sc->bge_tx_prodidx);
+ bge_writembx(sc, BGE_MBX_TX_HOST_PROD0_LO, sc->bge_tx_prodidx);
/* 5700 b2 errata */
if (sc->bge_chiprev == BGE_CHIPREV_5700_BX)
- CSR_WRITE_4(sc, BGE_MBX_TX_HOST_PROD0_LO, sc->bge_tx_prodidx);
+ bge_writembx(sc, BGE_MBX_TX_HOST_PROD0_LO, sc->bge_tx_prodidx);
/* NIC-memory send ring not used; initialize to zero. */
- CSR_WRITE_4(sc, BGE_MBX_TX_NIC_PROD0_LO, 0);
+ bge_writembx(sc, BGE_MBX_TX_NIC_PROD0_LO, 0);
/* 5700 b2 errata */
if (sc->bge_chiprev == BGE_CHIPREV_5700_BX)
- CSR_WRITE_4(sc, BGE_MBX_TX_NIC_PROD0_LO, 0);
+ bge_writembx(sc, BGE_MBX_TX_NIC_PROD0_LO, 0);
return (0);
}
@@ -1273,6 +1386,16 @@
/* Set the timer prescaler (always 66Mhz) */
CSR_WRITE_4(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ);
+ /* XXX: The Linux tg3 driver does this at the start of brgphy_reset. */
+ if (sc->bge_asicrev == BGE_ASICREV_BCM5906) {
+ DELAY(40); /* XXX */
+
+ /* Put PHY into ready state */
+ BGE_CLRBIT(sc, BGE_MISC_CFG, BGE_MISCCFG_EPHY_IDDQ);
+ CSR_READ_4(sc, BGE_MISC_CFG); /* Flush */
+ DELAY(40);
+ }
+
return (0);
}
@@ -1310,14 +1433,19 @@
}
/* Configure mbuf pool watermarks */
- if (BGE_IS_5705_PLUS(sc)) {
+ if (!BGE_IS_5705_PLUS(sc)) {
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x50);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x20);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60);
+ } else if (sc->bge_asicrev == BGE_ASICREV_BCM5906) {
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x04);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x10);
+ } else {
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10);
- } else {
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x50);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x20);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60);
}
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60);
/* Configure DMA resource watermarks */
CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_LOWAT, 5);
@@ -1423,6 +1551,9 @@
* requirement of all 575x family chips. The Linux driver sets
* the lower threshold for all 5705 family chips as well, but there
* are reports that it might not need to be so strict.
+ *
+ * XXX Linux does some extra fiddling here for the 5906 parts as
+ * well.
*/
if (BGE_IS_5705_PLUS(sc))
val = 8;
@@ -1464,15 +1595,15 @@
BGE_RCB_MAXLEN_FLAGS(sc->bge_return_ring_cnt,
BGE_RCB_FLAG_RING_DISABLED));
RCB_WRITE_4(sc, vrcb, bge_nicaddr, 0);
- CSR_WRITE_4(sc, BGE_MBX_RX_CONS0_LO +
+ bge_writembx(sc, BGE_MBX_RX_CONS0_LO +
(i * (sizeof(uint64_t))), 0);
vrcb += sizeof(struct bge_rcb);
}
/* Initialize RX ring indexes */
- CSR_WRITE_4(sc, BGE_MBX_RX_STD_PROD_LO, 0);
- CSR_WRITE_4(sc, BGE_MBX_RX_JUMBO_PROD_LO, 0);
- CSR_WRITE_4(sc, BGE_MBX_RX_MINI_PROD_LO, 0);
+ bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, 0);
+ bge_writembx(sc, BGE_MBX_RX_JUMBO_PROD_LO, 0);
+ bge_writembx(sc, BGE_MBX_RX_MINI_PROD_LO, 0);
/*
* Set up RX return ring 0
@@ -2226,7 +2357,6 @@
struct ifnet *ifp;
struct bge_softc *sc;
uint32_t hwcfg = 0;
- uint32_t mac_tmp = 0;
u_char eaddr[ETHER_ADDR_LEN];
int error, reg, rid, trys;
@@ -2240,7 +2370,7 @@
rid = BGE_PCI_BAR0;
sc->bge_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
- RF_ACTIVE | PCI_RF_DENSE);
+ RF_ACTIVE);
if (sc->bge_res == NULL) {
device_printf (sc->bge_dev, "couldn't map memory\n");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list