svn commit: r277844 - in projects/clang360-import: contrib/amd/amd contrib/amd/hlfsd contrib/elftoolchain/elfcopy contrib/netbsd-tests/bin/expr lib/libpmc release release/scripts share/man/man7 sys...

Dimitry Andric dim at FreeBSD.org
Wed Jan 28 18:45:47 UTC 2015


Author: dim
Date: Wed Jan 28 18:45:40 2015
New Revision: 277844
URL: https://svnweb.freebsd.org/changeset/base/277844

Log:
  Merge ^/head r277804 through r277843.

Added:
  projects/clang360-import/sys/dev/hwpmc/hwpmc_armv7.c
     - copied unchanged from r277843, head/sys/dev/hwpmc/hwpmc_armv7.c
  projects/clang360-import/sys/dev/hwpmc/hwpmc_armv7.h
     - copied unchanged from r277843, head/sys/dev/hwpmc/hwpmc_armv7.h
Modified:
  projects/clang360-import/contrib/amd/amd/amfs_generic.c
  projects/clang360-import/contrib/amd/hlfsd/homedir.c
  projects/clang360-import/contrib/elftoolchain/elfcopy/main.c
  projects/clang360-import/contrib/netbsd-tests/bin/expr/t_expr.sh
  projects/clang360-import/lib/libpmc/libpmc.c
  projects/clang360-import/release/Makefile
  projects/clang360-import/release/scripts/make-manifest.sh
  projects/clang360-import/share/man/man7/release.7
  projects/clang360-import/sys/arm/arm/intr.c
  projects/clang360-import/sys/arm/include/pmc_mdep.h
  projects/clang360-import/sys/arm/ti/files.ti
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/clang360-import/sys/conf/files.arm
  projects/clang360-import/sys/dev/ath/ath_hal/ah_internal.h
  projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.c
  projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.h
  projects/clang360-import/sys/dev/hwpmc/hwpmc_arm.c
  projects/clang360-import/sys/dev/hwpmc/pmc_events.h
  projects/clang360-import/sys/dev/vt/vt_core.c
  projects/clang360-import/sys/fs/tmpfs/tmpfs.h
  projects/clang360-import/sys/fs/tmpfs/tmpfs_subr.c
  projects/clang360-import/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/clang360-import/sys/fs/tmpfs/tmpfs_vnops.c
  projects/clang360-import/sys/netinet/sctp_input.c
  projects/clang360-import/sys/netinet/sctp_usrreq.c
  projects/clang360-import/sys/sys/pmc.h
  projects/clang360-import/sys/vm/vm_fault.c
  projects/clang360-import/sys/vm/vm_object.c
  projects/clang360-import/sys/vm/vm_object.h
  projects/clang360-import/usr.bin/sed/main.c
  projects/clang360-import/usr.sbin/autofs/autounmountd.c
Directory Properties:
  projects/clang360-import/   (props changed)
  projects/clang360-import/contrib/elftoolchain/   (props changed)
  projects/clang360-import/share/   (props changed)
  projects/clang360-import/sys/   (props changed)
  projects/clang360-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang360-import/sys/conf/   (props changed)

Modified: projects/clang360-import/contrib/amd/amd/amfs_generic.c
==============================================================================
--- projects/clang360-import/contrib/amd/amd/amfs_generic.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/contrib/amd/amd/amfs_generic.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -1113,7 +1113,7 @@ amfs_generic_mount_child(am_node *new_mp
     new_mp->am_transp = (SVCXPRT *) xmalloc(sizeof(SVCXPRT));
     *(new_mp->am_transp) = *current_transp;
   }
-  if (error && (new_mp->am_mnt->mf_ops == &amfs_error_ops))
+  if (error && new_mp->am_mnt && (new_mp->am_mnt->mf_ops == &amfs_error_ops))
     new_mp->am_error = error;
 
   if (new_mp->am_error > 0)

Modified: projects/clang360-import/contrib/amd/hlfsd/homedir.c
==============================================================================
--- projects/clang360-import/contrib/amd/hlfsd/homedir.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/contrib/amd/hlfsd/homedir.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -494,7 +494,7 @@ readent:
   buf[0] = '\0';
   fgets(buf, 256, passwd_fp);
   passwd_line++;
-  if (!buf || buf[0] == '\0')
+  if (buf[0] == '\0')
     goto readent;
 
   /* read user name */

Modified: projects/clang360-import/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/elfcopy/main.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/contrib/elftoolchain/elfcopy/main.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -210,7 +210,7 @@ static struct {
 };
 
 static int	copy_from_tempfile(const char *src, const char *dst,
-    int infd, int *outfd);
+    int infd, int *outfd, int in_place);
 static void	create_file(struct elfcopy *ecp, const char *src,
     const char *dst);
 static void	elfcopy_main(struct elfcopy *ecp, int argc, char **argv);
@@ -523,33 +523,39 @@ create_tempfile(char **fn, int *fd)
 #undef _TEMPFILEPATH
 }
 
+/*
+ * Copy temporary file with path src and file descriptor infd to path dst.
+ * If in_place is set act as if editing the file in place, avoiding rename()
+ * to preserve hard and symbolic links. Output file remains open, with file
+ * descriptor returned in outfd.
+ */
 static int
