Created
April 21, 2020 18:45
-
-
Save ObserverHerb/6420938460cf50370b860143fb1a2e2d to your computer and use it in GitHub Desktop.
Make proprietary Broadcom wireless drivers compile against Linux kernel 5.6 on Gentoo
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment