summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO17
-rw-r--r--0004-kernel-6.2-class-const-devnode.patch16
-rw-r--r--0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch19
-rw-r--r--PKGBUILD56
4 files changed, 87 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 785a2cad7893..ef0fe750bc25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = asix-ax99100
pkgdesc = kernel module driver for Asix serial RS-232 port
- pkgver = 1.8.0
- pkgrel = 2
+ pkgver = 1.9.0
+ pkgrel = 1
url = https://www.asix.com.tw/
install = asix-ax99100-install.sh
arch = i686
@@ -15,20 +15,27 @@ pkgbase = asix-ax99100
depends = linux
depends = dkms
depends = linux-headers
- source = AX99100_SP_PP_SPI_Linux_Driver_v1.8.0_Source.tar.bz2::https://www.asix.com.tw/en/support/download/file/1229
+ noextract = AX99100_SP_PP_SPI_Linux_Driver_v1.9.0_Source.tar.bz2
+ source = AX99100_SP_PP_SPI_Linux_Driver_v1.9.0_Source.tar.bz2::https://www.asix.com.tw/en/support/download/file/1484
source = 0000-ax99100_sp.c-ch.patch
source = 0001-kernel.5.12.MODULE_SUPPORTED_DEVICE.patch
source = 0002-kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
source = 0003-kernel-6.0-set_termios-const-ktermios.patch
- md5sums = eb1f8c5e347b308702a9082c79bd469b
+ source = 0004-kernel-6.2-class-const-devnode.patch
+ source = 0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch
+ md5sums = 470e66014d444276bd228e27f44fc7b5
md5sums = e992800dddd65a174ac531448e3f1498
md5sums = ab3d71682ad549eb51ae8a13aa90efc5
md5sums = 8bf51364274f661b3f88fafb23b61f87
md5sums = e3ae65a199f4bdc7153fb73f60fd9ea0
- sha256sums = d4eda7e48f335e670c6f5286d744dcf111aaa7304dc921ac89089cf253e5cf1d
+ md5sums = 3827ba41339a6ad65089287df11a5726
+ md5sums = 211906a3d015a4c16f6ec52d0e5f3b23
+ sha256sums = 9855e6e7e3775e5849220bc12fbc0c00120016cee123f6200f31b03251959559
sha256sums = 158c5a5118e9f7b109276c0639e507ad0471468cef18ebc0a1103bdf96cd2d36
sha256sums = 86b91328ed6b596aaa441aea448e6f7fb833a447483b44e869cfbf8286810e54
sha256sums = be4b1bf9b404b6704002e6d6866af42bb69bda487f5ad063e575a374192969d5
sha256sums = 58cf6c6dee888be410ba208e694199548093632a5a7dc0feaec08b3ca3cffc1b
+ sha256sums = 5caab8b025c64e55e92c2ff0750ec8fa7bec5d3b80c4743f1c218bc90f933211
+ sha256sums = 9fbec377d027e64185a58d450e319956a4b26cb74ac8f971eb4c6dc61e4316a1
pkgname = asix-ax99100
diff --git a/0004-kernel-6.2-class-const-devnode.patch b/0004-kernel-6.2-class-const-devnode.patch
new file mode 100644
index 000000000000..095c7c4a0c90
--- /dev/null
+++ b/0004-kernel-6.2-class-const-devnode.patch
@@ -0,0 +1,16 @@
+diff -pNaru5 a/ax99100_spi.c b/ax99100_spi.c
+--- a/ax99100_spi.c 2023-08-07 06:01:06.000000000 -0400
++++ b/ax99100_spi.c 2023-12-18 02:01:25.237345326 -0500
+@@ -74,11 +74,11 @@ KERN_INFO "ASIX AX99100 PCIe Bridge to S
+ int spi_suspend_count;
+ #define NUM_DEVICE 16
+ static unsigned int spi_major = 241;
+ static unsigned int spi_min_count = 0;
+ /* device Class */
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)
+ static char *ax_devnode(struct device *dev, umode_t *mode)
+ #else
+ static char *ax_devnode(const struct device *dev, umode_t *mode)
+ #endif
+ {
diff --git a/0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch b/0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch
new file mode 100644
index 000000000000..c79a16ff26ee
--- /dev/null
+++ b/0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch
@@ -0,0 +1,19 @@
+diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c
+--- a/ax99100_sp.c 2023-08-07 06:18:10.000000000 -0400
++++ b/ax99100_sp.c 2023-12-18 02:09:56.226262255 -0500
+@@ -2692,11 +2692,15 @@ static void serial99100_dma_tx_tasklet (
+ }
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ static DECLARE_MUTEX(serial99100_sem);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
+ static DEFINE_SEMAPHORE(serial99100_sem);
++#else
++static DEFINE_SEMAPHORE(serial99100_sem,1);
++#endif
+ #endif
+
+ static struct uart_driver starex_serial_driver = {
+ .owner = THIS_MODULE,
+ .driver_name = "AX99100",
diff --git a/PKGBUILD b/PKGBUILD
index a7809d665840..8b2250610deb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,9 @@ set -u
pkgname="asix-${_modulename,,}"
#pkgver='1.6.0'; _dl='529'
#pkgver='1.7.0'; _dl='1162'
-pkgver='1.8.0'; _dl='1229'
-pkgrel='2'
+#pkgver='1.8.0'; _dl='1229'
+pkgver='1.9.0'; _dl='1484'
+pkgrel='1'
pkgdesc='kernel module driver for Asix serial RS-232 port'
arch=('i686' 'x86_64')
url='https://www.asix.com.tw/'
@@ -38,17 +39,24 @@ source+=(
'0001-kernel.5.12.MODULE_SUPPORTED_DEVICE.patch'
'0002-kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch'
'0003-kernel-6.0-set_termios-const-ktermios.patch'
+ '0004-kernel-6.2-class-const-devnode.patch'
+ '0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch'
)
-md5sums=('eb1f8c5e347b308702a9082c79bd469b'
+md5sums=('470e66014d444276bd228e27f44fc7b5'
'e992800dddd65a174ac531448e3f1498'
'ab3d71682ad549eb51ae8a13aa90efc5'
'8bf51364274f661b3f88fafb23b61f87'
- 'e3ae65a199f4bdc7153fb73f60fd9ea0')
-sha256sums=('d4eda7e48f335e670c6f5286d744dcf111aaa7304dc921ac89089cf253e5cf1d'
+ 'e3ae65a199f4bdc7153fb73f60fd9ea0'
+ '3827ba41339a6ad65089287df11a5726'
+ '211906a3d015a4c16f6ec52d0e5f3b23')
+sha256sums=('9855e6e7e3775e5849220bc12fbc0c00120016cee123f6200f31b03251959559'
'158c5a5118e9f7b109276c0639e507ad0471468cef18ebc0a1103bdf96cd2d36'
'86b91328ed6b596aaa441aea448e6f7fb833a447483b44e869cfbf8286810e54'
'be4b1bf9b404b6704002e6d6866af42bb69bda487f5ad063e575a374192969d5'
- '58cf6c6dee888be410ba208e694199548093632a5a7dc0feaec08b3ca3cffc1b')
+ '58cf6c6dee888be410ba208e694199548093632a5a7dc0feaec08b3ca3cffc1b'
+ '5caab8b025c64e55e92c2ff0750ec8fa7bec5d3b80c4743f1c218bc90f933211'
+ '9fbec377d027e64185a58d450e319956a4b26cb74ac8f971eb4c6dc61e4316a1')
+noextract=("${source[0]%%:*}")
if [ "${_opt_DKMS}" -ne 0 ]; then
depends+=('linux' 'dkms' 'linux-headers')
@@ -75,14 +83,18 @@ _install_check() {
prepare() {
set -u
_install_check
+ if [ ! -d "${_srcdir}" ]; then
+ mkdir "${_srcdir}"
+ bsdtar -C "${_srcdir}" -xf "${_srcdir}.tar.bz2"
+ fi
cd "${_srcdir}"
rm -rf '.git'
- rm 'ax99100' # Current kernels automatically load the driver
+ rm -f 'ax99100' # Current kernels automatically load the driver
- sed -e 's:\r$::g' -i $(grep -l $'\r$' *)
+ #sed -e 's:\r$::g' -i $(grep -l $'\r$' *)
- if [ "$(vercmp "${pkgver}" '1.7.0')" -ne 0 ]; then
+ if [ "$(vercmp "${pkgver}" '1.7.0')" -ne 0 ] && [ "$(vercmp "${pkgver}" '1.8.0')" -lt 0 ]; then
# diff -pNau5 ax99100_sp.c{.orig,} > '0000-ax99100_sp.c-ch.patch'
patch -Nup0 -i "${srcdir}/0000-ax99100_sp.c-ch.patch"
fi
@@ -92,14 +104,26 @@ prepare() {
patch -Nup0 -i "${srcdir}/0001-kernel.5.12.MODULE_SUPPORTED_DEVICE.patch"
fi
- #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
- # diff -pNaru5 'a' 'b' > '0002-kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch'
- patch -Nup1 -i "${srcdir}/0002-kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch"
+ if [ "$(vercmp "${pkgver}" '1.9.0')" -lt 0 ]; then
+ #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
+ # diff -pNaru5 'a' 'b' > '0002-kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch'
+ patch -Nup1 -i "${srcdir}/0002-kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch"
+ fi
+
+ if [ "$(vercmp "${pkgver}" '1.9.0')" -lt 0 ]; then
+ # https://lore.kernel.org/linux-arm-kernel/20220816115739.10928-9-ilpo.jarvinen@linux.intel.com/T/
+ #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
+ # diff -pNaru5 'a' 'b' > '0003-kernel-6.0-set_termios-const-ktermios.patch'
+ patch -Nup1 -i "${srcdir}/0003-kernel-6.0-set_termios-const-ktermios.patch"
+ fi
+
+ #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
+ # diff -pNaru5 'a' 'b' > '0004-kernel-6.2-class-const-devnode.patch'
+ patch -Nup1 -i "${srcdir}/0004-kernel-6.2-class-const-devnode.patch"
- # https://lore.kernel.org/linux-arm-kernel/20220816115739.10928-9-ilpo.jarvinen@linux.intel.com/T/
- #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
- # diff -pNaru5 'a' 'b' > '0003-kernel-6.0-set_termios-const-ktermios.patch'
- patch -Nup1 -i "${srcdir}/0003-kernel-6.0-set_termios-const-ktermios.patch"
+ #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
+ # diff -pNaru5 'a' 'b' > '0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch'
+ patch -Nup1 -i "${srcdir}/0005-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch"
# Make package and DKMS compatible
# cp -p 'Makefile' 'Makefile.Arch'