Skip to contentSkip to conversation

package/sunxi-mali-utgard-driver: fix build failure with linux version >= 5.15

PATCH In review Giulio Benetti 1 participant 2 messages Aug 4, 2022 – Aug 5, 2022 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/sunxi-mali-utgard-driver: fix build failure with linux version >= 5.15

Add a patch to fix missing DMA_BUF module inclusion that leads to build failure. The patch includes DMA_BUF by using:
MODULE_IMPORT_NS(DMA_BUF);

Fixes:
http://autobuild.buildroot.net/results/8f25c26de737c358b3b43a10737609465b4e1398/

---
 ...1-mali-support-building-against-5.15.patch | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 package/sunxi-mali-utgard-driver/0001-mali-support-building-against-5.15.patch
package/sunxi-mali-utgard-driver/0001-mali-support-building-against-5.15.patch new file +93 -0
new file mode 100644
index 0000000000..39709a3107
@@ -0,0 +1,93 @@
+From e5f387146fb2e14c4785e84e239a3de6da1312c3 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Fri, 5 Aug 2022 00:26:42 +0200
+Subject: [PATCH] mali: support building against 5.15
+
+Add patch to fix build failure with Linux version 5.15 due to missing
+MODULE_IMPORT_NS(DMA_BUF);
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ ...6-mali-support-building-against-5.15.patch | 30 +++++++++++++++++++
+ patches/r6p0/series                           |  1 +
+ patches/r6p2/series                           |  1 +
+ patches/r8p1/series                           |  1 +
+ patches/r9p0/series                           |  1 +
+ 5 files changed, 34 insertions(+)
+ create mode 100644 patches/0026-mali-support-building-against-5.15.patch
+
+diff --git a/patches/0026-mali-support-building-against-5.15.patch b/patches/0026-mali-support-building-against-5.15.patch
+new file mode 100644
+index 0000000..2e05c43
+--- /dev/null
++++ b/patches/0026-mali-support-building-against-5.15.patch
+@@ -0,0 +1,30 @@
++From 57999c7d17fabc53c684304e83571db7f6cfb656 Mon Sep 17 00:00:00 2001
++From: Giulio Benetti <[email protected]>
++Date: Fri, 5 Aug 2022 00:20:00 +0200
++Subject: [PATCH] mali: support building against 5.15
++
++Since Linux 5.15 module using DMA_BUF needs to explictly MODULE_IMPORT_NS
++it, so let's add MODULE_IMPORT_NS(DMA_BUF); if Linux version is >= 5.15.0.
++
++Signed-off-by: Giulio Benetti <[email protected]>
++---
++ src/devicedrv/mali/linux/mali_kernel_linux.c | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/src/devicedrv/mali/linux/mali_kernel_linux.c b/src/devicedrv/mali/linux/mali_kernel_linux.c
++index 9bfa2bd..27ec709 100755
++--- a/src/devicedrv/mali/linux/mali_kernel_linux.c
+++++ b/src/devicedrv/mali/linux/mali_kernel_linux.c
++@@ -1129,6 +1129,9 @@ static int mali_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++ module_init(mali_module_init);
++ module_exit(mali_module_exit);
++ 
+++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+++MODULE_IMPORT_NS(DMA_BUF);
+++#endif
++ MODULE_LICENSE(MALI_KERNEL_LINUX_LICENSE);
++ MODULE_AUTHOR("ARM Ltd.");
++ MODULE_VERSION(SVN_REV_STRING);
++-- 
++2.34.1
++
+diff --git a/patches/r6p0/series b/patches/r6p0/series
+index 5d4883f..c5d3568 100644
+--- a/patches/r6p0/series
++++ b/patches/r6p0/series
+@@ -19,3 +19,4 @@ r6p0/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ r6p0/0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+diff --git a/patches/r6p2/series b/patches/r6p2/series
+index e19cf11..dcc0c8e 100644
+--- a/patches/r6p2/series
++++ b/patches/r6p2/series
+@@ -22,3 +22,4 @@ r6p2/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ r6p2/0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+diff --git a/patches/r8p1/series b/patches/r8p1/series
+index 4ad43c1..c03d4e0 100644
+--- a/patches/r8p1/series
++++ b/patches/r8p1/series
+@@ -17,3 +17,4 @@ r6p2/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ 0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+diff --git a/patches/r9p0/series b/patches/r9p0/series
+index dca4e02..913edd4 100644
+--- a/patches/r9p0/series
++++ b/patches/r9p0/series
+@@ -14,3 +14,4 @@ r6p2/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ 0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+-- 
+2.34.1
+
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hi All,

please discard this patch in favor of this one:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

Thank you
Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 102 lines · Giulio Benetti

