Merge pull request #7 from sy-c/master

PDA v11.9.7

Author: sy-c

VERSION

@@ -1 +1 @@
-11.8.7
+11.9.7

patches/linux_uio/debian/changelog

@@ -1,3 +1,9 @@
+pda-kernel-dkms (0.12.0-1) noble; urgency=medium
+
+  * Bugfix: avoid scheduling while atomic
+
+ -- Dirk Hutter <[email protected]>  Fri, 07 Feb 2025 11:23:28 +0100
+
 pda-kernel-dkms (0.11.0-1) noble; urgency=medium
 
   * Bugfix: correctly initialize kernel memory

patches/linux_uio/dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME="uio_pci_dma"
-PACKAGE_VERSION="0.11.0"
+PACKAGE_VERSION="0.12.0"
 BUILT_MODULE_NAME[0]="uio_pci_dma"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/uio/"
 AUTOINSTALL="yes"

patches/linux_uio/make-pda-kadapter-dkms-rpm.sh

@@ -5,12 +5,15 @@
 # [email protected]
 
 
-# This is pda GIT tag from https://github.com/cbm-fles/pda
-GIT_TAG=11.8.7
+# This is pda GIT tag from upstream repository
+GIT_REPO=https://github.com/cbm-fles/pda
+GIT_TAG=11.9.7
+# This is the branch name to take from, if not using the tag. Leave blank to use tag.
+GIT_BRANCH=bug_sched_atomic
 
 # This is the base name and version for this dkms package
 PKG_NAME=pda-kadapter-dkms
-PKG_VERSION=2.1.3
+PKG_VERSION=2.1.4
 
 # local build directory
 TMPDIR=/tmp/rpm
@@ -47,11 +50,14 @@ mkdir -p ${TMPDIR}/SOURCES ${TMPDIR}/SPECS ${TMPDIR}/BUILD ${TMPDIR}/RPMS ${TMPD
 # get source code from upstream
 echo "Generating source tarball ${TMPDIR}/SOURCES/${PKG_DIR}.src.tar.gz"
 cd ${WDIR}
-git clone https://github.com/cbm-fles/pda.git -c advice.detachedHead=false
+git clone ${GIT_REPO} -c advice.detachedHead=false
 cd pda
 git fetch
-#git checkout -b fix_sysfs_attr origin/fix_sysfs_attr
-git checkout tags/${GIT_TAG}
+if [ "$GIT_BRANCH" != "" ]; then
+  git checkout -b ${GIT_BRANCH} origin/${GIT_BRANCH}
+else
+  git checkout tags/${GIT_TAG}
+fi
 cd patches/linux_uio
 
 # update source code with local files, if present
@@ -90,25 +96,33 @@ rm -f ${TMPDIR}/SPECS/${SPECFILE}
 
 echo "%define version ${VERSION}" >> ${TMPDIR}/SPECS/${SPECFILE}
 echo "%define module ${PKG_NAME}" >> ${TMPDIR}/SPECS/${SPECFILE}
+echo "URL: ${GIT_REPO}" >> ${TMPDIR}/SPECS/${SPECFILE}
 
 echo '
 Summary: PDA kernel adapter DKMS package
 Name: %{module}
 Version: %{version}
 Release: 0
 License: BSD
-URL: https://github.com/cbm-fles/pda/
 Packager: Sylvain Chapeland <[email protected]>
 Group: System Environment/Kernel
 BuildArch: noarch
-Requires: dkms >= 1.00, kernel-devel, kernel-headers
+Requires: dkms >= 1.00, kernel-devel, kernel-headers, kernel-modules
 Requires: bash
 Source0: %{module}-%{version}.src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root/
 
 %description
-This package contains the PDA kernel adapter wrapped for the DKMS framework.
+This package contains the PDA kernel adapter wrapped for the DKMS framework.'\
+ >> ${TMPDIR}/SPECS/${SPECFILE}
+
+if [ "$GIT_BRANCH" != "" ]; then
+  echo "Built from repository ${GIT_REPO} branch ${GIT_BRANCH}" >> ${TMPDIR}/SPECS/${SPECFILE}
+else
+  echo "Built from repository ${GIT_REPO} tag ${GIT_TAG}" >> ${TMPDIR}/SPECS/${SPECFILE}
+fi
 
+echo '
 %prep
 %setup
 

patches/linux_uio/uio_pci_dma.c

@@ -71,7 +71,8 @@ struct uio_pci_dma_device
     bool                  msi_enabled;
 };
 
-spinlock_t alloc_free_lock;
+DEFINE_MUTEX(alloc_free_lock);
+
 static inline int
 uio_pci_dma_allocate_kernel_memory(struct uio_pci_dma_private *priv);
 
@@ -255,7 +256,7 @@ probe
     struct kset               *kset;
     bool                       msi_enabled = false;
 
-    spin_lock_init(&alloc_free_lock);
+    mutex_init(&alloc_free_lock);
 
     /* attr_bin_request */
     BIN_ATTR_PDA(request, sizeof(struct uio_pci_dma_private), S_IWUSR | S_IWGRP,
@@ -525,7 +526,7 @@ BIN_ATTR_WRITE_CALLBACK( request_buffer_write )
     if(count != sizeof(struct uio_pci_dma_private) )
     { UIO_PDA_ERROR("Invalid size of request struct -> aborting!\n", exit); }
 
-    spin_lock(&alloc_free_lock);
+    mutex_lock(&alloc_free_lock);
 
     UIO_DEBUG_PRINTF("MB = %zu are requested\n", (request->size/MB_SIZE) );
 
@@ -589,7 +590,7 @@ BIN_ATTR_WRITE_CALLBACK( request_buffer_write )
 
     kobject_uevent(&priv->kobj, KOBJ_ADD);
 
-    spin_unlock(&alloc_free_lock);
+    mutex_unlock(&alloc_free_lock);
 
     UIO_DEBUG_RETURN(sizeof(struct uio_pci_dma_private));
 
@@ -616,7 +617,7 @@ BIN_ATTR_WRITE_CALLBACK( request_buffer_write )
         priv = NULL;
     }
 
-    spin_unlock(&alloc_free_lock);
+    mutex_unlock(&alloc_free_lock);
 
     UIO_DEBUG_RETURN(-1);
 }
@@ -970,7 +971,7 @@ BIN_ATTR_WRITE_CALLBACK( delete_buffer_write )
 {
     UIO_DEBUG_ENTER();
 
-    spin_lock(&alloc_free_lock);
+    mutex_lock(&alloc_free_lock);
 
     struct bin_attribute attrib;
     char                 tmp_string[UIO_PCI_DMA_BUFFER_NAME_SIZE];
@@ -994,7 +995,7 @@ BIN_ATTR_WRITE_CALLBACK( delete_buffer_write )
     else
     { printk(DRIVER_NAME " : freeing of buffer %s failed!\n", tmp_string); }
 
-    spin_unlock(&alloc_free_lock);
+    mutex_unlock(&alloc_free_lock);
 
     UIO_DEBUG_RETURN(count);
 }

patches/linux_uio/uio_pci_dma.h

@@ -48,7 +48,7 @@
 #define LINUX_VERSION_CODE KERNEL_VERSION(2,6,35)
 */
 
-#define UIO_PCI_DMA_VERSION "0.11.0"
+#define UIO_PCI_DMA_VERSION "0.12.0"
 #define UIO_PCI_DMA_MINOR   "0"
 
 #define UIO_PCI_DMA_SUCCESS 0