diff options
author | Eric Hameleers <alien@slackware.com> | 2022-03-24 16:29:14 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-03-24 16:29:14 +0000 |
commit | a73b41a9d9e034df3650c93f42f1c13d3c947285 (patch) | |
tree | 66f86898c32174f4dd2c79bfbc085f228e4552f5 /broadcom-sta/build/patches | |
parent | 6fadb654bad38a6bc71df0a02dd5336ec8e30c30 (diff) | |
download | asb-a73b41a9d9e034df3650c93f42f1c13d3c947285.tar.gz asb-a73b41a9d9e034df3650c93f42f1c13d3c947285.tar.xz |
Initial revision
Diffstat (limited to 'broadcom-sta/build/patches')
-rw-r--r-- | broadcom-sta/build/patches/22-linux51.patch | 24 | ||||
-rw-r--r-- | broadcom-sta/build/patches/23-linux56.patch | 57 | ||||
-rw-r--r-- | broadcom-sta/build/patches/24-linux59.patch | 202 | ||||
-rw-r--r-- | broadcom-sta/build/patches/25-linux517.patch | 39 |
4 files changed, 322 insertions, 0 deletions
diff --git a/broadcom-sta/build/patches/22-linux51.patch b/broadcom-sta/build/patches/22-linux51.patch new file mode 100644 index 00000000..3e8e0224 --- /dev/null +++ b/broadcom-sta/build/patches/22-linux51.patch @@ -0,0 +1,24 @@ +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -43,6 +43,9 @@ + #define EVENT_FLAGS(e) dtoh16((e)->flags) + #define EVENT_STATUS(e) dtoh32((e)->status) + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) ++#define get_ds() (KERNEL_DS) ++#endif + #ifdef BCMDBG + u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO; + #else +--- a/src/wl/sys/wl_iw.c ++++ b/src/wl/sys/wl_iw.c +@@ -61,6 +61,9 @@ typedef struct priv_link { + wl_iw_t *wliw; + } priv_link_t; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) ++#define get_ds() (KERNEL_DS) ++#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)) + #define WL_DEV_LINK(dev) (priv_link_t*)(dev->priv) + #else diff --git a/broadcom-sta/build/patches/23-linux56.patch b/broadcom-sta/build/patches/23-linux56.patch new file mode 100644 index 00000000..3a05b4a0 --- /dev/null +++ b/broadcom-sta/build/patches/23-linux56.patch @@ -0,0 +1,57 @@ +diff -rup a/src/shared/linux_osl.c b/src/shared/linux_osl.c +--- a/src/shared/linux_osl.c 2020-04-21 08:30:44.872033927 +0200 ++++ b/src/shared/linux_osl.c 2020-04-21 08:33:31.744546100 +0200 +@@ -946,7 +946,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 -rup a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2020-04-21 08:30:44.876033940 +0200 ++++ b/src/wl/sys/wl_linux.c 2020-04-21 08:33:31.744546100 +0200 +@@ -588,7 +588,7 @@ wl_attach(uint16 vendor, uint16 device, + } + 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; + } +@@ -777,9 +777,9 @@ wl_pci_probe(struct pci_dev *pdev, const + pci_read_config_dword(pdev, 0x40, &val); + 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_size); ++ bar1_size = pci_resource_len(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); + +@@ -3354,12 +3354,19 @@ wl_proc_write(struct file *filp, const c + } + + #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) diff --git a/broadcom-sta/build/patches/24-linux59.patch b/broadcom-sta/build/patches/24-linux59.patch new file mode 100644 index 00000000..bb5d7233 --- /dev/null +++ b/broadcom-sta/build/patches/24-linux59.patch @@ -0,0 +1,202 @@ +From: Joan Bruguera <joanbrugueram@gmail.com> +Date: Sun, 13 Sep 2020 07:33:32 +0200 +Subject: Get rid of get_fs/set_fs calls in Broadcom WL driver. +Origin: https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290 + +Fixes linux-next where get_fs/set_fs is already removed for some architectures. + +NB: Some checks in wlc_ioctl_internal are likely superfluous, + but I'm not familiar enough with the driver to remove them with confidence. + +See also: https://lwn.net/Articles/722267/ + https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/arch/x86/include/asm/uaccess.h?h=next-20200911&id=47058bb54b57962b3958a936ddbc59355e4c5504 + https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/include/linux/uaccess.h?h=next-20200911&id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5 + +Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com> +--- + src/wl/sys/wl_cfg80211_hybrid.c | 29 ++----------------------- + src/wl/sys/wl_iw.c | 25 ++-------------------- + src/wl/sys/wl_linux.c | 40 ++++++++++++++++++++++++++++++----- + src/wl/sys/wl_linux.h | 2 ++ + src/wl/sys/wlc_pub.h | 1 + + 5 files changed, 42 insertions(+), 55 deletions(-) + +diff -rup a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2020-11-13 08:38:56.883599679 +0100 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2020-11-13 08:42:07.944320760 +0100 +@@ -38,6 +38,7 @@ + #include <wlioctl.h> + #include <proto/802.11.h> + #include <wl_cfg80211_hybrid.h> ++#include <wl_linux.h> + + #define EVENT_TYPE(e) dtoh32((e)->event_type) + #define EVENT_FLAGS(e) dtoh16((e)->flags) +@@ -436,30 +437,8 @@ static void key_endian_to_host(struct wl + static s32 + wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + { +- struct ifreq ifr; +- struct wl_ioctl ioc; +- mm_segment_t fs; +- s32 err = 0; +- + BUG_ON(len < sizeof(int)); +- +- memset(&ioc, 0, sizeof(ioc)); +- ioc.cmd = cmd; +- ioc.buf = arg; +- ioc.len = len; +- strcpy(ifr.ifr_name, dev->name); +- ifr.ifr_data = (caddr_t)&ioc; +- +- fs = get_fs(); +- set_fs(get_ds()); +-#if defined(WL_USE_NETDEV_OPS) +- err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#else +- err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#endif +- set_fs(fs); +- +- return err; ++ return wlc_ioctl_internal(dev, cmd, arg, len); + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) +diff -rup a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c +--- a/src/wl/sys/wl_iw.c 2020-11-13 08:38:56.891599715 +0100 ++++ b/src/wl/sys/wl_iw.c 2020-11-13 08:40:14.803914270 +0100 +@@ -37,6 +37,7 @@ typedef const struct si_pub si_t; + + #include <wl_dbg.h> + #include <wl_iw.h> ++#include <wl_linux.h> + + extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status, + uint32 reason, char* stringBuf, uint buflen); +@@ -106,29 +107,7 @@ dev_wlc_ioctl( + int len + ) + { +- struct ifreq ifr; +- wl_ioctl_t ioc; +- mm_segment_t fs; +- int ret; +- +- memset(&ioc, 0, sizeof(ioc)); +- ioc.cmd = cmd; +- ioc.buf = arg; +- ioc.len = len; +- +- strcpy(ifr.ifr_name, dev->name); +- ifr.ifr_data = (caddr_t) &ioc; +- +- fs = get_fs(); +- set_fs(get_ds()); +-#if defined(WL_USE_NETDEV_OPS) +- ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#else +- ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#endif +- set_fs(fs); +- +- return ret; ++ return wlc_ioctl_internal(dev, cmd, arg, len); + } + + static int +diff -rup a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2020-11-13 08:39:05.659639371 +0100 ++++ b/src/wl/sys/wl_linux.c 2020-11-13 08:40:14.803914270 +0100 +@@ -1649,10 +1649,7 @@ wl_ioctl(struct net_device *dev, struct + goto done2; + } + +- if (segment_eq(get_fs(), KERNEL_DS)) +- buf = ioc.buf; +- +- else if (ioc.buf) { ++ if (ioc.buf) { + if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) { + bcmerror = BCME_NORESOURCE; + goto done2; +@@ -1673,7 +1670,7 @@ wl_ioctl(struct net_device *dev, struct + WL_UNLOCK(wl); + + done1: +- if (ioc.buf && (ioc.buf != buf)) { ++ if (ioc.buf) { + if (copy_to_user(ioc.buf, buf, ioc.len)) + bcmerror = BCME_BADADDR; + MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN)); +@@ -1683,6 +1680,39 @@ done2: + ASSERT(VALID_BCMERROR(bcmerror)); + if (bcmerror != 0) + wl->pub->bcmerror = bcmerror; ++ return (OSL_ERROR(bcmerror)); ++} ++ ++int ++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len) ++{ ++ wl_info_t *wl; ++ wl_if_t *wlif; ++ int bcmerror; ++ ++ if (!dev) ++ return -ENETDOWN; ++ ++ wl = WL_INFO(dev); ++ wlif = WL_DEV_IF(dev); ++ if (wlif == NULL || wl == NULL || wl->dev == NULL) ++ return -ENETDOWN; ++ ++ bcmerror = 0; ++ ++ WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd)); ++ ++ WL_LOCK(wl); ++ if (!capable(CAP_NET_ADMIN)) { ++ bcmerror = BCME_EPERM; ++ } else { ++ bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif); ++ } ++ WL_UNLOCK(wl); ++ ++ ASSERT(VALID_BCMERROR(bcmerror)); ++ if (bcmerror != 0) ++ wl->pub->bcmerror = bcmerror; + return (OSL_ERROR(bcmerror)); + } + +diff -rup a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h +--- a/src/wl/sys/wl_linux.h 2015-09-19 00:47:30.000000000 +0200 ++++ b/src/wl/sys/wl_linux.h 2020-11-13 08:40:14.803914270 +0100 +@@ -22,6 +22,7 @@ + #define _wl_linux_h_ + + #include <wlc_types.h> ++#include <wlc_pub.h> + + typedef struct wl_timer { + struct timer_list timer; +@@ -187,6 +188,7 @@ extern irqreturn_t wl_isr(int irq, void + extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); + extern void wl_free(wl_info_t *wl); + extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); ++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len); + extern struct net_device * wl_netdev_get(wl_info_t *wl); + + #endif +diff -rup a/src/wl/sys/wlc_pub.h b/src/wl/sys/wlc_pub.h +--- a/src/wl/sys/wlc_pub.h 2015-09-19 00:47:30.000000000 +0200 ++++ b/src/wl/sys/wlc_pub.h 2020-11-13 08:40:14.803914270 +0100 +@@ -24,6 +24,7 @@ + + #include <wlc_types.h> + #include <wlc_utils.h> ++#include <siutils.h> + #include "proto/802.11.h" + #include "proto/bcmevent.h" + diff --git a/broadcom-sta/build/patches/25-linux517.patch b/broadcom-sta/build/patches/25-linux517.patch new file mode 100644 index 00000000..74847cb6 --- /dev/null +++ b/broadcom-sta/build/patches/25-linux517.patch @@ -0,0 +1,39 @@ +diff -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2022-03-23 00:35:42.930416350 +0000 ++++ b/src/wl/sys/wl_linux.c 2022-03-23 00:40:12.903771013 +0000 +@@ -2980,7 +2980,11 @@ + else + dev->type = ARPHRD_IEEE80211_RADIOTAP; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN); ++#else ++ eth_hw_addr_set(wl->dev, dev->dev_addr); ++#endif + + #if defined(WL_USE_NETDEV_OPS) + dev->netdev_ops = &wl_netdev_monitor_ops; +@@ -3261,7 +3265,11 @@ + static ssize_t + wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#else ++ wl_info_t * wl = pde_data(file_inode(filp)); ++#endif + #endif + int bcmerror, len; + int to_user = 0; +@@ -3318,7 +3326,11 @@ + static ssize_t + wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#else ++ wl_info_t * wl = pde_data(file_inode(filp)); ++#endif + #endif + int from_user = 0; + int bcmerror; |