Date: Thu, 30 Aug 2007 12:18:49 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 125854 for review Message-ID: <200708301218.l7UCIneN025916@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=125854 Change 125854 by zec@zec_tca51 on 2007/08/30 12:18:40 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#15 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#6 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#6 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/vimage/src/sys/dev/coretemp/coretemp.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#11 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#11 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/vimage/src/sys/i386/i386/support.s#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/vimage/src/sys/i386/include/asm.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/vimage/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_switch.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#7 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#10 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/vimage/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#11 integrate .. //depot/projects/vimage/src/sys/modules/coretemp/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#24 edit .. //depot/projects/vimage/src/sys/netinet/sctp.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_header.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#16 integrate .. //depot/projects/vimage/src/sys/powerpc/include/intr_machdep.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/hrowpicvar.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/interrupt.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/nexus.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pic_if.m#3 integrate .. //depot/projects/vimage/src/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/vimage/src/sys/sys/ata.h#3 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#7 integrate .. //depot/projects/vimage/src/sys/sys/syscall.h#3 integrate .. //depot/projects/vimage/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/vimage/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/vimage/src/sys/sys/thr.h#3 integrate .. //depot/projects/vimage/src/sys/vm/device_pager.c#3 integrate .. //depot/projects/vimage/src/sys/vm/phys_pager.c#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#6 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#5 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#6 (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.159 2007/07/17 22:36:56 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $ */ #include <machine/asmacros.h> @@ -81,6 +81,7 @@ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ jmp swact +END(cpu_throw) /* * cpu_switch(old, new, mtx) @@ -256,7 +257,8 @@ movq %rax,%dr7 1: ret - +END(cpu_switch) + /* * savectx(pcb) * Update pcb, saving current processor state. @@ -314,3 +316,4 @@ popfq ret +END(savectx) ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $"); /* * Manages physical address maps. @@ -1722,7 +1722,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field, page_req; + int bit, field; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1755,8 +1755,7 @@ } } /* No free items, allocate another chunk */ - page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; - m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -1775,7 +1774,7 @@ PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); m = vm_page_alloc(NULL, colour, - VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { PV_STAT(pmap_collect_active++); pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); ==== //depot/projects/vimage/src/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $ */ #include "opt_ddb.h" @@ -69,7 +69,8 @@ rep stosb ret - +END(bzero) + /* Address: %rdi */ ENTRY(pagezero) movq $-PAGE_SIZE,%rdx @@ -84,6 +85,7 @@ jne 1b sfence ret +END(pagezero) ENTRY(bcmp) movq %rdx,%rcx @@ -101,6 +103,7 @@ setne %al movsbl %al,%eax ret +END(bcmp) /* * bcopy(src, dst, cnt) @@ -144,7 +147,8 @@ movsq cld ret - +END(bcopy) + /* * Note: memcpy does not support overlapping copies */ @@ -159,6 +163,7 @@ rep movsb ret +END(memcpy) /* * pagecopy(%rdi=from, %rsi=to) @@ -185,6 +190,7 @@ jne 2b sfence ret +END(pagecopy) /* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ @@ -196,6 +202,7 @@ rep stosw ret +END(fillw) /*****************************************************************************/ /* copyout and fubyte family */ @@ -267,6 +274,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyout) /* * copyin(from_user, to_kernel, len) - MP SAFE @@ -312,6 +320,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyin) /* * casuword32. Compare and set user integer. Returns -1 or the current value. @@ -340,6 +349,7 @@ movq PCPU(CURPCB),%rcx movq $0,PCB_ONFAULT(%rcx) ret +END(casuword32) /* * casuword. Compare and set user word. Returns -1 or the current value. @@ -369,6 +379,7 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq $0,PCB_ONFAULT(%rcx) ret +END(casuword) /* * Fetch (load) a 64-bit word, a 32-bit word, a 16-bit word, or an 8-bit @@ -388,6 +399,8 @@ movq (%rdi),%rax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword64) +END(fuword) ENTRY(fuword32) movq PCPU(CURPCB),%rcx @@ -400,6 +413,7 @@ movl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword32) /* * fuswintr() and suswintr() are specialized variants of fuword16() and @@ -412,6 +426,8 @@ ENTRY(fuswintr) movq $-1,%rax ret +END(suswintr) +END(fuswintr) ENTRY(fuword16) movq PCPU(CURPCB),%rcx @@ -424,6 +440,7 @@ movzwl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword16) ENTRY(fubyte) movq PCPU(CURPCB),%rcx @@ -436,6 +453,7 @@ movzbl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fubyte) ALIGN_TEXT fusufault: @@ -464,6 +482,8 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword64) +END(suword) ENTRY(suword32) movq PCPU(CURPCB),%rcx @@ -478,6 +498,7 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword32) ENTRY(suword16) movq PCPU(CURPCB),%rcx @@ -492,6 +513,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(suword16) ENTRY(subyte) movq PCPU(CURPCB),%rcx @@ -507,6 +529,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(subyte) /* * copyinstr(from, to, maxlen, int *lencopied) - MP SAFE @@ -575,7 +598,7 @@ movq %r8,(%r9) 1: ret - +END(copyinstr) /* * copystr(from, to, maxlen, int *lencopied) - MP SAFE @@ -612,6 +635,7 @@ movq %r8,(%rcx) 7: ret +END(copystr) /* * Handling of special amd64 registers and descriptor tables etc @@ -639,6 +663,7 @@ pushq %rax MEXITCOUNT lretq +END(lgdt) /*****************************************************************************/ /* setjump, longjump */ @@ -656,6 +681,7 @@ movq %rdx,56(%rdi) /* save rip */ xorl %eax,%eax /* return(0); */ ret +END(setjmp) ENTRY(longjmp) movq 0(%rdi),%rbx /* restore rbx */ @@ -670,6 +696,7 @@ xorl %eax,%eax /* return(1); */ incl %eax ret +END(longjmp) /* * Support for BB-profiling (gcc -a). The kernbb program will extract ==== //depot/projects/vimage/src/sys/amd64/conf/NOTES#6 (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.68 2007/07/04 00:18:38 bz Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69 2007/08/15 19:26:02 des Exp $ # # @@ -446,6 +446,13 @@ # device ichwd +# +# Temperature sensors: +# +# coretemp: on-die sensor on Intel Core and newer CPUs +# +device coretemp + #--------------------------------------------------------------------------- # ISDN4BSD # ==== //depot/projects/vimage/src/sys/amd64/include/asm.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -77,6 +77,8 @@ #define ENTRY(x) _ENTRY(x) #endif +#define END(x) .size x, . - x + #define RCSID(x) .text; .asciz x #undef __FBSDID ==== //depot/projects/vimage/src/sys/amd64/include/asmacros.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.33 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -57,6 +57,8 @@ #define NON_GPROF_ENTRY(name) GEN_ENTRY(name) #define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */ +#define END(name) .size name, . - name + #ifdef GPROF /* * __mcount is like [.]mcount except that doesn't require its caller to set ==== //depot/projects/vimage/src/sys/amd64/include/specialreg.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.40 2007/08/15 19:26:01 des Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -179,6 +179,7 @@ #define MSR_BIOS_SIGN 0x08b #define MSR_PERFCTR0 0x0c1 #define MSR_PERFCTR1 0x0c2 +#define MSR_IA32_EXT_CONFIG 0x0ee /* Undocumented. Core Solo/Duo only */ #define MSR_MTRRcap 0x0fe #define MSR_BBL_CR_ADDR 0x116 #define MSR_BBL_CR_DECC 0x118 ==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.34 2007/07/27 14:46:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.35 2007/08/18 16:47:28 cognet Exp $"); /* * ARM bus dma support routines @@ -1091,13 +1091,19 @@ { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; - if (op & BUS_DMASYNC_PREWRITE) { + if ((op & BUS_DMASYNC_PREWRITE) && !(op & BUS_DMASYNC_PREREAD)) { cpu_dcache_wb_range((vm_offset_t)buf, len); cpu_l2cache_wb_range((vm_offset_t)buf, len); } if (op & BUS_DMASYNC_PREREAD) { - cpu_idcache_wbinv_range((vm_offset_t)buf, len); - cpu_l2cache_wbinv_range((vm_offset_t)buf, len); + if ((op & BUS_DMASYNC_PREWRITE) || + ((((vm_offset_t)(buf) | len) & arm_dcache_align_mask) == 0)) { + cpu_dcache_inv_range((vm_offset_t)buf, len); + cpu_l2cache_inv_range((vm_offset_t)buf, len); + } else { + cpu_dcache_wbinv_range((vm_offset_t)buf, len); + cpu_l2cache_wbinv_range((vm_offset_t)buf, len); + } } if (op & BUS_DMASYNC_POSTREAD) { if ((vm_offset_t)buf & arm_dcache_align_mask) { ==== //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.7 2007/08/17 18:22:31 imp Exp $"); #include <sys/param.h> #include <sys/disklabel.h> @@ -216,7 +216,7 @@ return; } addr = eh.e_entry; - ((void(*)(int))addr)(RB_BOOTINFO | (opts & RBX_MASK)); + ((void(*)(int))addr)(opts & RBX_MASK); } static int ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.77 2007/07/04 23:03:50 peter Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.78 2007/08/16 05:32:25 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.75 2007/07/04 23:03:50 peter Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.76 2007/08/16 05:32:25 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ @@ -337,4 +337,5 @@ #define FREEBSD32_SYS_freebsd32_lseek 478 #define FREEBSD32_SYS_freebsd32_truncate 479 #define FREEBSD32_SYS_freebsd32_ftruncate 480 -#define FREEBSD32_SYS_MAXSYSCALL 481 +#define FREEBSD32_SYS_thr_kill2 481 +#define FREEBSD32_SYS_MAXSYSCALL 482 ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.66 2007/07/04 23:03:50 peter Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.67 2007/08/16 05:32:25 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ @@ -488,4 +488,5 @@ "freebsd32_lseek", /* 478 = freebsd32_lseek */ "freebsd32_truncate", /* 479 = freebsd32_truncate */ "freebsd32_ftruncate", /* 480 = freebsd32_ftruncate */ + "thr_kill2", /* 481 = thr_kill2 */ }; ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.76 2007/07/04 23:03:50 peter Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.77 2007/08/16 05:32:25 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ @@ -519,4 +519,5 @@ { AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 478 = freebsd32_lseek */ { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_truncate */ { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_ftruncate */ + { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 }, /* 481 = thr_kill2 */ }; ==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.91 2007/08/16 05:30:04 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -794,3 +794,4 @@ u_int32_t lengthlo, u_int32_t lengthhi); } 480 AUE_FTRUNCATE STD { int freebsd32_ftruncate(int fd, \ u_int32_t lengthlo, u_int32_t lengthhi); } +481 AUE_KILL NOPROTO { int thr_kill2(pid_t pid, long id, int sig); } ==== //depot/projects/vimage/src/sys/compat/opensolaris/sys/proc.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/proc.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/proc.h,v 1.2 2007/08/16 20:33:20 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_PROC_H_ @@ -56,6 +56,12 @@ typedef struct thread *kthread_id_t; typedef struct proc proc_t; +#if (KSTACK_PAGES * PAGE_SIZE) < 16384 +#define ZFS_KSTACK_PAGES (16384 / PAGE_SIZE) +#else +#define ZFS_KSTACK_PAGES 0 +#endif + static __inline kthread_t * thread_create(caddr_t stk, size_t stksize, void (*proc)(void *), void *arg, size_t len, proc_t *pp, int state, pri_t pri) @@ -71,7 +77,8 @@ ASSERT(len == 0); ASSERT(state == TS_RUN); - error = kthread_create(proc, arg, &p, 0, 0, "solthread %p", proc); + error = kthread_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES, + "solthread %p", proc); return (error == 0 ? FIRST_THREAD_IN_PROC(p) : NULL); } ==== //depot/projects/vimage/src/sys/conf/NOTES#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1448 2007/08/05 16:16:15 bz Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1449 2007/08/13 17:19:27 emax Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -627,7 +627,7 @@ options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) -# options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) - not MPSAFE +options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) ==== //depot/projects/vimage/src/sys/conf/files.amd64#6 (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.amd64,v 1.106 2007/07/05 06:12:40 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.107 2007/08/15 19:26:01 des Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -145,6 +145,7 @@ dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +dev/coretemp/coretemp.c optional coretemp # There are no systems with isa slots, so all ed isa entries should go.. dev/ed/if_ed_3c503.c optional ed isa ed_3c503 dev/ed/if_ed_isa.c optional ed isa ==== //depot/projects/vimage/src/sys/conf/files.i386#6 (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.i386,v 1.579 2007/07/05 06:12:40 peter Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.580 2007/08/15 19:26:01 des Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -158,6 +158,7 @@ dev/ce/if_ce.c optional ce dev/ce/tau32-ddk.c optional ce dev/cm/if_cm_isa.c optional cm isa +dev/coretemp/coretemp.c optional coretemp dev/cp/cpddk.c optional cp dev/cp/if_cp.c optional cp dev/ctau/ctau.c optional ctau ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.45 2007/07/03 12:16:07 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.46 2007/08/23 09:30:58 dhartmei Exp $"); #endif #ifdef __FreeBSD__ @@ -5445,8 +5445,7 @@ dst = &(*state)->dst; } - if (src->wscale && dst->wscale && - !(th.th_flags & TH_SYN)) + if (src->wscale && dst->wscale) dws = dst->wscale & PF_WSCALE_MASK; else dws = 0; ==== //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.61 2006/12/11 18:28:28 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.62 2007/08/23 20:12:40 emaste Exp $"); /* * PCI bus interface and resource allocation. @@ -194,6 +194,10 @@ "ICP ICP9047MA SATA RAID"}, {0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0, "ICP ICP9087MA SATA RAID"}, + {0x9005, 0x0285, 0x9005, 0x02bb, AAC_HWIF_I960RX, 0, + "Adaptec RAID 3405"}, + {0x9005, 0x0285, 0x9005, 0x02bc, AAC_HWIF_I960RX, 0, + "Adaptec RAID 3805"}, {0x9005, 0x0286, 0x1014, 0x9580, AAC_HWIF_RKT, 0, "IBM ServeRAID-8k"}, {0, 0, 0, 0, 0, 0, 0} ==== //depot/projects/vimage/src/sys/dev/ata/ata-raid.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.123 2007/02/21 19:07:18 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.124 2007/08/13 18:46:31 jhb Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -56,7 +56,7 @@ /* prototypes */ static void ata_raid_done(struct ata_request *request); static void ata_raid_config_changed(struct ar_softc *rdp, int writeback); -static int ata_raid_status(struct ata_ioc_raid_config *config); +static int ata_raid_status(struct ata_ioc_raid_status *status); static int ata_raid_create(struct ata_ioc_raid_config *config); static int ata_raid_delete(int array); static int ata_raid_addspare(struct ata_ioc_raid_config *config); @@ -216,13 +216,14 @@ static int ata_raid_ioctl(u_long cmd, caddr_t data) { + struct ata_ioc_raid_status *status = (struct ata_ioc_raid_status *)data; struct ata_ioc_raid_config *config = (struct ata_ioc_raid_config *)data; int *lun = (int *)data; int error = EOPNOTSUPP; switch (cmd) { case IOCATARAIDSTATUS: - error = ata_raid_status(config); + error = ata_raid_status(status); break; case IOCATARAIDCREATE: @@ -929,25 +930,32 @@ } static int -ata_raid_status(struct ata_ioc_raid_config *config) +ata_raid_status(struct ata_ioc_raid_status *status) { struct ar_softc *rdp; int i; - if (!(rdp = ata_raid_arrays[config->lun])) + if (!(rdp = ata_raid_arrays[status->lun])) return ENXIO; - config->type = rdp->type; - config->total_disks = rdp->total_disks; + status->type = rdp->type; + status->total_disks = rdp->total_disks; for (i = 0; i < rdp->total_disks; i++ ) { - if ((rdp->disks[i].flags & AR_DF_PRESENT) && rdp->disks[i].dev) - config->disks[i] = device_get_unit(rdp->disks[i].dev); - else - config->disks[i] = -1; + status->disks[i].state = 0; + if ((rdp->disks[i].flags & AR_DF_PRESENT) && rdp->disks[i].dev) { + status->disks[i].lun = device_get_unit(rdp->disks[i].dev); + if (rdp->disks[i].flags & AR_DF_PRESENT) + status->disks[i].state |= AR_DISK_PRESENT; + if (rdp->disks[i].flags & AR_DF_ONLINE) + status->disks[i].state |= AR_DISK_ONLINE; + if (rdp->disks[i].flags & AR_DF_SPARE) + status->disks[i].state |= AR_DISK_SPARE; + } else + status->disks[i].lun = -1; } - config->interleave = rdp->interleave; - config->status = rdp->status; - config->progress = 100 * rdp->rebuild_lba / rdp->total_sectors; + status->interleave = rdp->interleave; + status->status = rdp->status; + status->progress = 100 * rdp->rebuild_lba / rdp->total_sectors; return 0; } ==== //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.6 2007/07/17 06:50:34 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.7 2007/08/17 05:57:04 kmacy Exp $"); #ifdef CONFIG_DEFINED @@ -501,7 +501,7 @@ #undef CAPS_10G #define VPD_ENTRY(name, len) \ - u8 name##_kword[2]; u8 name##_len; u8 name##_data[len] + u8 name##_kword[2]; u8 name##_len; char name##_data[len] /* * Partial EEPROM Vital Product Data structure. Includes only the ID and ==== //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.3 2007/08/25 21:07:37 kmacy Exp $"); #ifdef CONFIG_DEFINED #include <cxgb_include.h> @@ -248,4 +248,5 @@ const struct mdio_ops *mdio_ops) { cphy_init(phy, adapter, phy_addr, &vsc8211_ops, mdio_ops); + t3_os_sleep(20); /* PHY needs ~10ms to start responding to MDIO */ } ==== //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.14 2007/07/17 06:50:33 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.17 2007/08/25 21:07:36 kmacy Exp $ ***************************************************************************/ @@ -36,7 +36,7 @@ #define _CXGB_ADAPTER_H_ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.14 2007/07/17 06:50:33 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.17 2007/08/25 21:07:36 kmacy Exp $"); #include <sys/lock.h> #include <sys/mutex.h> @@ -117,10 +117,13 @@ #else struct mtx lock; #endif - int port; - uint8_t hw_addr[ETHER_ADDR_LEN]; + uint8_t port_id; + uint8_t tx_chan; + uint8_t txpkt_intf; uint8_t nqsets; uint8_t first_qset; + + uint8_t hw_addr[ETHER_ADDR_LEN]; struct taskqueue *tq; struct task start_task; struct task timer_reclaim_task; @@ -310,7 +313,7 @@ TAILQ_ENTRY(adapter) adapter_entry; /* PCI register resources */ - uint32_t regs_rid; + int regs_rid; struct resource *regs_res; bus_space_handle_t bh; bus_space_tag_t bt; @@ -515,7 +518,7 @@ void t3_rx_eth_lro(adapter_t *adap, struct sge_rspq *rq, struct mbuf *m, int ethpad, uint32_t rss_hash, uint32_t rss_csum, int lro); -void t3_rx_eth(struct port_info *p, struct sge_rspq *rq, struct mbuf *m, int ethpad); +void t3_rx_eth(struct adapter *adap, struct sge_rspq *rq, struct mbuf *m, int ethpad); void t3_lro_flush(adapter_t *adap, struct sge_qset *qs, struct lro_state *state); void t3_add_sysctls(adapter_t *sc); ==== //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_ioctl.h,v 1.4 2007/07/17 06:50:33 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_ioctl.h,v 1.5 2007/08/17 05:57:03 kmacy Exp $ ***************************************************************************/ #ifndef __CHIOCTL_H__ @@ -128,7 +128,7 @@ int8_t channel; int32_t kbps; /* rate in Kbps */ int32_t class_ipg; /* tenths of nanoseconds */ - int32_t flow_ipg; /* usec */ + uint32_t flow_ipg; /* usec */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708301218.l7UCIneN025916>