[RFC,XEN,06/23] riscv: Add riscv to tools/libxc header files

Commit Message

Bobby Eshleman Jan. 22, 2020, 1:58 a.m. UTC

From: Alistair Francis <[e-mail]>

Signed-off-by: Alistair Francis <[e-mail]>
---
 tools/libxc/include/xenctrl.h |  7 +++++
 tools/libxc/xc_core.h         |  2 ++
 tools/libxc/xc_core_riscv.h   | 57 +++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 tools/libxc/xc_core_riscv.h

Patch

diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h
index 75f191ae3a..4cbe35bb2b 100644
--- a/tools/libxc/include/xenctrl.h
+++ b/tools/libxc/include/xenctrl.h
@@ -83,6 +83,13 @@ 
 #define xen_mb()   asm volatile ("dmb sy" : : : "memory")
 #define xen_rmb()  asm volatile ("dmb sy" : : : "memory")
 #define xen_wmb()  asm volatile ("dmb sy" : : : "memory")
+#elif defined(__riscv)
+#define RISCV_FENCE(p, s) \
+  __asm__ __volatile__ ("fence " #p "," #s : : : "memory")
+
+#define xen_mb()  RISCV_FENCE(rw,rw)
+#define xen_rmb() RISCV_FENCE(r,r)
+#define xen_wmb() RISCV_FENCE(w,w)
 #else
 #error "Define barriers"
 #endif
diff --git a/tools/libxc/xc_core.h b/tools/libxc/xc_core.h
index ed7ed53ca5..7baba3e4bd 100644
--- a/tools/libxc/xc_core.h
+++ b/tools/libxc/xc_core.h
@@ -155,6 +155,8 @@  int xc_core_arch_get_scratch_gpfn(xc_interface *xch, uint32_t domid,
 # include "xc_core_x86.h"
 #elif defined (__arm__) || defined(__aarch64__)
 # include "xc_core_arm.h"
+#elif defined(__riscv)
+# include "xc_core_riscv.h"
 #else
 # error "unsupported architecture"
 #endif
diff --git a/tools/libxc/xc_core_riscv.h b/tools/libxc/xc_core_riscv.h
new file mode 100644
index 0000000000..353020576e
--- /dev/null
+++ b/tools/libxc/xc_core_riscv.h
@@ -0,0 +1,57 @@ 
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef XC_CORE_RISCV_H
+#define XC_CORE_RISCV_H
+
+#define ELF_ARCH_DATA           ELFDATA2LSB
+#define ELF_ARCH_MACHINE        EM_RISCV
+
+struct xc_core_arch_context {
+    /* nothing */
+};
+
+#define xc_core_arch_context_init(arch_ctxt)            do {} while (0)
+#define xc_core_arch_context_free(arch_ctxt)            do {} while (0)
+#define xc_core_arch_context_get(arch_ctxt, ctxt, xch, domid) \
+                                                                (0)
+#define xc_core_arch_context_dump(xch, arch_ctxt, args, dump_rtn)    (0)
+
+int
+xc_core_arch_gpfn_may_present(struct xc_core_arch_context *arch_ctxt,
+                              unsigned long pfn);
+static inline int
+xc_core_arch_context_get_shdr(xc_interface *xch,
+                              struct xc_core_arch_context *arch_ctxt, 
+                              struct xc_core_section_headers *sheaders,
+                              struct xc_core_strtab *strtab,
+                              uint64_t *filesz, uint64_t offset)
+{
+    *filesz = 0;
+    return 0;
+}
+
+#endif /* XC_CORE_RISCV_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */