From 6ad16e7e67d0abe6f4083d7a2184ee3fa0ff2c4d Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Fri, 9 Apr 2021 12:22:52 +0200
Subject: [PATCH] Added kernel-specific handling for init_timer/setup_timer and
 access_ok() for ec_tty module and example. Closes #2.

---
 examples/tty/tty.c |  8 ++++++++
 tty/module.c       | 40 +++++++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/examples/tty/tty.c b/examples/tty/tty.c
index 8e565e76..d5af9a78 100644
--- a/examples/tty/tty.c
+++ b/examples/tty/tty.c
@@ -116,7 +116,11 @@ void check_master_state(void)
 
 /*****************************************************************************/
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+void cyclic_task(struct timer_list *t)
+#else
 void cyclic_task(unsigned long data)
+#endif
 {
     // receive process data
     down(&master_sem);
@@ -214,8 +218,12 @@ int __init init_mini_module(void)
     domain1_pd = ecrt_domain_data(domain1);
 
     printk(KERN_INFO PFX "Starting cyclic sample thread.\n");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+    timer_setup(&timer, cyclic_task, 0);
+#else
     init_timer(&timer);
     timer.function = cyclic_task;
+#endif
     timer.expires = jiffies + 10;
     add_timer(&timer);
 
diff --git a/tty/module.c b/tty/module.c
index 48058a9d..620e1d80 100644
--- a/tty/module.c
+++ b/tty/module.c
@@ -67,7 +67,11 @@ static struct tty_driver *tty_driver = NULL;
 ec_tty_t *ttys[EC_TTY_MAX_DEVICES];
 struct semaphore tty_sem;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+void ec_tty_wakeup(struct timer_list *);
+#else
 void ec_tty_wakeup(unsigned long);
+#endif
 
 /*****************************************************************************/
 
@@ -200,7 +204,13 @@ int ec_tty_init(ec_tty_t *t, int minor,
     t->wakeup = 0;
     t->rx_read_idx = 0;
     t->rx_write_idx = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+    timer_setup(&t->timer, ec_tty_wakeup, 0);
+#else
     init_timer(&t->timer);
+    t->timer.function = ec_tty_wakeup;
+    t->timer.data = (unsigned long) t;
+#endif
     t->tty = NULL;
     t->open_count = 0;
     sema_init(&t->sem, 1);
@@ -237,8 +247,6 @@ int ec_tty_init(ec_tty_t *t, int minor,
         return ret;
     }
 
-    t->timer.function = ec_tty_wakeup;
-    t->timer.data = (unsigned long) t;
     t->timer.expires = jiffies + 10;
     add_timer(&t->timer);
     return 0;
@@ -317,9 +325,17 @@ int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data)
 
 /** Timer function.
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+void ec_tty_wakeup(struct timer_list *t)
+#else
 void ec_tty_wakeup(unsigned long data)
+#endif
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+    ec_tty_t *tty = from_timer(tty, t, timer);
+#else
     ec_tty_t *tty = (ec_tty_t *) data;
+#endif
     size_t to_recv;
 
     /* Wake up any process waiting to send data */
@@ -344,8 +360,8 @@ void ec_tty_wakeup(unsigned long data)
 #endif
 
         if (space < to_recv) {
-            printk(KERN_WARNING PFX "Insufficient space to_recv=%d space=%d\n",
-                    to_recv, space);
+            printk(KERN_WARNING PFX "Insufficient space to_recv=%zu"
+                    " space=%d\n", to_recv, space);
         }
 
         if (space < 0) {
@@ -566,8 +582,14 @@ static int ec_tty_ioctl(struct tty_struct *tty,
 
     switch (cmd) {
         case TIOCGSERIAL:
-            if (access_ok(VERIFY_WRITE,
-                        (void *) arg, sizeof(struct serial_struct))) {
+            if (
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
+            access_ok((void *) arg, sizeof(struct serial_struct))
+#else
+            access_ok(VERIFY_WRITE,
+                        (void *) arg, sizeof(struct serial_struct))
+#endif
+                    ) {
                 ret = ec_tty_get_serial_info(t, (struct serial_struct *) arg);
             } else {
                 ret = -EFAULT;
@@ -761,7 +783,7 @@ void ectty_free(ec_tty_t *tty)
 
 unsigned int ectty_tx_data(ec_tty_t *tty, uint8_t *buffer, size_t size)
 {
-    unsigned int data_size = min(ec_tty_tx_size(tty), size), i;
+    unsigned int data_size = min(ec_tty_tx_size(tty), (unsigned int) size), i;
 
     if (data_size)  {
 #if EC_TTY_DEBUG >= 1
@@ -794,10 +816,10 @@ void ectty_rx_data(ec_tty_t *tty, const uint8_t *buffer, size_t size)
         printk(KERN_INFO PFX "Received %u bytes.\n", size);
 #endif
 
-        to_recv = min(ec_tty_rx_space(tty), size);
+        to_recv = min(ec_tty_rx_space(tty), (unsigned int) size);
 
         if (to_recv < size) {
-            printk(KERN_WARNING PFX "Dropping %u bytes.\n", size - to_recv);
+            printk(KERN_WARNING PFX "Dropping %zu bytes.\n", size - to_recv);
         }
 
         for (i = 0; i < size; i++) {