autu: Update to 6.10.0.1-3

3 files changed, 103 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c62977f3dcbf..0e655a0bf3ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = trueport
 	pkgdesc = tty driver for Perle IOLan+ DS TS SDS STS SCS JetStream LanStream LinkStream and 3rd party serial console terminal device servers
 	pkgver = 6.10.0.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.perle.com/
 	install = trueport-install.sh
 	arch = i686
@@ -29,15 +29,18 @@ pkgbase = trueport
 	source = 0000-tty_unregister_driver-void.patch
 	source = 0001-kernel-5.13-dropped-tty_check_change.patch
 	source = 0002-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch
+	source = 0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
 	md5sums = 5a529676de30706133255ba4e8dae5b0
 	md5sums = 56444e2f404aa2e6a2c9e8e2bd919fcf
 	md5sums = fb798f306553cb253b30ff5af5ba2f40
 	md5sums = a103f2791c03733b1fd75493864fb464
 	md5sums = 5206e863cf6340c05325d86935d4b40c
+	md5sums = f464a0217b85a76657bcb7aa022f9a95
 	sha256sums = c21340a7523593da3e229b79cfbcf9e656772b2039e972dbca3947d138d55ffa
 	sha256sums = 28863731fd99e447dc456312ef33e40f93623b56da0d345e45f40e238ca49639
 	sha256sums = 5f806246751d3a91c59bd97273221d1066006bafc7ed598c3d93f9b7bdae65a1
 	sha256sums = 88181bc7a0a5fa5a1320cbed20e02e1329b03b4c9800fc691990754b9a9aac18
 	sha256sums = ee64f971753fb4fd8a488e32e8fe3de9c468a00a1d1b995329bcfe87c93cedf7
+	sha256sums = 04025f2dc6fe868e890853e355d1d31fff6d3c463ad89db1cedda5f3843078a3
 
 pkgname = trueport
