PERFORCE change 223084 for review

[Brooks Davis]

http://p4web.freebsd.org/@@223084?ac=10

Change 223084 by brooks at brooks_zenith on 2013/03/20 21:16:47

	Implement bus_space_generic_*_8().  Extremly limited testing to
	date on beri.  Potentially remains a panic() implementation on some
	platforms.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/include/cpufunc.h#4 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/bus_space_generic.c#8 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/cpufunc.h#4 (text+ko) ====

@@ -354,9 +354,11 @@
 #define	readb(va)	(*(volatile uint8_t *) (va))
 #define	readw(va)	(*(volatile uint16_t *) (va))
 #define	readl(va)	(*(volatile uint32_t *) (va))
+#define readd(va)	mips3_ld(va)
  
 #define	writeb(va, d)	(*(volatile uint8_t *) (va) = (d))
 #define	writew(va, d)	(*(volatile uint16_t *) (va) = (d))
 #define	writel(va, d)	(*(volatile uint32_t *) (va) = (d))
+#define	writed(va, d)	mips3_sd((va), (d))
 
 #endif /* !_MACHINE_CPUFUNC_H_ */

==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/bus_space_generic.c#8 (text+ko) ====

@@ -202,9 +202,11 @@
 #define rd8(a) cvmx_read64_uint8(a)
 #define rd16(a) cvmx_read64_uint16(a)
 #define rd32(a) cvmx_read64_uint32(a)
+#define rd64(a) cvmx_read64_uint64(a)
 #define wr8(a, v) cvmx_write64_uint8(a, v)
 #define wr16(a, v) cvmx_write64_uint16(a, v)
 #define wr32(a, v) cvmx_write64_uint32(a, v)
+#define wr64(a, v) cvmx_write64_uint64(a, v)
 #elif defined(CPU_SB1) && _BYTE_ORDER == _BIG_ENDIAN
 #include <mips/sibyte/sb_bus_space.h>
 #define rd8(a) sb_big_endian_read8(a)
@@ -217,9 +219,11 @@
 #define rd8(a) readb(a)
 #define rd16(a) readw(a)
 #define rd32(a) readl(a)
+#define	rd64(a)	readd(a)
 #define wr8(a, v) writeb(a, v)
 #define wr16(a, v) writew(a, v)
 #define wr32(a, v) writel(a, v)
+#define	wr64(a, v) writed(a, v)
 #endif
 
 /* generic bus_space tag */
@@ -297,7 +301,11 @@
 generic_bs_r_8(void *t, bus_space_handle_t handle, bus_size_t offset)
 {
 
+#ifdef rd64
+	return(rd64(handle + offset));
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 void
@@ -333,8 +341,14 @@
 generic_bs_rm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
     uint64_t *addr, size_t count)
 {
+#ifdef rd64
+	bus_addr_t baddr = bsh + offset;
 
+	while (count--)
+		*addr++ = rd64(baddr);
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 /*
@@ -382,8 +396,16 @@
 generic_bs_rr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
     uint64_t *addr, size_t count)
 {
+#ifdef rd64
+	bus_addr_t baddr = bsh + offset;
 
+	while (count--) {
+		*addr++ = rd64(baddr);
+		baddr += 8;
+	}
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 /*
@@ -419,7 +441,11 @@
     uint64_t value)
 {
 
+#ifdef rd64
+	wr64(bsh + offset, value);
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 /*
@@ -460,8 +486,14 @@
 generic_bs_wm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
     const uint64_t *addr, size_t count)
 {
+#ifdef rd64
+	bus_addr_t baddr = bsh + offset;
 
+	while (count--)
+		wr64(baddr, *addr++);
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 /*
@@ -508,8 +540,16 @@
 generic_bs_wr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
     const uint64_t *addr, size_t count)
 {
+#ifdef rd64
+	bus_addr_t baddr = bsh + offset;
 
+	while (count--) {
+		wr64(baddr, *addr++);
+		baddr += 8;
+	}
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 /*
@@ -550,8 +590,14 @@
 generic_bs_sm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
     uint64_t value, size_t count)
 {
+#ifdef rd64
+	bus_addr_t addr = bsh + offset;
 
+	while (count--)
+		wr64(addr, value);
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 /*
@@ -592,8 +638,14 @@
 generic_bs_sr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
     uint64_t value, size_t count)
 {
+#ifdef rd64
+	bus_addr_t addr = bsh + offset;
 
+	for (; count != 0; count--, addr += 8)
+		wr64(addr, value);
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 /*
@@ -664,8 +716,23 @@
 generic_bs_c_8(void *t, bus_space_handle_t bsh1, bus_size_t off1,
     bus_space_handle_t bsh2, bus_size_t off2, size_t count)
 {
+#ifdef rd64
+	bus_addr_t addr1 = bsh1 + off1;
+	bus_addr_t addr2 = bsh2 + off2;
 
+	if (addr1 >= addr2) {
+		/* src after dest: copy forward */
+		for (; count != 0; count--, addr1 += 8, addr2 += 8)
+			wr64(addr2, rd64(addr1));
+	} else {
+		/* dest after src: copy backwards */
+		for (addr1 += 8 * (count - 1), addr2 += 8 * (count - 1);
+		    count != 0; count--, addr1 -= 8, addr2 -= 8)
+			wr64(addr2, rd64(addr1));
+	}
+#else
 	panic("%s: not implemented", __func__);
+#endif
 }
 
 void