Merge tag 'v2.0.4' into develop

2.0.4 - 2021-07-29 ================== Fixed ----- - sw: improve compatibility with newer ( > 3.10) Linux kernel version

Merge tag 'v2.0.4' into develop
2.0.4 - 2021-07-29 ================== Fixed ----- - sw: improve compatibility with newer ( > 3.10) Linux kernel version
b01a5edc · Federico Vaga · 74f73fb3 · c0d76b04 · b01a5edc · b01a5edc
Commit b01a5edc authored Jul 29, 2021 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

CHANGELOG.rst CHANGELOG.rst +6 -0

svec-core-fpga.c software/kernel/svec-core-fpga.c +2 -8

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

+2.0.4 - 2021-07-29
+==================
+Fixed
+-----
+- sw: improve compatibility with newer ( > 3.10) Linux kernel version
+
 2.0.3 - 2021-03-22
 ==================
 Fixed

--- a/software/kernel/svec-core-fpga.c
+++ b/software/kernel/svec-core-fpga.c
@@ -217,14 +217,8 @@ static struct resource svec_fpga_vic_res[] = {

 struct irq_domain *svec_fpga_irq_find_host(struct device *dev)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
-	struct irq_fwspec fwspec = {
-		.fwnode = dev->fwnode,
-		.param_count = 2,
-		.param[0] = ((unsigned long)dev >> 32) & 0xffffffff,
-		.param[1] = ((unsigned long)dev) & 0xffffffff,
-	};
-	return irq_find_matching_fwspec(&fwspec, DOMAIN_BUS_ANY);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
+	return irq_find_matching_fwnode(dev->fwnode, DOMAIN_BUS_ANY);
 #else
 	return (irq_find_host((void *)dev));
 #endif