Merge Perforce changeset 219925 to head:

  Provided a bus_space implementation for FDT, modelled on
  bus_space_generic, but with a local version of the map address
  routine that does a P->V translation, as is the case with NLM's
  similar routine for XLP.  It's not clear to me that this is the
  right solution -- possibly this belongs in simplebus -- however,
  it is sufficient to get the DE4 LED driver working.

Sponsored by:	DARPA, AFRL

1 files changed, 10 insertions, 479 deletions

diff --git a/sys/mips/mips/bus_space_fdt.c b/sys/mips/mips/bus_space_fdt.c
index 88c5ffe..38efea1 100644
--- a/sys/mips/mips/bus_space_fdt.c
+++ b/sys/mips/mips/bus_space_fdt.c
@@ -89,12 +89,15 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cache.h>
 
-static struct bus_space generic_space = {
+static int	fdt_bs_map(void *, bus_addr_t, bus_size_t, int,
+		    bus_space_handle_t *);
+
+static struct bus_space fdt_space = {
 	/* cookie */
 	(void *) 0,
 
 	/* mapping/unmapping */
-	generic_bs_map,
+	fdt_bs_map,
 	generic_bs_unmap,
 	generic_bs_subregion,
 
@@ -196,486 +199,14 @@ static struct bus_space generic_space = {
 	generic_bs_wr_8,
 };
 
-/* Ultra-gross kludge */
-#if defined(CPU_CNMIPS) && (defined(__mips_n32) || defined(__mips_o32))
-#include <contrib/octeon-sdk/cvmx.h>
-#define rd8(a) cvmx_read64_uint8(a)
-#define rd16(a) cvmx_read64_uint16(a)
-#define rd32(a) cvmx_read64_uint32(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)
-#elif defined(CPU_SB1) && _BYTE_ORDER == _BIG_ENDIAN
-#include <mips/sibyte/sb_bus_space.h>
-#define rd8(a) sb_big_endian_read8(a)
-#define rd16(a) sb_big_endian_read16(a)
-#define rd32(a) sb_big_endian_read32(a)
-#define wr8(a, v) sb_big_endian_write8(a, v)
-#define wr16(a, v) sb_big_endian_write16(a, v)
-#define wr32(a, v) sb_big_endian_write32(a, v)
-#else
-#define rd8(a) readb(a)
-#define rd16(a) readw(a)
-#define rd32(a) readl(a)
-#define wr8(a, v) writeb(a, v)
-#define wr16(a, v) writew(a, v)
-#define wr32(a, v) writel(a, v)
-#endif
-
 /* generic bus_space tag */
-bus_space_tag_t mips_bus_space_generic = &generic_space;
-
-int
-generic_bs_map(void *t __unused, bus_addr_t addr,
-	      bus_size_t size __unused, int flags __unused,
-	      bus_space_handle_t *bshp)
-{
-
-	*bshp = addr;
-	return (0);
-}
-
-void
-generic_bs_unmap(void *t __unused, bus_space_handle_t bh __unused,
-	      bus_size_t size __unused)
-{
+bus_space_tag_t	mips_bus_space_fdt = &fdt_space;
 
-	/* Do nothing */
-}
-
-int
-generic_bs_subregion(void *t __unused, bus_space_handle_t handle,
-	      bus_size_t offset, bus_size_t size __unused,
-	      bus_space_handle_t *bshp)
+static int
+fdt_bs_map(void *t __unused, bus_addr_t addr, bus_size_t size __unused,
+    int flags __unused, bus_space_handle_t *bshp)
 {
 
-	*bshp = handle + offset;
+	*bshp = MIPS_PHYS_TO_DIRECT_UNCACHED(addr);
 	return (0);
 }
-
-int
-generic_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
-    bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
-    bus_addr_t *bpap, bus_space_handle_t *bshp)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-void    
-generic_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-uint8_t
-generic_bs_r_1(void *t, bus_space_handle_t handle,
-    bus_size_t offset)
-{
-
-	return (rd8(handle + offset));
-}
-
-uint16_t
-generic_bs_r_2(void *t, bus_space_handle_t handle,
-    bus_size_t offset)
-{
-
-	return (rd16(handle + offset));
-}
-
-uint32_t
-generic_bs_r_4(void *t, bus_space_handle_t handle,
-    bus_size_t offset)
-{
-
-	return (rd32(handle + offset));
-}
-
-uint64_t
-generic_bs_r_8(void *t, bus_space_handle_t handle, bus_size_t offset)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-void
-generic_bs_rm_1(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t *addr, size_t count)
-{
-
-	while (count--)
-		*addr++ = rd8(bsh + offset);
-}
-
-void
-generic_bs_rm_2(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--)
-		*addr++ = rd16(baddr);
-}
-
-void
-generic_bs_rm_4(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--)
-		*addr++ = rd32(baddr);
-}
-
-void
-generic_bs_rm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
-    uint64_t *addr, size_t count)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-/*
- * Read `count' 1, 2, 4, or 8 byte quantities from bus space
- * described by tag/handle and starting at `offset' and copy into
- * buffer provided.
- */
-void
-generic_bs_rr_1(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--) {
-		*addr++ = rd8(baddr);
-		baddr += 1;
-	}
-}
-
-void
-generic_bs_rr_2(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--) {
-		*addr++ = rd16(baddr);
-		baddr += 2;
-	}
-}
-
-void
-generic_bs_rr_4(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--) {
-		*addr++ = rd32(baddr);
-		baddr += 4;
-	}
-}
-
-void
-generic_bs_rr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
-    uint64_t *addr, size_t count)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-/*
- * Write the 1, 2, 4, or 8 byte value `value' to bus space
- * described by tag/handle/offset.
- */
-void
-generic_bs_w_1(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t value)
-{
-
-	wr8(bsh + offset, value);
-}
-
-void
-generic_bs_w_2(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t value)
-{
-
-	wr16(bsh + offset, value);
-}
-
-void
-generic_bs_w_4(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t value)
-{
-
-	wr32(bsh + offset, value);
-}
-
-void
-generic_bs_w_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
-    uint64_t value)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-/*
- * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
- * provided to bus space described by tag/handle/offset.
- */
-void
-generic_bs_wm_1(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, const uint8_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--)
-		wr8(baddr, *addr++);
-}
-
-void
-generic_bs_wm_2(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, const uint16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--)
-		wr16(baddr, *addr++);
-}
-
-void
-generic_bs_wm_4(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, const uint32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--)
-		wr32(baddr, *addr++);
-}
-
-void
-generic_bs_wm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
-    const uint64_t *addr, size_t count)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-/*
- * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
- * to bus space described by tag/handle starting at `offset'.
- */
-void
-generic_bs_wr_1(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, const uint8_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--) {
-		wr8(baddr, *addr++);
-		baddr += 1;
-	}
-}
-
-void
-generic_bs_wr_2(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, const uint16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--) {
-		wr16(baddr, *addr++);
-		baddr += 2;
-	}
-}
-
-void
-generic_bs_wr_4(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, const uint32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-
-	while (count--) {
-		wr32(baddr, *addr++);
-		baddr += 4;
-	}
-}
-
-void
-generic_bs_wr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
-    const uint64_t *addr, size_t count)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-/*
- * Write the 1, 2, 4, or 8 byte value `val' to bus space described
- * by tag/handle/offset `count' times.
- */
-void
-generic_bs_sm_1(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-	while (count--)
-		wr8(addr, value);
-}
-
-void
-generic_bs_sm_2(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint16_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-	while (count--)
-		wr16(addr, value);
-}
-
-void
-generic_bs_sm_4(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-	while (count--)
-		wr32(addr, value);
-}
-
-void
-generic_bs_sm_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
-    uint64_t value, size_t count)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-/*
- * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
- * by tag/handle starting at `offset'.
- */
-void
-generic_bs_sr_1(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint8_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-	for (; count != 0; count--, addr++)
-		wr8(addr, value);
-}
-
-void
-generic_bs_sr_2(void *t, bus_space_handle_t bsh,
-		       bus_size_t offset, uint16_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-	for (; count != 0; count--, addr += 2)
-		wr16(addr, value);
-}
-
-void
-generic_bs_sr_4(void *t, bus_space_handle_t bsh,
-    bus_size_t offset, uint32_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-	for (; count != 0; count--, addr += 4)
-		wr32(addr, value);
-}
-
-void
-generic_bs_sr_8(void *t, bus_space_handle_t bsh, bus_size_t offset,
-    uint64_t value, size_t count)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-/*
- * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
- * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
- */
-void
-generic_bs_c_1(void *t, bus_space_handle_t bsh1,
-    bus_size_t off1, bus_space_handle_t bsh2,
-    bus_size_t off2, size_t count)
-{
-	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++, addr2++)
-			wr8(addr2, rd8(addr1));
-	} else {
-		/* dest after src: copy backwards */
-		for (addr1 += (count - 1), addr2 += (count - 1);
-		    count != 0; count--, addr1--, addr2--)
-			wr8(addr2, rd8(addr1));
-	}
-}
-
-void
-generic_bs_c_2(void *t, bus_space_handle_t bsh1,
-    bus_size_t off1, bus_space_handle_t bsh2,
-    bus_size_t off2, size_t count)
-{
-	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 += 2, addr2 += 2)
-			wr16(addr2, rd16(addr1));
-	} else {
-		/* dest after src: copy backwards */
-		for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1);
-		    count != 0; count--, addr1 -= 2, addr2 -= 2)
-			wr16(addr2, rd16(addr1));
-	}
-}
-
-void
-generic_bs_c_4(void *t, bus_space_handle_t bsh1,
-    bus_size_t off1, bus_space_handle_t bsh2,
-    bus_size_t off2, size_t count)
-{
-	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 += 4, addr2 += 4)
-			wr32(addr2, rd32(addr1));
-	} else {
-		/* dest after src: copy backwards */
-		for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1);
-		    count != 0; count--, addr1 -= 4, addr2 -= 4)
-			wr32(addr2, rd32(addr1));
-	}
-}
-
-void
-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)
-{
-
-	panic("%s: not implemented", __func__);
-}
-
-void
-generic_bs_barrier(void *t __unused, 
-		bus_space_handle_t bsh __unused,
-		bus_size_t offset __unused, bus_size_t len __unused, 
-		int flags)
-{
-#if 0
-	if (flags & BUS_SPACE_BARRIER_WRITE)
-		mips_dcache_wbinv_all();
-#endif
-}