wok-current annotate broadcom-wl64/stuff/017-linux56.patch @ rev 25701

Fix dep for libglamoregl.so (libepoxy), and miss file for amdgpu (thanks alanyih)
author Stanislas Leduc <shann@slitaz.org>
date Fri Apr 19 12:48:51 2024 +0000 (2 months ago)
parents
children
rev   line source
shann@25673 1 diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
shann@25673 2 index 6157d18..8237ec7 100644
shann@25673 3 --- a/src/shared/linux_osl.c
shann@25673 4 +++ b/src/shared/linux_osl.c
shann@25673 5 @@ -942,7 +942,7 @@ osl_getcycles(void)
shann@25673 6 void *
shann@25673 7 osl_reg_map(uint32 pa, uint size)
shann@25673 8 {
shann@25673 9 - return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
shann@25673 10 + return (ioremap((unsigned long)pa, (unsigned long)size));
shann@25673 11 }
shann@25673 12
shann@25673 13 void
shann@25673 14 diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
shann@25673 15 index 0d05100..2ed1f0d 100644
shann@25673 16 --- a/src/wl/sys/wl_linux.c
shann@25673 17 +++ b/src/wl/sys/wl_linux.c
shann@25673 18 @@ -582,7 +582,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
shann@25673 19 }
shann@25673 20 wl->bcm_bustype = bustype;
shann@25673 21
shann@25673 22 - if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
shann@25673 23 + if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
shann@25673 24 WL_ERROR(("wl%d: ioremap() failed\n", unit));
shann@25673 25 goto fail;
shann@25673 26 }
shann@25673 27 @@ -772,7 +772,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
shann@25673 28 if ((val & 0x0000ff00) != 0)
shann@25673 29 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
shann@25673 30 bar1_size = pci_resource_len(pdev, 2);
shann@25673 31 - bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
shann@25673 32 + bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
shann@25673 33 bar1_size);
shann@25673 34 wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
shann@25673 35 pdev->irq, bar1_addr, bar1_size);
shann@25673 36 @@ -3335,12 +3335,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
shann@25673 37 }
shann@25673 38
shann@25673 39 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
shann@25673 40 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
shann@25673 41 +static struct proc_ops wl_fops = {
shann@25673 42 + .proc_read = wl_proc_read,
shann@25673 43 + .proc_write = wl_proc_write,
shann@25673 44 +};
shann@25673 45 +#else
shann@25673 46 static const struct file_operations wl_fops = {
shann@25673 47 .owner = THIS_MODULE,
shann@25673 48 .read = wl_proc_read,
shann@25673 49 .write = wl_proc_write,
shann@25673 50 };
shann@25673 51 #endif
shann@25673 52 +#endif
shann@25673 53
shann@25673 54 static int
shann@25673 55 wl_reg_proc_entry(wl_info_t *wl)