Date: Tue, 21 Nov 2006 16:18:54 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 110277 for review Message-ID: <200611211618.kALGIsOn045789@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=110277 Change 110277 by imp@imp_paco-paco on 2006/11/20 04:49:56 IFC @110276 Affected files ... .. //depot/projects/arm/src/share/man/man9/Makefile#4 integrate .. //depot/projects/arm/src/share/man/man9/cr_cansee.9#1 branch .. //depot/projects/arm/src/share/man/man9/p_candebug.9#2 integrate .. //depot/projects/arm/src/share/man/man9/p_cansee.9#1 branch .. //depot/projects/arm/src/share/mk/bsd.own.mk#8 integrate .. //depot/projects/arm/src/share/mk/bsd.port.mk#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/arm/src/sys/amd64/include/pmap.h#10 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/arm/src/sys/arm/arm/identcpu.c#10 integrate .. //depot/projects/arm/src/sys/arm/arm/nexus_io.c#4 integrate .. //depot/projects/arm/src/sys/arm/at91/at91.c#24 integrate .. //depot/projects/arm/src/sys/arm/include/bus.h#6 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/arm/src/sys/boot/ia64/common/copy.c#3 integrate .. //depot/projects/arm/src/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#8 integrate .. //depot/projects/arm/src/sys/conf/files#54 integrate .. //depot/projects/arm/src/sys/conf/options.arm#17 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#33 integrate .. //depot/projects/arm/src/sys/dev/iicbus/ad7418.c#1 branch .. //depot/projects/arm/src/sys/dev/iicbus/ds1672.c#1 branch .. //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#8 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#20 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#28 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#19 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/arm/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/arm/src/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/arm/src/sys/ia64/include/kdb.h#3 integrate .. //depot/projects/arm/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/arm/src/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#12 integrate .. //depot/projects/arm/src/sys/net/ethernet.h#4 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs.h#6 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/arm/src/sys/sun4v/conf/NOTES#4 integrate .. //depot/projects/arm/src/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/arm/src/sys/vm/vm_meter.c#7 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#1 branch .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#1 branch .. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/index.c#2 integrate Differences ... ==== //depot/projects/arm/src/share/man/man9/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.284 2006/11/11 08:59:34 ru Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.285 2006/11/19 13:35:03 ceri Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -41,6 +41,7 @@ config_intrhook.9 \ contigmalloc.9 \ copy.9 \ + cr_cansee.9 \ critical_enter.9 \ cr_seeothergids.9 \ cr_seeotheruids.9 \ @@ -157,6 +158,7 @@ panic.9 \ pbuf.9 \ p_candebug.9 \ + p_cansee.9 \ pci.9 \ pfil.9 \ pfind.9 \ ==== //depot/projects/arm/src/share/man/man9/p_candebug.9#2 (text+ko) ==== @@ -25,15 +25,16 @@ .\" (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/share/man/man9/p_candebug.9,v 1.3 2004/07/06 07:26:23 ru Exp $ +.\" $FreeBSD: src/share/man/man9/p_candebug.9,v 1.5 2006/11/19 13:36:04 ceri Exp $ .\" -.Dd November 11, 2003 +.Dd November 19, 2006 .Os .Dt P_CANDEBUG 9 .Sh NAME .Nm p_candebug .Nd determine debuggability of a process .Sh SYNOPSIS +.In sys/param.h .In sys/proc.h .Ft int .Fn p_candebug "struct thread *td" "struct proc *p" @@ -128,10 +129,10 @@ The MAC subsystem denied debuggability. .El .Sh SEE ALSO -.Xr intro 2 , .Xr jail 2 , .Xr sysctl 8 , .Xr cr_seeothergids 9 , .Xr cr_seeotheruids 9 , .Xr mac 9 , +.Xr p_cansee 9 , .Xr prison_check 9 ==== //depot/projects/arm/src/share/mk/bsd.own.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.own.mk,v 1.58 2006/11/01 09:02:10 jb Exp $ +# $FreeBSD: src/share/mk/bsd.own.mk,v 1.59 2006/11/19 16:28:52 ru Exp $ # # The include file <bsd.own.mk> set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -104,10 +104,12 @@ .if !target(__<bsd.own.mk>__) __<bsd.own.mk>__: +.if !defined(_WITHOUT_SRCCONF) SRCCONF?= /etc/src.conf .if exists(${SRCCONF}) .include "${SRCCONF}" .endif +.endif # # CPU model, derived from MACHINE_ARCH @@ -175,6 +177,7 @@ COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz +.if !defined(_WITHOUT_SRCCONF) # # Define MK_* variables (which are either "yes" or "no") for users # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the @@ -453,5 +456,6 @@ MK_${var}_SUPPORT:= yes .endif .endfor +.endif # !_WITHOUT_SRCCONF .endif # !target(__<bsd.own.mk>__) ==== //depot/projects/arm/src/share/mk/bsd.port.mk#3 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/mk/bsd.port.mk,v 1.308 2006/08/24 18:04:49 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.port.mk,v 1.309 2006/11/19 16:28:52 ru Exp $ PORTSDIR?= /usr/ports BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk -# Needed to keep bsd.own.mk from reading in /etc/src.conf when building ports. -SRCCONF= /dev/null +# Needed to keep bsd.own.mk from reading in /etc/src.conf +# and setting MK_* variables when building ports. +_WITHOUT_SRCCONF= .include <bsd.own.mk> .include "${BSDPORTMK}" ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#18 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.663 2006/11/17 20:27:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -833,7 +833,7 @@ static void getmemsize(caddr_t kmdp, u_int64_t first) { - int i, physmap_idx, pa_indx, da_indx; + int i, off, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; u_long physmem_tunable; pt_entry_t *pte; @@ -1096,14 +1096,17 @@ /* Trim off space for the message buffer. */ phys_avail[pa_indx] -= round_page(MSGBUF_SIZE); - avail_end = phys_avail[pa_indx]; + /* Map the message buffer. */ + for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) + pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + + off); } u_int64_t hammer_time(u_int64_t modulep, u_int64_t physfree) { caddr_t kmdp; - int gsel_tss, off, x; + int gsel_tss, x; struct pcpu *pc; u_int64_t msr; char *env; @@ -1270,10 +1273,6 @@ /* now running on new page tables, configured,and u/iom is accessible */ - /* Map the message buffer. */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, avail_end + off); - msgbufinit(msgbufp, MSGBUF_SIZE); fpuinit(); ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#27 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.573 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.574 2006/11/19 20:54:57 alc Exp $"); /* * Manages physical address maps. @@ -168,8 +168,7 @@ struct pmap kernel_pmap_store; -vm_paddr_t avail_start; /* PA of first available physical page */ -vm_paddr_t avail_end; /* PA of last available physical page */ +static vm_paddr_t avail_start; /* PA of first available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ ==== //depot/projects/arm/src/sys/amd64/include/pmap.h#10 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.136 2006/11/13 20:33:54 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -296,7 +296,6 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; -extern vm_paddr_t avail_end; extern vm_paddr_t phys_avail[]; extern vm_paddr_t dump_avail[]; extern vm_offset_t virtual_avail; ==== //depot/projects/arm/src/sys/arm/arm/cpufunc.c#12 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.14 2006/11/19 23:55:23 sam Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#10 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $"); #include <sys/systm.h> #include <sys/param.h> #include <sys/malloc.h> ==== //depot/projects/arm/src/sys/arm/arm/nexus_io.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.7 2006/11/19 23:46:50 sam Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/arm/src/sys/arm/at91/at91.c#24 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.8 2006/08/28 20:05:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.9 2006/11/19 23:47:51 sam Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/arm/src/sys/arm/include/bus.h#6 (text+ko) ==== @@ -67,7 +67,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/arm/include/bus.h,v 1.8 2005/04/18 21:45:33 imp Exp $ + * $FreeBSD: src/sys/arm/include/bus.h,v 1.9 2006/11/19 23:46:49 sam Exp $ */ #ifndef _MACHINE_BUS_H_ ==== //depot/projects/arm/src/sys/boot/ia64/common/copy.c#3 (text+ko) ==== @@ -25,18 +25,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ia64/common/copy.c,v 1.8 2006/11/05 22:03:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/common/copy.c,v 1.9 2006/11/19 20:04:11 marcel Exp $"); #include <stand.h> #include <ia64/include/vmparam.h> #include "libia64.h" -#define LDR_LOG2_PGSZ 20 - -uint64_t *ia64_pgtbl; -uint32_t ia64_pgtblsz; - static void * va2pa(vm_offset_t va, size_t *len) { ==== //depot/projects/arm/src/sys/boot/ia64/common/libia64.h#2 (text+ko) ==== @@ -23,7 +23,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/boot/ia64/common/libia64.h,v 1.1 2006/11/05 22:03:03 marcel Exp $ + * $FreeBSD: src/sys/boot/ia64/common/libia64.h,v 1.2 2006/11/19 20:04:11 marcel Exp $ */ #ifndef _LIBIA64_H_ @@ -45,9 +45,6 @@ * and shared by all loader implementations. */ -extern uint64_t *ia64_pgtbl; -extern uint32_t ia64_pgtblsz; - extern int ia64_autoload(void); extern ssize_t ia64_copyin(const void *, vm_offset_t, size_t); ==== //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.26 2006/11/18 13:31:03 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.27 2006/11/18 17:27:39 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -426,7 +426,7 @@ #ifdef DEBUG if (ldebug(getcwd)) - printf(ARGS(getcwd, "%p, %ld", args->buf, (long)args->bufsize); + printf(ARGS(getcwd, "%p, %ld"), args->buf, (long)args->bufsize); #endif len = args->bufsize; ==== //depot/projects/arm/src/sys/conf/files#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1162 2006/11/15 09:13:24 maxim Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1163 2006/11/19 23:43:29 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -664,6 +664,8 @@ dev/ieee488/pcii.c optional pcii dev/ieee488/tnt4882.c optional tnt4882 dev/ieee488/upd7210.c optional pcii | tnt4882 +dev/iicbus/ad7418.c optional ad7418 +dev/iicbus/ds1672.c optional ds1672 dev/iicbus/if_ic.c optional ic dev/iicbus/iic.c optional iic dev/iicbus/iicbb.c optional iicbb ==== //depot/projects/arm/src/sys/conf/options.arm#17 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.13 2006/08/24 23:51:28 cognet Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.14 2006/11/19 23:56:44 sam Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h ==== //depot/projects/arm/src/sys/dev/em/if_em.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.164 2006/11/15 20:04:56 jhb Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.165 2006/11/18 23:18:43 csjp Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -248,7 +248,6 @@ static void em_update_link_status(struct adapter *); static int em_get_buf(struct adapter *, int); static void em_enable_vlans(struct adapter *); -static void em_disable_vlans(struct adapter *); static int em_encap(struct adapter *, struct mbuf **); static void em_smartspeed(struct adapter *); static int em_82547_fifo_workaround(struct adapter *, int); @@ -761,7 +760,7 @@ } /* Send a copy of the frame to the BPF listener */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); /* Set timeout in case hardware has problems transmitting. */ adapter->watchdog_timer = EM_TX_TIMEOUT; @@ -1507,45 +1506,6 @@ } /* - * When operating in promiscuous mode, hardware stripping of the - * VLAN tag on receive is disabled. This should not prevent us - * from doing hardware insertion of the VLAN tag here as that - * is controlled by the dma descriptor flags and not the receive - * tag strip setting. Unfortunatly this hardware switches the - * VLAN encapsulation type from 802.1q to ISL when stripping om - * receive is disabled. This means we have to add the vlan - * encapsulation here in the driver, since it will have come down - * from the VLAN layer with a tag instead of a VLAN header. - */ - if ((m_head->m_flags & M_VLANTAG) && adapter->em_insert_vlan_header) { - struct ether_vlan_header *evl; - struct ether_header eh; - - m_head = m_pullup(m_head, sizeof(eh)); - if (m_head == NULL) { - *m_headp = NULL; - return (ENOBUFS); - } - eh = *mtod(m_head, struct ether_header *); - M_PREPEND(m_head, sizeof(*evl), M_DONTWAIT); - if (m_head == NULL) { - *m_headp = NULL; - return (ENOBUFS); - } - m_head = m_pullup(m_head, sizeof(*evl)); - if (m_head == NULL) { - *m_headp = NULL; - return (ENOBUFS); - } - evl = mtod(m_head, struct ether_vlan_header *); - bcopy(&eh, evl, sizeof(*evl)); - evl->evl_proto = evl->evl_encap_proto; - evl->evl_encap_proto = htons(ETHERTYPE_VLAN); - evl->evl_tag = htons(m_head->m_pkthdr.ether_vtag); - *m_headp = m_head; - } - - /* * TSO workaround: * If an mbuf contains only the IP and TCP header we have * to pull 4 bytes of data into it. @@ -1915,29 +1875,16 @@ if (ifp->if_flags & IFF_PROMISC) { reg_rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE); E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); - /* - * Disable VLAN stripping in promiscous mode. - * This enables bridging of vlan tagged frames to occur - * and also allows vlan tags to be seen in tcpdump. - * XXX: This is a bit bogus as tcpdump may be used - * w/o promisc mode as well. - */ - if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) - em_disable_vlans(adapter); - adapter->em_insert_vlan_header = 1; } else if (ifp->if_flags & IFF_ALLMULTI) { reg_rctl |= E1000_RCTL_MPE; reg_rctl &= ~E1000_RCTL_UPE; E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); - adapter->em_insert_vlan_header = 0; - } else - adapter->em_insert_vlan_header = 0; + } } static void em_disable_promisc(struct adapter *adapter) { - struct ifnet *ifp = adapter->ifp; uint32_t reg_rctl; reg_rctl = E1000_READ_REG(&adapter->hw, RCTL); @@ -1945,10 +1892,6 @@ reg_rctl &= (~E1000_RCTL_UPE); reg_rctl &= (~E1000_RCTL_MPE); E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); - - if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) - em_enable_vlans(adapter); - adapter->em_insert_vlan_header = 0; } @@ -2429,7 +2372,7 @@ */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; - ifp->if_capenable |= IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; #ifdef DEVICE_POLLING ifp->if_capabilities |= IFCAP_POLLING; @@ -3816,16 +3759,6 @@ } static void -em_disable_vlans(struct adapter *adapter) -{ - uint32_t ctrl; - - ctrl = E1000_READ_REG(&adapter->hw, CTRL); - ctrl &= ~E1000_CTRL_VME; - E1000_WRITE_REG(&adapter->hw, CTRL, ctrl); -} - -static void em_enable_intr(struct adapter *adapter) { E1000_WRITE_REG(&adapter->hw, IMS, (IMS_ENABLE_MASK)); ==== //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.22 2006/07/14 23:15:06 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.23 2006/11/19 23:42:32 sam Exp $"); /* * Autoconfiguration and support routines for the Philips serial I2C bus ==== //depot/projects/arm/src/sys/dev/mpt/mpt.h#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.31 2006/11/15 20:04:57 jhb Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.32 2006/11/19 23:15:42 mjacob Exp $ */ /*- * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -496,7 +496,8 @@ uint32_t mpt_pers_mask; uint32_t unit : 8, - : 3, + : 2, + msi_enable : 1, twildcard : 1, tenabled : 1, do_cfg_role : 1, ==== //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#28 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.40 2006/11/17 00:19:55 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.41 2006/11/19 23:13:12 mjacob Exp $"); #include <dev/mpt/mpt.h> #include <dev/mpt/mpt_cam.h> @@ -2327,7 +2327,7 @@ req->IOCStatus = le16toh(tmf_reply->IOCStatus); req->ResponseCode = tmf_reply->ResponseCode; - mpt_lprt(mpt, MPT_PRT_INFO, "TMF complete: req %p:%u status 0x%x\n", + mpt_lprt(mpt, MPT_PRT_DEBUG, "TMF complete: req %p:%u status 0x%x\n", req, req->serno, le16toh(tmf_reply->IOCStatus)); TAILQ_REMOVE(&mpt->request_pending_list, req, links); if ((req->state & REQ_STATE_NEED_WAKEUP) != 0) { @@ -3566,7 +3566,7 @@ } tmf_req->TaskMsgContext = abort_ctx; - mpt_lprt(mpt, MPT_PRT_INFO, + mpt_lprt(mpt, MPT_PRT_DEBUG, "Issuing TMF %p:%u with MsgContext of 0x%x\n", mpt->tmf_req, mpt->tmf_req->serno, tmf_req->MsgContext); if (mpt->verbose > MPT_PRT_DEBUG) { @@ -3578,6 +3578,8 @@ TAILQ_INSERT_HEAD(&mpt->request_pending_list, mpt->tmf_req, links); error = mpt_send_handshake_cmd(mpt, sizeof(*tmf_req), tmf_req); if (error != MPT_OK) { + TAILQ_REMOVE(&mpt->request_pending_list, mpt->tmf_req, links); + mpt->tmf_req->state = REQ_STATE_FREE; mpt_reset(mpt, TRUE); } return (error); ==== //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#19 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.42 2006/11/16 02:40:18 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.44 2006/11/19 23:24:52 mjacob Exp $"); #include <dev/mpt/mpt.h> #include <dev/mpt/mpt_cam.h> @@ -326,6 +326,8 @@ } mpt->do_cfg_role = 1; } + + mpt->msi_enable = 0; } #else static void @@ -350,6 +352,13 @@ mpt->cfg_role = tval; mpt->do_cfg_role = 1; } + + tval = 0; + mpt->msi_enable = 0; + if (resource_int_value(device_get_name(mpt->dev), + device_get_unit(mpt->dev), "msi_enable", &tval) == 0 && tval == 1) { + mpt->msi_enable = 1; + } } #endif @@ -512,12 +521,13 @@ /* Get a handle to the interrupt */ iqd = 0; - if (pci_msi_count(dev) == 1) { + if (mpt->msi_enable && pci_msi_count(dev) == 1) { mpt->pci_msi_count = 1; - if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) + if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) { iqd = 1; - else + } else { mpt->pci_msi_count = 0; + } } mpt->pci_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd, RF_ACTIVE | RF_SHAREABLE); ==== //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.159 2006/11/06 13:41:58 rwatson Exp $ + * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.160 2006/11/18 18:22:11 rodrigc Exp $ */ /*- @@ -119,7 +119,10 @@ static int compute_sb_data(struct vnode * devvp, struct ext2_super_block * es, struct ext2_sb_info * fs); -static const char *ext2_opts[] = { "from", "export" }; +static const char *ext2_opts[] = { "from", "export", "union", "acls", "exec", + "atime", "union", "suiddir", "multilabel", "symfollow", "clusterr", + "clusterw" }; + /* * VFS Operations. * ==== //depot/projects/arm/src/sys/i386/i386/machdep.c#22 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.642 2006/11/17 19:20:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.643 2006/11/19 20:54:57 alc Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -1608,7 +1608,7 @@ static void getmemsize(int first) { - int i, physmap_idx, pa_indx, da_indx; + int i, off, physmap_idx, pa_indx, da_indx; int hasbrokenint12, has_smap; u_long physmem_tunable; u_int extmem; @@ -2036,7 +2036,10 @@ /* Trim off space for the message buffer. */ phys_avail[pa_indx] -= round_page(MSGBUF_SIZE); - avail_end = phys_avail[pa_indx]; + /* Map the message buffer. */ + for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) + pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + + off); } void @@ -2044,7 +2047,7 @@ int first; { struct gate_descriptor *gdp; - int gsel_tss, metadata_missing, off, x; + int gsel_tss, metadata_missing, x; struct pcpu *pc; thread0.td_kstack = proc0kstack; @@ -2269,10 +2272,6 @@ /* now running on new page tables, configured,and u/iom is accessible */ - /* Map the message buffer. */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, avail_end + off); - msgbufinit(msgbufp, MSGBUF_SIZE); /* make a call gate to reenter kernel with */ ==== //depot/projects/arm/src/sys/i386/i386/pmap.c#25 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.578 2006/11/16 11:46:24 maxim Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.579 2006/11/19 20:54:57 alc Exp $"); /* * Manages physical address maps. @@ -196,7 +196,6 @@ static struct pmaplist allpmaps; static struct mtx allpmaps_lock; -vm_paddr_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ int pgeflag = 0; /* PG_G or-in */ ==== //depot/projects/arm/src/sys/i386/include/pmap.h#7 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.124 2006/11/13 20:33:54 ru Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.125 2006/11/19 20:54:58 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -361,7 +361,6 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; -extern vm_paddr_t avail_end; extern vm_paddr_t phys_avail[]; extern vm_paddr_t dump_avail[]; extern int pseflag; ==== //depot/projects/arm/src/sys/ia64/ia64/genassym.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.43 2006/11/01 04:54:50 jb Exp $ + * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.44 2006/11/18 21:48:13 marcel Exp $ */ #include "opt_compat.h" @@ -91,7 +91,6 @@ ASSYM(PAGE_SHIFT, PAGE_SHIFT); ASSYM(PAGE_SIZE, PAGE_SIZE); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_CURRENT_PMAP, offsetof(struct pcpu, pc_current_pmap)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ==== //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.55 2006/04/03 23:56:40 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.56 2006/11/18 21:52:26 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -224,7 +224,7 @@ cpumask_t mybit = PCPU_GET(cpumask); intr = intr_disable(); - savectx(PCPU_GET(pcb)); + savectx(PCPU_PTR(pcb)); atomic_set_int(&stopped_cpus, mybit); while ((started_cpus & mybit) == 0) /* spin */; ==== //depot/projects/arm/src/sys/ia64/ia64/machdep.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.210 2006/11/03 04:06:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.212 2006/11/18 23:15:25 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -108,7 +108,7 @@ u_int64_t pa_bootinfo; struct bootinfo bootinfo; -struct pcpu early_pcpu; +struct pcpu pcpu0; extern char kstack[]; vm_offset_t proc0kstack; @@ -403,17 +403,7 @@ void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) { - size_t pcpusz; - /* - * Make sure the PCB is 16-byte aligned by making the PCPU - * a multiple of 16 bytes. We assume the PCPU is 16-byte - * aligned itself. - */ - pcpusz = (sizeof(struct pcpu) + 15) & ~15; - KASSERT(size >= pcpusz + sizeof(struct pcb), - ("%s: too small an allocation for pcpu", __func__)); - pcpu->pc_pcb = (struct pcb *)((char*)pcpu + pcpusz); pcpu->pc_acpi_id = cpuid; } @@ -611,6 +601,16 @@ bootverbose = 1; /* + * Setup the PCPU data for the bootstrap processor. It is needed + * by printf(). Also, since printf() has critical sections, we + * need to initialize at least pc_curthread. + */ + pcpup = &pcpu0; + ia64_set_k4((u_int64_t)pcpup); + pcpu_init(pcpup, 0, sizeof(pcpu0)); + PCPU_SET(curthread, &thread0); + + /* * Initialize the console before we print anything out. */ cninit(); @@ -781,21 +781,11 @@ #else proc_linkup(&proc0, &thread0); #endif - /* - * Init mapping for kernel stack for proc 0 - */ + proc0kstack = (vm_offset_t)kstack; thread0.td_kstack = proc0kstack; thread0.td_kstack_pages = KSTACK_PAGES; - /* - * Setup the global data for the bootstrap cpu. - */ - pcpup = (struct pcpu *)pmap_steal_memory(PAGE_SIZE); - ia64_set_k4((u_int64_t)pcpup); - pcpu_init(pcpup, 0, PAGE_SIZE); - PCPU_SET(curthread, &thread0); - mutex_init(); /* ==== //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.61 2006/05/16 14:32:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.62 2006/11/18 21:52:26 marcel Exp $"); #include "opt_kstack_pages.h" @@ -200,8 +200,8 @@ } if (acpiid != 0) { - pc = (struct pcpu *)kmem_alloc(kernel_map, PAGE_SIZE); - pcpu_init(pc, acpiid, PAGE_SIZE); + pc = (struct pcpu *)malloc(sizeof(*pc), M_PMAP, M_WAITOK); + pcpu_init(pc, acpiid, sizeof(*pc)); } else pc = pcpup; ==== //depot/projects/arm/src/sys/ia64/include/kdb.h#3 (text+ko) ==== @@ -23,7 +23,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/ia64/include/kdb.h,v 1.3 2006/04/03 22:51:47 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/kdb.h,v 1.4 2006/11/18 21:52:26 marcel Exp $ */ #ifndef _MACHINE_KDB_H_ @@ -33,7 +33,7 @@ #include <machine/frame.h> #include <machine/ia64_cpu.h> -#define KDB_STOPPEDPCB(pc) (pc)->pc_pcb +#define KDB_STOPPEDPCB(pc) (&(pc)->pc_pcb) static __inline void kdb_cpu_clear_singlestep(void) ==== //depot/projects/arm/src/sys/ia64/include/pcpu.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/pcpu.h,v 1.17 2003/11/17 03:40:41 bde Exp $ + * $FreeBSD: src/sys/ia64/include/pcpu.h,v 1.18 2006/11/18 21:52:26 marcel Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -32,13 +32,15 @@ #ifdef _KERNEL +#include <machine/pcb.h> + #define PCPU_MD_FIELDS \ - struct pcb *pc_pcb; /* Used by IPI_STOP */ \ + struct pcb pc_pcb; /* Used by IPI_STOP */ \ struct pmap *pc_current_pmap; /* active pmap */ \ uint64_t pc_lid; /* local CPU ID */ \ - uint32_t pc_awake:1; /* CPU is awake? */ \ uint64_t pc_clock; /* Clock counter. */ \ uint64_t pc_clockadj; /* Clock adjust. */ \ + uint32_t pc_awake:1; /* CPU is awake? */ \ uint32_t pc_acpi_id /* ACPI CPU id. */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611211618.kALGIsOn045789>