Merge branch 'release/v4.0.5'

a2160c7f · Federico Vaga · 1fd03e45 · 0328bfec · a2160c7f · a2160c7f
Commit a2160c7f authored Jul 28, 2021 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

CHANGELOG.rst CHANGELOG.rst +7 -0

mockturtle-core.c software/kernel/mockturtle-core.c +1 -0

mockturtle-drv.h software/kernel/mockturtle-drv.h +5 -0

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,13 @@
 Change Log
 ==========

+[4.0.5] - 2021-07-29
+====================
+Fixed
+-----
+- [sw] support for Linux versions greater than 5.8
+
+
 [4.0.4] - 2019-10-21
 ====================
 Changed

--- a/software/kernel/mockturtle-core.c
+++ b/software/kernel/mockturtle-core.c
@@ -28,6 +28,7 @@
 #include <linux/mod_devicetable.h>
 #include <linux/uaccess.h>
 #include <linux/version.h>
+#include <linux/io.h>

 #include <mockturtle/hw/mockturtle_cpu_csr.h>
 #include <mockturtle/hw/mockturtle_queue.h>

--- a/software/kernel/mockturtle-drv.h
+++ b/software/kernel/mockturtle-drv.h
@@ -12,6 +12,7 @@
 #include <linux/irqreturn.h>
 #include <linux/circ_buf.h>
 #include <linux/tty.h>
+#include <linux/version.h>

 #include "mockturtle/hw/mockturtle_addresses.h"
 #include "mockturtle/hw/mockturtle_queue.h"
@@ -76,7 +77,11 @@ static inline uint32_t trtl_get_sequence(struct trtl_msg *msg)
 }

 struct trtl_memory_ops {
+#if KERNEL_VERSION(5, 8, 0) <= LINUX_VERSION_CODE
+	u32 (*read)(const void *addr);
+#else
 	u32 (*read)(void *addr);
+#endif
 	void (*write)(u32 value, void *addr);
 };