-copy_from_tempfile(const char *src, const char *dst, int infd, int *outfd)
+copy_from_tempfile(const char *src, const char *dst, int infd, int *outfd,
+    int in_place)
 {
 	int tmpfd;
 
 	/*
 	 * First, check if we can use rename().
 	 */
-	if (rename(src, dst) >= 0) {
-		*outfd = infd;
-		return (0);
-	} else if (errno != EXDEV)
-		return (-1);
-
-	/*
-	 * If the rename() failed due to 'src' and 'dst' residing in
-	 * two different file systems, invoke a helper function in
-	 * libelftc to do the copy.
-	 */
-
-	if (unlink(dst) < 0)
-		return (-1);
+	if (in_place == 0) {
+		if (rename(src, dst) >= 0) {
+			*outfd = infd;
+			return (0);
+		} else if (errno != EXDEV)
+			return (-1);
+	
+		/*
+		 * If the rename() failed due to 'src' and 'dst' residing in
+		 * two different file systems, invoke a helper function in
+		 * libelftc to do the copy.
+		 */
 
-	if ((tmpfd = open(dst, O_CREAT | O_WRONLY, 0755)) < 0)
-		return (-1);
+		if (unlink(dst) < 0)
+			return (-1);
+	}
 
-	if (lseek(infd, 0, SEEK_SET) < 0)
+	if ((tmpfd = open(dst, O_CREAT | O_TRUNC | O_WRONLY, 0755)) < 0)
 		return (-1);
 
 	if (elftc_copyfile(infd, tmpfd) < 0)
@@ -578,6 +584,7 @@ create_file(struct elfcopy *ecp, const c
 	struct stat	 sb;
 	char		*tempfile, *elftemp;
 	int		 efd, ifd, ofd, ofd0, tfd;
+	int		 in_place;
 
 	tempfile = NULL;
 
@@ -718,10 +725,15 @@ copy_done:
 #endif
 
 	if (tempfile != NULL) {
-		if (dst == NULL)
+		in_place = 0;
+		if (dst == NULL) {
 			dst = src;
+			if (lstat(dst, &sb) != -1 &&
+			    (sb.st_nlink > 1 || S_ISLNK(sb.st_mode)))
+				in_place = 1;
+		}
 
-		if (copy_from_tempfile(tempfile, dst, ofd, &tfd) < 0)
+		if (copy_from_tempfile(tempfile, dst, ofd, &tfd, in_place) < 0)
 			err(EXIT_FAILURE, "creation of %s failed", dst);
 
 		free(tempfile);

Modified: projects/clang360-import/contrib/netbsd-tests/bin/expr/t_expr.sh
==============================================================================
--- projects/clang360-import/contrib/netbsd-tests/bin/expr/t_expr.sh	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/contrib/netbsd-tests/bin/expr/t_expr.sh	Wed Jan 28 18:45:40 2015	(r277844)
@@ -54,9 +54,6 @@ overflow_head() {
 	atf_set "descr" "Test overflow cases"
 }
 overflow_body() {
-	# Begin FreeBSD
-	atf_expect_fail "FreeBSD's expr does not check overflow to the same degree NetBSD's expr does; see bug 196867 for more details"
-	# End FreeBSD
 	test_expr '4611686018427387904 + 4611686018427387903' \
 	          '9223372036854775807'
 	test_expr '4611686018427387904 + 4611686018427387904' \

Modified: projects/clang360-import/lib/libpmc/libpmc.c
==============================================================================
--- projects/clang360-import/lib/libpmc/libpmc.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/lib/libpmc/libpmc.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -74,10 +74,14 @@ static int p6_allocate_pmc(enum pmc_even
 static int tsc_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
     struct pmc_op_pmcallocate *_pmc_config);
 #endif
+#if defined(__arm__)
 #if defined(__XSCALE__)
 static int xscale_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
     struct pmc_op_pmcallocate *_pmc_config);
 #endif
+static int armv7_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
+    struct pmc_op_pmcallocate *_pmc_config);
+#endif
 #if defined(__mips__)
 static int mips_allocate_pmc(enum pmc_event _pe, char* ctrspec,
 			     struct pmc_op_pmcallocate *_pmc_config);
@@ -153,6 +157,7 @@ PMC_CLASSDEP_TABLE(p4, P4);
 PMC_CLASSDEP_TABLE(p5, P5);
 PMC_CLASSDEP_TABLE(p6, P6);
 PMC_CLASSDEP_TABLE(xscale, XSCALE);
+PMC_CLASSDEP_TABLE(armv7, ARMV7);
 PMC_CLASSDEP_TABLE(mips24k, MIPS24K);
 PMC_CLASSDEP_TABLE(octeon, OCTEON);
 PMC_CLASSDEP_TABLE(ucf, UCF);
@@ -286,6 +291,7 @@ PMC_MDEP_TABLE(p4, P4, PMC_CLASS_SOFT, P
 PMC_MDEP_TABLE(p5, P5, PMC_CLASS_SOFT, PMC_CLASS_TSC);
 PMC_MDEP_TABLE(p6, P6, PMC_CLASS_SOFT, PMC_CLASS_TSC);
 PMC_MDEP_TABLE(xscale, XSCALE, PMC_CLASS_SOFT, PMC_CLASS_XSCALE);
+PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7);
 PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K);
 PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON);
 PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450);
