Overview

Request 5073 (accepted)

Add patch to allow building for Linux kernel v5.6

Submit package home:manfred.h / broadcom-wl to package Essentials / broadcom-wl

broadcom-wl.changes Changed
x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Tue Apr 21 05:55:23 UTC 2020 - manfred.h@gmx.net
4
+
5
+- Add broadcom-wl.linux-5.6.patch as Patch17
6
+
7
+-------------------------------------------------------------------
8
 Wed Apr  3 17:52:44 UTC 2019 - olaf@aepfle.de
9
 
10
 - Add broadcom-wl.linux-5.1.patch 
11
broadcom-wl.spec Changed
9
 
1
@@ -47,6 +47,7 @@
2
 Patch14:        broadcom-wl.linux-4.14.patch
3
 Patch15:        broadcom-wl.linux-4.15.patch
4
 Patch16:        broadcom-wl.linux-5.1.patch
5
+Patch17:        broadcom-wl.linux-5.6.patch
6
 %if %{defined kernel_module_package_buildreqs}
7
 BuildRequires:  %{kernel_module_package_buildreqs}
8
 %endif
9
broadcom-wl.linux-5.6.patch Added
59
 
1
@@ -0,0 +1,57 @@
2
+diff -rup a/src/shared/linux_osl.c b/src/shared/linux_osl.c
3
+--- a/src/shared/linux_osl.c   2020-04-21 08:30:44.872033927 +0200
4
++++ b/src/shared/linux_osl.c   2020-04-21 08:33:31.744546100 +0200
5
+@@ -946,7 +946,7 @@ osl_getcycles(void)
6
+ void *
7
+ osl_reg_map(uint32 pa, uint size)
8
+ {
9
+-  return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
10
++  return (ioremap((unsigned long)pa, (unsigned long)size));
11
+ }
12
+ 
13
+ void
14
+diff -rup a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
15
+--- a/src/wl/sys/wl_linux.c    2020-04-21 08:30:44.876033940 +0200
16
++++ b/src/wl/sys/wl_linux.c    2020-04-21 08:33:31.744546100 +0200
17
+@@ -588,7 +588,7 @@ wl_attach(uint16 vendor, uint16 device,
18
+   }
19
+   wl->bcm_bustype = bustype;
20
+ 
21
+-  if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
22
++  if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
23
+       WL_ERROR(("wl%d: ioremap() failed\n", unit));
24
+       goto fail;
25
+   }
26
+@@ -777,9 +777,9 @@ wl_pci_probe(struct pci_dev *pdev, const
27
+   pci_read_config_dword(pdev, 0x40, &val);
28
+   if ((val & 0x0000ff00) != 0)
29
+       pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
30
+-      bar1_size = pci_resource_len(pdev, 2);
31
+-      bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
32
+-          bar1_size);
33
++  bar1_size = pci_resource_len(pdev, 2);
34
++  bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
35
++      bar1_size);
36
+   wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
37
+       pdev->irq, bar1_addr, bar1_size);
38
+ 
39
+@@ -3354,12 +3354,19 @@ wl_proc_write(struct file *filp, const c
40
+ }
41
+ 
42
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
43
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
44
++static struct proc_ops wl_fops = {
45
++        .proc_read     = wl_proc_read,
46
++        .proc_write    = wl_proc_write,
47
++};
48
++#else
49
+ static const struct file_operations wl_fops = {
50
+   .owner  = THIS_MODULE,
51
+   .read   = wl_proc_read,
52
+   .write  = wl_proc_write,
53
+ };
54
+ #endif
55
++#endif
56
+ 
57
+ static int
58
+ wl_reg_proc_entry(wl_info_t *wl)
59
Refresh
Refresh

No rpmlint results available

Request History
manfred.h's avatar

manfred.h created request almost 5 years ago

Add patch to allow building for Linux kernel v5.6


Olaf Hering's avatar

olh accepted request almost 5 years ago