PERFORCE change 126838 for review
Marius Strobl
marius at FreeBSD.org
Wed Sep 26 14:27:16 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=126838
Change 126838 by marius at flak on 2007/09/26 21:26:39
IFC @126837 in order to get the CVS repo version of gem(4).
Affected files ...
.. //depot/projects/usiii/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/usiii/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/usiii/amd64/amd64/uma_machdep.c#2 integrate
.. //depot/projects/usiii/amd64/conf/GENERIC#2 integrate
.. //depot/projects/usiii/amd64/include/smp.h#2 integrate
.. //depot/projects/usiii/amd64/include/vmparam.h#2 integrate
.. //depot/projects/usiii/amd64/isa/clock.c#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux.h#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/usiii/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/usiii/arm/arm/pmap.c#2 integrate
.. //depot/projects/usiii/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/usiii/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/usiii/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/usiii/arm/conf/CRB#2 integrate
.. //depot/projects/usiii/arm/include/asmacros.h#2 integrate
.. //depot/projects/usiii/arm/include/endian.h#2 integrate
.. //depot/projects/usiii/arm/include/vmparam.h#2 integrate
.. //depot/projects/usiii/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/usiii/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/usiii/arm/xscale/i8134x/files.crb#2 integrate
.. //depot/projects/usiii/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/usiii/arm/xscale/i8134x/i81342reg.h#2 integrate
.. //depot/projects/usiii/arm/xscale/i8134x/iq81342_7seg.c#1 branch
.. //depot/projects/usiii/arm/xscale/i8134x/iq81342reg.h#1 branch
.. //depot/projects/usiii/arm/xscale/i8134x/iq81342var.h#1 branch
.. //depot/projects/usiii/boot/forth/loader.conf#2 integrate
.. //depot/projects/usiii/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/usiii/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/usiii/conf/NOTES#3 integrate
.. //depot/projects/usiii/conf/files#2 integrate
.. //depot/projects/usiii/conf/options#2 integrate
.. //depot/projects/usiii/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/usiii/contrib/dev/acpica/evxface.c#2 integrate
.. //depot/projects/usiii/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/usiii/ddb/db_ps.c#2 integrate
.. //depot/projects/usiii/dev/acpica/acpi.c#2 integrate
.. //depot/projects/usiii/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/usiii/dev/an/if_an.c#2 integrate
.. //depot/projects/usiii/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/usiii/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/usiii/dev/ath/if_ath.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_sge_defs.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_vsc7323.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_include.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete
.. //depot/projects/usiii/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch
.. //depot/projects/usiii/dev/em/if_em.c#2 integrate
.. //depot/projects/usiii/dev/em/if_em.h#2 integrate
.. //depot/projects/usiii/dev/gem/if_gem.c#3 integrate
.. //depot/projects/usiii/dev/gem/if_gem_pci.c#3 integrate
.. //depot/projects/usiii/dev/gem/if_gemreg.h#3 integrate
.. //depot/projects/usiii/dev/gem/if_gemvar.h#3 integrate
.. //depot/projects/usiii/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/usiii/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/usiii/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/usiii/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/usiii/dev/pci/pcireg.h#2 integrate
.. //depot/projects/usiii/dev/ral/rt2560.c#3 integrate
.. //depot/projects/usiii/dev/ral/rt2661.c#3 integrate
.. //depot/projects/usiii/dev/sound/pci/emu10kx-midi.c#2 integrate
.. //depot/projects/usiii/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/usiii/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/usiii/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/usiii/dev/syscons/syscons.c#2 integrate
.. //depot/projects/usiii/dev/syscons/syscons.h#2 integrate
.. //depot/projects/usiii/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/usiii/dev/usb/if_axe.c#2 integrate
.. //depot/projects/usiii/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/usiii/dev/usb/if_rum.c#3 integrate
.. //depot/projects/usiii/dev/usb/if_ural.c#3 integrate
.. //depot/projects/usiii/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/usiii/dev/wi/if_wi.c#3 integrate
.. //depot/projects/usiii/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/usiii/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/usiii/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/usiii/geom/virstor/binstream.c#1 branch
.. //depot/projects/usiii/geom/virstor/binstream.h#1 branch
.. //depot/projects/usiii/geom/virstor/g_virstor.c#1 branch
.. //depot/projects/usiii/geom/virstor/g_virstor.h#1 branch
.. //depot/projects/usiii/geom/virstor/g_virstor_md.c#1 branch
.. //depot/projects/usiii/geom/virstor/g_virstor_md.h#1 branch
.. //depot/projects/usiii/i386/acpica/madt.c#2 integrate
.. //depot/projects/usiii/i386/conf/GENERIC#2 integrate
.. //depot/projects/usiii/i386/i386/genassym.c#2 integrate
.. //depot/projects/usiii/i386/i386/geode.c#2 integrate
.. //depot/projects/usiii/i386/i386/local_apic.c#2 integrate
.. //depot/projects/usiii/i386/include/smp.h#2 integrate
.. //depot/projects/usiii/i386/include/vmparam.h#2 integrate
.. //depot/projects/usiii/i386/linux/linux.h#2 integrate
.. //depot/projects/usiii/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/usiii/i386/linux/linux_ptrace.c#2 integrate
.. //depot/projects/usiii/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/usiii/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/usiii/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/usiii/i386/linux/syscalls.master#2 integrate
.. //depot/projects/usiii/ia64/conf/GENERIC#2 integrate
.. //depot/projects/usiii/ia64/ia64/uma_machdep.c#2 integrate
.. //depot/projects/usiii/ia64/include/vmparam.h#2 integrate
.. //depot/projects/usiii/kern/init_main.c#2 integrate
.. //depot/projects/usiii/kern/kern_clock.c#2 integrate
.. //depot/projects/usiii/kern/kern_exec.c#2 integrate
.. //depot/projects/usiii/kern/kern_fork.c#2 integrate
.. //depot/projects/usiii/kern/kern_kse.c#2 integrate
.. //depot/projects/usiii/kern/kern_proc.c#2 integrate
.. //depot/projects/usiii/kern/kern_switch.c#2 integrate
.. //depot/projects/usiii/kern/kern_synch.c#2 integrate
.. //depot/projects/usiii/kern/kern_thread.c#2 integrate
.. //depot/projects/usiii/kern/kern_timeout.c#3 integrate
.. //depot/projects/usiii/kern/sched_4bsd.c#2 integrate
.. //depot/projects/usiii/kern/sched_ule.c#2 integrate
.. //depot/projects/usiii/kern/subr_kdb.c#2 integrate
.. //depot/projects/usiii/kern/subr_lock.c#2 integrate
.. //depot/projects/usiii/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/usiii/kern/subr_smp.c#2 integrate
.. //depot/projects/usiii/kern/subr_trap.c#2 integrate
.. //depot/projects/usiii/kern/subr_witness.c#2 integrate
.. //depot/projects/usiii/kern/sys_process.c#2 integrate
.. //depot/projects/usiii/kern/vfs_bio.c#2 integrate
.. //depot/projects/usiii/kern/vfs_cache.c#2 integrate
.. //depot/projects/usiii/kern/vfs_lookup.c#2 integrate
.. //depot/projects/usiii/kern/vfs_mount.c#2 integrate
.. //depot/projects/usiii/kern/vfs_subr.c#2 integrate
.. //depot/projects/usiii/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/usiii/modules/Makefile#3 integrate
.. //depot/projects/usiii/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/usiii/modules/cxgb/Makefile#2 integrate
.. //depot/projects/usiii/modules/geom/geom_virstor/Makefile#1 branch
.. //depot/projects/usiii/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/usiii/net/bpf.c#2 integrate
.. //depot/projects/usiii/net/bpf_filter.c#2 integrate
.. //depot/projects/usiii/net/if_bridge.c#2 integrate
.. //depot/projects/usiii/net/if_ethersubr.c#2 integrate
.. //depot/projects/usiii/net/if_media.h#2 integrate
.. //depot/projects/usiii/net/if_stf.c#2 integrate
.. //depot/projects/usiii/net/rtsock.c#2 integrate
.. //depot/projects/usiii/net80211/_ieee80211.h#3 integrate
.. //depot/projects/usiii/net80211/ieee80211.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_ioctl.h#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_power.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_proto.h#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/usiii/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/usiii/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/usiii/netinet/in_gif.c#2 integrate
.. //depot/projects/usiii/netinet/sctp.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_auth.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_cc_functions.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_cc_functions.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_constants.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_indata.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_input.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_lock_bsd.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_output.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_output.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_structs.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_sysctl.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_timer.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_timer.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_uio.h#2 integrate
.. //depot/projects/usiii/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/usiii/netinet/sctp_var.h#2 integrate
.. //depot/projects/usiii/netinet/sctputil.c#2 integrate
.. //depot/projects/usiii/netinet/sctputil.h#2 integrate
.. //depot/projects/usiii/netinet/tcp_input.c#2 integrate
.. //depot/projects/usiii/netinet/tcp_subr.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_timer.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_timer.h#3 integrate
.. //depot/projects/usiii/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_var.h#3 integrate
.. //depot/projects/usiii/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/usiii/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/usiii/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/usiii/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/usiii/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/usiii/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/usiii/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/usiii/pc98/conf/GENERIC#2 integrate
.. //depot/projects/usiii/pci/agp_i810.c#2 integrate
.. //depot/projects/usiii/pci/agp_via.c#2 integrate
.. //depot/projects/usiii/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/usiii/powerpc/conf/NOTES#3 integrate
.. //depot/projects/usiii/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/usiii/powerpc/powerpc/uma_machdep.c#2 integrate
.. //depot/projects/usiii/security/mac/mac_framework.h#2 integrate
.. //depot/projects/usiii/security/mac/mac_policy.h#2 integrate
.. //depot/projects/usiii/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/usiii/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/usiii/security/mac_bsdextended/mac_bsdextended.c#2 integrate
.. //depot/projects/usiii/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/usiii/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/usiii/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/usiii/security/mac_test/mac_test.c#2 integrate
.. //depot/projects/usiii/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/usiii/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/usiii/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/usiii/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/usiii/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/usiii/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/usiii/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/usiii/sun4v/mdesc/mdesc_init.c#2 integrate
.. //depot/projects/usiii/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/usiii/sys/callout.h#2 integrate
.. //depot/projects/usiii/sys/lock_profile.h#2 integrate
.. //depot/projects/usiii/sys/mount.h#2 integrate
.. //depot/projects/usiii/sys/proc.h#2 integrate
.. //depot/projects/usiii/sys/socket.h#2 integrate
.. //depot/projects/usiii/sys/user.h#2 integrate
.. //depot/projects/usiii/sys/vmmeter.h#2 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/usiii/vm/vm_contig.c#2 integrate
.. //depot/projects/usiii/vm/vm_fault.c#2 integrate
.. //depot/projects/usiii/vm/vm_glue.c#2 integrate
.. //depot/projects/usiii/vm/vm_map.c#2 integrate
.. //depot/projects/usiii/vm/vm_object.c#2 integrate
.. //depot/projects/usiii/vm/vm_object.h#2 integrate
.. //depot/projects/usiii/vm/vm_page.c#2 integrate
.. //depot/projects/usiii/vm/vm_page.h#2 integrate
.. //depot/projects/usiii/vm/vm_pageout.c#2 integrate
.. //depot/projects/usiii/vm/vm_pageq.c#2 integrate
.. //depot/projects/usiii/vm/vm_phys.c#2 integrate
.. //depot/projects/usiii/vm/vm_phys.h#2 integrate
Differences ...
==== //depot/projects/usiii/amd64/amd64/genassym.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $");
#include "opt_compat.h"
#include "opt_kstack_pages.h"
@@ -74,7 +74,6 @@
ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace));
ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap));
ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active));
-ASSYM(P_SFLAG, offsetof(struct proc, p_sflag));
ASSYM(TD_LOCK, offsetof(struct thread, td_lock));
ASSYM(TD_FLAGS, offsetof(struct thread, td_flags));
@@ -181,6 +180,7 @@
ASSYM(ENOENT, ENOENT);
ASSYM(EFAULT, EFAULT);
ASSYM(ENAMETOOLONG, ENAMETOOLONG);
+ASSYM(MAXCPU, MAXCPU);
ASSYM(MAXCOMLEN, MAXCOMLEN);
ASSYM(MAXPATHLEN, MAXPATHLEN);
ASSYM(PC_SIZEOF, sizeof(struct pcpu));
==== //depot/projects/usiii/amd64/amd64/local_apic.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $");
#include "opt_hwpmc_hooks.h"
@@ -1061,7 +1061,7 @@
printf("%s: Failed to setup the local APIC: returned %d\n",
best_enum->apic_name, retval);
}
-SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL)
+SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL)
/*
* Setup the I/O APICs.
==== //depot/projects/usiii/amd64/amd64/uma_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.3 2007/02/18 06:33:01 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.4 2007/09/15 18:47:01 alc Exp $");
#include <sys/param.h>
#include <sys/lock.h>
@@ -50,9 +50,9 @@
*flags = UMA_SLAB_PRIV;
if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT)
- pflags = VM_ALLOC_INTERRUPT;
+ pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED;
else
- pflags = VM_ALLOC_SYSTEM;
+ pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED;
if (wait & M_ZERO)
pflags |= VM_ALLOC_ZERO;
for (;;) {
@@ -82,5 +82,7 @@
pa = DMAP_TO_PHYS((vm_offset_t)mem);
dump_drop_page(pa);
m = PHYS_TO_VM_PAGE(pa);
+ m->wire_count--;
vm_page_free(m);
+ atomic_subtract_int(&cnt.v_wire_count, 1);
}
==== //depot/projects/usiii/amd64/conf/GENERIC#2 (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.483 2007/07/01 21:47:45 njl Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484 2007/09/26 20:05:06 brueffer Exp $
cpu HAMMER
ident GENERIC
@@ -30,7 +30,7 @@
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
-options SCTP # Stream Transmission Control Protocol
+options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
==== //depot/projects/usiii/amd64/include/smp.h#2 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.91 2007/09/20 20:38:43 attilio Exp $
*
*/
@@ -34,7 +34,6 @@
extern int mp_naps;
extern int boot_cpu_id;
extern struct pcb stoppcbs[];
-extern struct mtx smp_tlb_mtx;
extern int cpu_apic_ids[];
/* IPI handlers */
==== //depot/projects/usiii/amd64/include/vmparam.h#2 (text+ko) ====
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.48 2007/06/03 23:18:29 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $
*/
@@ -101,12 +101,13 @@
#define VM_PHYSSEG_MAX 31
/*
- * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool
+ * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool
* from which physical pages are allocated and VM_FREEPOOL_DIRECT is
* the pool from which physical pages for page tables and small UMA
* objects are allocated.
*/
-#define VM_NFREEPOOL 2
+#define VM_NFREEPOOL 3
+#define VM_FREEPOOL_CACHE 2
#define VM_FREEPOOL_DEFAULT 0
#define VM_FREEPOOL_DIRECT 1
==== //depot/projects/usiii/amd64/isa/clock.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.233 2007/07/23 09:42:30 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.234 2007/09/14 01:12:39 attilio Exp $");
/*
* Routines to handle clock hardware.
@@ -565,7 +565,7 @@
i8254_init(void)
{
- mtx_init(&clock_lock, "clk", NULL, MTX_SPIN);
+ mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
set_timer_freq(timer_freq, hz);
}
==== //depot/projects/usiii/amd64/linux32/linux.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* (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/amd64/linux32/linux.h,v 1.15 2007/03/29 02:11:46 julian Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.16 2007/09/18 19:50:32 dwmalone Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -242,6 +242,19 @@
l_ulonglong st_ino;
} __packed;
+struct l_statfs64 {
+ l_int f_type;
+ l_int f_bsize;
+ uint64_t f_blocks;
+ uint64_t f_bfree;
+ uint64_t f_bavail;
+ uint64_t f_files;
+ uint64_t f_ffree;
+ l_fsid_t f_fsid;
+ l_int f_namelen;
+ l_int f_spare[6];
+} __packed;
+
struct l_new_utsname {
char sysname[LINUX_MAX_UTSNAME];
char nodename[LINUX_MAX_UTSNAME];
==== //depot/projects/usiii/amd64/linux32/linux32_proto.h#2 (text+ko) ====
@@ -2,7 +2,7 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $
* created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
@@ -801,6 +801,7 @@
};
struct linux_statfs64_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)];
char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)];
};
struct linux_fstatfs64_args {
==== //depot/projects/usiii/amd64/linux32/linux32_syscall.h#2 (text+ko) ====
@@ -2,7 +2,7 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $
* created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
==== //depot/projects/usiii/amd64/linux32/linux32_sysent.c#2 (text+ko) ====
@@ -2,7 +2,7 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.32 2007/08/28 12:36:23 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.33 2007/09/18 19:50:32 dwmalone Exp $
* created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp
*/
==== //depot/projects/usiii/amd64/linux32/linux32_sysvec.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.31 2007/09/20 13:46:26 kib Exp $");
#include "opt_compat.h"
#ifndef COMPAT_IA32
@@ -372,6 +372,7 @@
frame.sf_sc.uc_mcontext.sc_esp_at_signal = regs->tf_rsp;
frame.sf_sc.uc_mcontext.sc_ss = regs->tf_ss;
frame.sf_sc.uc_mcontext.sc_err = regs->tf_err;
+ frame.sf_sc.uc_mcontext.sc_cr2 = (u_int32_t)(uintptr_t)ksi->ksi_addr;
frame.sf_sc.uc_mcontext.sc_trapno = bsd_to_linux_trapcode(code);
#ifdef DEBUG
@@ -503,6 +504,7 @@
frame.sf_sc.sc_esp_at_signal = regs->tf_rsp;
frame.sf_sc.sc_ss = regs->tf_ss;
frame.sf_sc.sc_err = regs->tf_err;
+ frame.sf_sc.sc_cr2 = (u_int32_t)(uintptr_t)ksi->ksi_addr;
frame.sf_sc.sc_trapno = bsd_to_linux_trapcode(code);
for (i = 0; i < (LINUX_NSIG_WORDS-1); i++)
==== //depot/projects/usiii/amd64/linux32/syscalls.master#2 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.30 2007/09/18 19:50:32 dwmalone Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -436,7 +436,7 @@
266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); }
267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \
struct l_timespec *rqtp, struct l_timespec *rmtp); }
-268 AUE_STATFS STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); }
+268 AUE_STATFS STD { int linux_statfs64(char *path, size_t bufsize, struct l_statfs64_buf *buf); }
269 AUE_FSTATFS STD { int linux_fstatfs64(void); }
270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); }
271 AUE_UTIMES STD { int linux_utimes(char *fname, \
==== //depot/projects/usiii/arm/arm/pmap.c#2 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.84 2007/07/27 14:45:04 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.86 2007/09/22 22:47:48 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -270,7 +270,6 @@
*/
union pmap_cache_state *pmap_cache_state;
-/* static pt_entry_t *msgbufmap;*/
struct msgbuf *msgbufp = 0;
extern void bcopy_page(vm_offset_t, vm_offset_t);
@@ -4074,7 +4073,7 @@
panic("pmap_zero_page: page has mappings");
#endif
- if (_arm_bzero &&
+ if (_arm_bzero && size >= _min_bzero_size &&
_arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0)
return;
@@ -4115,7 +4114,7 @@
void
pmap_zero_page_xscale(vm_paddr_t phys, int off, int size)
{
- if (_arm_bzero &&
+ if (_arm_bzero && size >= _min_bzero_size &&
_arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0)
return;
mtx_lock(&cmtx);
@@ -4429,7 +4428,7 @@
#endif
cpu_dcache_wbinv_all();
- if (_arm_memcpy &&
+ if (_arm_memcpy && PAGE_SIZE >= _min_memcpy_size &&
_arm_memcpy((void *)VM_PAGE_TO_PHYS(dst),
(void *)VM_PAGE_TO_PHYS(src), PAGE_SIZE, IS_PHYSICAL) == 0)
return;
==== //depot/projects/usiii/arm/arm/vm_machdep.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.33 2007/07/27 14:46:15 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.34 2007/09/15 18:47:01 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -580,9 +580,9 @@
return (ret);
}
if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT)
- pflags = VM_ALLOC_INTERRUPT;
+ pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED;
else
- pflags = VM_ALLOC_SYSTEM;
+ pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED;
if (wait & M_ZERO)
pflags |= VM_ALLOC_ZERO;
for (;;) {
@@ -640,9 +640,9 @@
vm_paddr_t pa = vtophys((vm_offset_t)mem);
m = PHYS_TO_VM_PAGE(pa);
- vm_page_lock_queues();
+ m->wire_count--;
vm_page_free(m);
- vm_page_unlock_queues();
+ atomic_subtract_int(&cnt.v_wire_count, 1);
}
}
}
==== //depot/projects/usiii/arm/at91/at91_mci.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.3 2007/02/23 12:18:27 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.4 2007/09/16 07:48:58 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -293,13 +293,10 @@
else
clkdiv = (at91_master_clock / ios->clock) / 2;
}
- if (ios->bus_width == bus_width_4 && sc->wire4) {
- device_printf(sc->dev, "Setting controller bus width to 4\n");
+ if (ios->bus_width == bus_width_4 && sc->wire4)
WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS);
- } else {
- device_printf(sc->dev, "Setting controller bus width to 1\n");
+ else
WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS);
- }
WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv);
#if 0
if (sc->vcc_pin) {
==== //depot/projects/usiii/arm/at91/at91_pmc.c#2 (text) ====
@@ -25,7 +25,7 @@
#include "opt_at91.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.4 2007/01/05 01:14:14 ticso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.5 2007/09/16 07:51:02 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,6 @@
struct at91_pmc_softc *sc = pmc_softc;
uint32_t value;
- printf("Turning PLLB %#x %s\n", sc->pllb_init, on ? "on" : "off");
if (on) {
on = PMC_IER_LOCKB;
value = sc->pllb_init;
@@ -172,7 +171,6 @@
WR4(sc, CKGR_PLLBR, value);
while ((RD4(sc, PMC_SR) & PMC_IER_LOCKB) != on)
continue;
- printf("Done!\n");
}
static void
@@ -180,7 +178,6 @@
{
struct at91_pmc_softc *sc = pmc_softc;
- printf("Turning SC %#x %s\n", clk->pmc_mask, on ? "on" : "off");
WR4(sc, on ? PMC_SCER : PMC_SCDR, clk->pmc_mask);
if (on)
while ((RD4(sc, PMC_SCSR) & clk->pmc_mask) != clk->pmc_mask)
@@ -188,7 +185,6 @@
else
while ((RD4(sc, PMC_SCSR) & clk->pmc_mask) == clk->pmc_mask)
continue;
- printf("Done SCSR is now: %#x!\n", RD4(sc, PMC_SCSR));
}
static void
@@ -196,7 +192,6 @@
{
struct at91_pmc_softc *sc = pmc_softc;
- printf("Turning PC %#x %s\n", clk->pmc_mask, on ? "on" : "off");
WR4(sc, on ? PMC_PCER : PMC_PCDR, clk->pmc_mask);
if (on)
while ((RD4(sc, PMC_PCSR) & clk->pmc_mask) != clk->pmc_mask)
@@ -204,7 +199,6 @@
else
while ((RD4(sc, PMC_PCSR) & clk->pmc_mask) == clk->pmc_mask)
continue;
- printf("Done PCSR is now: %#x!\n", RD4(sc, PMC_PCSR));
}
struct at91_pmc_clock *
@@ -228,7 +222,6 @@
at91_pmc_clock_enable(struct at91_pmc_clock *clk)
{
/* XXX LOCKING? XXX */
- printf("Enable %s\n", clk->name);
if (clk->parent)
at91_pmc_clock_enable(clk->parent);
if (clk->refcnt++ == 0 && clk->set_mode)
==== //depot/projects/usiii/arm/conf/CRB#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.1 2007/07/27 14:57:03 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.2 2007/09/22 16:25:42 cognet Exp $
machine arm
ident CRB
@@ -84,6 +84,8 @@
device atapist # ATAPI tape drives
options ATA_STATIC_ID # Static device numbering
+device "7seg"
+
# SCSI Controllers
device pty
==== //depot/projects/usiii/arm/include/asmacros.h#2 (text+ko) ====
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.5 2006/04/13 14:25:28 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.6 2007/09/22 14:23:52 cognet Exp $
*/
#ifndef _MACHINE_ASMACROS_H_
@@ -116,18 +116,15 @@
ldr r5, =0xe0000004; /* Check if there's any RAS */ \
ldr r3, [r5]; \
cmp r3, #0; /* Is the update needed ? */ \
- beq 1f; \
- ldr lr, [r0, #16]; \
- ldr r1, =0xe0000008; \
- ldr r4, [r1]; /* Get the end of the RAS */ \
- mov r2, #0; /* Reset the magic addresses */ \
- str r2, [r5]; \
- str r2, [r1]; \
- cmp lr, r3; /* Were we in the RAS ? */ \
- blt 1f; \
- cmp lr, r4; \
- strlt r3, [r0, #16]; /* Yes, update the pc */ \
- 1: \
+ ldrgt lr, [r0, #16]; \
+ ldrgt r1, =0xe0000008; \
+ ldrgt r4, [r1]; /* Get the end of the RAS */ \
+ movgt r2, #0; /* Reset the magic addresses */ \
+ strgt r2, [r5]; \
+ strgt r2, [r1]; \
+ cmpgt lr, r3; /* Were we in the RAS ? */ \
+ cmpgt r4, lr; \
+ strgt r3, [r0, #16]; /* Yes, update the pc */ \
mrs r0, spsr_all; /* Put the SPSR on the stack */ \
str r0, [sp, #-4]!
==== //depot/projects/usiii/arm/include/endian.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
*
* @(#)endian.h 8.1 (Berkeley) 6/10/93
* $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $
*/
#ifndef _ENDIAN_H_
@@ -99,13 +99,15 @@
static __inline __uint16_t
__bswap16_var(__uint16_t v)
{
+ __uint32_t ret = v & 0xffff;
+
__asm __volatile(
"mov %0, %0, ror #8\n"
"orr %0, %0, %0, lsr #16\n"
"bic %0, %0, %0, lsl #16"
- : "+r" (v));
+ : "+r" (ret));
- return (v);
+ return ((__uint16_t)ret);
}
#ifdef __OPTIMIZE__
==== //depot/projects/usiii/arm/include/vmparam.h#2 (text+ko) ====
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.10 2007/06/04 08:02:22 alc Exp $
+ * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.11 2007/09/25 06:25:04 alc Exp $
*/
#ifndef _MACHINE_VMPARAM_H_
@@ -59,12 +59,13 @@
#define VM_PHYSSEG_DENSE
/*
- * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool
+ * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool
* from which physical pages are allocated and VM_FREEPOOL_DIRECT is
* the pool from which physical pages for small UMA objects are
* allocated.
*/
-#define VM_NFREEPOOL 2
+#define VM_NFREEPOOL 3
+#define VM_FREEPOOL_CACHE 2
#define VM_FREEPOOL_DEFAULT 0
#define VM_FREEPOOL_DIRECT 1
==== //depot/projects/usiii/arm/sa11x0/uart_dev_sa1110.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.9 2007/09/12 18:28:09 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@
static void
sa1110_putc(struct uart_bas *bas, int c)
{
- while (!uart_getreg(bas, SACOM_SR1) & SR1_TNF);
+ while (!(uart_getreg(bas, SACOM_SR1) & SR1_TNF));
uart_setreg(bas, SACOM_DR, c);
}
@@ -186,7 +186,7 @@
uart_setreg(&sc->sc_bas, SACOM_CR3, uart_getreg(&sc->sc_bas, SACOM_CR3)
| CR3_TIE);
for (i = 0; i < sc->sc_txdatasz; i++) {
- while (!uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF);
+ while (!(uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF));
uart_setreg(&sc->sc_bas, SACOM_DR, sc->sc_txbuf[i]);
uart_barrier(&sc->sc_bas);
==== //depot/projects/usiii/arm/xscale/i8134x/crb_machdep.c#2 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.2 2007/09/22 16:25:43 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -171,6 +171,13 @@
VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
},
+ {
+ IOP34X_PCE1_VADDR,
+ IOP34X_PCE1,
+ IOP34X_PCE1_SIZE,
+ VM_PROT_READ|VM_PROT_WRITE,
+ PTE_NOCACHE,
+ },
{
0,
0,
==== //depot/projects/usiii/arm/xscale/i8134x/files.crb#2 (text+ko) ====
@@ -1,2 +1,3 @@
-# $FreeBSD: src/sys/arm/xscale/i8134x/files.crb,v 1.1 2007/07/27 14:50:57 cognet Exp $
+# $FreeBSD: src/sys/arm/xscale/i8134x/files.crb,v 1.2 2007/09/22 16:25:43 cognet Exp $
arm/xscale/i8134x/crb_machdep.c standard
+arm/xscale/i8134x/iq81342_7seg.c optional 7seg
==== //depot/projects/usiii/arm/xscale/i8134x/i81342.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.2 2007/09/22 16:25:43 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -400,6 +400,7 @@
device_add_child(dev, "iopwdog", 0);
device_add_child(dev, "pcib", 0);
device_add_child(dev, "pcib", 1);
+ device_add_child(dev, "iqseg", 0);
bus_generic_probe(dev);
bus_generic_attach(dev);
return (0);
==== //depot/projects/usiii/arm/xscale/i8134x/i81342reg.h#2 (text+ko) ====
@@ -24,7 +24,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/arm/xscale/i8134x/i81342reg.h,v 1.1 2007/07/27 14:50:57 cognet Exp $ */
+/* $FreeBSD: src/sys/arm/xscale/i8134x/i81342reg.h,v 1.3 2007/09/22 22:25:24 cognet Exp $ */
#ifndef I83142_REG_H_
#define I83142_REG_H_
@@ -46,9 +46,51 @@
#define IOP34X_HWADDR 0xffd00000
#define IOP34X_SIZE 0x100000
+#define IOP34X_ADMA0_OFFSET 0x00080000
+#define IOP34X_ADMA1_OFFSET 0x00080200
+#define IOP34X_ADMA2_OFFSET 0x00080400
+#define IOP34X_ADMA_SIZE 0x200
+
+
+/* ADMA Registers */
+#define IOP34X_ADMA_CCR 0x0000 /* Channel Control Register */
+#define IOP34X_ADMA_CSR 0x0004 /* Channel Status Register */
+#define IOP34X_ADMA_DAR 0x0008 /* Descriptor Address Register */
+#define IOP34X_ADMA_IPCR 0x0018 /* Internal Interface Parity Ctrl Reg */
+#define IOP34X_ADMA_NDAR 0x0024 /* Next Descriptor Register */
+#define IOP34X_ADMA_DCR 0x0028 /* Descriptor Control Register */
+
+#define IOP34X_ADMA_IE (1 << 0) /* Interrupt enable */
+#define IOP34X_ADMA_TR (1 << 1) /* Transfert Direction */
+/*
+ * Source Destination
+ * 00 Host I/O Interface Local Memory
+ * 01 Local Memory Host I/O Interface
+ * 10 Internal Bus Local Memory
+ * 11 Local Memory Internal Bus
+ */
+#define IOP34X_ADMA_SS (1 << 3) /* Source selection */
+/* 0000: Data Transfer / CRC / Memory Block Fill */
+#define IOP34X_ADMA_ZRBCE (1 << 7) /* Zero Result Buffer Check Enable */
+#define IOP34X_ADMA_MBFE (1 << 8) /* Memory Block Fill Enable */
+#define IOP34X_ADMA_CGE (1 << 9) /* CRC Generation enable */
+#define IOP34X_ADMA_CTD (1 << 10) /* CRC Transfer disable */
+#define IOP34X_ADMA_CSFD (1 << 11) /* CRC Seed fetch disable */
+#define IOP34X_ADMA_SWBE (1 << 12) /* Status write back enable */
+#define IOP34X_ADMA_ESE (1 << 13) /* Endian swap enable */
+#define IOP34X_ADMA_PQUTE (1 << 16) /* P+Q Update Transfer Enable */
+#define IOP34X_ADMA_DXE (1 << 17) /* Dual XOR Enable */
+#define IOP34X_ADMA_PQTE (1 << 18) /* P+Q Transfer Enable */
+#define IOP34X_ADMA_PTD (1 << 19) /* P Transfer Disable */
+#define IOP34X_ADMA_ROE (1 << 30) /* Relaxed Ordering Enable */
+#define IOP34X_ADMA_NSE (1 << 31) /* No Snoop Enable */
+
#define IOP34X_PBBAR0 0x81588 /* PBI Base Address Register 0 */
#define IOP34X_PBBAR0_ADDRMASK 0xfffff000
#define IOP34X_PBBAR1 0x81590
+#define IOP34X_PCE1 0xF2000000
+#define IOP34X_PCE1_SIZE 0x00100000
+#define IOP34X_PCE1_VADDR 0xF1000000
#define IOP34X_ESSTSR0 0x82188
#define IOP34X_CONTROLLER_ONLY (1 << 14)
#define IOP34X_INT_SEL_PCIX (1 << 15)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list