From: Praneeth Bajjuri <prane...@ti.com>
This update contains build fix for linux kernel 5.10
* uio-module-drv: Replace ioremap_nocache with ioremap
Signed-off-by: Praneeth Bajjuri <prane...@ti.com>
---
recipes-bsp/uio-module-drv/uio-module-drv.inc | 7 +++-
...Replace-ioremap_nocache-with-ioremap.patch | 35 +++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644
recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
diff --git a/recipes-bsp/uio-module-drv/uio-module-drv.inc
b/recipes-bsp/uio-module-drv/uio-module-drv.inc
index f483010e..ab1beb9f 100644
--- a/recipes-bsp/uio-module-drv/uio-module-drv.inc
+++ b/recipes-bsp/uio-module-drv/uio-module-drv.inc
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend:= "${THISDIR}/${PN}:"
+
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
@@ -9,7 +11,10 @@ PV = "2.2.1.0+git${SRCPV}"
UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git"
UIO_MODULE_DRV_GIT_PROTOCOL = "git"
-SRC_URI =
"${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH}"
+SRC_URI = " \
+
${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH}
\
+ file://0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch \
+"
SRCREV = "${UIO_MODULE_DRV_SRCREV}"
diff --git
a/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
b/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
new file mode 100644
index 00000000..955ef558
--- /dev/null
+++
b/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
@@ -0,0 +1,35 @@
+From b5c4036dac06817bffd0be21c5fa1b7f75f74e4b Mon Sep 17 00:00:00 2001
+From: Suman Anna <s-a...@ti.com>
+Date: Mon, 19 Apr 2021 13:15:51 -0500
+Subject: [PATCH] uio-module-drv: Replace ioremap_nocache with ioremap
+
+The ioremap_nocache is the same as the regular ioremap and its
+definition has been dropped from the Linux kernel v5.6 onwards in
+commit 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
+[1]. The uio-module-drv module fails to build against these newer
+kernels, so fix it by simply replacing ioremap_nocache with ioremap.
+
+[1]
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4bdc0d676a643140bdf17dbf7eafedee3d496a3c
+
+Signed-off-by: Suman Anna <s-a...@ti.com>
+---
+ uio_module_drv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/uio_module_drv.c b/uio_module_drv.c
+index 5a67dd199e21..7cc6005d1f05 100644
+--- a/uio_module_drv.c
++++ b/uio_module_drv.c
+@@ -240,7 +240,7 @@ static ssize_t uio_module_drv_transfer(struct file *file,
char __user *buf,
+ return -EINVAL;
+ }
+
+- virt_addr_p = ioremap_nocache(phys_addr, count);
++ virt_addr_p = ioremap(phys_addr, count);
+ if (!virt_addr_p) {
+ dev_err(uio_module_drv->dev, "Mapping of virtual memory
failed\n");
+ return(-ENOMEM);
+--
+2.30.1
+
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13726):
https://lists.yoctoproject.org/g/meta-ti/message/13726
Mute This Topic: https://lists.yoctoproject.org/mt/82271343/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