@@ -346,9 +352,12 @@ PMC_CLASS_TABLE_DESC(p6, P6, p6, p6);
 #if	defined(__i386__) || defined(__amd64__)
 PMC_CLASS_TABLE_DESC(tsc, TSC, tsc, tsc);
 #endif
+#if	defined(__arm__)
 #if	defined(__XSCALE__)
 PMC_CLASS_TABLE_DESC(xscale, XSCALE, xscale, xscale);
 #endif
+PMC_CLASS_TABLE_DESC(armv7, ARMV7, armv7, armv7);
+#endif
 #if defined(__mips__)
 PMC_CLASS_TABLE_DESC(mips24k, MIPS24K, mips24k, mips);
 PMC_CLASS_TABLE_DESC(octeon, OCTEON, octeon, mips);
@@ -2371,6 +2380,7 @@ soft_allocate_pmc(enum pmc_event pe, cha
 	return (0);
 }
 
+#if	defined(__arm__)
 #if	defined(__XSCALE__)
 
 static struct pmc_event_alias xscale_aliases[] = {
@@ -2394,6 +2404,25 @@ xscale_allocate_pmc(enum pmc_event pe, c
 }
 #endif
 
+static struct pmc_event_alias armv7_aliases[] = {
+	EV_ALIAS("dc-misses",		"L1_DCACHE_REFILL"),
+	EV_ALIAS("ic-misses",		"L1_ICACHE_REFILL"),
+	EV_ALIAS("instructions",	"INSTR_EXECUTED"),
+	EV_ALIAS(NULL, NULL)
+};
+static int
+armv7_allocate_pmc(enum pmc_event pe, char *ctrspec __unused,
+    struct pmc_op_pmcallocate *pmc_config __unused)
+{
+	switch (pe) {
+	default:
+		break;
+	}
+
+	return (0);
+}
+#endif
+
 #if defined(__mips__)
 
 static struct pmc_event_alias mips24k_aliases[] = {
@@ -2886,6 +2915,10 @@ pmc_event_names_of_class(enum pmc_class 
 		ev = xscale_event_table;
 		count = PMC_EVENT_TABLE_SIZE(xscale);
 		break;
+	case PMC_CLASS_ARMV7:
+		ev = armv7_event_table;
+		count = PMC_EVENT_TABLE_SIZE(armv7);
+		break;
 	case PMC_CLASS_MIPS24K:
 		ev = mips24k_event_table;
 		count = PMC_EVENT_TABLE_SIZE(mips24k);
@@ -3163,12 +3196,18 @@ pmc_init(void)
 	case PMC_CPU_GENERIC:
 		PMC_MDEP_INIT(generic);
 		break;
+#if defined(__arm__)
 #if defined(__XSCALE__)
 	case PMC_CPU_INTEL_XSCALE:
 		PMC_MDEP_INIT(xscale);
 		pmc_class_table[n] = &xscale_class_table_descr;
 		break;
 #endif
+	case PMC_CPU_ARMV7:
+		PMC_MDEP_INIT(armv7);
+		pmc_class_table[n] = &armv7_class_table_descr;
+		break;
+#endif
 #if defined(__mips__)
 	case PMC_CPU_MIPS_24K:
 		PMC_MDEP_INIT(mips24k);
@@ -3369,6 +3408,9 @@ _pmc_name_of_event(enum pmc_event pe, en
 	} else if (pe >= PMC_EV_XSCALE_FIRST && pe <= PMC_EV_XSCALE_LAST) {
 		ev = xscale_event_table;
 		evfence = xscale_event_table + PMC_EVENT_TABLE_SIZE(xscale);
+	} else if (pe >= PMC_EV_ARMV7_FIRST && pe <= PMC_EV_ARMV7_LAST) {
+		ev = armv7_event_table;
+		evfence = armv7_event_table + PMC_EVENT_TABLE_SIZE(armv7);
 	} else if (pe >= PMC_EV_MIPS24K_FIRST && pe <= PMC_EV_MIPS24K_LAST) {
 		ev = mips24k_event_table;
 		evfence = mips24k_event_table + PMC_EVENT_TABLE_SIZE(mips24k);

Modified: projects/clang360-import/release/Makefile
==============================================================================
--- projects/clang360-import/release/Makefile	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/release/Makefile	Wed Jan 28 18:45:40 2015	(r277844)
@@ -109,7 +109,7 @@ IMAGES+=	memstick.img
 IMAGES+=	mini-memstick.img
 .endif
 
-CLEANFILES=	packagesystem *.txz MANIFEST system ${IMAGES}
+CLEANFILES=	packagesystem *.txz MANIFEST release ${IMAGES}
 .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
 . for I in ${IMAGES}
 CLEANFILES+=	${I}.xz
@@ -118,7 +118,7 @@ CLEANFILES+=	${I}.xz
 .if defined(WITH_DVD) && !empty(WITH_DVD)
 CLEANFILES+=	pkg-stage
 .endif
-CLEANDIRS=	dist ftp release bootonly dvd
+CLEANDIRS=	dist ftp disc1 bootonly dvd
 beforeclean:
 	chflags -R noschg .
 .include <bsd.obj.mk>
@@ -165,57 +165,57 @@ reldoc:
 .endfor
 	cp rdoc/${RELNOTES_LANG}/readme/docbook.css reldoc
 
-system: packagesystem
+disc1: packagesystem
 # Install system
-	mkdir -p release
+	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-		DESTDIR=${.OBJDIR}/release MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
+		DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
 		MK_PROFILE=no MK_SENDMAIL=no MK_TESTS=no MK_LIB32=no \
 		MK_DEBUG_FILES=no
 # Copy distfiles
-	mkdir -p release/usr/freebsd-dist
+	mkdir -p ${.TARGET}/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \
-	    do cp $${dist} release/usr/freebsd-dist; \
+	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
 	done
 # Copy documentation, if generated
 .if !defined(NODOC)
-	cp reldoc/* release
+	cp reldoc/* ${.TARGET}
 .endif
 # Set up installation environment
-	ln -fs /tmp/bsdinstall_etc/resolv.conf release/etc/resolv.conf
-	echo sendmail_enable=\"NONE\" > release/etc/rc.conf
-	echo hostid_enable=\"NO\" >> release/etc/rc.conf
-	echo debug.witness.trace=0 >> release/etc/sysctl.conf
-	echo vfs.mountroot.timeout=\"10\" >> release/boot/loader.conf
-	cp ${.CURDIR}/rc.local release/etc
+	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
+	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
+	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
+	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
+	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 	touch ${.TARGET}
 
 bootonly: packagesystem
 # Install system
-	mkdir -p bootonly
+	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-	    DESTDIR=${.OBJDIR}/bootonly MK_AMD=no MK_AT=no \
+	    DESTDIR=${.OBJDIR}/${.TARGET} MK_AMD=no MK_AT=no \
 	    MK_GAMES=no MK_GROFF=no \
 	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
 	    MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
 	    MK_INSTALLIB=no MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
 # Copy manifest only (no distfiles) to get checksums
-	mkdir -p bootonly/usr/freebsd-dist
-	cp MANIFEST bootonly/usr/freebsd-dist
+	mkdir -p ${.TARGET}/usr/freebsd-dist
+	cp MANIFEST ${.TARGET}/usr/freebsd-dist
 # Copy documentation, if generated
 .if !defined(NODOC)
-	cp reldoc/* bootonly
+	cp reldoc/* ${.TARGET}
 .endif
 # Set up installation environment
-	ln -fs /tmp/bsdinstall_etc/resolv.conf bootonly/etc/resolv.conf
-	echo sendmail_enable=\"NONE\" > bootonly/etc/rc.conf
-	echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
-	echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf
-	echo vfs.mountroot.timeout=\"10\" >> bootonly/boot/loader.conf
-	cp ${.CURDIR}/rc.local bootonly/etc
+	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
+	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
+	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
+	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
+	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 
-dvd:
+dvd: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
@@ -240,8 +240,8 @@ dvd:
 	touch ${.TARGET}
 
 release.iso: disc1.iso
-disc1.iso: system
-	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ${.TARGET} release
+disc1.iso: disc1
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ${.TARGET} disc1
 
 dvd1.iso: dvd pkg-stage
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ${.TARGET} dvd
@@ -250,11 +250,11 @@ bootonly.iso: bootonly
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ${.TARGET} bootonly
 
 memstick: memstick.img
-memstick.img: system
-	sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET}
+memstick.img: disc1
+	sh ${.CURDIR}/${TARGET}/make-memstick.sh disc1 ${.TARGET}
 
 mini-memstick: mini-memstick.img
-mini-memstick.img: system
+mini-memstick.img: bootonly
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET}
 
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
@@ -279,7 +279,7 @@ ftp: packagesystem
 	cp *.txz MANIFEST ftp
 
 release:	real-release vm-release cloudware-release
-	@true
+	touch ${.TARGET}
 
 real-release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj

Modified: projects/clang360-import/release/scripts/make-manifest.sh
==============================================================================
--- projects/clang360-import/release/scripts/make-manifest.sh	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/release/scripts/make-manifest.sh	Wed Jan 28 18:45:40 2015	(r277844)
@@ -5,7 +5,7 @@
 #  Usage: make-manifest.sh foo1.txz foo2.txz ...
 #
 # The output file looks like this (tab-delimited):
-#  foo1.txz SHA256-checksu Number-of-files foo1 Description Install-by-default
+#  foo1.txz SHA256-checksum Number-of-files foo1 Description Install-by-default
 #
 # $FreeBSD$
 
@@ -17,7 +17,9 @@ desc_games="Games (fortune, etc.)"
 desc_lib32="32-bit compatibility libraries"
 desc_ports="Ports tree"
 desc_src="System source code"
+desc_tests="Test suite"
 src_default=off
+tests_default=off
 
 for i in $*; do
 	echo "`basename $i`	`sha256 -q $i`	`tar tvf $i | wc -l | tr -d ' '`	`basename $i .txz`	\"`eval echo \\\$desc_$(basename $i .txz)`\"	`eval echo \\\${$(basename $i .txz)_default:-on}`"

Modified: projects/clang360-import/share/man/man7/release.7
==============================================================================
--- projects/clang360-import/share/man/man7/release.7	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/share/man/man7/release.7	Wed Jan 28 18:45:40 2015	(r277844)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 16, 2015
+.Dd January 28, 2015
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -546,7 +546,7 @@ Major subtargets called by targets above
 Generates all the distribution archives
 .Pq base, kernel, ports, doc
 applicable on this platform.
-.It Cm system
+.It Cm disc1
 Builds a bootable installation system containing all the distribution files
 packaged by the
 .Cm packagesystem

Modified: projects/clang360-import/sys/arm/arm/intr.c
==============================================================================
--- projects/clang360-import/sys/arm/arm/intr.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/arm/arm/intr.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -37,6 +37,7 @@
  */
 
 #include "opt_platform.h"
+#include "opt_hwpmc_hooks.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -50,6 +51,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/conf.h>
+#include <sys/pmc.h>
+#include <sys/pmckern.h>
 
 #include <machine/atomic.h>
 #include <machine/intr.h>
@@ -190,6 +193,10 @@ arm_irq_handler(struct trapframe *frame)
 			arm_mask_irq(i);
 		}
 	}
+#ifdef HWPMC_HOOKS
+	if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
+		pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, frame);
+#endif
 }
 
 /*

Modified: projects/clang360-import/sys/arm/include/pmc_mdep.h
==============================================================================
--- projects/clang360-import/sys/arm/include/pmc_mdep.h	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/arm/include/pmc_mdep.h	Wed Jan 28 18:45:40 2015	(r277844)
@@ -30,12 +30,15 @@
 #define	_MACHINE_PMC_MDEP_H_
 
 #define	PMC_MDEP_CLASS_INDEX_XSCALE	1
+#define	PMC_MDEP_CLASS_INDEX_ARMV7	1
 /*
  * On the ARM platform we support the following PMCs.
  *
  * XSCALE	Intel XScale processors
+ * ARMV7	ARM Cortex-A processors
  */
 #include <dev/hwpmc/hwpmc_xscale.h>
