From owner-p4-projects@FreeBSD.ORG Mon Mar 11 13:59:39 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E70F8E27; Mon, 11 Mar 2013 13:59:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A77A1E25 for ; Mon, 11 Mar 2013 13:59:38 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7DE99380 for ; Mon, 11 Mar 2013 13:59:38 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BDxcOZ018821 for ; Mon, 11 Mar 2013 13:59:38 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2BDxc1t018818 for perforce@freebsd.org; Mon, 11 Mar 2013 13:59:38 GMT (envelope-from jonathan@freebsd.org) Date: Mon, 11 Mar 2013 13:59:38 GMT Message-Id: <201303111359.r2BDxc1t018818@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 222785 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 13:59:39 -0000 http://p4web.freebsd.org/@@222785?ac=10 Change 222785 by jonathan@jonathan-on-kent on 2013/03/11 13:58:40 Pass -code-model=kernel to llc. This isn't really the Right Place (TM) to do this: we really ought to create a new flag from the kernel build that we pass through to sys.mk. For now, however, whatever lets me build a bootable kernel makes me happy. :) Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#7 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#7 (text+ko) ==== @@ -280,7 +280,7 @@ ${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC} .instrll.instro: tesla.manifest - ${LLC} -filetype=obj ${.IMPSRC} -o ${.TARGET} + ${LLC} -filetype=obj -code-model=kernel ${.IMPSRC} -o ${.TARGET} .manifest.dot: ${TESLA} graph ${.IMPSRC} -o ${.TARGET} From owner-p4-projects@FreeBSD.ORG Mon Mar 11 14:05:45 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7BC819F; Mon, 11 Mar 2013 14:05:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7005119D for ; Mon, 11 Mar 2013 14:05:45 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 608A63FA for ; Mon, 11 Mar 2013 14:05:45 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BE5jj6019518 for ; Mon, 11 Mar 2013 14:05:45 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2BE5jNj019515 for perforce@freebsd.org; Mon, 11 Mar 2013 14:05:45 GMT (envelope-from jonathan@freebsd.org) Date: Mon, 11 Mar 2013 14:05:45 GMT Message-Id: <201303111405.r2BE5jNj019515@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 222786 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 14:05:46 -0000 http://p4web.freebsd.org/@@222786?ac=10 Change 222786 by jonathan@jonathan-on-kent on 2013/03/11 14:05:12 Drop some devices that weren't playing nice with TESLA. Obviously, it would be good to fix the TESLA build so that e.g. we can deal with Atheros' non-standard header file arrangement, but that's not a priority in the near term. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/GENERIC#3 edit .. //depot/projects/ctsrd/tesla/src/sys/modules/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -102,17 +102,17 @@ # ATA controllers device ahci # AHCI-compatible SATA controllers device ata # Legacy ATA/SATA controllers -options ATA_CAM # Handle legacy controllers with CAM +#options ATA_CAM # Handle legacy controllers with CAM options ATA_STATIC_ID # Static device numbering device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA # SCSI Controllers -device ahc # AHA2940 and onboard AIC7xxx devices -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug +#device ahc # AHA2940 and onboard AIC7xxx devices +#options AHC_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~128k to driver. -device ahd # AHA39320/29320 and onboard AIC79xx devices -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug +#device ahd # AHA39320/29320 and onboard AIC79xx devices +#options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. device esp # AMD Am53C974 (Tekram DC-390(T)) #device hptiop # Highpoint RocketRaid 3xxx series @@ -126,7 +126,7 @@ device adv # Advansys SCSI adapters device adw # Advansys wide SCSI adapters -device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. +#device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters device isci # Intel C600 SAS controller @@ -138,7 +138,7 @@ device cd # CD device pass # Passthrough device (direct ATA/SCSI access) device ses # Enclosure Services (SES and SAF-TE) -device ctl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID @@ -158,7 +158,7 @@ # RAID controllers device aac # Adaptec FSA RAID -device aacp # SCSI passthrough for aac (requires CAM) +#device aacp # SCSI passthrough for aac (requires CAM) device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family @@ -204,7 +204,7 @@ # PCI Ethernet NICs. device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet -device de # DEC/Intel DC21x4x (``Tulip'') +#device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family device ixgbe # Intel PRO/10GbE PCIE Ethernet Family @@ -274,10 +274,10 @@ device ath # Atheros NICs device ath_pci # Atheros pci/cardbus glue device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later -device ath_rate_sample # SampleRate tx rate control for ath +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation +options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later +#device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. device ipw # Intel 2100 wireless NICs. ==== //depot/projects/ctsrd/tesla/src/sys/modules/Makefile#2 (text+ko) ==== @@ -22,8 +22,6 @@ aha \ ${_ahb} \ ahci \ - ${_aic} \ - aic7xxx \ aio \ alc \ ale \ @@ -39,8 +37,6 @@ ${_asmc} \ ${_asr} \ ata \ - ath \ - ath_pci \ ${_auxio} \ ${_bce} \ bfe \ @@ -84,7 +80,6 @@ dc \ dcons \ dcons_crom \ - de \ ${_dpms} \ ${_dpt} \ ${_drm} \ From owner-p4-projects@FreeBSD.ORG Mon Mar 11 18:51:58 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC466359; Mon, 11 Mar 2013 18:51:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 80237357 for ; Mon, 11 Mar 2013 18:51:57 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C9D48B6 for ; Mon, 11 Mar 2013 18:51:57 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BIpus8047314 for ; Mon, 11 Mar 2013 18:51:56 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2BIpuje047311 for perforce@freebsd.org; Mon, 11 Mar 2013 18:51:56 GMT (envelope-from brooks@freebsd.org) Date: Mon, 11 Mar 2013 18:51:56 GMT Message-Id: <201303111851.r2BIpuje047311@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222792 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 18:51:58 -0000 http://p4web.freebsd.org/@@222792?ac=10 Change 222792 by brooks@brooks_zenith on 2013/03/11 18:51:00 Add -code-model=kernel to a new LLCFLAGS variable in kern.prep.mk. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#8 edit .. //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#2 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#8 (text+ko) ==== @@ -280,7 +280,7 @@ ${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC} .instrll.instro: tesla.manifest - ${LLC} -filetype=obj -code-model=kernel ${.IMPSRC} -o ${.TARGET} + ${LLC} -filetype=obj ${LLCFLAGS} ${.IMPSRC} -o ${.TARGET} .manifest.dot: ${TESLA} graph ${.IMPSRC} -o ${.TARGET} ==== //depot/projects/ctsrd/tesla/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -94,6 +94,8 @@ .endif WERROR?= -Werror +LLCFLAGS= -code-model=kernel + # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} From owner-p4-projects@FreeBSD.ORG Mon Mar 11 20:57:14 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42B06AA0; Mon, 11 Mar 2013 20:57:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 00AD4A9E for ; Mon, 11 Mar 2013 20:57:13 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id D7AA0CA for ; Mon, 11 Mar 2013 20:57:13 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2BKvD3P058906 for ; Mon, 11 Mar 2013 20:57:13 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2BKvDgQ058903 for perforce@freebsd.org; Mon, 11 Mar 2013 20:57:13 GMT (envelope-from brooks@freebsd.org) Date: Mon, 11 Mar 2013 20:57:13 GMT Message-Id: <201303112057.r2BKvDgQ058903@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222793 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 20:57:14 -0000 http://p4web.freebsd.org/@@222793?ac=10 Change 222793 by brooks@brooks_zenith on 2013/03/11 20:56:48 Pull in changes require to build extract_and_verify on ubuntu. Fix copyright year. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/writefile/Makefile#3 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/writefile/eav.c#2 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/writefile/eav.h#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/writefile/Makefile#3 (text+ko) ==== @@ -11,6 +11,7 @@ WARNS= 6 +CFLAGS+=-DMD5_SUPPORT LDADD+= -lbz2 -lmd -lutil .include ==== //depot/projects/ctsrd/beribsd/src/ctsrd/writefile/eav.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 SRI International + * Copyright (c) 2013 SRI International * All rights reserved. * * This software was developed by SRI International and the University of @@ -31,12 +31,30 @@ #include #include +#ifdef MD5_SUPPORT #include +#endif #include #include #include "eav.h" +#ifdef __linux__ +#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */ + +static void * +reallocf(void *ptr, size_t size) +{ + void *tmp; + + tmp = ptr; + ptr = realloc(ptr, size); + if (ptr == NULL) + free(tmp); + return (ptr); +} +#endif + enum eav_compression eav_taste(const unsigned char *buf, off_t len) { @@ -85,6 +103,8 @@ return "checksum mismatch"; case EAV_ERR_DIGEST_UNKNOWN: return "unknown digest"; + case EAV_ERR_DIGEST_UNSUPPORTED: + return "unsupported digest"; case EAV_ERR_COMP: return "decompression error"; case EAV_ERR_COMP_UNKNOWN: @@ -103,11 +123,14 @@ enum eav_digest dtype, const unsigned char *digest) { int ret; - char *obuf = NULL; - size_t olen = 0, prev_total_in, total_in, total_out; + unsigned char *obuf = NULL; + size_t olen = 0, total_in, total_out; bz_stream bzs; +#ifdef MD5_SUPPORT + size_t prev_total_in; MD5_CTX md5ctx; char i_md5sum[33]; +#endif switch (ctype) { case EAV_COMP_NONE: @@ -122,15 +145,23 @@ switch (dtype) { case EAV_DIGEST_NONE: + break; case EAV_DIGEST_MD5: +#ifdef MD5_SUPPORT break; +#else + return (EAV_ERR_DIGEST_UNSUPPORTED); +#endif + default: return (EAV_ERR_DIGEST_UNKNOWN); } if (dtype || ctype) { +#ifdef MD5_SUPPORT if (dtype == EAV_DIGEST_MD5) MD5Init(&md5ctx); +#endif if (ctype) { /* XXX: assume bzip2 for now */ @@ -139,14 +170,16 @@ return (EAV_ERR_MEM); total_in = 0; +#ifdef MD5_SUPPORT prev_total_in = 0; +#endif bzs.bzalloc = NULL; bzs.bzfree = NULL; bzs.opaque = NULL; - bzs.next_in = ibuf; + bzs.next_in = (char *)ibuf; bzs.avail_in = MIN(ilen, 1024 * 1024); - bzs.next_out = obuf; + bzs.next_out = (char *)obuf; bzs.avail_out = olen; if (BZ2_bzDecompressInit(&bzs, 0, 0) != BZ_OK) return (EAV_ERR_COMP); @@ -164,10 +197,12 @@ total_out = ((size_t)bzs.total_out_hi32 << 32) + bzs.total_out_lo32; +#ifdef MD5_SUPPORT if (dtype == EAV_DIGEST_MD5) MD5Update(&md5ctx, ibuf + prev_total_in, total_in - prev_total_in); prev_total_in = total_in; +#endif if (bzs.avail_in == 0) bzs.avail_in = @@ -180,7 +215,7 @@ BZ2_bzDecompressEnd(&bzs); return (EAV_ERR_COMP); } - bzs.next_out = obuf + total_out; + bzs.next_out = (char *)obuf + total_out; bzs.avail_out = olen - total_out; } } @@ -190,10 +225,12 @@ total_out = ((size_t)bzs.total_out_hi32 << 32) + bzs.total_out_lo32; +#ifdef MD5_SUPPORT /* Push the last read block in the MD5 machine */ if (dtype == EAV_DIGEST_MD5) MD5Update(&md5ctx, ibuf + prev_total_in, total_in - prev_total_in); +#endif /* Round up to blocksize and zero pad */ olen = roundup2(total_out, blocksize); @@ -202,16 +239,20 @@ olen - total_out); /* XXX: realloc to shorten allocation? */ } else if (dtype) { +#ifdef MD5_SUPPORT if (dtype == EAV_DIGEST_MD5) MD5Update(&md5ctx, ibuf, ilen); +#endif } if (dtype) { +#ifdef MD5_SUPPORT if (dtype == EAV_DIGEST_MD5) { MD5End(&md5ctx, i_md5sum); if (strcmp(digest, i_md5sum) != 0) return (EAV_ERR_DIGEST); } +#endif } } ==== //depot/projects/ctsrd/beribsd/src/ctsrd/writefile/eav.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 SRI International + * Copyright (c) 2013 SRI International * All rights reserved. * * This software was developed by SRI International and the University of @@ -36,6 +36,7 @@ EAV_ERR_MEM, EAV_ERR_DIGEST, EAV_ERR_DIGEST_UNKNOWN, + EAV_ERR_DIGEST_UNSUPPORTED, EAV_ERR_COMP, EAV_ERR_COMP_UNKNOWN, EAV_ERR_COMP_UNSUPPORTED From owner-p4-projects@FreeBSD.ORG Tue Mar 12 16:02:04 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B50B389; Tue, 12 Mar 2013 16:02:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1F33B387 for ; Tue, 12 Mar 2013 16:02:04 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0E70386A for ; Tue, 12 Mar 2013 16:02:04 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CG23iC072629 for ; Tue, 12 Mar 2013 16:02:03 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CG23Tv072626 for perforce@freebsd.org; Tue, 12 Mar 2013 16:02:03 GMT (envelope-from brooks@freebsd.org) Date: Tue, 12 Mar 2013 16:02:03 GMT Message-Id: <201303121602.r2CG23Tv072626@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222816 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 16:02:04 -0000 http://p4web.freebsd.org/@@222816?ac=10 Change 222816 by brooks@brooks_zenith on 2013/03/12 16:02:03 Explicitly match source extension so that the various lists of TESLA intermediate products don't include C++ files which are then added to CLEANFILES and deleted. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#6 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#6 (text+ko) ==== @@ -92,10 +92,19 @@ .endif # !defined(SRCS) -TESLA_FILES= ${SRCS:.c=.tesla} -OLLS= ${SRCS:.c=.oll} -INSTRLLS= ${SRCS:.c=.instrll} -INSTROBJS= ${SRCS:.c=.instro} +# XXX: forced assignment due to make not figuring out how to make things +# from generated .c files (which are added to SRCS later). +CSRC_OBJS:= ${SRCS:M*.c:R:S/$/.object/:N.object} +CXXSRC_OBJS:= ${SRCS:M*.cc:R:S/$/.object/:N.object} \ + ${SRCS:M*.cpp:R:S/$/.object/:N.object} \ + ${SRCS:M*.cxx:R:S/$/.object/:N.object} \ + ${SRCS:M*.C:R:S/$/.object/:N.object} +SRC_OBJS= ${CSRC_OBJS} ${CXX_OBJS} + +TESLA_FILES= ${CSRC_OBJS:.object=.tesla} +OLLS= ${CSRC_OBJS:.object=.oll} +INSTRLLS= ${CSRC_OBJS:.object=.instrll} +INSTROBJS= ${CSRC_OBJS:.object=.instro} CLEANFILES+= ${TESLA_FILES} tesla.manifest ${OLLS} ${INSTRLLS} ${INSTROBJS} \ ${PROG}.instrumented @@ -108,10 +117,7 @@ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${INSTROBJS} ${LDADD} -ltesla .if defined(LLVM_IR) && !defined(NO_LLVM_IR) -LOBJS:= ${SRCS:M*.[Cc]:R:S/$/.obc/:N.obc} \ - ${SRCS:M*.cc:R:S/$/.obc/:N.obc} \ - ${SRCS:M*.cpp:R:S/$/.obc/:N.obc} \ - ${SRCS:M*.cxx:R:S/$/.obc/:N.obc} +LOBJS:= ${SRC_OBJS:.object=.obc} CLEANFILES+= ${PROG}.bc ${LOBJS} .if !empty(LOBJS) From owner-p4-projects@FreeBSD.ORG Tue Mar 12 16:32:37 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F6C7AF6; Tue, 12 Mar 2013 16:32:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0098DAF4 for ; Tue, 12 Mar 2013 16:32:36 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id E5D69B1A for ; Tue, 12 Mar 2013 16:32:36 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CGWasn075869 for ; Tue, 12 Mar 2013 16:32:36 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CGWa4d075866 for perforce@freebsd.org; Tue, 12 Mar 2013 16:32:36 GMT (envelope-from brooks@freebsd.org) Date: Tue, 12 Mar 2013 16:32:36 GMT Message-Id: <201303121632.r2CGWa4d075866@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222817 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 16:32:37 -0000 http://p4web.freebsd.org/@@222817?ac=10 Change 222817 by brooks@brooks_zenith on 2013/03/12 16:31:49 Number the entry for /dev/map/kernel correctly. The prior entry incorrectly resulted in the map being read only. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#24 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#24 (text+ko) ==== @@ -21,10 +21,10 @@ hint.map.2.name="reserved" # Kernel on the second chip -hint.map.5.at="cfid0" -hint.map.5.start=0x02000000 -hint.map.5.end=0x03fe0000 -hint.map.5.name="kernel" +hint.map.3.at="cfid0" +hint.map.3.start=0x02000000 +hint.map.3.end=0x03fe0000 +hint.map.3.name="kernel" # Area for use by the boot loader hint.map.4.at="cfid0" From owner-p4-projects@FreeBSD.ORG Tue Mar 12 21:57:32 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1852AEDC; Tue, 12 Mar 2013 21:57:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 68FECEDA for ; Tue, 12 Mar 2013 21:57:31 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 357C2A7D for ; Tue, 12 Mar 2013 21:57:31 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CLvUCg006474 for ; Tue, 12 Mar 2013 21:57:30 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CLvUKx006471 for perforce@freebsd.org; Tue, 12 Mar 2013 21:57:30 GMT (envelope-from brooks@freebsd.org) Date: Tue, 12 Mar 2013 21:57:30 GMT Message-Id: <201303122157.r2CLvUKx006471@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222819 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 21:57:32 -0000 http://p4web.freebsd.org/@@222819?ac=10 Change 222819 by brooks@brooks_zenith on 2013/03/12 21:57:20 Add writefile to the build. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile#16 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile#16 (text+ko) ==== @@ -13,7 +13,8 @@ pngsb \ spinner \ share \ - wr + wr \ + writefile .include From owner-p4-projects@FreeBSD.ORG Tue Mar 12 22:02:36 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B206132; Tue, 12 Mar 2013 22:02:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4CE70130 for ; Tue, 12 Mar 2013 22:02:36 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3B991ABC for ; Tue, 12 Mar 2013 22:02:36 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CM2agX007284 for ; Tue, 12 Mar 2013 22:02:36 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CM2anI007281 for perforce@freebsd.org; Tue, 12 Mar 2013 22:02:36 GMT (envelope-from brooks@freebsd.org) Date: Tue, 12 Mar 2013 22:02:36 GMT Message-Id: <201303122202.r2CM2anI007281@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222820 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 22:02:36 -0000 http://p4web.freebsd.org/@@222820?ac=10 Change 222820 by brooks@brooks_zenith on 2013/03/12 22:01:54 When our stored MAC address uses an Altera prefix and ends in 0x0, then use it for up to the first 16 units. Previously we did this if it was locally administred and ended in 0x0 but Cambridge sysadmins don't want the LA bit set. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#14 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#14 (text+ko) ==== @@ -727,7 +727,7 @@ } /* - * If we find a locally administered address with a 0x0 ending + * If we find an Altera prefixed address with a 0x0 ending * adjust by device unit. If not and this is not the first * Ethernet, go to random. */ @@ -741,7 +741,8 @@ "random hadware address.\n"); goto get_random; } - if ((sc->atse_eth_addr[0] & 0x2) == 0 || + if ((sc->atse_eth_addr[0] & ~0x2) != 0 || + sc->atse_eth_addr[1] != 0x07 || sc->atse_eth_addr[2] != 0xed || (sc->atse_eth_addr[5] & 0x0f) != 0x0) { device_printf(sc->atse_dev, "Ethernet address not meeting our " "multi-MAC standards. Falling back to random hadware " From owner-p4-projects@FreeBSD.ORG Tue Mar 12 22:04:39 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FD262B1; Tue, 12 Mar 2013 22:04:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C5CA92AF for ; Tue, 12 Mar 2013 22:04:38 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 98AB6AD7 for ; Tue, 12 Mar 2013 22:04:38 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CM4cT2007357 for ; Tue, 12 Mar 2013 22:04:38 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CM4csv007354 for perforce@freebsd.org; Tue, 12 Mar 2013 22:04:38 GMT (envelope-from brooks@freebsd.org) Date: Tue, 12 Mar 2013 22:04:38 GMT Message-Id: <201303122204.r2CM4csv007354@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222821 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 22:04:39 -0000 http://p4web.freebsd.org/@@222821?ac=10 Change 222821 by brooks@brooks_zenith on 2013/03/12 22:03:39 IF FreeBSD/BERI @ 222820 Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#12 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/eav.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/eav.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/writefile.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse.c#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#13 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#12 (text+ko) ==== @@ -12,7 +12,8 @@ pictview \ spinner \ share \ - wr + wr \ + writefile .include ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse.c#3 (text+ko) ==== @@ -727,7 +727,7 @@ } /* - * If we find a locally administered address with a 0x0 ending + * If we find an Altera prefixed address with a 0x0 ending * adjust by device unit. If not and this is not the first * Ethernet, go to random. */ @@ -741,7 +741,8 @@ "random hadware address.\n"); goto get_random; } - if ((sc->atse_eth_addr[0] & 0x2) == 0 || + if ((sc->atse_eth_addr[0] & ~0x2) != 0 || + sc->atse_eth_addr[1] != 0x07 || sc->atse_eth_addr[2] != 0xed || (sc->atse_eth_addr[5] & 0x0f) != 0x0) { device_printf(sc->atse_dev, "Ethernet address not meeting our " "multi-MAC standards. Falling back to random hadware " ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#13 (text+ko) ==== @@ -21,10 +21,10 @@ hint.map.2.name="reserved" # Kernel on the second chip -hint.map.5.at="cfid0" -hint.map.5.start=0x02000000 -hint.map.5.end=0x03fe0000 -hint.map.5.name="kernel" +hint.map.3.at="cfid0" +hint.map.3.start=0x02000000 +hint.map.3.end=0x03fe0000 +hint.map.3.name="kernel" # Area for use by the boot loader hint.map.4.at="cfid0" From owner-p4-projects@FreeBSD.ORG Wed Mar 13 18:41:06 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E35C789; Wed, 13 Mar 2013 18:41:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 01A53787 for ; Wed, 13 Mar 2013 18:41:05 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id C2FC7E29 for ; Wed, 13 Mar 2013 18:41:05 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2DIf5eH027311 for ; Wed, 13 Mar 2013 18:41:05 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2DIf5xn027308 for perforce@freebsd.org; Wed, 13 Mar 2013 18:41:05 GMT (envelope-from brooks@freebsd.org) Date: Wed, 13 Mar 2013 18:41:05 GMT Message-Id: <201303131841.r2DIf5xn027308@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222836 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2013 18:41:06 -0000 http://p4web.freebsd.org/@@222836?ac=10 Change 222836 by brooks@brooks_zenith on 2013/03/13 18:40:14 Add support for partitioning CFI disks from FDT using geom_flashmap. In geom_flashmap, don't partition anything other that disks. With out this, the layering violation required to retrieve FDT entries caused not only the disk, but all non-flashmap partitions of the disk to have *s. entries created. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_disk.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/geom/geom_flashmap.c#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_disk.c#4 (text+ko) ==== @@ -44,6 +44,7 @@ #include +#include #include struct cfi_disk_softc { @@ -64,9 +65,11 @@ static int cfi_disk_open(struct disk *); static int cfi_disk_close(struct disk *); static void cfi_io_proc(void *, int); +static int cfi_disk_getattr(struct bio *); static void cfi_disk_strategy(struct bio *); static int cfi_disk_ioctl(struct disk *, u_long, void *, int, struct thread *); + static int cfi_disk_probe(device_t dev) { @@ -95,6 +98,7 @@ sc->disk->d_strategy = cfi_disk_strategy; sc->disk->d_ioctl = cfi_disk_ioctl; sc->disk->d_dump = NULL; /* NB: no dumps */ + sc->disk->d_getattr = cfi_disk_getattr; sc->disk->d_sectorsize = CFI_DISK_SECSIZE; sc->disk->d_mediasize = sc->parent->sc_size; sc->disk->d_maxsize = CFI_DISK_MAXIOSIZE; @@ -275,6 +279,31 @@ } } +static int +cfi_disk_getattr(struct bio *bp) +{ + struct cfi_disk_softc *dsc; + struct cfi_softc *sc; + device_t dev; + + if (bp->bio_disk == NULL || bp->bio_disk->d_drv1 == NULL) + return (ENXIO); + + dsc = bp->bio_disk->d_drv1; + sc = dsc->parent; + dev = sc->sc_dev; + + do { + if (g_handleattr(bp, "CFI::device", &dev, sizeof(device_t))) + break; + + return (ERESTART); + } while(0); + + return (EJUSTRETURN); +} + + static void cfi_disk_strategy(struct bio *bp) { ==== //depot/projects/ctsrd/beribsd/src/sys/geom/geom_flashmap.c#3 (text+ko) ==== @@ -174,7 +174,7 @@ g_topology_assert(); if (flags == G_TF_NORMAL && - !strcmp(pp->geom->class->name, FLASHMAP_CLASS_NAME)) + strcmp(pp->geom->class->name, "DISK") != 0) return (NULL); gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, NULL, 0, @@ -186,8 +186,11 @@ do { size = sizeof(device_t); - if (g_io_getattr("NAND::device", cp, &size, &dev)) - break; + if (g_io_getattr("NAND::device", cp, &size, &dev)) { + size = sizeof(device_t); + if (g_io_getattr("CFI::device", cp, &size, &dev)) + break; + } nslices = g_flashmap_load(dev, &head); if (nslices == 0) From owner-p4-projects@FreeBSD.ORG Wed Mar 13 20:38:14 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 471B9C41; Wed, 13 Mar 2013 20:38:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0A84EC3F for ; Wed, 13 Mar 2013 20:38:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id EDE93835 for ; Wed, 13 Mar 2013 20:38:13 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2DKcDrK038234 for ; Wed, 13 Mar 2013 20:38:13 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2DKcDne038231 for perforce@freebsd.org; Wed, 13 Mar 2013 20:38:13 GMT (envelope-from brooks@freebsd.org) Date: Wed, 13 Mar 2013 20:38:13 GMT Message-Id: <201303132038.r2DKcDne038231@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222839 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2013 20:38:14 -0000 http://p4web.freebsd.org/@@222839?ac=10 Change 222839 by brooks@brooks_zenith on 2013/03/13 20:37:52 Move the majority of the partitioning of the Intel StrataFlash into FDT. This allows us to store hardware or bitcode defined offsets in the FDT which will eventually live in a ROM on the FPGA. Retain the /dev/map/fpga and /dev/map/kernel maps for compatiblity for now. Remove references to isf[01]. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#18 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#25 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#18 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2012-2013 Robert N. M. Watson + * Copyright (c) 2013 SRI International * All rights reserved. * * This software was developed by SRI International and the University of @@ -100,8 +101,40 @@ * Ethernet addresses for now. */ flash@74000000 { + #address-cells = <1>; + #size-cells = <1>; compatible = "cfi-flash"; reg = <0x74000000 0x4000000>; + + /* Board configuration */ + partition@0 { + reg = <0x0 0x20000>; + label = "config"; + }; + + /* Power up FPGA image */ + partition@20000 { + reg = <0x20000 0xc00000>; + label = "fpga0"; + }; + + /* Secondary FPGA image (on RE_CONFIGn button) */ + partition@C20000 { + reg = <0xc20000 0xc00000>; + label = "fpga1"; + }; + + /* Space for operating system use */ + partition@1820000 { + reg = <0x1820000 0x027c0000>; + label = "os"; + }; + + /* Second stage bootloader */ + parition@3fe0000 { + reg = <0x3fe0000 0x20000>; + label = "boot"; + }; }; ethernet@7f007000 { ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#25 (text+ko) ==== @@ -1,67 +1,16 @@ # $FreeBSD: head/sys/mips/conf/BERI_DE4.hints 239713 2012-08-26 10:40:13Z rwatson $ -# Reserved configuration blocks. Don't touch. -hint.map.0.at="cfid0" +# Hardwired location of bitfile +hint.map.0.at="cfid0s.fpga0" hint.map.0.start=0x00000000 -hint.map.0.end=0x00020000 -hint.map.0.name="config" -hint.map.0.readonly=1 - -# Hardwired location of bitfile -hint.map.1.at="cfid0" -hint.map.1.start=0x00020000 -hint.map.1.end=0x01820000 -hint.map.1.name="fpga" - -# Currently unused space on the first chip -# XXX: To be merged with the kernel map when we begin using the boot loader -hint.map.2.at="cfid0" -hint.map.2.start=0x01820000 -hint.map.2.end=0x02000000 -hint.map.2.name="reserved" +hint.map.0.end=0x00c00000 +hint.map.0.name="fpga" # Kernel on the second chip -hint.map.3.at="cfid0" -hint.map.3.start=0x02000000 -hint.map.3.end=0x03fe0000 -hint.map.3.name="kernel" - -# Area for use by the boot loader -hint.map.4.at="cfid0" -hint.map.4.start=0x03fe0000 -hint.map.4.end=0x04000000 -hint.map.4.name="boot" - -# Reserved configuration blocks. Don't touch. -hint.map.5.at="isf0" -hint.map.5.start=0x00000000 -hint.map.5.end=0x00020000 -hint.map.5.name="config" -hint.map.5.readonly=1 - -# Hardwired location of bitfile -hint.map.6.at="isf0" -hint.map.6.start=0x00020000 -hint.map.6.end=0x01820000 -hint.map.6.name="fpga" - -# Currently unused space on the first chip -hint.map.7.at="isf0" -hint.map.7.start=0x01820000 -hint.map.7.end=0x02000000 -hint.map.7.name="reserved" - -# Kernel on the second chip -hint.map.8.at="isf1" -hint.map.8.start=0x00000000 -hint.map.8.end=0x01fe0000 -hint.map.8.name="kernel" - -# Area for use by the boot loader -hint.map.10.at="isf1" -hint.map.10.start=0x01fe0000 -hint.map.10.end=0x02000000 -hint.map.10.name="kernel" +hint.map.1.at="cfid0s.os" +hint.map.1.start=0x007e0000 +hint.map.1.end=0x01fe0000 +hint.map.1.name="kernel" # Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations # configured from fdt(4) but PHYs are still described in here. From owner-p4-projects@FreeBSD.ORG Thu Mar 14 16:06:28 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A5A24FDF for ; Thu, 14 Mar 2013 16:06:28 +0000 (UTC) (envelope-from bounceback+www+57784+p4-projects=freebsd.org@app.etouches.com) Received: from mail.app.etouches.com (mail.app.etouches.com [23.23.239.161]) by mx1.freebsd.org (Postfix) with ESMTP id 6D0858CA for ; Thu, 14 Mar 2013 16:06:28 +0000 (UTC) Received: from mail.app.etouches.com (domU-12-31-39-0F-7E-F5.compute-1.internal [10.193.125.7]) by mail.app.etouches.com (Postfix) with ESMTPA id 21B684D5C for ; Thu, 14 Mar 2013 15:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=app.etouches.com; s=default; t=1363276622; bh=RkAFSQHlRhSMh/Y99jfJAxPNpJ20IHJNeUTKS9azB5U=; h=Date:Subject:From:To; b=Nxc6FnlOQnr7mfYKUToU7t2It0r1p2wrHkaq5v/wWpYVnRi5fzcDQG4ylUGDnlsjv kOdwQGB0a2wV30HbYwn/LzK9OXh43Z5pz3Xmu32nLlqm28ERM/YjVEXBa2Qq+tlFov bQAt02vt3zuKA+bhTlZV0I/Aj1vFdel3Ov6wTtBQ= Message-ID: <1363276622.5141f34e16867@etouches.com> Date: Thu, 14 Mar 2013 11:57:02 -0400 Subject: WCO E-learning Customs Training - Register now! From: WCO-Demos Team WCO-Demos Team To: p4-projects@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Mar 2013 16:06:28 -0000 Harmonized System 2012 Classroom Training Would you like to know the basic rules for classifying goods and justification of the classification opinions? Would you like to know more about the HS 2012 amendments and their consequences on the classification of goods? A two day training to guide you through the basic rules for classifying goods and justification of the classification opinions. Major amendments in HS 2012 and their consequential effects on classifying products. Core fundamentals of the Harmonized System and classification. Dates: September 26-27, 2012 Location: Brussels, Belgium The 2 day training will address the following main topics: The Harmonized System, an indispensable tool in international trade The application of the Harmonized System General Interpretative Rules The classification of sets and composite goods in the Harmonized System Case studies will complement the presentations on technical subject For more information visit our website www.wcoomdtraining.org, contact us at customs-wco@demosgroup.com Demos Group, WCO’s official training supplier for the private sector Do not miss this opportunity to enrich your knowledge! Register here: https://www.etouches.com/hs2012 -------------------------------------- To unsubscribe from this mailing list, please click here https://www.eiseverywhere.com/emarketing/profile.php?id=61JyErVXXenumpBmkknJ3rPBwCQXt172%2FGda%2F9Q4Nz4%3D From owner-p4-projects@FreeBSD.ORG Thu Mar 14 18:09:45 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBCF1AFF; Thu, 14 Mar 2013 18:09:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A917EAFA for ; Thu, 14 Mar 2013 18:09:44 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 996D612F for ; Thu, 14 Mar 2013 18:09:44 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2EI9ioc061539 for ; Thu, 14 Mar 2013 18:09:44 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2EI9i1Y061536 for perforce@freebsd.org; Thu, 14 Mar 2013 18:09:44 GMT (envelope-from brooks@freebsd.org) Date: Thu, 14 Mar 2013 18:09:44 GMT Message-Id: <201303141809.r2EI9i1Y061536@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222848 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Mar 2013 18:09:45 -0000 http://p4web.freebsd.org/@@222848?ac=10 Change 222848 by brooks@brooks_zenith on 2013/03/14 18:09:37 Integrate from FreeBSD/BERI. Switch most partitioning to geom_flashmap.c. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#6 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_disk.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/geom/geom_flashmap.c#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#14 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#6 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2012-2013 Robert N. M. Watson + * Copyright (c) 2013 SRI International * All rights reserved. * * This software was developed by SRI International and the University of @@ -100,8 +101,40 @@ * Ethernet addresses for now. */ flash@74000000 { + #address-cells = <1>; + #size-cells = <1>; compatible = "cfi-flash"; reg = <0x74000000 0x4000000>; + + /* Board configuration */ + partition@0 { + reg = <0x0 0x20000>; + label = "config"; + }; + + /* Power up FPGA image */ + partition@20000 { + reg = <0x20000 0xc00000>; + label = "fpga0"; + }; + + /* Secondary FPGA image (on RE_CONFIGn button) */ + partition@C20000 { + reg = <0xc20000 0xc00000>; + label = "fpga1"; + }; + + /* Space for operating system use */ + partition@1820000 { + reg = <0x1820000 0x027c0000>; + label = "os"; + }; + + /* Second stage bootloader */ + parition@3fe0000 { + reg = <0x3fe0000 0x20000>; + label = "boot"; + }; }; ethernet@7f007000 { ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_disk.c#4 (text+ko) ==== @@ -44,6 +44,7 @@ #include +#include #include struct cfi_disk_softc { @@ -64,9 +65,11 @@ static int cfi_disk_open(struct disk *); static int cfi_disk_close(struct disk *); static void cfi_io_proc(void *, int); +static int cfi_disk_getattr(struct bio *); static void cfi_disk_strategy(struct bio *); static int cfi_disk_ioctl(struct disk *, u_long, void *, int, struct thread *); + static int cfi_disk_probe(device_t dev) { @@ -95,6 +98,7 @@ sc->disk->d_strategy = cfi_disk_strategy; sc->disk->d_ioctl = cfi_disk_ioctl; sc->disk->d_dump = NULL; /* NB: no dumps */ + sc->disk->d_getattr = cfi_disk_getattr; sc->disk->d_sectorsize = CFI_DISK_SECSIZE; sc->disk->d_mediasize = sc->parent->sc_size; sc->disk->d_maxsize = CFI_DISK_MAXIOSIZE; @@ -275,6 +279,31 @@ } } +static int +cfi_disk_getattr(struct bio *bp) +{ + struct cfi_disk_softc *dsc; + struct cfi_softc *sc; + device_t dev; + + if (bp->bio_disk == NULL || bp->bio_disk->d_drv1 == NULL) + return (ENXIO); + + dsc = bp->bio_disk->d_drv1; + sc = dsc->parent; + dev = sc->sc_dev; + + do { + if (g_handleattr(bp, "CFI::device", &dev, sizeof(device_t))) + break; + + return (ERESTART); + } while(0); + + return (EJUSTRETURN); +} + + static void cfi_disk_strategy(struct bio *bp) { ==== //depot/projects/ctsrd/cheribsd/src/sys/geom/geom_flashmap.c#3 (text+ko) ==== @@ -174,7 +174,7 @@ g_topology_assert(); if (flags == G_TF_NORMAL && - !strcmp(pp->geom->class->name, FLASHMAP_CLASS_NAME)) + strcmp(pp->geom->class->name, "DISK") != 0) return (NULL); gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, NULL, 0, @@ -186,8 +186,11 @@ do { size = sizeof(device_t); - if (g_io_getattr("NAND::device", cp, &size, &dev)) - break; + if (g_io_getattr("NAND::device", cp, &size, &dev)) { + size = sizeof(device_t); + if (g_io_getattr("CFI::device", cp, &size, &dev)) + break; + } nslices = g_flashmap_load(dev, &head); if (nslices == 0) ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#14 (text+ko) ==== @@ -1,67 +1,16 @@ # $FreeBSD: head/sys/mips/conf/BERI_DE4.hints 239713 2012-08-26 10:40:13Z rwatson $ -# Reserved configuration blocks. Don't touch. -hint.map.0.at="cfid0" +# Hardwired location of bitfile +hint.map.0.at="cfid0s.fpga0" hint.map.0.start=0x00000000 -hint.map.0.end=0x00020000 -hint.map.0.name="config" -hint.map.0.readonly=1 - -# Hardwired location of bitfile -hint.map.1.at="cfid0" -hint.map.1.start=0x00020000 -hint.map.1.end=0x01820000 -hint.map.1.name="fpga" - -# Currently unused space on the first chip -# XXX: To be merged with the kernel map when we begin using the boot loader -hint.map.2.at="cfid0" -hint.map.2.start=0x01820000 -hint.map.2.end=0x02000000 -hint.map.2.name="reserved" +hint.map.0.end=0x00c00000 +hint.map.0.name="fpga" # Kernel on the second chip -hint.map.3.at="cfid0" -hint.map.3.start=0x02000000 -hint.map.3.end=0x03fe0000 -hint.map.3.name="kernel" - -# Area for use by the boot loader -hint.map.4.at="cfid0" -hint.map.4.start=0x03fe0000 -hint.map.4.end=0x04000000 -hint.map.4.name="boot" - -# Reserved configuration blocks. Don't touch. -hint.map.5.at="isf0" -hint.map.5.start=0x00000000 -hint.map.5.end=0x00020000 -hint.map.5.name="config" -hint.map.5.readonly=1 - -# Hardwired location of bitfile -hint.map.6.at="isf0" -hint.map.6.start=0x00020000 -hint.map.6.end=0x01820000 -hint.map.6.name="fpga" - -# Currently unused space on the first chip -hint.map.7.at="isf0" -hint.map.7.start=0x01820000 -hint.map.7.end=0x02000000 -hint.map.7.name="reserved" - -# Kernel on the second chip -hint.map.8.at="isf1" -hint.map.8.start=0x00000000 -hint.map.8.end=0x01fe0000 -hint.map.8.name="kernel" - -# Area for use by the boot loader -hint.map.10.at="isf1" -hint.map.10.start=0x01fe0000 -hint.map.10.end=0x02000000 -hint.map.10.name="kernel" +hint.map.1.at="cfid0s.os" +hint.map.1.start=0x007e0000 +hint.map.1.end=0x01fe0000 +hint.map.1.name="kernel" # Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations # configured from fdt(4) but PHYs are still described in here. From owner-p4-projects@FreeBSD.ORG Sat Mar 16 17:53:55 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A8456D; Sat, 16 Mar 2013 17:53:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4F9D456B for ; Sat, 16 Mar 2013 17:53:54 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3F275C2F for ; Sat, 16 Mar 2013 17:53:54 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GHrr08041388 for ; Sat, 16 Mar 2013 17:53:53 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2GHrrsL041385 for perforce@freebsd.org; Sat, 16 Mar 2013 17:53:53 GMT (envelope-from jonathan@freebsd.org) Date: Sat, 16 Mar 2013 17:53:53 GMT Message-Id: <201303161753.r2GHrrsL041385@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 222931 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 17:53:55 -0000 http://p4web.freebsd.org/@@222931?ac=10 Change 222931 by jonathan@jonathan-on-kent on 2013/03/16 17:53:20 Comment out Atheros driver - it causes build failures. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/GENERIC#4 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -271,9 +271,9 @@ device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. -device ath # Atheros NICs -device ath_pci # Atheros pci/cardbus glue -device ath_hal # pci/cardbus chip support +#device ath # Atheros NICs +#device ath_pci # Atheros pci/cardbus glue +#device ath_hal # pci/cardbus chip support options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later From owner-p4-projects@FreeBSD.ORG Sat Mar 16 18:52:59 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D0FAFB4; Sat, 16 Mar 2013 18:52:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C1525FB2 for ; Sat, 16 Mar 2013 18:52:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id A50B8E5A for ; Sat, 16 Mar 2013 18:52:58 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GIqwAR047100 for ; Sat, 16 Mar 2013 18:52:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2GIqw1r047097 for perforce@freebsd.org; Sat, 16 Mar 2013 18:52:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 16 Mar 2013 18:52:58 GMT Message-Id: <201303161852.r2GIqw1r047097@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 222933 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 18:52:59 -0000 http://p4web.freebsd.org/@@222933?ac=10 Change 222933 by rwatson@rwatson_cinnamon on 2013/03/16 18:52:24 Merge libtesla from userspace to kernel in the ctsrd/tesla branch. Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/libtesla/Makefile#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/debug.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/key.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/libtesla.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/state-global.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/state-perthread.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/state.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/store.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla_internal.h#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/update.c#1 branch .. //depot/projects/ctsrd/tesla/src/sys/libtesla/util.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Mar 16 21:08:26 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADE1359A; Sat, 16 Mar 2013 21:08:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4169E598 for ; Sat, 16 Mar 2013 21:08:26 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 26EBA26B for ; Sat, 16 Mar 2013 21:08:26 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GL8QG1059876 for ; Sat, 16 Mar 2013 21:08:26 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2GL8PvK059873 for perforce@freebsd.org; Sat, 16 Mar 2013 21:08:25 GMT (envelope-from pjd@freebsd.org) Date: Sat, 16 Mar 2013 21:08:25 GMT Message-Id: <201303162108.r2GL8PvK059873@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek Subject: PERFORCE change 222934 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 21:08:27 -0000 http://p4web.freebsd.org/@@222934?ac=10 Change 222934 by pjd@pjd_anger on 2013/03/16 21:08:12 Merge from FreeBSD-HEAD: When we are waiting for new trail files we may have been disconnected and reconnected in the meantime. Check if reset is set before opening next trail file, as not doing so will result in sending OPEN message with the same file name twice and this is illegal - the second OPEN is send without first closing previous trail file. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#4 $ */ #include @@ -394,6 +394,7 @@ mtx_lock(&adist_remote_mtx); if (adhost->adh_reset) { +reset: adhost->adh_reset = false; if (trail_filefd(adist_trail) != -1) trail_close(adist_trail); @@ -408,6 +409,14 @@ while (trail_filefd(adist_trail) == -1) { newfile = true; wait_for_dir(); + /* + * We may have been disconnected and reconnected in the + * meantime, check if reset is set. + */ + mtx_lock(&adist_remote_mtx); + if (adhost->adh_reset) + goto reset; + mtx_unlock(&adist_remote_mtx); if (trail_filefd(adist_trail) == -1) trail_next(adist_trail); } From owner-p4-projects@FreeBSD.ORG Sat Mar 16 21:12:31 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F39ED753; Sat, 16 Mar 2013 21:12:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B60B0751 for ; Sat, 16 Mar 2013 21:12:30 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9C60E29F for ; Sat, 16 Mar 2013 21:12:30 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GLCUPG060508 for ; Sat, 16 Mar 2013 21:12:30 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2GLCUI8060505 for perforce@freebsd.org; Sat, 16 Mar 2013 21:12:30 GMT (envelope-from pjd@freebsd.org) Date: Sat, 16 Mar 2013 21:12:30 GMT Message-Id: <201303162112.r2GLCUI8060505@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek Subject: PERFORCE change 222935 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 21:12:31 -0000 http://p4web.freebsd.org/@@222935?ac=10 Change 222935 by pjd@pjd_anger on 2013/03/16 21:11:45 Merge from FreeBSD-HEAD: - Rename AUE_CAP_GETRIGHTS to AUE_CAP_RIGHTS_GET as the cap_getrights(2) syscall was renamed to cap_rights_get(2) too. - Add event definitions for new syscalls: - cap_rights_limit(2) - cap_ioctls_limit(2) - cap_ioctls_get(2) - cap_fcntls_limit(2) - cap_fcntls_get(2) Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#44 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#44 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#44 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -547,7 +547,7 @@ 43184:AUE_OPENAT:openat(2) - attr only:fa 43185:AUE_POSIX_OPENPT:posix_openpt(2):ip 43186:AUE_CAP_NEW:cap_new(2):fm -43187:AUE_CAP_GETRIGHTS:cap_getrights(2):fm +43187:AUE_CAP_RIGHTS_GET:cap_rights_get(2):fm 43188:AUE_CAP_ENTER:cap_enter(2):pc 43189:AUE_CAP_GETMODE:cap_getmode(2):pc 43190:AUE_POSIX_SPAWN:posix_spawn(2):pc @@ -562,6 +562,11 @@ 43199:AUE_PDGETPID:pdgetpid(2):pc 43200:AUE_PDWAIT:pdwait(2):pc 43201:AUE_WAIT6:wait6(2):pc +43202:AUE_CAP_RIGHTS_LIMIT:cap_rights_limit(2):fm +43203:AUE_CAP_IOCTLS_LIMIT:cap_ioctls_limit(2):fm +43204:AUE_CAP_IOCTLS_GET:cap_ioctls_get(2):fm +43205:AUE_CAP_FCNTLS_LIMIT:cap_fcntls_limit(2):fm +43206:AUE_CAP_FCNTLS_GET:cap_fcntls_get(2):fm # # Solaris userspace events. # From owner-p4-projects@FreeBSD.ORG Sat Mar 16 21:13:32 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C32184E; Sat, 16 Mar 2013 21:13:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E185384C for ; Sat, 16 Mar 2013 21:13:31 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id C8E852AC for ; Sat, 16 Mar 2013 21:13:31 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GLDVcX061415 for ; Sat, 16 Mar 2013 21:13:31 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2GLDVvN061412 for perforce@freebsd.org; Sat, 16 Mar 2013 21:13:31 GMT (envelope-from pjd@freebsd.org) Date: Sat, 16 Mar 2013 21:13:31 GMT Message-Id: <201303162113.r2GLDVvN061412@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek Subject: PERFORCE change 222936 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 21:13:32 -0000 http://p4web.freebsd.org/@@222936?ac=10 Change 222936 by pjd@pjd_anger on 2013/03/16 21:12:59 Add events for new syscalls (bindat(2) and connectat(2)). Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#45 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#45 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#44 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#45 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -567,6 +567,8 @@ 43204:AUE_CAP_IOCTLS_GET:cap_ioctls_get(2):fm 43205:AUE_CAP_FCNTLS_LIMIT:cap_fcntls_limit(2):fm 43206:AUE_CAP_FCNTLS_GET:cap_fcntls_get(2):fm +43207:AUE_BINDAT:bindat(2):nt +43208:AUE_CONNECTAT:connectat(2):nt # # Solaris userspace events. #