From 99f2f113ec397dd042dcaa23c47123f3def19ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Fri, 28 Oct 2016 00:25:02 +0200 Subject: riscv: Unify SBI call implementations under arch/riscv/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note that currently, traps are only handled by the trap handler installed in the bootblock. The romstage and ramstage don't override it. TEST=Booted emulation/spike-qemu and lowrisc/nexys4ddr with a linux payload. It worked as much as before (Linux didn't boot, but it made some successful SBI calls) Change-Id: Icce96ab3f41ae0f34bd86e30f9ff17c30317854e Signed-off-by: Jonathan Neuschäfer Reviewed-on: https://review.coreboot.org/17057 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Ronald G. Minnich --- src/mainboard/lowrisc/nexys4ddr/Makefile.inc | 3 - src/mainboard/lowrisc/nexys4ddr/uart.c | 1 - src/mainboard/lowrisc/nexys4ddr/util.c | 103 --------------------------- 3 files changed, 107 deletions(-) delete mode 100644 src/mainboard/lowrisc/nexys4ddr/util.c (limited to 'src/mainboard/lowrisc/nexys4ddr') 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 #include #include -#include 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 -#include -#include -#include -#include -#include -#include - -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; -} -- cgit v1.2.3