svn commit: r277634 - in projects/powernv: amd64/vmm/amd arm/ti/am335x boot/i386/libfirewire cddl/contrib/opensolaris/uts/common/fs/zfs powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Jan 24 02:12:00 2015
New Revision: 277634
URL: https://svnweb.freebsd.org/changeset/base/277634

Log:
  Merge from head to get r277633.

Modified:
  projects/powernv/amd64/vmm/amd/svm.c
  projects/powernv/arm/ti/am335x/am335x_lcd.c
  projects/powernv/boot/i386/libfirewire/firewire.c
  projects/powernv/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/powernv/powerpc/aim/machdep.c
Directory Properties:
  projects/powernv/   (props changed)
  projects/powernv/amd64/vmm/   (props changed)
  projects/powernv/boot/   (props changed)
  projects/powernv/cddl/contrib/opensolaris/   (props changed)

Modified: projects/powernv/amd64/vmm/amd/svm.c
==============================================================================
--- projects/powernv/amd64/vmm/amd/svm.c	Sat Jan 24 01:58:15 2015	(r277633)
+++ projects/powernv/amd64/vmm/amd/svm.c	Sat Jan 24 02:12:00 2015	(r277634)
@@ -80,6 +80,7 @@ SYSCTL_NODE(_hw_vmm, OID_AUTO, svm, CTLF
 #define AMD_CPUID_SVM_DECODE_ASSIST	BIT(7)  /* Decode assist */
 #define AMD_CPUID_SVM_PAUSE_INC		BIT(10) /* Pause intercept filter. */
 #define AMD_CPUID_SVM_PAUSE_FTH		BIT(12) /* Pause filter threshold */
+#define	AMD_CPUID_SVM_AVIC		BIT(13)	/* AVIC present */
 
 #define	VMCB_CACHE_DEFAULT	(VMCB_CACHE_ASID 	|	\
 				VMCB_CACHE_IOPM		|	\

Modified: projects/powernv/arm/ti/am335x/am335x_lcd.c
==============================================================================
--- projects/powernv/arm/ti/am335x/am335x_lcd.c	Sat Jan 24 01:58:15 2015	(r277633)
+++ projects/powernv/arm/ti/am335x/am335x_lcd.c	Sat Jan 24 02:12:00 2015	(r277634)
@@ -356,6 +356,8 @@ am335x_lcd_intr(void *arg)
 
 	reg = LCD_READ4(sc, LCD_IRQSTATUS);
 	LCD_WRITE4(sc, LCD_IRQSTATUS, reg);
+	/* Read value back to make sure it reached the hardware */
+	reg = LCD_READ4(sc, LCD_IRQSTATUS);
 
 	if (reg & IRQ_SYNC_LOST) {
 		reg = LCD_READ4(sc, LCD_RASTER_CTRL);
@@ -401,6 +403,8 @@ am335x_lcd_intr(void *arg)
 
 done:
 	LCD_WRITE4(sc, LCD_END_OF_INT_IND, 0);
+	/* Read value back to make sure it reached the hardware */
+	reg = LCD_READ4(sc, LCD_END_OF_INT_IND);
 }
 
 static int

Modified: projects/powernv/boot/i386/libfirewire/firewire.c
==============================================================================
--- projects/powernv/boot/i386/libfirewire/firewire.c	Sat Jan 24 01:58:15 2015	(r277633)
+++ projects/powernv/boot/i386/libfirewire/firewire.c	Sat Jan 24 02:12:00 2015	(r277634)
@@ -233,7 +233,8 @@ fw_init_crom(struct fwohci_softc *sc)
 	src->businfo.cyc_clk_acc = 100;
 	src->businfo.max_rec = sc->maxrec;
 	src->businfo.max_rom = MAXROM_4;
-	src->businfo.generation = 1;
+#define FW_GENERATION_CHANGEABLE 2
+	src->businfo.generation = FW_GENERATION_CHANGEABLE;
 	src->businfo.link_spd = sc->speed;
 
 	src->businfo.eui64.hi = sc->eui.hi;
@@ -313,11 +314,14 @@ fw_crom(struct fwohci_softc *sc)
 	src = &sc->crom_src_buf->src;
 	crom_load(src, (uint32_t *)newrom, CROMSIZE);
 	if (bcmp(newrom, sc->config_rom, CROMSIZE) != 0) {
-		/* bump generation and reload */
-		src->businfo.generation ++;
-		/* generation must be between 0x2 and 0xF */
+		/* Bump generation and reload. */
+		src->businfo.generation++;
+
+		/* Handle generation count wraps. */
 		if (src->businfo.generation < 2)
-			src->businfo.generation ++;
+			src->businfo.generation = 2;
+
+		/* Recalculate CRC to account for generation change. */
 		crom_load(src, (uint32_t *)newrom, CROMSIZE);
 		bcopy(newrom, (void *)sc->config_rom, CROMSIZE);
 	}

Modified: projects/powernv/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==============================================================================
--- projects/powernv/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sat Jan 24 01:58:15 2015	(r277633)
+++ projects/powernv/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sat Jan 24 02:12:00 2015	(r277634)
@@ -794,7 +794,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, d
 		gen = vap->va_nblocks;		/* ditto */
 	} else {
 		obj = 0;
-		gethrestime(&now);
+		vfs_timestamp(&now);
 		gen = dmu_tx_get_txg(tx);
 	}
 
@@ -1426,7 +1426,7 @@ zfs_tstamp_update_setup(znode_t *zp, uin
 {
 	timestruc_t	now;
 
-	gethrestime(&now);
+	vfs_timestamp(&now);
 
 	if (have_tx) {	/* will sa_bulk_update happen really soon? */
 		zp->z_atime_dirty = 0;

Modified: projects/powernv/powerpc/aim/machdep.c
==============================================================================
--- projects/powernv/powerpc/aim/machdep.c	Sat Jan 24 01:58:15 2015	(r277633)
+++ projects/powernv/powerpc/aim/machdep.c	Sat Jan 24 02:12:00 2015	(r277634)
@@ -535,7 +535,7 @@ powerpc_init(vm_offset_t fdt, vm_offset_
 #endif
 	bcopy(&alitrap,  (void *)(EXC_ALI + trap_offset),  (size_t)&aliend -
 	    (size_t)&alitrap);
-	bcopy(&dsitrap,  (void *)(EXC_DSI + trap_offset),  (size_t)&dsitrap -
+	bcopy(&dsitrap,  (void *)(EXC_DSI + trap_offset),  (size_t)&dsiend -
 	    (size_t)&dsitrap);
 	bcopy(generictrap, (void *)EXC_ISI,  trapsize);
 	#ifdef __powerpc64__