* [PR PATCH] broadcom-wl-dkms: kernel 5.6 patch
@ 2020-04-17 3:24 mnabid
2020-04-17 3:54 ` [PR PATCH] [Updated] " mnabid
2020-04-17 14:11 ` [PR PATCH] [Merged]: " Hoshpak
0 siblings, 2 replies; 3+ messages in thread
From: mnabid @ 2020-04-17 3:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
There is a new pull request by mnabid against master on the void-packages repository
https://github.com/mnabid/void-packages broadcom-wl-dkms
https://github.com/void-linux/void-packages/pull/21064
broadcom-wl-dkms: kernel 5.6 patch
A patch file from https://github.com/void-linux/void-packages/pull/21064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-broadcom-wl-dkms-21064.patch --]
[-- Type: text/x-diff, Size: 3014 bytes --]
From 6e1b25995ef4e3f02ecde702868af6cddb49d757 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 17 Apr 2020 09:16:23 +0600
Subject: [PATCH] broadcom-wl-dkms: kernel 5.6 patch
---
.../broadcom-wl-dkms/patches/linux-5.6.patch | 55 +++++++++++++++++++
srcpkgs/broadcom-wl-dkms/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch
new file mode 100644
index 00000000000..e97819c80e6
--- /dev/null
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch
@@ -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)
diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template
index 0e055ffe5b2..36280c93033 100644
--- a/srcpkgs/broadcom-wl-dkms/template
+++ b/srcpkgs/broadcom-wl-dkms/template
@@ -2,7 +2,7 @@
pkgname=broadcom-wl-dkms
version=6.30.223.271
-revision=8
+revision=9
maintainer="Orphaned <orphan@voidlinux.org>"
license="Proprietary Broadcom license"
homepage="http://broadcom.com"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] broadcom-wl-dkms: kernel 5.6 patch
2020-04-17 3:24 [PR PATCH] broadcom-wl-dkms: kernel 5.6 patch mnabid
@ 2020-04-17 3:54 ` mnabid
2020-04-17 14:11 ` [PR PATCH] [Merged]: " Hoshpak
1 sibling, 0 replies; 3+ messages in thread
From: mnabid @ 2020-04-17 3:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by mnabid against master on the void-packages repository
https://github.com/mnabid/void-packages broadcom-wl-dkms
https://github.com/void-linux/void-packages/pull/21064
broadcom-wl-dkms: kernel 5.6 patch
A patch file from https://github.com/void-linux/void-packages/pull/21064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-broadcom-wl-dkms-21064.patch --]
[-- Type: text/x-diff, Size: 3671 bytes --]
From 1ede74f729025c775a7d0896e988370be6c99385 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Fri, 17 Apr 2020 09:16:23 +0600
Subject: [PATCH] broadcom-wl-dkms: fix license and distfiles, kernel 5.6 patch
---
.../broadcom-wl-dkms/patches/linux-5.6.patch | 55 +++++++++++++++++++
srcpkgs/broadcom-wl-dkms/template | 10 +++-
2 files changed, 62 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch
new file mode 100644
index 00000000000..e97819c80e6
--- /dev/null
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.6.patch
@@ -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)
diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template
index 0e055ffe5b2..43711032f87 100644
--- a/srcpkgs/broadcom-wl-dkms/template
+++ b/srcpkgs/broadcom-wl-dkms/template
@@ -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
+}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: broadcom-wl-dkms: kernel 5.6 patch
2020-04-17 3:24 [PR PATCH] broadcom-wl-dkms: kernel 5.6 patch mnabid
2020-04-17 3:54 ` [PR PATCH] [Updated] " mnabid
@ 2020-04-17 14:11 ` Hoshpak
1 sibling, 0 replies; 3+ messages in thread
From: Hoshpak @ 2020-04-17 14:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
There's a merged pull request on the void-packages repository
broadcom-wl-dkms: kernel 5.6 patch
https://github.com/void-linux/void-packages/pull/21064
Description:
Also fixed license and distfiles.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-17 14:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-17 3:24 [PR PATCH] broadcom-wl-dkms: kernel 5.6 patch mnabid
2020-04-17 3:54 ` [PR PATCH] [Updated] " mnabid
2020-04-17 14:11 ` [PR PATCH] [Merged]: " Hoshpak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).