4 files changed, 111 insertions, 0 deletions

diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb
new file mode 100644
index 00000000..dc17a1e9
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Test code for user space IO (UIO) driver"
+
+include uio-module-drv.inc
+
+PR = "r1"
+
+COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEVICE_NAME:omap-a15 = "am57xx"
+DEVICE_NAME:ti33x = "am33xx"
+DEVICE_NAME:ti43x = "am43xx"
+RDEPENDS:${PN} = "uio-module-drv"
+
+do_compile() {
+        oe_runmake -C ${S} test "DEVICE=${DEVICE_NAME}"
+}
+
+do_install() {
+        install -d ${D}${bindir}/
+        install -c -m 755 ${S}/test/uio_mem_test ${D}${bindir}/.
+        install -c -m 755 ${S}/test/uio_int_test ${D}${bindir}/.
+}
+
+do_install:append:omap-a15 () {
+        install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/.
+}
+
+do_install:append:ti33x () {
+        install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/.
+}
+
+do_install:append:ti43x () {
+        install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/.
+}
diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc
new file mode 100644
index 00000000..8081d021
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc
@@ -0,0 +1,19 @@
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
+
+BRANCH = "master"
+# This corresponds to version 02.02.01.00
+UIO_MODULE_DRV_SRCREV = "bda9260f2220840a60ec0fbc8011cbadf3cf1b91"
+
+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}"
+
+SRCREV = "${UIO_MODULE_DRV_SRCREV}"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST:ti-soc = "(.*)"
diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch b/meta-ti-bsp/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/meta-ti-bsp/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-anna@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-anna@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
+
diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv_git.bb b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv_git.bb
new file mode 100644
index 00000000..2bb1f0b3
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "User space IO (UIO) driver for on-chip modules"
+
+include uio-module-drv.inc
+
+FILESEXTRAPATHS:prepend:= "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch"
+
+# This package builds a kernel module, use kernel PR as base and append a local
+MACHINE_KERNEL_PR:append = "d"
+PR = "${MACHINE_KERNEL_PR}"
+
+module_auto_load_uio-module-drv = "uio-module-drv"
+
+inherit module
+
+do_install:append () {
+    install -d ${D}${includedir}
+    cp *.h ${D}${includedir}
+}
+
+KERNEL_MODULE_AUTOLOAD += "uio_module_drv"