[arch-commits] Commit in broadcom-wl-dkms/trunk (3 files)

[Christian Hesse]

    Date: Thursday, April 2, 2020 @ 07:52:01
  Author: eworm
Revision: 609376

upgpkg: broadcom-wl-dkms 6.30.223.271-21

fix for linux >= 5.6

Added:
  broadcom-wl-dkms/trunk/010-linux56.patch
Modified:
  broadcom-wl-dkms/trunk/PKGBUILD
  broadcom-wl-dkms/trunk/dkms.conf.in

-------------------+
 010-linux56.patch |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD          |    6 +++--
 dkms.conf.in      |    1 
 3 files changed, 60 insertions(+), 2 deletions(-)

Added: 010-linux56.patch
===================================================================
--- 010-linux56.patch	                        (rev 0)
+++ 010-linux56.patch	2020-04-02 07:52:01 UTC (rev 609376)
@@ -0,0 +1,55 @@
+diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+index 6157d18..8237ec7 100644
+--- a/src/shared/linux_osl.c
++++ b/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 a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 0d05100..2ed1f0d 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/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)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-02 07:51:29 UTC (rev 609375)
+++ PKGBUILD	2020-04-02 07:52:01 UTC (rev 609376)
@@ -6,7 +6,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=20
+pkgrel=21
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=(x86_64)
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
@@ -25,9 +25,10 @@
         '007-linux412.patch'
         '008-linux415.patch'
         '009-fix_mac_profile_discrepancy.patch'
+        '010-linux56.patch'
         "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
-            'f1df2aa45416b4ac61ea1501602bd1f205a416e1bf1664f23b3761a84d035b26'
+            '7edf519dad569ac121996addb8cfbd513337bc5a856ac47393265d078f6e5b90'
             '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
             '4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd'
             '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e'
@@ -37,6 +38,7 @@
             'a3d13e8abb96ad440dbfae29acae82d31d1ced2ea62052f1efb2c3c4add347ce'
             '08c24157cf3b93b60e67e600d1d90223447361990df09acfb00281d79813d167'
             '4e73e50653bb612946edd34bf31ca5a0b80f632d47a08766ae6042880927c98d'
+            'f1300bcce93363088481671150ff2bbd6957e12ba11098980b9f428c7a171812'
             '5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
 
 prepare() {

Modified: dkms.conf.in
===================================================================
--- dkms.conf.in	2020-04-02 07:51:29 UTC (rev 609375)
+++ dkms.conf.in	2020-04-02 07:52:01 UTC (rev 609376)
@@ -10,4 +10,5 @@
 PATCH[5]="006-linux411.patch"
 PATCH[6]="007-linux412.patch"
 PATCH[7]="008-linux415.patch"
+PATCH[8]="010-linux56.patch"
 AUTOINSTALL="yes"