jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

broadcom-wl-dkms: fix license and distfiles, kernel 5.6 patch

Browse source
This commit is contained in:
Nafis 2020-04-17 09:16:23 +06:00 committed by Helmut Pozimski
parent 0d1c197d78
commit 0c96f2e4f2
2 changed files with 62 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch Normal file
View file

@ -0,0 +1,55 @@
diff --git src/shared/linux_osl.c src/shared/linux_osl.c
index 6157d18..8237ec7 100644
--- src/shared/linux_osl.c
+++ src/shared/linux_osl.c
@@ -942,7 +942,7 @@ osl_getcycles(void)
void *
osl_reg_map(uint32 pa, uint size)
{
- return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
+ return (ioremap((unsigned long)pa, (unsigned long)size));
}
void
diff --git src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
index 0d05100..2ed1f0d 100644
--- src/wl/sys/wl_linux.c
+++ src/wl/sys/wl_linux.c
@@ -582,7 +582,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
}
wl->bcm_bustype = bustype;
- if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
+ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
WL_ERROR(("wl%d: ioremap() failed\n", unit));
goto fail;
}
@@ -772,7 +772,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if ((val & 0x0000ff00) != 0)
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
bar1_size = pci_resource_len(pdev, 2);
- bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
bar1_size);
wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
pdev->irq, bar1_addr, bar1_size);
@@ -3335,12 +3335,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+static struct proc_ops wl_fops = {
+ .proc_read = wl_proc_read,
+ .proc_write = wl_proc_write,
+};
+#else
static const struct file_operations wl_fops = {
.owner = THIS_MODULE,
.read = wl_proc_read,
.write = wl_proc_write,
};
#endif
+#endif
static int
wl_reg_proc_entry(wl_info_t *wl)

10
srcpkgs/broadcom-wl-dkms/template
View file

@ -2,9 +2,9 @@
pkgname=broadcom-wl-dkms
version=6.30.223.271
revision=8
revision=9
maintainer="Orphaned <orphan@voidlinux.org>"
license="Proprietary Broadcom license"
license="custom:Proprietary Broadcom license"
homepage="http://broadcom.com"
archs="i686* x86_64*"
@ -17,7 +17,7 @@ depends="dkms"
case "$XBPS_TARGET_MACHINE" in
i686*)
distfiles="https://www.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${version//./_}.tar.gz"
distfiles="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${version//./_}.tar.gz"
checksum=4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd
;;
x86_64*)
@ -54,3 +54,7 @@ do_install() {
chmod 644 ${DESTDIR}/usr/lib/modprobe.d/wl.conf
}
post_install() {
vlicense lib/LICENSE.txt LICENSE
}