- Use the name returned by device_get_nameunit(9) for the name of the

  counter-timer timecounter so the associated SYSCTL nodes don't clash on
  machines having multiple U2P and U2S bridges as well as establishing a
  clear mapping between these bridges and their timecounter device.
- Don't bother setting up a "nice" name for the IOMMU, just use the name
  returned by device_get_nameunit(9), too.
- Fix some minor style(9) bugs.
- Use __FBSDID in counter.c

MFC after:	1 week

2 files changed, 10 insertions, 9 deletions

diff --git a/sys/sparc64/include/bus_common.h b/sys/sparc64/include/bus_common.h
index de6b22c..e2ea4e9 100644
--- a/sys/sparc64/include/bus_common.h
+++ b/sys/sparc64/include/bus_common.h
@@ -65,7 +65,7 @@
 	((inr) & INTMAP_INR_MASK))
 
 /* counter-timer support. */
-void sparc64_counter_init(bus_space_tag_t tag, bus_space_handle_t handle,
-    bus_addr_t offset);
+void sparc64_counter_init(const char *name, bus_space_tag_t tag,
+    bus_space_handle_t handle, bus_addr_t offset);
 
 #endif	/* !_MACHINE_BUS_COMMON_H_ */
diff --git a/sys/sparc64/include/iommuvar.h b/sys/sparc64/include/iommuvar.h
index 792a823..644a3fa 100644
--- a/sys/sparc64/include/iommuvar.h
+++ b/sys/sparc64/include/iommuvar.h
@@ -31,7 +31,7 @@
  */
 
 #ifndef _MACHINE_IOMMUVAR_H_
-#define _MACHINE_IOMMUVAR_H_
+#define	_MACHINE_IOMMUVAR_H_
 
 #define	IO_PAGE_SIZE		PAGE_SIZE_8K
 #define	IO_PAGE_MASK		PAGE_MASK_8K
@@ -62,10 +62,10 @@ struct iommu_state {
 	struct rman		is_dvma_rman;	/* DVMA space rman */
 	struct iommu_maplruq_head is_maplruq;	/* (i) LRU queue */
 	vm_paddr_t		is_ptsb;	/* (r) TSB physical address */
-	u_int64_t		*is_tsb;	/* (*i) TSB virtual address */
+	uint64_t		*is_tsb;	/* (*i) TSB virtual address */
 	int			is_tsbsize;	/* (r) 0 = 8K, ... */
-	u_int64_t		is_pmaxaddr;	/* (r) max. physical address */
-	u_int64_t		is_dvmabase;	/* (r) */
+	uint64_t		is_pmaxaddr;	/* (r) max. physical address */
+	uint64_t		is_dvmabase;	/* (r) */
 	int64_t			is_cr;		/* (r) Control reg value */
 
 	vm_paddr_t		is_flushpa[2];	/* (r) */
@@ -99,9 +99,10 @@ struct iommu_state {
 };
 
 /* interfaces for PCI/SBus code */
-void iommu_init(char *, struct iommu_state *, int, u_int32_t, int);
-void iommu_reset(struct iommu_state *);
-void iommu_decode_fault(struct iommu_state *, vm_offset_t);
+void iommu_init(const char *name, struct iommu_state *is, int tsbsize,
+    uint32_t iovabase, int resvpg);
+void iommu_reset(struct iommu_state *is);
+void iommu_decode_fault(struct iommu_state *is, vm_offset_t phys);
 
 extern struct bus_dma_methods iommu_dma_methods;