Index: sys/dev/sfxge/common/efsys.h
===================================================================
--- sys/dev/sfxge/common/efsys.h
+++ sys/dev/sfxge/common/efsys.h
@@ -51,7 +51,11 @@
 #include <machine/endian.h>
 
 #define	EFSYS_HAS_UINT64 1
+#if defined(__x86_64__)
+#define	EFSYS_USE_UINT64 1
+#else
 #define	EFSYS_USE_UINT64 0
+#endif
 #if _BYTE_ORDER == _BIG_ENDIAN
 #define	EFSYS_IS_BIG_ENDIAN 1
 #define	EFSYS_IS_LITTLE_ENDIAN 0
@@ -399,8 +403,28 @@
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
 
+#if defined(__x86_64__)
 #define	EFSYS_MEM_READQ(_esmp, _offset, _eqp)				\
 	do {								\
+		uint64_t *addr;						\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		addr = (void *)((_esmp)->esm_base + (_offset));		\
+									\
+		(_eqp)->eq_u64[0] = *addr;				\
+									\
+		EFSYS_PROBE3(mem_readq, unsigned int, (_offset),	\
+		    uint32_t, (_eqp)->eq_u32[1],			\
+		    uint32_t, (_eqp)->eq_u32[0]);			\
+									\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+#else
+#define	EFSYS_MEM_READQ(_esmp, _offset, _eqp)				\
+	do {								\
 		uint32_t *addr;						\
 									\
 		_NOTE(CONSTANTCONDITION)				\
@@ -418,9 +442,33 @@
 									\
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
+#endif
 
+#if defined(__x86_64__)
 #define	EFSYS_MEM_READO(_esmp, _offset, _eop)				\
 	do {								\
+		uint64_t *addr;						\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		addr = (void *)((_esmp)->esm_base + (_offset));		\
+									\
+		(_eop)->eo_u64[0] = *addr++;				\
+		(_eop)->eo_u64[1] = *addr;				\
+									\
+		EFSYS_PROBE5(mem_reado, unsigned int, (_offset),	\
+		    uint32_t, (_eop)->eo_u32[3],			\
+		    uint32_t, (_eop)->eo_u32[2],			\
+		    uint32_t, (_eop)->eo_u32[1],			\
+		    uint32_t, (_eop)->eo_u32[0]);			\
+									\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+#else
+#define	EFSYS_MEM_READO(_esmp, _offset, _eop)				\
+	do {								\
 		uint32_t *addr;						\
 									\
 		_NOTE(CONSTANTCONDITION)				\
@@ -442,6 +490,7 @@
 									\
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
+#endif
 
 #define	EFSYS_MEM_WRITED(_esmp, _offset, _edp)				\
 	do {								\
@@ -461,8 +510,29 @@
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
 
+#if defined(__x86_64__)
 #define	EFSYS_MEM_WRITEQ(_esmp, _offset, _eqp)				\
 	do {								\
+		uint64_t *addr;						\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		EFSYS_PROBE3(mem_writeq, unsigned int, (_offset),	\
+		    uint32_t, (_eqp)->eq_u32[1],			\
+		    uint32_t, (_eqp)->eq_u32[0]);			\
+									\
+		addr = (void *)((_esmp)->esm_base + (_offset));		\
+									\
+		*addr   = (_eqp)->eq_u64[0];				\
+									\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+
+#else
+#define	EFSYS_MEM_WRITEQ(_esmp, _offset, _eqp)				\
+	do {								\
 		uint32_t *addr;						\
 									\
 		_NOTE(CONSTANTCONDITION)				\
@@ -480,9 +550,33 @@
 									\
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
+#endif
 
+#if defined(__x86_64__)
 #define	EFSYS_MEM_WRITEO(_esmp, _offset, _eop)				\
 	do {								\
+		uint64_t *addr;						\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		EFSYS_PROBE5(mem_writeo, unsigned int, (_offset),	\
+		    uint32_t, (_eop)->eo_u32[3],			\
+		    uint32_t, (_eop)->eo_u32[2],			\
+		    uint32_t, (_eop)->eo_u32[1],			\
+		    uint32_t, (_eop)->eo_u32[0]);			\
+									\
+		addr = (void *)((_esmp)->esm_base + (_offset));		\
+									\
+		*addr++ = (_eop)->eo_u64[0];				\
+		*addr   = (_eop)->eo_u64[1];				\
+									\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+#else
+#define	EFSYS_MEM_WRITEO(_esmp, _offset, _eop)				\
+	do {								\
 		uint32_t *addr;						\
 									\
 		_NOTE(CONSTANTCONDITION)				\
@@ -504,6 +598,7 @@
 									\
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
+#endif
 
 #define	EFSYS_MEM_ADDR(_esmp)						\
 	((_esmp)->esm_addr)
@@ -540,6 +635,7 @@
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
 
+#if defined(__x86_64__)
 #define	EFSYS_BAR_READQ(_esbp, _offset, _eqp)				\
 	do {								\
 		_NOTE(CONSTANTCONDITION)				\
@@ -548,6 +644,53 @@
 									\
 		mtx_lock(&((_esbp)->esb_lock));				\
 									\
+		(_eqp)->eq_u64[0] = bus_space_read_8((_esbp)->esb_tag,	\
+		    (_esbp)->esb_handle, (_offset));			\
+									\
+		EFSYS_PROBE3(bar_readq, unsigned int, (_offset),	\
+		    uint32_t, (_eqp)->eq_u32[1],			\
+		    uint32_t, (_eqp)->eq_u32[0]);			\
+									\
+		mtx_unlock(&((_esbp)->esb_lock));			\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+
+#define	EFSYS_BAR_READO(_esbp, _offset, _eop, _lock)			\
+	do {								\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		if (_lock)						\
+			mtx_lock(&((_esbp)->esb_lock));			\
+									\
+		(_eop)->eo_u64[0] = bus_space_read_8((_esbp)->esb_tag,	\
+		    (_esbp)->esb_handle, (_offset));			\
+		(_eop)->eo_u64[1] = bus_space_read_8((_esbp)->esb_tag,	\
+		    (_esbp)->esb_handle, (_offset+8));			\
+									\
+		EFSYS_PROBE5(bar_reado, unsigned int, (_offset),	\
+		    uint32_t, (_eop)->eo_u32[3],			\
+		    uint32_t, (_eop)->eo_u32[2],			\
+		    uint32_t, (_eop)->eo_u32[1],			\
+		    uint32_t, (_eop)->eo_u32[0]);			\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		if (_lock)						\
+			mtx_unlock(&((_esbp)->esb_lock));		\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+
+#else
+#define	EFSYS_BAR_READQ(_esbp, _offset, _eqp)				\
+	do {								\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		mtx_lock(&((_esbp)->esb_lock));				\
+									\
 		(_eqp)->eq_u32[0] = bus_space_read_4((_esbp)->esb_tag,	\
 		    (_esbp)->esb_handle, (_offset));			\
 		(_eqp)->eq_u32[1] = bus_space_read_4((_esbp)->esb_tag,	\
@@ -591,6 +734,7 @@
 			mtx_unlock(&((_esbp)->esb_lock));		\
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
+#endif
 
 #define	EFSYS_BAR_WRITED(_esbp, _offset, _edp, _lock)			\
 	do {								\
@@ -614,6 +758,7 @@
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
 
+#if defined(__x86_64__)
 #define	EFSYS_BAR_WRITEQ(_esbp, _offset, _eqp)				\
 	do {								\
 		_NOTE(CONSTANTCONDITION)				\
@@ -626,6 +771,25 @@
 		    uint32_t, (_eqp)->eq_u32[1],			\
 		    uint32_t, (_eqp)->eq_u32[0]);			\
 									\
+		bus_space_write_8((_esbp)->esb_tag, (_esbp)->esb_handle,\
+		    (_offset), (_eqp)->eq_u64[0]);			\
+									\
+		mtx_unlock(&((_esbp)->esb_lock));			\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+#else
+#define	EFSYS_BAR_WRITEQ(_esbp, _offset, _eqp)				\
+	do {								\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		mtx_lock(&((_esbp)->esb_lock));				\
+									\
+		EFSYS_PROBE3(bar_writeq, unsigned int, (_offset),	\
+		    uint32_t, (_eqp)->eq_u32[1],			\
+		    uint32_t, (_eqp)->eq_u32[0]);			\
+									\
 		bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\
 		    (_offset), (_eqp)->eq_u32[0]);			\
 		bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\
@@ -634,7 +798,9 @@
 		mtx_unlock(&((_esbp)->esb_lock));			\
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
+#endif
 
+#if defined(__x86_64__)
 #define	EFSYS_BAR_WRITEO(_esbp, _offset, _eop, _lock)			\
 	do {								\
 		_NOTE(CONSTANTCONDITION)				\
@@ -651,6 +817,34 @@
 		    uint32_t, (_eop)->eo_u32[1],			\
 		    uint32_t, (_eop)->eo_u32[0]);			\
 									\
+		bus_space_write_8((_esbp)->esb_tag, (_esbp)->esb_handle,\
+		    (_offset), (_eop)->eo_u64[0]);			\
+		bus_space_write_8((_esbp)->esb_tag, (_esbp)->esb_handle,\
+		    (_offset+8), (_eop)->eo_u64[1]);			\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		if (_lock)						\
+			mtx_unlock(&((_esbp)->esb_lock));		\
+	_NOTE(CONSTANTCONDITION)					\
+	} while (B_FALSE)
+
+#else
+#define	EFSYS_BAR_WRITEO(_esbp, _offset, _eop, _lock)			\
+	do {								\
+		_NOTE(CONSTANTCONDITION)				\
+		KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_oword_t)),	\
+		    ("not power of 2 aligned"));			\
+									\
+		_NOTE(CONSTANTCONDITION)				\
+		if (_lock)						\
+			mtx_lock(&((_esbp)->esb_lock));			\
+									\
+		EFSYS_PROBE5(bar_writeo, unsigned int, (_offset),	\
+		    uint32_t, (_eop)->eo_u32[3],			\
+		    uint32_t, (_eop)->eo_u32[2],			\
+		    uint32_t, (_eop)->eo_u32[1],			\
+		    uint32_t, (_eop)->eo_u32[0]);			\
+									\
 		bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\
 		    (_offset), (_eop)->eo_u32[0]);			\
 		bus_space_write_4((_esbp)->esb_tag, (_esbp)->esb_handle,\
@@ -665,6 +859,7 @@
 			mtx_unlock(&((_esbp)->esb_lock));		\
 	_NOTE(CONSTANTCONDITION)					\
 	} while (B_FALSE)
+#endif
 
 /* SPIN */