svn commit: r269379 - in projects/arm64/sys: arm64/arm64 conf

Fri Aug 1 13:39:50 UTC 2014

Author: andrew
Date: Fri Aug  1 13:39:49 2014
New Revision: 269379
URL: http://svnweb.freebsd.org/changeset/base/269379

Log:
  Add entries for all bus_space functions, most are still NULL.

Added:
  projects/arm64/sys/arm64/arm64/bus_space_asm.S   (contents, props changed)
Modified:
  projects/arm64/sys/arm64/arm64/bus_machdep.c
  projects/arm64/sys/conf/files.arm64

Modified: projects/arm64/sys/arm64/arm64/bus_machdep.c
==============================================================================

--- projects/arm64/sys/arm64/arm64/bus_machdep.c	Fri Aug  1 13:38:10 2014	(r269378)
+++ projects/arm64/sys/arm64/arm64/bus_machdep.c	Fri Aug  1 13:39:49 2014	(r269379)
@@ -33,6 +33,16 @@ __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_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);
+
 static int
 generic_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp)
@@ -60,4 +70,96 @@ struct bus_space memmap_bus = {
 	/* mapping/unmapping */
 	.bs_map = generic_bs_map,
 	.bs_unmap = generic_bs_unmap,
+	.bs_subregion = NULL,
+
+	/* allocation/deallocation */
+	.bs_alloc = NULL,
+	.bs_free = NULL,
+
+	/* barrier */
+	.bs_barrier = NULL,
+
+	/* read single */
+	.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,
+	.bs_rm_2 = NULL,
+	.bs_rm_4 = NULL,
+	.bs_rm_8 = NULL,
+
+	/* write single */
+	.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,
+	.bs_wm_2 = NULL,
+	.bs_wm_4 = NULL,
+	.bs_wm_8 = NULL,
+
+	/* write region */
+	.bs_wr_1 = NULL,
+	.bs_wr_2 = NULL,
+	.bs_wr_4 = NULL,
+	.bs_wr_8 = NULL,
+
+	/* set multiple */
+	.bs_sm_1 = NULL,
+	.bs_sm_2 = NULL,
+	.bs_sm_4 = NULL,
+	.bs_sm_8 = NULL,
+
+	/* set region */
+	.bs_sr_1 = NULL,
+	.bs_sr_2 = NULL,
+	.bs_sr_4 = NULL,
+	.bs_sr_8 = NULL,
+
+	/* copy */
+	.bs_c_1 = NULL,
+	.bs_c_2 = NULL,
+	.bs_c_4 = NULL,
+	.bs_c_8 = NULL,
+
+	/* read single stream */
+	.bs_r_1_s = NULL,
+	.bs_r_2_s = NULL,
+	.bs_r_4_s = NULL,
+	.bs_r_8_s = NULL,
+
+	/* read multiple stream */
+	.bs_rm_1_s = NULL,
+	.bs_rm_2_s = NULL,
+	.bs_rm_4_s = NULL,
+	.bs_rm_8_s = NULL,
+
+	/* read region stream */
+	.bs_rr_1_s = NULL,
+	.bs_rr_2_s = NULL,
+	.bs_rr_4_s = NULL,
+	.bs_rr_8_s = NULL,
+
+	/* write single stream */
+	.bs_w_1_s = NULL,
+	.bs_w_2_s = NULL,
+	.bs_w_4_s = NULL,
+	.bs_w_8_s = NULL,
+
+	/* write multiple stream */
+	.bs_wm_1_s = NULL,
+	.bs_wm_2_s = NULL,
+	.bs_wm_4_s = NULL,
+	.bs_wm_8_s = NULL,
+
+	/* write region stream */
+	.bs_wr_1_s = NULL,
+	.bs_wr_2_s = NULL,
+	.bs_wr_4_s = NULL,
+	.bs_wr_8_s = NULL,
 };

Added: projects/arm64/sys/arm64/arm64/bus_space_asm.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arm64/sys/arm64/arm64/bus_space_asm.S	Fri Aug  1 13:39:49 2014	(r269379)
@@ -0,0 +1,71 @@
+/*-
+ * Copyright (c) 2014 Andrew Turner
+ * All rights reserved.
+ *
+ * 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)
+	ldrb	w0, [x1, x2]
+	ret
+END(generic_bs_r_1)
+
+ENTRY(generic_bs_r_2)
+	ldrh	w0, [x1, x2]
+	ret
+END(generic_bs_r_2)
+
+ENTRY(generic_bs_r_4)
+	ldr	w0, [x1, x2]
+	ret
+END(generic_bs_r_4)
+
+ENTRY(generic_bs_r_8)
+	ldr	x0, [x1, x2]
+	ret
+END(generic_bs_r_8)
+
+ENTRY(generic_bs_w_1)
+	strb	w3, [x1, x2]
+	ret
+END(generic_bs_w_1)
+
+ENTRY(generic_bs_w_2)
+	strh	w3, [x1, x2]
+	ret
+END(generic_bs_w_2)
+
+ENTRY(generic_bs_w_4)
+	str	w3, [x1, x2]
+	ret
+END(generic_bs_w_4)
+
+ENTRY(generic_bs_w_8)
+	str	x3, [x1, x2]
+	ret
+END(generic_bs_r_8)
+

Modified: projects/arm64/sys/conf/files.arm64
==============================================================================
--- projects/arm64/sys/conf/files.arm64	Fri Aug  1 13:38:10 2014	(r269378)
+++ projects/arm64/sys/conf/files.arm64	Fri Aug  1 13:39:49 2014	(r269379)
@@ -3,6 +3,7 @@ arm/arm/devmap.c		standard
 arm64/arm64/autoconf.c		standard
 arm64/arm64/bcopy.c		standard
 arm64/arm64/bus_machdep.c	standard
+arm64/arm64/bus_space_asm.S	standard
 arm64/arm64/busdma_machdep.c	standard
 arm64/arm64/clock.c		standard
 arm64/arm64/copyinout.c		standard