+#include <dev/hwpmc/hwpmc_armv7.h>
 
 union pmc_md_op_pmcallocate {
 	uint64_t	__pad[4];
@@ -48,6 +51,7 @@ union pmc_md_op_pmcallocate {
 #ifdef	_KERNEL
 union pmc_md_pmc {
 	struct pmc_md_xscale_pmc	pm_xscale;
+	struct pmc_md_armv7_pmc		pm_armv7;
 };
 
 #define	PMC_IN_KERNEL_STACK(S,START,END)		\
@@ -73,6 +77,8 @@ union pmc_md_pmc {
  */
 struct pmc_mdep *pmc_xscale_initialize(void);
 void		pmc_xscale_finalize(struct pmc_mdep *_md);
+struct pmc_mdep *pmc_armv7_initialize(void);
+void		pmc_armv7_finalize(struct pmc_mdep *_md);
 #endif /* _KERNEL */
 
 #endif /* !_MACHINE_PMC_MDEP_H_ */

Modified: projects/clang360-import/sys/arm/ti/files.ti
==============================================================================
--- projects/clang360-import/sys/arm/ti/files.ti	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/arm/ti/files.ti	Wed Jan 28 18:45:40 2015	(r277844)
@@ -9,6 +9,7 @@ arm/arm/cpufunc_asm_armv5.S			standard
 arm/arm/cpufunc_asm_arm10.S			standard
 arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
+arm/arm/pmu.c					optional	hwpmc
 
 arm/ti/ti_common.c				standard
 arm/ti/ti_cpuid.c				standard

Modified: projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2014 by Saso Kiselkov. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.

Modified: projects/clang360-import/sys/conf/files.arm
==============================================================================
--- projects/clang360-import/sys/conf/files.arm	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/conf/files.arm	Wed Jan 28 18:45:40 2015	(r277844)
@@ -70,6 +70,7 @@ crypto/des/des_enc.c		optional	crypto | 
 dev/fb/fb.c			optional	sc
 dev/fdt/fdt_arm_platform.c	optional	platform fdt
 dev/hwpmc/hwpmc_arm.c		optional	hwpmc
+dev/hwpmc/hwpmc_armv7.c		optional	hwpmc
 dev/kbd/kbd.c			optional	sc | vt
 dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-teken.c	optional	sc

Modified: projects/clang360-import/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- projects/clang360-import/sys/dev/ath/ath_hal/ah_internal.h	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/dev/ath/ath_hal/ah_internal.h	Wed Jan 28 18:45:40 2015	(r277844)
@@ -282,7 +282,8 @@ typedef struct {
 			halRadioRetentionSupport	: 1,
 			halSpectralScanSupport		: 1,
 			halRxUsingLnaMixing		: 1,
-			halRxDoMyBeacon			: 1;
+			halRxDoMyBeacon			: 1,
+			halHwUapsdTrig			: 1;
 
 	uint32_t	halWirelessModes;
 	uint16_t	halTotalQueues;

Modified: projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.c
==============================================================================
--- projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -891,8 +891,8 @@ ath_rate_tx_complete(struct ath_softc *s
 
 	if (!mrr || ts->ts_finaltsi == 0) {
 		if (!IS_RATE_DEFINED(sn, final_rix)) {
-			device_printf(sc->sc_dev, "%s: ts_rate=%d ts_finaltsi=%d\n",
-			    __func__, ts->ts_rate, ts->ts_finaltsi);
+			device_printf(sc->sc_dev, "%s: ts_rate=%d ts_finaltsi=%d, final_rix=%d\n",
+			    __func__, ts->ts_rate, ts->ts_finaltsi, final_rix);
 			badrate(ifp, 0, ts->ts_rate, long_tries, status);
 			return;
 		}

Modified: projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.h
==============================================================================
--- projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.h	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/dev/ath/ath_rate/sample/sample.h	Wed Jan 28 18:45:40 2015	(r277844)
@@ -113,7 +113,7 @@ struct sample_node {
 #ifdef	_KERNEL
 
 #define	ATH_NODE_SAMPLE(an)	((struct sample_node *)&(an)[1])
-#define	IS_RATE_DEFINED(sn, rix)	(((sn)->ratemask & (1<<(rix))) != 0)
+#define	IS_RATE_DEFINED(sn, rix)	(((uint64_t) (sn)->ratemask & (1ULL<<((uint64_t) rix))) != 0)
 
 #ifndef MIN
 #define	MIN(a,b)	((a) < (b) ? (a) : (b))

Modified: projects/clang360-import/sys/dev/hwpmc/hwpmc_arm.c
==============================================================================
--- projects/clang360-import/sys/dev/hwpmc/hwpmc_arm.c	Wed Jan 28 18:37:09 2015	(r277843)
+++ projects/clang360-import/sys/dev/hwpmc/hwpmc_arm.c	Wed Jan 28 18:45:40 2015	(r277844)
@@ -47,9 +47,12 @@ pmc_md_initialize()
 #ifdef CPU_XSCALE_IXP425
 	if (cpu_class == CPU_CLASS_XSCALE)
 		return pmc_xscale_initialize();
-	else
 #endif
-		return NULL;
+#ifdef CPU_CORTEXA
+	if (cpu_class == CPU_CLASS_CORTEXA)
+		return pmc_armv7_initialize();
+#endif
+	return NULL;
 }
 
 void
@@ -62,6 +65,10 @@ pmc_md_finalize(struct pmc_mdep *md)
 		KASSERT(0, ("[arm,%d] Unknown CPU Class 0x%x", __LINE__,
 		    cpu_class));
 #endif
+#ifdef CPU_CORTEXA
+	if (cpu_class == CPU_CLASS_CORTEXA)
+		pmc_armv7_finalize(md);
+#endif
 }
 
 int

Copied: projects/clang360-import/sys/dev/hwpmc/hwpmc_armv7.c (from r277843, head/sys/dev/hwpmc/hwpmc_armv7.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang360-import/sys/dev/hwpmc/hwpmc_armv7.c	Wed Jan 28 18:45:40 2015	(r277844, copy of r277843, head/sys/dev/hwpmc/hwpmc_armv7.c)
@@ -0,0 +1,652 @@
+/*-
+ * Copyright (c) 2015 Ruslan Bukin <br at bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/pmc.h>
+#include <sys/pmckern.h>
+
+#include <machine/pmc_mdep.h>
+#include <machine/cpu.h>
+
+#define	CPU_ID_CORTEX_VER_MASK	0xff
+#define	CPU_ID_CORTEX_VER_SHIFT	4
+
+static int armv7_npmcs;
+
+struct armv7_event_code_map {
+	enum pmc_event	pe_ev;
+	uint8_t		pe_code;
+};
+
+const struct armv7_event_code_map armv7_event_codes[] = {
+	{ PMC_EV_ARMV7_PMNC_SW_INCR,		0x00 },
+	{ PMC_EV_ARMV7_L1_ICACHE_REFILL,	0x01 },
+	{ PMC_EV_ARMV7_ITLB_REFILL,		0x02 },
+	{ PMC_EV_ARMV7_L1_DCACHE_REFILL,	0x03 },
+	{ PMC_EV_ARMV7_L1_DCACHE_ACCESS,	0x04 },
+	{ PMC_EV_ARMV7_DTLB_REFILL,		0x05 },
+	{ PMC_EV_ARMV7_MEM_READ,		0x06 },
+	{ PMC_EV_ARMV7_MEM_WRITE,		0x07 },
+	{ PMC_EV_ARMV7_INSTR_EXECUTED,		0x08 },
+	{ PMC_EV_ARMV7_EXC_TAKEN,		0x09 },
+	{ PMC_EV_ARMV7_EXC_EXECUTED,		0x0A },
+	{ PMC_EV_ARMV7_CID_WRITE,		0x0B },
+	{ PMC_EV_ARMV7_PC_WRITE,		0x0C },
+	{ PMC_EV_ARMV7_PC_IMM_BRANCH,		0x0D },
+	{ PMC_EV_ARMV7_PC_PROC_RETURN,		0x0E },
+	{ PMC_EV_ARMV7_MEM_UNALIGNED_ACCESS,	0x0F },
+	{ PMC_EV_ARMV7_PC_BRANCH_MIS_PRED,	0x10 },
+	{ PMC_EV_ARMV7_CLOCK_CYCLES,		0x11 },
+	{ PMC_EV_ARMV7_PC_BRANCH_PRED,		0x12 },
+	{ PMC_EV_ARMV7_MEM_ACCESS,		0x13 },
+	{ PMC_EV_ARMV7_L1_ICACHE_ACCESS,	0x14 },
+	{ PMC_EV_ARMV7_L1_DCACHE_WB,		0x15 },
+	{ PMC_EV_ARMV7_L2_CACHE_ACCESS,		0x16 },
+	{ PMC_EV_ARMV7_L2_CACHE_REFILL,		0x17 },
+	{ PMC_EV_ARMV7_L2_CACHE_WB,		0x18 },
+	{ PMC_EV_ARMV7_BUS_ACCESS,		0x19 },
+	{ PMC_EV_ARMV7_MEM_ERROR,		0x1A },
+	{ PMC_EV_ARMV7_INSTR_SPEC,		0x1B },
+	{ PMC_EV_ARMV7_TTBR_WRITE,		0x1C },
+	{ PMC_EV_ARMV7_BUS_CYCLES,		0x1D },
+	{ PMC_EV_ARMV7_CPU_CYCLES,		0xFF },
+};
+
+const int armv7_event_codes_size =
+	sizeof(armv7_event_codes) / sizeof(armv7_event_codes[0]);
+
+/*
+ * Per-processor information.
+ */
+struct armv7_cpu {
+	struct pmc_hw   *pc_armv7pmcs;
+	int cortex_ver;
+};
+
+static struct armv7_cpu **armv7_pcpu;
+
+/*
+ * Performance Monitor Control Register
+ */
+static __inline uint32_t
+armv7_pmnc_read(void)
+{
+	uint32_t reg;
+
+	__asm __volatile("mrc p15, 0, %0, c9, c12, 0" : "=r" (reg));
+
+	return (reg);
+}
+
+static __inline void
+armv7_pmnc_write(uint32_t reg)
+{
+
+	__asm __volatile("mcr p15, 0, %0, c9, c12, 0" : : "r" (reg));
+}
+
+/*
+ * Clock Counter Register (PMCCNTR)
+ * Counts processor clock cycles.
+ */
+static __inline uint32_t
+armv7_ccnt_read(void)
+{
+	uint32_t reg;
+
+	__asm __volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (reg));
+	
+	return (reg);
+}
+
+static __inline void
+armv7_ccnt_write(uint32_t reg)
+{
+
+	__asm __volatile("mcr p15, 0, %0, c9, c13, 0" : : "r" (reg));
+}
+
+/*
+ * Interrupt Enable Set Register
+ */
+static __inline void
+armv7_interrupt_enable(uint32_t pmc)
+{
+	uint32_t reg;
+
+	reg = (1 << pmc);
+
+	__asm __volatile("mcr p15, 0, %0, c9, c14, 1" : : "r" (reg));
+}
+
+/*
+ * Interrupt Clear Set Register
+ */
+static __inline void
+armv7_interrupt_disable(uint32_t pmc)
+{
+	uint32_t reg;
+
+	reg = (1 << pmc);
+
+	__asm __volatile("mcr p15, 0, %0, c9, c14, 2" : : "r" (reg));
+}
+
+/*
+ * Overflow Flag Register
+ */
+static __inline uint32_t
+armv7_flag_read(void)
+{
+	uint32_t reg;
+
+	__asm __volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (reg));
+
+	return (reg);
+}
+
+static __inline void
+armv7_flag_write(uint32_t reg)
+{
+
+	__asm __volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (reg));
+}
+
+/*
+ * Event Selection Register
+ */
+static __inline void
+armv7_evtsel_write(uint32_t reg)
+{
+
+	__asm __volatile("mcr p15, 0, %0, c9, c13, 1" : : "r" (reg));
+}
+
+/*
+ * PMSELR
+ */
+static __inline void
+armv7_select_counter(unsigned int pmc)
+{
+
+	__asm __volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (pmc));
+}
+
+/*
+ * Counter Set Enable Register
+ */
+static __inline void
+armv7_counter_enable(unsigned int pmc)
+{
+	uint32_t reg;
+
+	reg = (1 << pmc);
+
+	__asm __volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (reg));
+}
+
+/*
+ * Counter Clear Enable Register
+ */
+static __inline void
+armv7_counter_disable(unsigned int pmc)
+{
+	uint32_t reg;
+
+	reg = (1 << pmc);
+
+	__asm __volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (reg));
+}
+
+/*
+ * Performance Count Register N
+ */
+static uint32_t
+armv7_pmcn_read(unsigned int pmc)
+{
+	uint32_t reg = 0;
+
+	KASSERT(pmc < 4, ("[armv7,%d] illegal PMC number %d", __LINE__, pmc));
+
+	armv7_select_counter(pmc);
+	__asm __volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (reg));
+
+	return (reg);
+}
+
+static uint32_t
+armv7_pmcn_write(unsigned int pmc, uint32_t reg)
+{
+
+	KASSERT(pmc < 4, ("[armv7,%d] illegal PMC number %d", __LINE__, pmc));
+
+	armv7_select_counter(pmc);
+	__asm __volatile("mcr p15, 0, %0, c9, c13, 2" : : "r" (reg));
+
+	return (reg);
+}
+
+static int
+armv7_allocate_pmc(int cpu, int ri, struct pmc *pm,
+  const struct pmc_op_pmcallocate *a)
+{
+	uint32_t caps, config;
+	struct armv7_cpu *pac;
+	enum pmc_event pe;
+	int i;
+
+	KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
+	    ("[armv7,%d] illegal CPU value %d", __LINE__, cpu));
+	KASSERT(ri >= 0 && ri < armv7_npmcs,
+	    ("[armv7,%d] illegal row index %d", __LINE__, ri));
+
+	pac = armv7_pcpu[cpu];
+
+	caps = a->pm_caps;
+	if (a->pm_class != PMC_CLASS_ARMV7)
+		return (EINVAL);
+	pe = a->pm_ev;
+
+	for (i = 0; i < armv7_event_codes_size; i++) {
+		if (armv7_event_codes[i].pe_ev == pe) {
+			config = armv7_event_codes[i].pe_code;
+			break;
+		}
+	}
+	if (i == armv7_event_codes_size)
+		return EINVAL;
+
+	pm->pm_md.pm_armv7.pm_armv7_evsel = config;
+
+	PMCDBG(MDP,ALL,2,"armv7-allocate ri=%d -> config=0x%x", ri, config);
+
+	return 0;
+}
+
+
+static int
+armv7_read_pmc(int cpu, int ri, pmc_value_t *v)
+{
+	pmc_value_t tmp;
+	struct pmc *pm;
+
+	KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
+	    ("[armv7,%d] illegal CPU value %d", __LINE__, cpu));
+	KASSERT(ri >= 0 && ri < armv7_npmcs,
+	    ("[armv7,%d] illegal row index %d", __LINE__, ri));
+
+	pm  = armv7_pcpu[cpu]->pc_armv7pmcs[ri].phw_pmc;
+
+	if (pm->pm_md.pm_armv7.pm_armv7_evsel == 0xFF)
+		tmp = armv7_ccnt_read();
+	else
+		tmp = armv7_pmcn_read(ri);
+
+	PMCDBG(MDP,REA,2,"armv7-read id=%d -> %jd", ri, tmp);
+	if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
+		*v = ARMV7_PERFCTR_VALUE_TO_RELOAD_COUNT(tmp);
+	else
+		*v = tmp;
+
+	return 0;
+}
+
+static int
+armv7_write_pmc(int cpu, int ri, pmc_value_t v)
+{
+	struct pmc *pm;
+
+	KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
+	    ("[armv7,%d] illegal CPU value %d", __LINE__, cpu));
+	KASSERT(ri >= 0 && ri < armv7_npmcs,
+	    ("[armv7,%d] illegal row-index %d", __LINE__, ri));
+
+	pm  = armv7_pcpu[cpu]->pc_armv7pmcs[ri].phw_pmc;
+
+	if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
+		v = ARMV7_RELOAD_COUNT_TO_PERFCTR_VALUE(v);
+	
+	PMCDBG(MDP,WRI,1,"armv7-write cpu=%d ri=%d v=%jx", cpu, ri, v);
+
+	if (pm->pm_md.pm_armv7.pm_armv7_evsel == 0xFF)
+		armv7_ccnt_write(v);
+	else
+		armv7_pmcn_write(ri, v);
+
+	return 0;
+}
+
+static int
+armv7_config_pmc(int cpu, int ri, struct pmc *pm)
+{
+	struct pmc_hw *phw;
+
+	PMCDBG(MDP,CFG,1, "cpu=%d ri=%d pm=%p", cpu, ri, pm);
+
+	KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
+	    ("[armv7,%d] illegal CPU value %d", __LINE__, cpu));
+	KASSERT(ri >= 0 && ri < armv7_npmcs,
+	    ("[armv7,%d] illegal row-index %d", __LINE__, ri));
+
+	phw = &armv7_pcpu[cpu]->pc_armv7pmcs[ri];
+
+	KASSERT(pm == NULL || phw->phw_pmc == NULL,
+	    ("[armv7,%d] pm=%p phw->pm=%p hwpmc not unconfigured",
+	    __LINE__, pm, phw->phw_pmc));
+
+	phw->phw_pmc = pm;
+
+	return 0;
+}
+
+static int
+armv7_start_pmc(int cpu, int ri)
+{
+	struct pmc_hw *phw;
+	uint32_t config;
+	struct pmc *pm;
+
+	phw    = &armv7_pcpu[cpu]->pc_armv7pmcs[ri];
+	pm     = phw->phw_pmc;
+	config = pm->pm_md.pm_armv7.pm_armv7_evsel;
+
+	/*
+	 * Configure the event selection.
+	 */
+	armv7_select_counter(ri);
+	armv7_evtsel_write(config);
+
+	/*
+	 * Enable the PMC.
+	 */
+	armv7_interrupt_enable(ri);
+	armv7_counter_enable(ri);
+
+	return 0;
+}
+
+static int
+armv7_stop_pmc(int cpu, int ri)
+{
+	struct pmc_hw *phw;
+	struct pmc *pm;
+
+	phw    = &armv7_pcpu[cpu]->pc_armv7pmcs[ri];
+	pm     = phw->phw_pmc;
+
+	/*
+	 * Disable the PMCs.
+	 */
+	armv7_counter_disable(ri);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-projects mailing list