diff --git a/0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch b/0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
new file mode 100644
index 000000000000..2310db6c0aa8
--- /dev/null
+++ b/0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
@@ -0,0 +1,87 @@
+diff -pNaru5 trueport-6.10.0.orig/ptyx/ptymod.c trueport-6.10.0/ptyx/ptymod.c
+--- trueport-6.10.0.orig/ptyx/ptymod.c	2021-11-20 15:21:35.364409568 -0500
++++ trueport-6.10.0/ptyx/ptymod.c	2021-11-20 15:24:01.845050085 -0500
+@@ -284,28 +284,28 @@ static int __init ptyx_init(void)
+ 		printk("ptyx module input paramater max_installed_ports=%d is invalid \n", max_installed_ports);
+ 		retval = -EINVAL;
+ 		goto init_out;
+ 	}
+ 	
+-	ptyx_master_driver = alloc_tty_driver(max_installed_ports);
+-	if (!ptyx_master_driver)
++	ptyx_master_driver = tty_alloc_driver(max_installed_ports,0);
++	if (IS_ERR(ptyx_master_driver))
+ 	{
+ 		printk("Couldn't allocate ptyx master driver \n");
+ 		retval = -ENOMEM;
+ 		goto init_out;
+ 	}
+ 	
+-	ptyx_slave_driver = alloc_tty_driver(max_installed_ports);
+-	if (!ptyx_slave_driver)
++	ptyx_slave_driver = tty_alloc_driver(max_installed_ports,0);
++	if (IS_ERR(ptyx_slave_driver))
+ 	{
+ 		printk("Couldn't allocate ptyx slave driver \n");
+ 		retval = -ENOMEM;
+ 		goto init_out;
+ 	}
+ 
+-	ptyx_control_driver = alloc_tty_driver(max_installed_ports);
+-	if (!ptyx_control_driver)
++	ptyx_control_driver = tty_alloc_driver(max_installed_ports,0);
++	if (IS_ERR(ptyx_control_driver))
+ 	{
+ 		printk("Couldn't allocate ptyx ctrl status driver \n");
+ 		retval = -ENOMEM;
+ 		goto init_out;
+ 	}
+@@ -401,24 +401,24 @@ static int __init ptyx_init(void)
+ 	ptyx_control_driver->driver_state = pty_state_table;		// global pointer ot private data
+ 	tty_set_operations(ptyx_control_driver, &ptyx_ops_control);
+ 
+ 	if ( (retval = tty_register_driver(ptyx_control_driver)) < 0 )
+ 	{
+- 		put_tty_driver(ptyx_control_driver);
++ 		tty_driver_kref_put(ptyx_control_driver);
+ 		printk("Couldn't register ptyx control status driver, retval=%d3 \n", retval);
+ 	}
+ 
+ 	if ( (retval = tty_register_driver(ptyx_slave_driver)) < 0 )
+ 	{
+-		put_tty_driver(ptyx_slave_driver);
++		tty_driver_kref_put(ptyx_slave_driver);
+ 		printk("Couldn't register ptyx slave driver, retval=%d \n", retval);
+ 		goto init_out;
+ 	}
+ 
+ 	if ( (retval = tty_register_driver(ptyx_master_driver)) < 0 )
+ 	{
+- 		put_tty_driver(ptyx_slave_driver);
++ 		tty_driver_kref_put(ptyx_slave_driver);
+ 		printk("Couldn't register ptyx master driver, retval=%d \n", retval);
+ 	}
+ 
+ init_out:
+  
+@@ -430,17 +430,17 @@ static void __exit ptyx_finish(void)
+ 	int i;
+ 	
+ 	ptyx_print(PTYX_DEBUG_MISC, ("ptyx_finish(): unregistering driver \n"));
+ 
+ 	tty_unregister_driver(ptyx_master_driver);
+-	put_tty_driver(ptyx_master_driver);
++	tty_driver_kref_put(ptyx_master_driver);
+ 
+ 	tty_unregister_driver(ptyx_slave_driver);
+-	put_tty_driver(ptyx_slave_driver);
++	tty_driver_kref_put(ptyx_slave_driver);
+ 
+ 	tty_unregister_driver(ptyx_control_driver);
+-	put_tty_driver(ptyx_control_driver);
++	tty_driver_kref_put(ptyx_control_driver);
+ 	
+ 	if (pty_state_table)
+ 	{
+ 	 	for (i = 0; i < max_installed_ports; i++)
+ 		{
diff --git a/PKGBUILD b/PKGBUILD
index d56824c8e201..9c76c81083a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -97,7 +97,7 @@ _dlver='6.10.0-1'
 pkgver="${_dlver//-/.}"
 #_dlver='6.8.0-2' # only use this with a version change patch set
 _srcdir="${pkgname}-${_dlver%%-*}"
-pkgrel='2'
+pkgrel='3'
 pkgdesc='tty driver for Perle IOLan+ DS TS SDS STS SCS JetStream LanStream LinkStream and 3rd party serial console terminal device servers'
 _pkgdescshort='Perle TruePort driver for Ethernet serial servers'
 arch=('i686' 'x86_64')
@@ -124,17 +124,20 @@ source=(
   '0000-tty_unregister_driver-void.patch'
   '0001-kernel-5.13-dropped-tty_check_change.patch'
   '0002-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch'
+  '0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
 )
 md5sums=('5a529676de30706133255ba4e8dae5b0'
          '56444e2f404aa2e6a2c9e8e2bd919fcf'
          'fb798f306553cb253b30ff5af5ba2f40'
          'a103f2791c03733b1fd75493864fb464'
-         '5206e863cf6340c05325d86935d4b40c')
+         '5206e863cf6340c05325d86935d4b40c'
+         'f464a0217b85a76657bcb7aa022f9a95')
 sha256sums=('c21340a7523593da3e229b79cfbcf9e656772b2039e972dbca3947d138d55ffa'
             '28863731fd99e447dc456312ef33e40f93623b56da0d345e45f40e238ca49639'
             '5f806246751d3a91c59bd97273221d1066006bafc7ed598c3d93f9b7bdae65a1'
             '88181bc7a0a5fa5a1320cbed20e02e1329b03b4c9800fc691990754b9a9aac18'
-            'ee64f971753fb4fd8a488e32e8fe3de9c468a00a1d1b995329bcfe87c93cedf7')
+            'ee64f971753fb4fd8a488e32e8fe3de9c468a00a1d1b995329bcfe87c93cedf7'
+            '04025f2dc6fe868e890853e355d1d31fff6d3c463ad89db1cedda5f3843078a3')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -168,6 +171,12 @@ prepare() {
   # diff -pNaru5 trueport-6.10.0{.orig,} > '0002-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch'
   patch -Nup1 -i "${srcdir}/0002-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch"
 
+  # http://lkml.iu.edu/hypermail/linux/kernel/2107.2/08799.html [PATCH 5/8] tty: drop alloc_tty_driver
+  # http://lkml.iu.edu/hypermail/linux/kernel/2107.2/08801.html [PATCH 7/8] tty: drop put_tty_driver
+  #cd ..; cp -pr trueport-6.10.0{,.orig}; false
+  # diff -pNaru5 trueport-6.10.0{.orig,} > '0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
+  patch -Nup1 -i "${srcdir}/0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch"
+
   # insert parameters and make install script non interactive.
   set +u; msg2 'Checking SSL with rpm_build'; set -u
   sed -e 's:^\(DONE\)=.*$:'"\1='done';SSL='${_opt_SSL}':g" \