Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[u-boot] / arch / sandbox / cpu / cpu.c

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 168f2efa33e5fe4f5eaab52503dbb724fd2f5528..cde0b055a673a2f5c897d9832cb6ead33d79d9ad 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -1,13 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #define DEBUG
 #include <common.h>
-#include <dm/root.h>
+#include <dm.h>
+#include <errno.h>
+#include <linux/libfdt.h>
 #include <os.h>
 #include <asm/io.h>
+#include <asm/setjmp.h>
 #include <asm/state.h>
+#include <dm/root.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -20,8 +24,10 @@ static struct udevice *map_dev;
 unsigned long map_len;
 #endif
 
-void reset_cpu(ulong ignored)
+void sandbox_exit(void)
 {
+       /* Do this here while it still has an effect */
+       os_fd_restore();
        if (state_uninit())
                os_exit(2);
 
@@ -32,32 +38,38 @@ void reset_cpu(ulong ignored)
        os_exit(0);
 }
 
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+/* delay x useconds */
+void __udelay(unsigned long usec)
 {
-       reset_cpu(0);
+       struct sandbox_state *state = state_get_current();
+
+       if (!state->skip_delays)
+               os_usleep(usec);
+}
 
+int cleanup_before_linux(void)
+{
        return 0;
 }
 
-/* delay x useconds */
-void __udelay(unsigned long usec)
+int cleanup_before_linux_select(int flags)
 {
-       os_usleep(usec);
+       return 0;
 }
 
-unsigned long __attribute__((no_instrument_function)) timer_get_us(void)
+void *phys_to_virt(phys_addr_t paddr)
 {
-       return os_get_nsec() / 1000;
+       return (void *)(gd->arch.ram_buf + paddr);
 }
 
-int cleanup_before_linux(void)
+phys_addr_t virt_to_phys(void *vaddr)
 {
-       return 0;
+       return (phys_addr_t)((uint8_t *)vaddr - gd->arch.ram_buf);
 }
 
 void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
 {
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && !defined(CONFIG_SPL_BUILD)
        unsigned long plen = len;
        void *ptr;
 
@@ -65,14 +77,14 @@ void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
        if (enable_pci_map && !pci_map_physmem(paddr, &len, &map_dev, &ptr)) {
                if (plen != len) {
                        printf("%s: Warning: partial map at %x, wanted %lx, got %lx\n",
-                              __func__, paddr, len, plen);
+                              __func__, (uint)paddr, len, plen);
                }
                map_len = len;
                return ptr;
        }
 #endif
 
-       return (void *)(gd->arch.ram_buf + paddr);
+       return phys_to_virt(paddr);
 }
 
 void unmap_physmem(const void *vaddr, unsigned long flags)
@@ -99,6 +111,10 @@ void flush_dcache_range(unsigned long start, unsigned long stop)
 {
 }
 
+void invalidate_dcache_range(unsigned long start, unsigned long stop)
+{
+}
+
 int sandbox_read_fdt_from_file(void)
 {
        struct sandbox_state *state = state_get_current();
@@ -138,3 +154,26 @@ done:
 
        return 0;
 }
+
+ulong timer_get_boot_us(void)
+{
+       static uint64_t base_count;
+       uint64_t count = os_get_nsec();
+
+       if (!base_count)
+               base_count = count;
+
+       return (count - base_count) / 1000;
+}
+
+int setjmp(jmp_buf jmp)
+{
+       return os_setjmp((ulong *)jmp, sizeof(*jmp));
+}
+
+void longjmp(jmp_buf jmp, int ret)
+{
+       os_longjmp((ulong *)jmp, ret);
+       while (1)
+               ;
+}