File broadcom-wl.linux-5.6.patch of Package broadcom-wl
58
1
diff -rup a/src/shared/linux_osl.c b/src/shared/linux_osl.c
2
--- a/src/shared/linux_osl.c 2020-04-21 08:30:44.872033927 +0200
3
+++ b/src/shared/linux_osl.c 2020-04-21 08:33:31.744546100 +0200
4
5
void *
6
osl_reg_map(uint32 pa, uint size)
7
{
8
- return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
9
+ return (ioremap((unsigned long)pa, (unsigned long)size));
10
}
11
12
void
13
diff -rup a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
14
--- a/src/wl/sys/wl_linux.c 2020-04-21 08:30:44.876033940 +0200
15
+++ b/src/wl/sys/wl_linux.c 2020-04-21 08:33:31.744546100 +0200
16
17
}
18
wl->bcm_bustype = bustype;
19
20
- if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
21
+ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
22
WL_ERROR(("wl%d: ioremap() failed\n", unit));
23
goto fail;
24
}
25
26
pci_read_config_dword(pdev, 0x40, &val);
27
if ((val & 0x0000ff00) != 0)
28
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
29
- bar1_size = pci_resource_len(pdev, 2);
30
- bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
31
- bar1_size);
32
+ bar1_size = pci_resource_len(pdev, 2);
33
+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
34
+ bar1_size);
35
wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
36
pdev->irq, bar1_addr, bar1_size);
37
38
39
}
40
41
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
42
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
43
+static struct proc_ops wl_fops = {
44
+ .proc_read = wl_proc_read,
45
+ .proc_write = wl_proc_write,
46
+};
47
+#else
48
static const struct file_operations wl_fops = {
49
.owner = THIS_MODULE,
50
.read = wl_proc_read,
51
.write = wl_proc_write,
52
};
53
#endif
54
+#endif
55
56
static int
57
wl_reg_proc_entry(wl_info_t *wl)
58