You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
Fix patches
This commit is contained in:
Aditya Garg
@@ -1,7 +1,7 @@
|
||||
From 3f43bc112ea442739258e2c6b143408c7c45e2e9 Mon Sep 17 00:00:00 2001
|
||||
From 5fab9624a67973825bb62d0b1bdb104ead2937eb Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 19:32:16 +0900
|
||||
Subject: [PATCH 01/34] brcmfmac: pcie: Declare missing firmware files in
|
||||
Subject: [PATCH 01/33] brcmfmac: pcie: Declare missing firmware files in
|
||||
pcie.c
|
||||
|
||||
Move one of the declarations from sdio.c to pcie.c, since it makes no
|
||||
@@ -9,6 +9,7 @@ sense in the former (SDIO support is optional), and add missing ones.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Fixes: 75729e110e68 ("brcmfmac: expose firmware config files through modinfo")
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 7 +++++++
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 -
|
||||
@@ -45,5 +46,5 @@ index 8effeb7a7..5d156e591 100644
|
||||
/* per-board firmware binaries */
|
||||
MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin");
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 59c61aa5ad2e12fdbccb5712d35c203cf9079230 Mon Sep 17 00:00:00 2001
|
||||
From 8378dd2076a04b084f37bb945205eb2b5a2d7c2d Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Sat, 18 Dec 2021 20:38:34 +0900
|
||||
Subject: [PATCH 02/34] brcmfmac: firmware: Support having multiple alt paths
|
||||
Subject: [PATCH 02/33] brcmfmac: firmware: Support having multiple alt paths
|
||||
|
||||
Apple platforms have firmware and config files identified with multiple
|
||||
dimensions. We want to be able to find the most specific firmware
|
||||
@@ -12,11 +12,15 @@ First, add support for having multiple alternate firmware paths.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/firmware.c | 74 ++++++++++++++-----
|
||||
1 file changed, 55 insertions(+), 19 deletions(-)
|
||||
Adjusted for rebase on:
|
||||
- c4caf72 ("brcmfmac: firmware: Fix crash in brcm_alt_fw_path")
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/firmware.c | 76 ++++++++++++++-----
|
||||
1 file changed, 56 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
index 0eb13e5df..dff974955 100644
|
||||
index d99140960..9a6e339af 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
@@ -427,6 +427,8 @@ void brcmf_fw_nvram_free(void *nvram)
|
||||
@@ -140,18 +144,20 @@ index 0eb13e5df..dff974955 100644
|
||||
{
|
||||
struct brcmf_fw_item *first = &req->items[0];
|
||||
struct brcmf_fw *fwctx;
|
||||
- char *alt_path;
|
||||
- char *alt_path = NULL;
|
||||
int ret;
|
||||
|
||||
brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
|
||||
@@ -712,12 +748,12 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,
|
||||
fwctx->done = fw_cb;
|
||||
@@ -713,13 +749,13 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,
|
||||
|
||||
/* First try alternative board-specific path if any */
|
||||
- alt_path = brcm_alt_fw_path(first->path, fwctx->req->board_type);
|
||||
if (fwctx->req->board_type)
|
||||
- alt_path = brcm_alt_fw_path(first->path,
|
||||
- fwctx->req->board_type);
|
||||
- if (alt_path) {
|
||||
- ret = request_firmware_nowait(THIS_MODULE, true, alt_path,
|
||||
+ fwctx->alt_paths = brcm_alt_fw_paths(first->path, fwctx);
|
||||
+ fwctx->alt_paths = brcm_alt_fw_paths(first->path, fwctx);
|
||||
+
|
||||
+ if (fwctx->alt_paths) {
|
||||
+ fwctx->alt_index = 0;
|
||||
+ ret = request_firmware_nowait(THIS_MODULE, true, fwctx->alt_paths[0],
|
||||
@@ -162,5 +168,5 @@ index 0eb13e5df..dff974955 100644
|
||||
ret = request_firmware_nowait(THIS_MODULE, true, first->path,
|
||||
fwctx->dev, GFP_KERNEL, fwctx,
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 637e3946944e25c98c8955ec2a84133b79afca4d Mon Sep 17 00:00:00 2001
|
||||
From fff59b00d136b44bd0944c1f220803b8fcf17e3a Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Sat, 18 Dec 2021 20:52:04 +0900
|
||||
Subject: [PATCH 03/34] brcmfmac: firmware: Handle per-board clm_blob files
|
||||
Subject: [PATCH 03/33] brcmfmac: firmware: Handle per-board clm_blob files
|
||||
|
||||
Teach brcm_alt_fw_paths to correctly split off variable length
|
||||
extensions, and enable alt firmware lookups for the CLM blob firmware
|
||||
@@ -10,12 +10,13 @@ requests.
|
||||
Apple platforms have per-board CLM blob files.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/firmware.c | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
index dff974955..16f342bc5 100644
|
||||
index 9a6e339af..93e31ddd0 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
@@ -598,16 +598,16 @@ static const char **brcm_alt_fw_paths(const char *path, const char *board_type)
|
||||
@@ -52,5 +53,5 @@ index dff974955..16f342bc5 100644
|
||||
if (!alt_paths)
|
||||
goto fallback;
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 10ae20866cddd7ba8421dfa331d617c36e1510f6 Mon Sep 17 00:00:00 2001
|
||||
From 2a33be44976577007be09404ee29cf976c20f960 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:13:49 +0900
|
||||
Subject: [PATCH 04/34] brcmfmac: pcie/sdio/usb: Get CLM blob via standard
|
||||
Subject: [PATCH 04/33] brcmfmac: pcie/sdio/usb: Get CLM blob via standard
|
||||
firmware mechanism
|
||||
|
||||
Now that the firmware fetcher can handle per-board CLM files, load the
|
||||
@@ -11,6 +11,7 @@ just return the existing blob, instead of fetching the filename.
|
||||
This enables per-board CLM blobs, which are required on Apple platforms.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/bus.h | 19 ++++++---
|
||||
.../broadcom/brcm80211/brcmfmac/common.c | 12 +-----
|
||||
@@ -370,5 +371,5 @@ index 9fb68c2dc..85e18fb9c 100644
|
||||
|
||||
#define BRCMF_USB_FW_CODE 0
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 880d3f98041005210a332974c3b19e0116e14053 Mon Sep 17 00:00:00 2001
|
||||
From 10a854cb42b9e85483a9a07887b9b24dbc1d02a3 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:38:37 +0900
|
||||
Subject: [PATCH 05/34] brcmfmac: firmware: Support passing in multiple
|
||||
Subject: [PATCH 05/33] brcmfmac: firmware: Support passing in multiple
|
||||
board_types
|
||||
|
||||
In order to make use of the multiple alt_path functionality, change
|
||||
@@ -10,14 +10,18 @@ of board type strings to try for the firmware fetch.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/firmware.c | 35 +++++++++++++------
|
||||
Adjusted for rebase on:
|
||||
- c4caf72 ("brcmfmac: firmware: Fix crash in brcm_alt_fw_path")
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/firmware.c | 37 +++++++++++++------
|
||||
.../broadcom/brcm80211/brcmfmac/firmware.h | 2 +-
|
||||
.../broadcom/brcm80211/brcmfmac/pcie.c | 7 +++-
|
||||
.../broadcom/brcm80211/brcmfmac/sdio.c | 4 ++-
|
||||
4 files changed, 35 insertions(+), 13 deletions(-)
|
||||
.../broadcom/brcm80211/brcmfmac/sdio.c | 4 +-
|
||||
4 files changed, 36 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
index 16f342bc5..02e36fa3d 100644
|
||||
index 93e31ddd0..68627c51c 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
@@ -594,26 +594,41 @@ static int brcmf_fw_complete_request(const struct firmware *fw,
|
||||
@@ -80,6 +84,15 @@ index 16f342bc5..02e36fa3d 100644
|
||||
const char **alt_paths = brcm_alt_fw_paths(cur->path, fwctx);
|
||||
if (!alt_paths)
|
||||
goto fallback;
|
||||
@@ -748,7 +763,7 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,
|
||||
fwctx->done = fw_cb;
|
||||
|
||||
/* First try alternative board-specific path if any */
|
||||
- if (fwctx->req->board_type)
|
||||
+ if (fwctx->req->board_types)
|
||||
fwctx->alt_paths = brcm_alt_fw_paths(first->path, fwctx);
|
||||
|
||||
if (fwctx->alt_paths) {
|
||||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
|
||||
index e290dec9c..d94a1d5be 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
|
||||
@@ -131,5 +144,5 @@ index 7466e6fd6..32f457bf0 100644
|
||||
return fwreq;
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 18b840ed5dc7084d4ba83345a63a7f5f33cec013 Mon Sep 17 00:00:00 2001
|
||||
From b6aadc75a336f1d9d9b31448dfe13978c0254325 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:26:34 +0900
|
||||
Subject: [PATCH 06/34] brcmfmac: pcie: Read Apple OTP information
|
||||
Subject: [PATCH 06/33] brcmfmac: pcie: Read Apple OTP information
|
||||
|
||||
On Apple platforms, the One Time Programmable ROM in the Broadcom chips
|
||||
contains information about the specific board design (module, vendor,
|
||||
@@ -12,6 +12,7 @@ Note that the user OTP offset/size is per-chip. This patch does not add
|
||||
any chips yet.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/pcie.c | 221 ++++++++++++++++++
|
||||
include/linux/bcma/bcma_driver_chipcommon.h | 1 +
|
||||
@@ -297,5 +298,5 @@ index d35b92060..c91db7460 100644
|
||||
#define BCMA_CC_SROM_CONTROL_SIZE_MASK 0x00000006
|
||||
#define BCMA_CC_SROM_CONTROL_SIZE_1K 0x00000000
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From c42886eecdf0752c2525bb9f24a4a1db862fdd18 Mon Sep 17 00:00:00 2001
|
||||
From 07d5d74638a8c297b48201e0ada94bdd08caaf44 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:27:19 +0900
|
||||
Subject: [PATCH 07/34] brcmfmac: of: Fetch Apple properties
|
||||
Subject: [PATCH 07/33] brcmfmac: of: Fetch Apple properties
|
||||
|
||||
On Apple ARM64 platforms, firmware selection requires two properties
|
||||
that come from system firmware: the module-instance (aka "island", a
|
||||
@@ -16,6 +16,7 @@ The module-instance is used to construct a board_type by prepending it
|
||||
with "apple,".
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/common.h | 1 +
|
||||
.../wireless/broadcom/brcm80211/brcmfmac/of.c | 20 ++++++++++++++++++-
|
||||
@@ -72,5 +73,5 @@ index 513c7e642..31407d3a1 100644
|
||||
char *board_type;
|
||||
const char *tmp;
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 2ea0163cdf39c28e923961180b8dd158467a3751 Mon Sep 17 00:00:00 2001
|
||||
From 4fe7b8a7ba38e6a124b0a6be20533495382629c0 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:45:21 +0900
|
||||
Subject: [PATCH 08/34] brcmfmac: pcie: Perform firmware selection for Apple
|
||||
Subject: [PATCH 08/33] brcmfmac: pcie: Perform firmware selection for Apple
|
||||
platforms
|
||||
|
||||
On Apple platforms, firmware selection uses the following elements:
|
||||
@@ -72,6 +72,7 @@ the mapping is not consistent between different chip types, so this has
|
||||
to be determined experimentally.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/pcie.c | 68 +++++++++++++++++--
|
||||
1 file changed, 63 insertions(+), 5 deletions(-)
|
||||
@@ -156,5 +157,5 @@ index 0f19fc9b1..4f14b261a 100644
|
||||
return fwreq;
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From dd4b327a30697ddad3819ca145d4ce319b7cf528 Mon Sep 17 00:00:00 2001
|
||||
From 37666ce8bd160b8eb281ade724e11ac560277926 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Thu, 23 Dec 2021 22:32:08 +0900
|
||||
Subject: [PATCH 09/34] brcmfmac: firmware: Allow platform to override macaddr
|
||||
Subject: [PATCH 09/33] brcmfmac: firmware: Allow platform to override macaddr
|
||||
|
||||
On Device Tree platforms, it is customary to be able to set the MAC
|
||||
address via the Device Tree, as it is often stored in system firmware.
|
||||
@@ -18,12 +18,13 @@ without one, such as Apple ARM64 devices, this is required for the
|
||||
firmware to boot (it will fail if it does not have a valid MAC at all).
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/firmware.c | 30 +++++++++++++++++--
|
||||
1 file changed, 28 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
index 02e36fa3d..dc4151bcc 100644
|
||||
index 68627c51c..a0ee0fab6 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
|
||||
@@ -21,6 +21,8 @@
|
||||
@@ -121,5 +122,5 @@ index 02e36fa3d..dc4151bcc 100644
|
||||
if (free_bcm47xx_nvram)
|
||||
bcm47xx_nvram_release_contents(data);
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
From 531b129464e6f498270c8283f547d65fad32b1fb Mon Sep 17 00:00:00 2001
|
||||
From 0272ded859d0ff41757a173e72a43ba444d3cfb5 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:39:04 +0900
|
||||
Subject: [PATCH 10/34] brcmfmac: msgbuf: Increase RX ring sizes to 1024
|
||||
Subject: [PATCH 10/33] brcmfmac: msgbuf: Increase RX ring sizes to 1024
|
||||
|
||||
Newer chips used on Apple platforms have more than max_rxbufpost greater
|
||||
than 512, which causes warnings when brcmf_msgbuf_rxbuf_data_fill tries
|
||||
to put more in the ring than fit. Increase the ring sizes to 1024.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
@@ -30,5 +31,5 @@ index 2e322edbb..6a849f4a9 100644
|
||||
|
||||
#define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_ITEMSIZE 40
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 60efee55336f83bb968713686bfd2c90d9b23733 Mon Sep 17 00:00:00 2001
|
||||
From 3cbe3c1d916a842ec6be0ad484540b969f7c83ee Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:44:00 +0900
|
||||
Subject: [PATCH 11/34] brcmfmac: pcie: Fix crashes due to early IRQs
|
||||
Subject: [PATCH 11/33] brcmfmac: pcie: Fix crashes due to early IRQs
|
||||
|
||||
The driver was enabling IRQs before the message processing was
|
||||
initialized. This could cause IRQs to come in too early and crash the
|
||||
@@ -10,6 +10,7 @@ function, at which point everything is properly initialized.
|
||||
|
||||
Fixes: 9e37f045d5e7 ("brcmfmac: Adding PCIe bus layer support.")
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/pcie.c | 18 +++++++++++++++---
|
||||
1 file changed, 15 insertions(+), 3 deletions(-)
|
||||
@@ -58,5 +59,5 @@ index 4f14b261a..7190b7b80 100644
|
||||
if (ret)
|
||||
goto fail;
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 6de1197eadd384f977934fb85061db7108f0c86d Mon Sep 17 00:00:00 2001
|
||||
From 215e445d3271dada17f435e830b1b73987ba22e7 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:25:35 +0900
|
||||
Subject: [PATCH 12/34] brcmfmac: pcie: Support PCIe core revisions >= 64
|
||||
Subject: [PATCH 12/33] brcmfmac: pcie: Support PCIe core revisions >= 64
|
||||
|
||||
These newer PCIe core revisions include new sets of registers that must
|
||||
be used instead of the legacy ones. Introduce a brcmf_pcie_reginfo to
|
||||
@@ -9,6 +9,7 @@ hold the specific register offsets and values to use for a given
|
||||
platform, and change all the register accesses to indirect through it.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/pcie.c | 127 +++++++++++++++---
|
||||
1 file changed, 107 insertions(+), 20 deletions(-)
|
||||
@@ -262,5 +263,5 @@ index 7190b7b80..01c7b2703 100644
|
||||
if (brcmf_pcie_send_mb_data(devinfo, BRCMF_H2D_HOST_D0_INFORM))
|
||||
goto cleanup;
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From d37f0e2bd8a981c82aaec33c4916b216a245d87c Mon Sep 17 00:00:00 2001
|
||||
From 2e57c94d84c20596dafb0e7d94fe36f77b239292 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:46:40 +0900
|
||||
Subject: [PATCH 13/34] brcmfmac: pcie: Add IDs/properties for BCM4378
|
||||
Subject: [PATCH 13/33] brcmfmac: pcie: Add IDs/properties for BCM4378
|
||||
|
||||
This chip is present on Apple M1 (t8103) platforms:
|
||||
|
||||
@@ -12,6 +12,7 @@ This chip is present on Apple M1 (t8103) platforms:
|
||||
* santorini (apple,j457): iMac (24-inch, 2x USB-C, M1, 2020)
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 ++
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++++++
|
||||
@@ -92,5 +93,5 @@ index 9d8132016..8f552b53f 100644
|
||||
|
||||
/* brcmsmac IDs */
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 599bfcd71c7c6b995db7a4453e03244d032b4317 Mon Sep 17 00:00:00 2001
|
||||
From 8f577818df988e9ddd91fc91b263b4ef0d74b230 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Thu, 23 Dec 2021 19:51:11 +0900
|
||||
Subject: [PATCH 14/34] ACPI / property: Support strings in Apple _DSM props
|
||||
Subject: [PATCH 14/33] ACPI / property: Support strings in Apple _DSM props
|
||||
|
||||
The Wi-Fi module in Apple machines has a "module-instance" device
|
||||
property that specifies the platform type and is used for firmware
|
||||
@@ -9,6 +9,7 @@ selection. Its value is a string, so add support for string values in
|
||||
acpi_extract_apple_properties().
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
drivers/acpi/x86/apple.c | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
@@ -49,5 +50,5 @@ index c285c91a5..1f5a0694c 100644
|
||||
newprops[v].buffer.length = val->buffer.length;
|
||||
newprops[v].buffer.pointer = free_space;
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From ebdaee11be6e18ea1952a72a4a9ef80ca4228b7d Mon Sep 17 00:00:00 2001
|
||||
From 65727024796647d6848003f40c9d1af863842e46 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Thu, 23 Dec 2021 19:51:36 +0900
|
||||
Subject: [PATCH 15/34] brcmfmac: acpi: Add support for fetching Apple ACPI
|
||||
Subject: [PATCH 15/33] brcmfmac: acpi: Add support for fetching Apple ACPI
|
||||
properties
|
||||
|
||||
On DT platforms, the module-instance and antenna-sku-info properties
|
||||
@@ -14,6 +14,7 @@ Add support for this, to allow proper firmware selection on Apple
|
||||
platforms.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/Makefile | 2 +
|
||||
.../broadcom/brcm80211/brcmfmac/acpi.c | 52 +++++++++++++++++++
|
||||
@@ -123,5 +124,5 @@ index d4aa25d64..a88c4a931 100644
|
||||
|
||||
u8 brcmf_map_prio_to_aci(void *cfg, u8 prio);
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 3ecb57b6628211ef42a6267f17a1d5c5fcecd012 Mon Sep 17 00:00:00 2001
|
||||
From 6584070cfb25335f4ac239a71637161e978dfdd7 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Thu, 23 Dec 2021 19:30:17 +0900
|
||||
Subject: [PATCH 16/34] brcmfmac: pcie: Provide a buffer of random bytes to the
|
||||
Subject: [PATCH 16/33] brcmfmac: pcie: Provide a buffer of random bytes to the
|
||||
device
|
||||
|
||||
Newer Apple firmwares on chipsets without a hardware RNG require the
|
||||
@@ -13,6 +13,7 @@ This won't affect chips/firmwares that do not use this feature, so do it
|
||||
unconditionally.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../broadcom/brcm80211/brcmfmac/pcie.c | 31 +++++++++++++++++++
|
||||
1 file changed, 31 insertions(+)
|
||||
@@ -79,5 +80,5 @@ index e1bc7e4a9..b71952254 100644
|
||||
brcmf_dbg(PCIE, "No matching NVRAM file found %s\n",
|
||||
devinfo->nvram_name);
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From e46046ce92838278ec265de9d662ca3ee0be8cef Mon Sep 17 00:00:00 2001
|
||||
From c74f1421fb8d246b22117608406d4e843853072e Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:50:15 +0900
|
||||
Subject: [PATCH 17/34] brcmfmac: pcie: Add IDs/properties for BCM4355
|
||||
Subject: [PATCH 17/33] brcmfmac: pcie: Add IDs/properties for BCM4355
|
||||
|
||||
This chip is present on at least these Apple T2 Macs:
|
||||
|
||||
@@ -9,6 +9,7 @@ This chip is present on at least these Apple T2 Macs:
|
||||
* hawaii: MacBook Air 13" (True Tone, 2019)
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 +
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++++++
|
||||
@@ -88,5 +89,5 @@ index 8f552b53f..9636ab4dd 100644
|
||||
#define BRCM_PCIE_43567_DEVICE_ID 0x43d3
|
||||
#define BRCM_PCIE_43570_DEVICE_ID 0x43d9
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From a014d5ec01f8b9084b55a368f5847105c5a87758 Mon Sep 17 00:00:00 2001
|
||||
From 226db6630db1557f4c0b64ad0692ae87e7083e6d Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:51:31 +0900
|
||||
Subject: [PATCH 18/34] brcmfmac: pcie: Add IDs/properties for BCM4377
|
||||
Subject: [PATCH 18/33] brcmfmac: pcie: Add IDs/properties for BCM4377
|
||||
|
||||
This chip is present on at least these Apple T2 Macs:
|
||||
|
||||
@@ -10,6 +10,7 @@ This chip is present on at least these Apple T2 Macs:
|
||||
* fiji: MacBook Air 13" (Scissor, 2020)
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 +
|
||||
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++++
|
||||
@@ -85,5 +86,5 @@ index 9636ab4dd..54d7ec515 100644
|
||||
|
||||
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 680ef41dd2e00b3e891e62f5ed8a746e96b8567d Mon Sep 17 00:00:00 2001
|
||||
From 0ea04c1f73e506a45383afb20e9ecf28e39b02a7 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 21 Dec 2021 17:51:52 +0900
|
||||
Subject: [PATCH 19/34] brcmfmac: pcie: Perform correct BCM4364 firmware
|
||||
Subject: [PATCH 19/33] brcmfmac: pcie: Perform correct BCM4364 firmware
|
||||
selection
|
||||
|
||||
This chip exists in two revisions (B2=r3 and B3=r4) on different
|
||||
@@ -33,6 +33,7 @@ kure: iMac 27" (5K, 2020, 5700/XT)
|
||||
Cc: brian m. carlson <sandals@crustytoothpaste.net>
|
||||
Fixes: 24f0bd136264 ("brcmfmac: add the BRCM 4364 found in MacBook Pro 15,2")
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
@@ -74,5 +75,5 @@ index 5b4a4cb33..b6b789b49 100644
|
||||
case BRCM_CC_4378_CHIP_ID:
|
||||
coreid = BCMA_CORE_GCI;
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 9600a63e7c36866faac8c458dc48ba9eb19032bc Mon Sep 17 00:00:00 2001
|
||||
From 66c8e1424e89aebddce3f0bea7961f8848eaf9ac Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Mon, 20 Dec 2021 20:00:57 +0900
|
||||
Subject: [PATCH 20/34] brcmfmac: chip: Only disable D11 cores; handle an
|
||||
Subject: [PATCH 20/33] brcmfmac: chip: Only disable D11 cores; handle an
|
||||
arbitrary number
|
||||
|
||||
At least on BCM4387, the D11 cores are held in reset on cold startup and
|
||||
@@ -15,6 +15,7 @@ brcmf_chip_ai_resetcore(), but since we aren't using that any more, just
|
||||
handle it here.
|
||||
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
---
|
||||
.../wireless/broadcom/brcm80211/brcmfmac/chip.c | 14 +++++++++-----
|
||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||
@@ -49,5 +50,5 @@ index 73ab96968..15a1211f0 100644
|
||||
|
||||
static bool brcmf_chip_cr4_set_active(struct brcmf_chip_priv *chip, u32 rstvec)
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user