Merge remote-tracking branch 'origin/rubi-test'

3ccd8975 · A. Hahn · cd0bd184 · 0434a533 · 3ccd8975
Commit 3ccd8975 authored Sep 15, 2023 by A. Hahn
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 1 deletion

wishbone.c pcie-wb/wishbone.c +25 -1

No files found.
--- a/pcie-wb/wishbone.c
+++ b/pcie-wb/wishbone.c
@@ -609,7 +609,31 @@ static int char_master_fasync(int fd, struct file *file, int on)
        return fasync_helper(fd, file, on, &context->fasync);
 }

-#if LINUX_VERSION_CODE > KERNEL_VERSION(4,1,0)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(5,19,0)
+/*
+ * Commit v5.19-10288-g3e20a751aff0, implementing read(2), removed
+ * initialization of iter->iov (and thus iter->nr_segs). Put it back.
+ * This is a hack, as I imagine there was a reason for the change (ARub).
+ */
+static ssize_t char_master_aio_read_iter(struct kiocb *iocb,
+					 struct iov_iter *iter)
+{
+	/* From new_sync_read before v5.19-10288-g3e20a751aff0 */
+	struct iovec iov = { .iov_base = iter->ubuf, .iov_len = iter->count };
+
+	return char_master_aio_read(iocb, &iov, 1, 0);
+}
+
+static ssize_t char_master_aio_write_iter(struct kiocb *iocb,
+					  struct iov_iter *iter)
+{
+	/* From new_sync_write before v5.19-10288-g3e20a751aff0 */
+	struct iovec iov = { .iov_base = iter->ubuf, .iov_len = iter->count };
+
+	return char_master_aio_write(iocb, &iov, 1, 0);
+}
+
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(4,1,0)

 static ssize_t char_master_aio_read_iter(struct kiocb *iocb, struct iov_iter *iter)
 {