svn commit: r298635 - head/sys/riscv/riscv
Ruslan Bukin
br at FreeBSD.org
Tue Apr 26 12:45:03 UTC 2016
Author: br
Date: Tue Apr 26 12:45:01 2016
New Revision: 298635
URL: https://svnweb.freebsd.org/changeset/base/298635
Log:
Add the implementation of basic bus_space_read/write functions.
Sponsored by: DARPA, AFRL
Sponsored by: HEIF5
Added:
head/sys/riscv/riscv/bus_space_asm.S (contents, props changed)
Modified:
head/sys/riscv/riscv/bus_machdep.c
Modified: head/sys/riscv/riscv/bus_machdep.c
==============================================================================
--- head/sys/riscv/riscv/bus_machdep.c Tue Apr 26 12:36:12 2016 (r298634)
+++ head/sys/riscv/riscv/bus_machdep.c Tue Apr 26 12:45:01 2016 (r298635)
@@ -1,4 +1,5 @@
/*-
+ * Copyright (c) 2014 Andrew Turner
* Copyright (c) 2015 Ruslan Bukin <br at bsdpad.com>
* All rights reserved.
*
@@ -42,27 +43,108 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
+uint8_t generic_bs_r_1(void *, bus_space_handle_t, bus_size_t);
+uint16_t generic_bs_r_2(void *, bus_space_handle_t, bus_size_t);
+uint32_t generic_bs_r_4(void *, bus_space_handle_t, bus_size_t);
+uint64_t generic_bs_r_8(void *, bus_space_handle_t, bus_size_t);
+
+void generic_bs_rm_1(void *, bus_space_handle_t, bus_size_t, uint8_t *,
+ bus_size_t);
+void generic_bs_rm_2(void *, bus_space_handle_t, bus_size_t, uint16_t *,
+ bus_size_t);
+void generic_bs_rm_4(void *, bus_space_handle_t, bus_size_t, uint32_t *,
+ bus_size_t);
+void generic_bs_rm_8(void *, bus_space_handle_t, bus_size_t, uint64_t *,
+ bus_size_t);
+
+void generic_bs_rr_1(void *, bus_space_handle_t, bus_size_t, uint8_t *,
+ bus_size_t);
+void generic_bs_rr_2(void *, bus_space_handle_t, bus_size_t, uint16_t *,
+ bus_size_t);
+void generic_bs_rr_4(void *, bus_space_handle_t, bus_size_t, uint32_t *,
+ bus_size_t);
+void generic_bs_rr_8(void *, bus_space_handle_t, bus_size_t, uint64_t *,
+ bus_size_t);
+
+void generic_bs_w_1(void *, bus_space_handle_t, bus_size_t, uint8_t);
+void generic_bs_w_2(void *, bus_space_handle_t, bus_size_t, uint16_t);
+void generic_bs_w_4(void *, bus_space_handle_t, bus_size_t, uint32_t);
+void generic_bs_w_8(void *, bus_space_handle_t, bus_size_t, uint64_t);
+
+void generic_bs_wm_1(void *, bus_space_handle_t, bus_size_t, const uint8_t *,
+ bus_size_t);
+void generic_bs_wm_2(void *, bus_space_handle_t, bus_size_t, const uint16_t *,
+ bus_size_t);
+void generic_bs_wm_4(void *, bus_space_handle_t, bus_size_t, const uint32_t *,
+ bus_size_t);
+void generic_bs_wm_8(void *, bus_space_handle_t, bus_size_t, const uint64_t *,
+ bus_size_t);
+
+void generic_bs_wr_1(void *, bus_space_handle_t, bus_size_t, const uint8_t *,
+ bus_size_t);
+void generic_bs_wr_2(void *, bus_space_handle_t, bus_size_t, const uint16_t *,
+ bus_size_t);
+void generic_bs_wr_4(void *, bus_space_handle_t, bus_size_t, const uint32_t *,
+ bus_size_t);
+void generic_bs_wr_8(void *, bus_space_handle_t, bus_size_t, const uint64_t *,
+ bus_size_t);
+
+static int
+generic_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
+ bus_space_handle_t *bshp)
+{
+ void *va;
+
+ va = pmap_mapdev(bpa, size);
+ if (va == NULL)
+ return (ENOMEM);
+ *bshp = (bus_space_handle_t)va;
+ return (0);
+}
+
+static void
+generic_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
+{
+
+ pmap_unmapdev(bsh, size);
+}
+
+static void
+generic_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ bus_size_t size, int flags)
+{
+}
+
+static int
+generic_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ bus_size_t size, bus_space_handle_t *nbshp)
+{
+
+ *nbshp = bsh + offset;
+ return (0);
+}
+
struct bus_space memmap_bus = {
/* cookie */
.bs_cookie = NULL,
/* mapping/unmapping */
- .bs_map = NULL,
- .bs_unmap = NULL,
- .bs_subregion = NULL,
+ .bs_map = generic_bs_map,
+ .bs_unmap = generic_bs_unmap,
+ .bs_subregion = generic_bs_subregion,
/* allocation/deallocation */
.bs_alloc = NULL,
.bs_free = NULL,
/* barrier */
- .bs_barrier = NULL,
+ .bs_barrier = generic_bs_barrier,
/* read single */
- .bs_r_1 = NULL,
- .bs_r_2 = NULL,
- .bs_r_4 = NULL,
- .bs_r_8 = NULL,
+ .bs_r_1 = generic_bs_r_1,
+ .bs_r_2 = generic_bs_r_2,
+ .bs_r_4 = generic_bs_r_4,
+ .bs_r_8 = generic_bs_r_8,
/* read multiple */
.bs_rm_1 = NULL,
@@ -71,10 +153,10 @@ struct bus_space memmap_bus = {
.bs_rm_8 = NULL,
/* write single */
- .bs_w_1 = NULL,
- .bs_w_2 = NULL,
- .bs_w_4 = NULL,
- .bs_w_8 = NULL,
+ .bs_w_1 = generic_bs_w_1,
+ .bs_w_2 = generic_bs_w_2,
+ .bs_w_4 = generic_bs_w_4,
+ .bs_w_8 = generic_bs_w_8,
/* write multiple */
.bs_wm_1 = NULL,
@@ -142,3 +224,7 @@ struct bus_space memmap_bus = {
.bs_wr_4_s = NULL,
.bs_wr_8_s = NULL,
};
+
+#ifdef FDT
+bus_space_tag_t fdtbus_bs_tag = &memmap_bus;
+#endif
Added: head/sys/riscv/riscv/bus_space_asm.S
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/riscv/riscv/bus_space_asm.S Tue Apr 26 12:45:01 2016 (r298635)
@@ -0,0 +1,85 @@
+/*-
+ * Copyright (c) 2016 Ruslan Bukin <br at bsdpad.com>
+ * All rights reserved.
+ *
+ * Portions of this software were developed by SRI International and the
+ * University of Cambridge Computer Laboratory under DARPA/AFRL contract
+ * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Portions of this software were developed by the University of Cambridge
+ * Computer Laboratory as part of the CTSRD Project, with support from the
+ * UK Higher Education Innovation Fund (HEIF).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+
+__FBSDID("$FreeBSD$");
+
+ENTRY(generic_bs_r_1)
+ add a3, a1, a2
+ lb a0, 0(a3)
+ ret
+END(generic_bs_r_1)
+
+ENTRY(generic_bs_r_2)
+ add a3, a1, a2
+ lh a0, 0(a3)
+ ret
+END(generic_bs_r_2)
+
+ENTRY(generic_bs_r_4)
+ add a3, a1, a2
+ lw a0, 0(a3)
+ ret
+END(generic_bs_r_4)
+
+ENTRY(generic_bs_r_8)
+ add a3, a1, a2
+ ld a0, 0(a3)
+ ret
+END(generic_bs_r_8)
+
+ENTRY(generic_bs_w_1)
+ add a4, a1, a2
+ sb a3, 0(a4)
+ ret
+END(generic_bs_w_1)
+
+ENTRY(generic_bs_w_2)
+ add a4, a1, a2
+ sh a3, 0(a4)
+ ret
+END(generic_bs_w_2)
+
+ENTRY(generic_bs_w_4)
+ add a4, a1, a2
+ sw a3, 0(a4)
+ ret
+END(generic_bs_w_4)
+
+ENTRY(generic_bs_w_8)
+ add a4, a1, a2
+ sd a3, 0(a4)
+ ret
+END(generic_bs_w_8)
More information about the svn-src-all
mailing list