gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #212634 from blitz/ax99100

Browse Source 
linuxPackages.ax99100: fix build on newer kernels
This commit is contained in:
Jacek Galowicz
2023-01-26 15:12:36 +01:00
committed by GitHub
parent a29ecae5e2 7e9f022808
commit 3e090d53d4
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/ax99100/default.nix
+26 -5
View File
@@ -1,15 +1,35 @@
{ kernel, stdenv, kmod, lib, fetchzip }:
{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }:
stdenv.mkDerivation
{
pname = "ax99100";
version = "1.8.0";
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
nativeBuildInputs = [ dos2unix kmod ] ++ kernel.moduleBuildDependencies;
src = fetchzip {
url = "https://www.asix.com.tw/en/support/download/file/1229";
sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh";
extension = "tar.bz2";
};
prePatch = ''
# The sources come with Windows file endings and that makes
# applying patches hard without first fixing the line endings.
dos2unix *.c *.h
'';
# The patches are adapted from: https://aur.archlinux.org/packages/asix-ax99100
#
# We included them here instead of fetching them, because of line
# ending issues that are easier to fix manually. Also the
# set_termios patch needs to be applied for 6.1 not for 6.0.
patches = [
./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
./kernel-6.1-set_termios-const-ktermios.patch
];
patchFlags = [ "-p0" ];
makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ];
installPhase = ''
@@ -18,12 +38,13 @@ stdenv.mkDerivation
'';
meta = {
description = "ASIX AX99100 Serial and Parralel Port driver";
description = "ASIX AX99100 Serial and Parallel Port driver";
homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100";
# According to the source code in the tarball, the license is gpl2.
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
# currently, the build fails with kernels newer than 5.17
broken = lib.versionAtLeast kernel.version "5.18.0";
# Older Linux versions need more patches to work.
broken = lib.versionOlder kernel.version "5.4.0";
};
}
pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch
+14
View File
@@ -0,0 +1,14 @@
diff -pNaru5 a/ax99100_sp.h b/ax99100_sp.h
--- ax99100_sp.h 2022-06-07 16:55:26.621034945 -0400
+++ ax99100_sp.h 2022-06-07 16:58:32.488989767 -0400
@@ -255,5 +255,10 @@ struct custom_eeprom {
#define _INLINE_
#endif
#define DEFAULT99100_BAUD 115200
#endif
+
+/* #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) */
+#define pci_alloc_consistent(hwdev,size,dma_handle) dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC)
+#define pci_free_consistent(hwdev,size,vaddr,dma_handle) dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle)
+/* #endif */
pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch
+18
View File
@@ -0,0 +1,18 @@
diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c
--- ax99100_sp.c 2023-01-02 23:44:46.707423858 -0500
+++ ax99100_sp.c 2023-01-02 23:44:27.171293092 -0500
@@ -1915,11 +1915,13 @@ static unsigned int serial99100_get_divi
DEBUG("In %s quot=%u----baud=%u-----------------------------END\n",__FUNCTION__,quot,baud);
return quot;
}
//This is a port ops function to set the terminal settings.
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
+static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, const struct ktermios *old)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old)
#else
static void serial99100_set_termios(struct uart_port *port, struct termios *termios, struct termios *old)
#endif
{