-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mac80211: backport brcmfmac fixes for WARNING and BCM4360 init
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49004 3c298f89-4303-0410-b956-a3cf2f4a3e73
- Loading branch information
rmilecki
committed
Mar 11, 2016
1 parent
7265f1c
commit ca1de2d
Showing
2 changed files
with
103 additions
and
0 deletions.
There are no files selected for viewing
73 changes: 73 additions & 0 deletions
73
...rnel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| From: Hante Meuleman <meuleman@broadcom.com> | ||
| Date: Wed, 17 Feb 2016 11:26:57 +0100 | ||
| Subject: [PATCH] brcmfmac: use device memsize config from fw if defined | ||
|
|
||
| Newer type pcie devices have memory which get shared between fw and | ||
| hw. The division of this memory is done firmware compile time. As a | ||
| result the ramsize as used by driver needs to be adjusted for this. | ||
| This is done by reading the memory size from the firmware. | ||
|
|
||
| Reviewed-by: Arend Van Spriel <arend@broadcom.com> | ||
| Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com> | ||
| Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> | ||
| Signed-off-by: Hante Meuleman <meuleman@broadcom.com> | ||
| Signed-off-by: Arend van Spriel <arend@broadcom.com> | ||
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> | ||
| --- | ||
|
|
||
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| @@ -207,6 +207,10 @@ static struct brcmf_firmware_mapping brc | ||
| #define BRCMF_PCIE_CFGREG_REG_BAR3_CONFIG 0x4F4 | ||
| #define BRCMF_PCIE_LINK_STATUS_CTRL_ASPM_ENAB 3 | ||
|
|
||
| +/* Magic number at a magic location to find RAM size */ | ||
| +#define BRCMF_RAMSIZE_MAGIC 0x534d4152 /* SMAR */ | ||
| +#define BRCMF_RAMSIZE_OFFSET 0x6c | ||
| + | ||
|
|
||
| struct brcmf_pcie_console { | ||
| u32 base_addr; | ||
| @@ -1412,6 +1416,28 @@ static const struct brcmf_bus_ops brcmf_ | ||
| }; | ||
|
|
||
|
|
||
| +static void | ||
| +brcmf_pcie_adjust_ramsize(struct brcmf_pciedev_info *devinfo, u8 *data, | ||
| + u32 data_len) | ||
| +{ | ||
| + __le32 *field; | ||
| + u32 newsize; | ||
| + | ||
| + if (data_len < BRCMF_RAMSIZE_OFFSET + 8) | ||
| + return; | ||
| + | ||
| + field = (__le32 *)&data[BRCMF_RAMSIZE_OFFSET]; | ||
| + if (le32_to_cpup(field) != BRCMF_RAMSIZE_MAGIC) | ||
| + return; | ||
| + field++; | ||
| + newsize = le32_to_cpup(field); | ||
| + | ||
| + brcmf_dbg(PCIE, "Found ramsize info in FW, adjusting to 0x%x\n", | ||
| + newsize); | ||
| + devinfo->ci->ramsize = newsize; | ||
| +} | ||
| + | ||
| + | ||
| static int | ||
| brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo, | ||
| u32 sharedram_addr) | ||
| @@ -1694,6 +1720,13 @@ static void brcmf_pcie_setup(struct devi | ||
|
|
||
| brcmf_pcie_attach(devinfo); | ||
|
|
||
| + /* Some of the firmwares have the size of the memory of the device | ||
| + * defined inside the firmware. This is because part of the memory in | ||
| + * the device is shared and the devision is determined by FW. Parse | ||
| + * the firmware and adjust the chip memory size now. | ||
| + */ | ||
| + brcmf_pcie_adjust_ramsize(devinfo, (u8 *)fw->data, fw->size); | ||
| + | ||
| ret = brcmf_pcie_download_fw_nvram(devinfo, fw, nvram, nvram_len); | ||
| if (ret) | ||
| goto fail; |
30 changes: 30 additions & 0 deletions
30
package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| From: Hante Meuleman <meuleman@broadcom.com> | ||
| Date: Wed, 17 Feb 2016 11:27:01 +0100 | ||
| Subject: [PATCH] brcmfmac: increase timeout for tx eapol | ||
|
|
||
| When keys get set and updated this has to happen after eapol got | ||
| transmitted (without key or old key) before the key can be updated. | ||
| To make sure the order of sending eapol and configuring key is done | ||
| correctly a timeout for tx of eapol is applied. This timeout is set | ||
| to 50 msec, which is not always enough. Especially in AP mode and | ||
| key updates the timeout may need to be much longer because client(s) | ||
| can be in powersave. Increase the timeout from 50 to 950 msec. | ||
|
|
||
| Reviewed-by: Arend Van Spriel <arend@broadcom.com> | ||
| Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> | ||
| Signed-off-by: Hante Meuleman <meuleman@broadcom.com> | ||
| Signed-off-by: Arend van Spriel <arend@broadcom.com> | ||
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> | ||
| --- | ||
|
|
||
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | ||
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | ||
| @@ -40,7 +40,7 @@ MODULE_AUTHOR("Broadcom Corporation"); | ||
| MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver."); | ||
| MODULE_LICENSE("Dual BSD/GPL"); | ||
|
|
||
| -#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(50) | ||
| +#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(950) | ||
|
|
||
| /* AMPDU rx reordering definitions */ | ||
| #define BRCMF_RXREORDER_FLOWID_OFFSET 0 |