diff options
| -rw-r--r-- | src/arch/riscv/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/riscv/include/mcall.h (renamed from src/arch/riscv/include/spike_util.h) | 4 | ||||
| -rw-r--r-- | src/arch/riscv/mcall.c (renamed from src/mainboard/emulation/qemu-riscv/qemu_util.c) | 3 | ||||
| -rw-r--r-- | src/arch/riscv/trap_handler.c | 2 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-riscv/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/emulation/spike-riscv/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/emulation/spike-riscv/spike_util.c | 100 | ||||
| -rw-r--r-- | src/mainboard/emulation/spike-riscv/uart.c | 1 | ||||
| -rw-r--r-- | src/mainboard/lowrisc/nexys4ddr/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/lowrisc/nexys4ddr/uart.c | 1 | ||||
| -rw-r--r-- | src/mainboard/lowrisc/nexys4ddr/util.c | 103 |
11 files changed, 6 insertions, 219 deletions
diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc index cf6ce99fb0..1fe8f7c268 100644 --- a/src/arch/riscv/Makefile.inc +++ b/src/arch/riscv/Makefile.inc @@ -34,6 +34,7 @@ $(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h bootblock-y = bootblock.S stages.c bootblock-y += trap_util.S bootblock-y += trap_handler.c +bootblock-y += mcall.c bootblock-y += virtual_memory.c bootblock-y += boot.c bootblock-y += misc.c @@ -89,7 +90,6 @@ endif ifeq ($(CONFIG_ARCH_RAMSTAGE_RISCV),y) ramstage-y = -ramstage-y += trap_handler.c ramstage-y += virtual_memory.c ramstage-y += stages.c ramstage-y += misc.c diff --git a/src/arch/riscv/include/spike_util.h b/src/arch/riscv/include/mcall.h index 175ee6ce2f..a43b9cf49b 100644 --- a/src/arch/riscv/include/spike_util.h +++ b/src/arch/riscv/include/mcall.h @@ -13,8 +13,8 @@ * GNU General Public License for more details. */ -#ifndef _SPIKE_UTIL_H -#define _SPIKE_UTIL_H +#ifndef _MCALL_H +#define _MCALL_H #include <arch/encoding.h> #include <atomic.h> diff --git a/src/mainboard/emulation/qemu-riscv/qemu_util.c b/src/arch/riscv/mcall.c index c97a61f246..fdc02bef2b 100644 --- a/src/mainboard/emulation/qemu-riscv/qemu_util.c +++ b/src/arch/riscv/mcall.c @@ -29,7 +29,7 @@ #include <arch/errno.h> #include <atomic.h> #include <console/console.h> -#include <spike_util.h> +#include <mcall.h> #include <string.h> #include <vm.h> @@ -57,6 +57,7 @@ uintptr_t mcall_clear_ipi(void) // only clear SSIP if no other events are pending if (HLS()->device_response_queue_head == NULL) { clear_csr(mip, MIP_SSIP); + /* Ensure the other hart sees it. */ mb(); } diff --git a/src/arch/riscv/trap_handler.c b/src/arch/riscv/trap_handler.c index 8c69366ba8..c7a11c6b9c 100644 --- a/src/arch/riscv/trap_handler.c +++ b/src/arch/riscv/trap_handler.c @@ -17,7 +17,7 @@ #include <arch/exception.h> #include <arch/sbi.h> #include <console/console.h> -#include <spike_util.h> +#include <mcall.h> #include <string.h> #include <vm.h> diff --git a/src/mainboard/emulation/qemu-riscv/Makefile.inc b/src/mainboard/emulation/qemu-riscv/Makefile.inc index 4fbe401944..36f1fca58c 100644 --- a/src/mainboard/emulation/qemu-riscv/Makefile.inc +++ b/src/mainboard/emulation/qemu-riscv/Makefile.inc @@ -13,14 +13,11 @@ ## GNU General Public License for more details. bootblock-y += uart.c -bootblock-y += qemu_util.c bootblock-y += rom_media.c romstage-y += romstage.c -romstage-y += qemu_util.c romstage-y += uart.c romstage-y += rom_media.c ramstage-y += uart.c -ramstage-y += qemu_util.c ramstage-y += rom_media.c bootblock-y += memlayout.ld diff --git a/src/mainboard/emulation/spike-riscv/Makefile.inc b/src/mainboard/emulation/spike-riscv/Makefile.inc index e3c9481599..36f1fca58c 100644 --- a/src/mainboard/emulation/spike-riscv/Makefile.inc +++ b/src/mainboard/emulation/spike-riscv/Makefile.inc @@ -13,14 +13,11 @@ ## GNU General Public License for more details. bootblock-y += uart.c -bootblock-y += spike_util.c bootblock-y += rom_media.c romstage-y += romstage.c romstage-y += uart.c -romstage-y += spike_util.c romstage-y += rom_media.c ramstage-y += uart.c -ramstage-y += spike_util.c ramstage-y += rom_media.c bootblock-y += memlayout.ld diff --git a/src/mainboard/emulation/spike-riscv/spike_util.c b/src/mainboard/emulation/spike-riscv/spike_util.c deleted file mode 100644 index c97a61f246..0000000000 --- a/src/mainboard/emulation/spike-riscv/spike_util.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2013, The Regents of the University of California (Regents). - * 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. - * 3. Neither the name of the Regents nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, - * SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING - * OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS - * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED - * HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE - * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - */ - -#include <arch/barrier.h> -#include <arch/errno.h> -#include <atomic.h> -#include <console/console.h> -#include <spike_util.h> -#include <string.h> -#include <vm.h> - -uintptr_t mcall_query_memory(uintptr_t id, memory_block_info *info) -{ - if (id == 0) { - mprv_write_ulong(&info->base, 2U*GiB); - - /* TODO: Return the correct value */ - mprv_write_ulong(&info->size, 1*GiB); - return 0; - } - - return -1; -} - -uintptr_t mcall_send_ipi(uintptr_t recipient) -{ - die("mcall_send_ipi is currently not implemented"); - return 0; -} - -uintptr_t mcall_clear_ipi(void) -{ - // only clear SSIP if no other events are pending - if (HLS()->device_response_queue_head == NULL) { - clear_csr(mip, MIP_SSIP); - mb(); - } - - return atomic_swap(&HLS()->ipi_pending, 0); -} - -uintptr_t mcall_shutdown(void) -{ - die("mcall_shutdown is currently not implemented"); - return 0; -} - -uintptr_t mcall_set_timer(unsigned long long when) -{ - printk(BIOS_DEBUG, "mcall_set_timer is currently not implemented, ignoring\n"); - return 0; -} - -uintptr_t mcall_dev_req(sbi_device_message *m) -{ - die("mcall_dev_req is currently not implemented"); - return 0; -} - -uintptr_t mcall_dev_resp(void) -{ - die("mcall_dev_resp is currently not implemented"); - return 0; -} - -void hls_init(uint32_t hart_id) -{ - memset(HLS(), 0, sizeof(*HLS())); - HLS()->hart_id = hart_id; -} - -uintptr_t mcall_console_putchar(uint8_t ch) -{ - do_putchar(ch); - return 0; -} diff --git a/src/mainboard/emulation/spike-riscv/uart.c b/src/mainboard/emulation/spike-riscv/uart.c index 8513849f05..57647fee1d 100644 --- a/src/mainboard/emulation/spike-riscv/uart.c +++ b/src/mainboard/emulation/spike-riscv/uart.c @@ -17,7 +17,6 @@ #include <console/uart.h> #include <arch/io.h> #include <boot/coreboot_tables.h> -#include <spike_util.h> uintptr_t uart_platform_base(int idx) { diff --git a/src/mainboard/lowrisc/nexys4ddr/Makefile.inc b/src/mainboard/lowrisc/nexys4ddr/Makefile.inc index 69519b189e..abd341c5d7 100644 --- a/src/mainboard/lowrisc/nexys4ddr/Makefile.inc +++ b/src/mainboard/lowrisc/nexys4ddr/Makefile.inc @@ -13,14 +13,11 @@ ## GNU General Public License for more details. bootblock-y += uart.c -bootblock-y += util.c bootblock-y += rom_media.c romstage-y += romstage.c romstage-y += uart.c -romstage-y += util.c romstage-y += rom_media.c ramstage-y += uart.c -ramstage-y += util.c ramstage-y += rom_media.c bootblock-y += memlayout.ld diff --git a/src/mainboard/lowrisc/nexys4ddr/uart.c b/src/mainboard/lowrisc/nexys4ddr/uart.c index d19ce520d8..7758db355a 100644 --- a/src/mainboard/lowrisc/nexys4ddr/uart.c +++ b/src/mainboard/lowrisc/nexys4ddr/uart.c @@ -17,7 +17,6 @@ #include <console/uart.h> #include <arch/io.h> #include <boot/coreboot_tables.h> -#include <spike_util.h> uintptr_t uart_platform_base(int idx) { diff --git a/src/mainboard/lowrisc/nexys4ddr/util.c b/src/mainboard/lowrisc/nexys4ddr/util.c deleted file mode 100644 index 32cdb6d573..0000000000 --- a/src/mainboard/lowrisc/nexys4ddr/util.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2013, The Regents of the University of California (Regents). - * 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. - * 3. Neither the name of the Regents nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, - * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING - * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS - * DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING - * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS - * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, - * UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - */ - -#include <arch/barrier.h> -#include <arch/errno.h> -#include <atomic.h> -#include <console/console.h> -#include <spike_util.h> -#include <string.h> -#include <vm.h> - -uintptr_t mcall_query_memory(uintptr_t id, memory_block_info *info) -{ - if (id == 0) { - mprv_write_ulong(&info->base, 2U*GiB); - - /* TODO: Return the correct value */ - mprv_write_ulong(&info->size, 1*GiB); - return 0; - } - - return -1; -} - -uintptr_t mcall_send_ipi(uintptr_t recipient) -{ - die("mcall_send_ipi is currently not implemented"); - return 0; -} - -uintptr_t mcall_clear_ipi(void) -{ - // only clear SSIP if no other events are pending - if (HLS()->device_response_queue_head == NULL) { - clear_csr(mip, MIP_SSIP); - /* Ensure the other hart sees it. */ - mb(); - } - - return atomic_swap(&HLS()->ipi_pending, 0); -} - -uintptr_t mcall_shutdown(void) -{ - die("mcall_shutdown is currently not implemented"); - return 0; -} - -uintptr_t mcall_set_timer(unsigned long long when) -{ - printk(BIOS_DEBUG, "mcall_set_timer is currently not implemented, ignoring\n"); - return 0; -} - -uintptr_t mcall_dev_req(sbi_device_message *m) -{ - die("mcall_dev_req is currently not implemented"); - return 0; -} - -uintptr_t mcall_dev_resp(void) -{ - die("mcall_dev_resp is currently not implemented"); - return 0; -} - -void hls_init(uint32_t hart_id) -{ - memset(HLS(), 0, sizeof(*HLS())); - HLS()->hart_id = hart_id; -} - -uintptr_t mcall_console_putchar(uint8_t ch) -{ - do_putchar(ch); - return 0; -} |