Add a patch to fix missing DMA_BUF module inclusion that leads to build failure. The patch includes DMA_BUF by using:
MODULE_IMPORT_NS(DMA_BUF);

Fixes:
http://autobuild.buildroot.net/results/8f25c26de737c358b3b43a10737609465b4e1398/

---
  ...1-mali-support-building-against-5.15.patch | 93 +++++++++++++++++++
  1 file changed, 93 insertions(+)

create mode 100644 package/sunxi-mali-utgard-driver/0001-mali-support-building-against-5.15.patch

package/sunxi-mali-utgard-driver/0001-mali-support-building-against-5.15.patch new file +83 -0
new file mode 100644
index 0000000000..39709a3107
@@ -0,0 +1,93 @@
+From e5f387146fb2e14c4785e84e239a3de6da1312c3 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Fri, 5 Aug 2022 00:26:42 +0200
+Subject: [PATCH] mali: support building against 5.15
+
+Add patch to fix build failure with Linux version 5.15 due to missing
+MODULE_IMPORT_NS(DMA_BUF);
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ ...6-mali-support-building-against-5.15.patch | 30 +++++++++++++++++++
+ patches/r6p0/series                           |  1 +
+ patches/r6p2/series                           |  1 +
+ patches/r8p1/series                           |  1 +
+ patches/r9p0/series                           |  1 +
+ 5 files changed, 34 insertions(+)
+ create mode 100644 patches/0026-mali-support-building-against-5.15.patch
+
+diff --git a/patches/0026-mali-support-building-against-5.15.patch b/patches/0026-mali-support-building-against-5.15.patch
+new file mode 100644
+index 0000000..2e05c43
+--- /dev/null
++++ b/patches/0026-mali-support-building-against-5.15.patch
+@@ -0,0 +1,30 @@
++From 57999c7d17fabc53c684304e83571db7f6cfb656 Mon Sep 17 00:00:00 2001
++From: Giulio Benetti <[email protected]>
++Date: Fri, 5 Aug 2022 00:20:00 +0200
++Subject: [PATCH] mali: support building against 5.15
++
++Since Linux 5.15 module using DMA_BUF needs to explictly MODULE_IMPORT_NS
++it, so let's add MODULE_IMPORT_NS(DMA_BUF); if Linux version is >= 5.15.0.
++
++Signed-off-by: Giulio Benetti <[email protected]>
++---
++ src/devicedrv/mali/linux/mali_kernel_linux.c | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/src/devicedrv/mali/linux/mali_kernel_linux.c b/src/devicedrv/mali/linux/mali_kernel_linux.c
++index 9bfa2bd..27ec709 100755
++--- a/src/devicedrv/mali/linux/mali_kernel_linux.c
+++++ b/src/devicedrv/mali/linux/mali_kernel_linux.c
++@@ -1129,6 +1129,9 @@ static int mali_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++ module_init(mali_module_init);
++ module_exit(mali_module_exit);
++
+++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+++MODULE_IMPORT_NS(DMA_BUF);
+++#endif
++ MODULE_LICENSE(MALI_KERNEL_LINUX_LICENSE);
++ MODULE_AUTHOR("ARM Ltd.");
++ MODULE_VERSION(SVN_REV_STRING);
++--
++2.34.1
++
+diff --git a/patches/r6p0/series b/patches/r6p0/series
+index 5d4883f..c5d3568 100644
+--- a/patches/r6p0/series
++++ b/patches/r6p0/series
+@@ -19,3 +19,4 @@ r6p0/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ r6p0/0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+diff --git a/patches/r6p2/series b/patches/r6p2/series
+index e19cf11..dcc0c8e 100644
+--- a/patches/r6p2/series
++++ b/patches/r6p2/series
+@@ -22,3 +22,4 @@ r6p2/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ r6p2/0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+diff --git a/patches/r8p1/series b/patches/r8p1/series
+index 4ad43c1..c03d4e0 100644
+--- a/patches/r8p1/series
++++ b/patches/r8p1/series
+@@ -17,3 +17,4 @@ r6p2/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ 0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+diff --git a/patches/r9p0/series b/patches/r9p0/series
+index dca4e02..913edd4 100644

package/sunxi-mali-utgard-driver/0001-mali-support-building-against-5.15.patch line 93

Quoted 10 lines
package/sunxi-mali-utgard-driver/0001-mali-support-building-against-5.15.patch new file +10 -0
+--- a/patches/r9p0/series
++++ b/patches/r9p0/series
+@@ -14,3 +14,4 @@ r6p2/0022-mali-support-building-against-5.6.patch
+ 0023-mali-support-building-against-5.7.patch
+ 0024-mali-support-building-against-5.9.patch
+ 0025-mali-support-building-against-5.10.patch
++0026-mali-support-building-against-5.15.patch
+--
+2.34.1
+

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot