Xilinx · MischaBaars · Feb 8, 2024 · Mar 15, 2024 · Mar 15, 2024
diff --git a/ChangeLog-2024.0.0 b/ChangeLog-2024.0.0
@@ -0,0 +1,8 @@
+Identifier Description
+
+2024011900 Modifications related to kernel 6.3.0
+2024011901 Modifications related to kernel 6.4.0 
+2024011902 Modifications related to unknown
+
+2024031500 Modifications related to Block Memory Generator (PG085) and AXI4 Memory Mapped Default Example Design (PG195)
+
diff --git a/QDMA/linux-kernel/driver/src/cdev.c b/QDMA/linux-kernel/driver/src/cdev.c
@@ -567,12 +567,20 @@ static ssize_t cdev_aio_read(struct kiocb *iocb, const struct iovec *io,
 #if KERNEL_VERSION(3, 16, 0) <= LINUX_VERSION_CODE
 static ssize_t cdev_write_iter(struct kiocb *iocb, struct iov_iter *io)
 {
-	return cdev_aio_write(iocb, io->iov, io->nr_segs, iocb->ki_pos);
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+	return cdev_aio_write(iocb, iter_iov(io), io->nr_segs, iocb->ki_pos);		// 2024011901: linux-6.4.0  - include/linux/uio.h line 72:73
+	#else
+	return cdev_aio_write(iocb, io->iov     , io->nr_segs, iocb->ki_pos);		// 2024011901: linux-6.3.13 - include/linux/uio.h line 54
+	#endif
 }
 
 static ssize_t cdev_read_iter(struct kiocb *iocb, struct iov_iter *io)
 {
-	return cdev_aio_read(iocb, io->iov, io->nr_segs, iocb->ki_pos);
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+	return cdev_aio_read (iocb, iter_iov(io), io->nr_segs, iocb->ki_pos);		// 2024011901: linux-6.4.0  - include/linux/uio.h line 72:73
+	#else
+	return cdev_aio_read (iocb, io->iov     , io->nr_segs, iocb->ki_pos);		// 2024011901: linux-6.3.13 - include/linux/uio.h line 54
+	#endif
 }
 #endif
 
@@ -780,7 +788,12 @@ int qdma_cdev_device_init(struct qdma_cdev_cb *xcb)
 
 int qdma_cdev_init(void)
 {
-	qdma_class = class_create(THIS_MODULE, QDMA_CDEV_CLASS_NAME);
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+	qdma_class = class_create(             QDMA_CDEV_CLASS_NAME);			// 2024011901: linux-6.4.0  - include/linux/device/class.h line 230
+	#else
+	qdma_class = class_create(THIS_MODULE, QDMA_CDEV_CLASS_NAME);			// 2024011901: linux-6.3.13 - include/linux/device/class.h line 260:277
+	#endif
+
 	if (IS_ERR(qdma_class)) {
 		pr_err("%s: failed to create class 0x%lx.",
 			QDMA_CDEV_CLASS_NAME, (unsigned long)qdma_class);

diff --git a/QDMA/linux-kernel/driver/src/cdev.h b/QDMA/linux-kernel/driver/src/cdev.h
@@ -90,7 +90,7 @@ struct qdma_cdev {
 	ssize_t (*fp_aiorw)(unsigned long dev_hndl, unsigned long qhndl,
 			unsigned long count, struct qdma_request **reqv);
 	/** name of the character device*/
-	char name[0];
+	char *name;									// 2024011902
 };
 
 /**

diff --git a/XDMA/linux-kernel/tests/scripts_mm/global.sh b/XDMA/linux-kernel/tests/scripts_mm/global.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+io_min_bit=6;			# 64 byte cacheline
+io_max_bit=12;			# log_2(('Port A Width' / 8) * 'Port A Depth') (Block Memory Generator (PG085) and AXI4 Memory Mapped Default Example Design (PG195))
diff --git a/XDMA/linux-kernel/tests/scripts_mm/io.sh b/XDMA/linux-kernel/tests/scripts_mm/io.sh
@@ -116,10 +116,10 @@ if [ "$data_check" -eq 0 ]; then
 	exit 0
 fi
 
-#md5sum $c2h_fname
-#md5sum $h2c_fname
-diff -q $c2h_fname $h2c_fname > /dev/null
-if [ "$?" -eq "1" ]; then
+readarray -d ' ' -t c2h_md5 <<< $(md5sum -b ${c2h_fname});
+readarray -d ' ' -t h2c_md5 <<< $(md5sum -b ${h2c_fname});
+
+if [[ ${c2h_md5[0]} != ${h2c_md5[0]} ]]; then
 	echo -e "\t$xid $h2cno:$c2hno: io $sz, addr $address, off $offset," \
 		"data integrity FAILED!."
 	exit 6

diff --git a/XDMA/linux-kernel/tests/scripts_mm/unaligned.sh b/XDMA/linux-kernel/tests/scripts_mm/unaligned.sh
@@ -1,16 +1,18 @@
 #!/bin/sh
 
+source ./global.sh;									# 2024031500
+
 ##########################
 #
 # preset test parameters:
 #
 ##########################
 # dma io size
-io_list="1 10 127 128 1021 1022 1023 1024 4095 4096 4097 4098 4099 8189 8190 8191 8192"
-io_max=8192
+io_list="";     for (( i=${io_min_bit};i<=${io_max_bit};i++ )); do io_list="${io_list} $((1<<${i}))"        ; done;
+io_max=$((1 << ${io_max_bit}));
 
 # offset
-offset_list="1 2 3 4 2045 2046 2047 2048 2049 4091 4092 4093 4094 4095"
+offset_list=""; for (( i=${io_min_bit};i<=${io_max_bit};i++ )); do offset_list="${offset_list} $((1<<${i}))"; done;
 
 # starting address
 address=0

diff --git a/XDMA/linux-kernel/tests/scripts_mm/xdma_mm.sh b/XDMA/linux-kernel/tests/scripts_mm/xdma_mm.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source ./global.sh;									# 2024031500
+
 ####################
 #
 # test settings
@@ -9,8 +11,8 @@ outdir="/tmp"
 driver_modes="0 4"		;# driver mode
 address=0
 offset=0
-io_min=64
-io_max=$((1 << 30))		;# 1GB
+io_min=$((1 << ${io_min_bit}));
+io_max=$((1 << ${io_max_bit}));
 delay=5				;# delay between each test
 
 fio_time=30

diff --git a/XDMA/linux-kernel/xdma/cdev_ctrl.c b/XDMA/linux-kernel/xdma/cdev_ctrl.c
@@ -233,7 +233,13 @@ int bridge_mmap(struct file *file, struct vm_area_struct *vma)
 	 * prevent touching the pages (byte access) for swap-in,
 	 * and prevent the pages from being swapped out
 	 */
-	vma->vm_flags |= VMEM_FLAGS;
+
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
+	vm_flags_set(vma, VMEM_FLAGS);							// 2024011900: linux-6.3.0  - include/linux/mm_types.h line 495:502
+	#else
+	vma->vm_flags |= VMEM_FLAGS;							// 2024011900: linux-6.2.16 - include/linux/mm_types.h line 549
+	#endif
+
 	/* make MMIO accessible to user space */
 	rv = io_remap_pfn_range(vma, vma->vm_start, phys >> PAGE_SHIFT,
 			vsize, vma->vm_page_prot);

diff --git a/XDMA/linux-kernel/xdma/cdev_sgdma.c b/XDMA/linux-kernel/xdma/cdev_sgdma.c
@@ -566,12 +566,20 @@ static ssize_t cdev_aio_read(struct kiocb *iocb, const struct iovec *io,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
 static ssize_t cdev_write_iter(struct kiocb *iocb, struct iov_iter *io)
 {
-	return cdev_aio_write(iocb, io->iov, io->nr_segs, io->iov_offset);
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+	return cdev_aio_write(iocb, iter_iov(io), io->nr_segs, io->iov_offset);		// 2024011901: linux-6.4.0  - include/linux/uio.h line 72:73
+	#else
+	return cdev_aio_write(iocb, io->iov     , io->nr_segs, io->iov_offset);		// 2024011901: linux-6.3.13 - include/linux/uio.h line 54
+	#endif
 }
 
 static ssize_t cdev_read_iter(struct kiocb *iocb, struct iov_iter *io)
 {
-	return cdev_aio_read(iocb, io->iov, io->nr_segs, io->iov_offset);
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+	return cdev_aio_read (iocb, iter_iov(io), io->nr_segs, io->iov_offset);		// 2024011901: linux-6.4.0  - include/linux/uio.h line 72:73
+	#else
+	return cdev_aio_read (iocb, io->iov     , io->nr_segs, io->iov_offset);		// 2024011901: linux-6.3.13 - include/linux/uio.h line 54
+	#endif
 }
 #endif
 

diff --git a/XDMA/linux-kernel/xdma/xdma_cdev.c b/XDMA/linux-kernel/xdma/xdma_cdev.c
@@ -603,7 +603,12 @@ int xpdev_create_interfaces(struct xdma_pci_dev *xpdev)
 
 int xdma_cdev_init(void)
 {
-	g_xdma_class = class_create(THIS_MODULE, XDMA_NODE_NAME);
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+	g_xdma_class = class_create(             XDMA_NODE_NAME);			// 2024011901: linux-6.4.0  - include/linux/device/class.h line 230
+	#else
+	g_xdma_class = class_create(THIS_MODULE, XDMA_NODE_NAME);			// 2024011901: linux-6.3.13 - include/linux/device/class.h line 260:277
+	#endif
+
 	if (IS_ERR(g_xdma_class)) {
 		dbg_init(XDMA_NODE_NAME ": failed to create class");
 		return -EINVAL;

diff --git a/XVSEC/linux-kernel/drv/xvsec_drv.c b/XVSEC/linux-kernel/drv/xvsec_drv.c
@@ -456,7 +456,12 @@ static int __init xvsec_drv_init(void)
 	if (dev_count == 0)
 		return 0;
 
-	g_xvsec_class = class_create(THIS_MODULE, XVSEC_NODE_NAME);
+	#if	(LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+	g_xvsec_class = class_create(             XVSEC_NODE_NAME);			// 2024011901: linux-6.4.0  - include/linux/device/class.h line 230
+	#else
+	g_xvsec_class = class_create(THIS_MODULE, XVSEC_NODE_NAME);			// 2024011901: linux-6.3.13 - include/linux/device/class.h line 260:277
+	#endif
+
 	if (IS_ERR(g_xvsec_class)) {
 		pr_err("failed to create class");
 		ret = -(PTR_ERR(g_xvsec_class));