-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
6.13: Add fix for Apple T2 Wifi Chip
Signed-off-by: Peter Jung <[email protected]>
- Loading branch information
Showing
2 changed files
with
98 additions
and
0 deletions.
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -10325,3 +10325,52 @@ index 9eed3683ad76..7ddbf75f4c26 100755 | |
| -- | ||
| 2.48.0.rc1 | ||
|
|
||
| From 43aaeb3514ecd4f57028f5e57d90cc49991b7310 Mon Sep 17 00:00:00 2001 | ||
| From: Aditya Garg <[email protected]> | ||
| Date: Mon, 20 Jan 2025 16:50:47 +0000 | ||
| Subject: [PATCH] wifi: brcmfmac: use random seed flag for BCM4355 and BCM4364 | ||
| firmware | ||
|
|
||
| Before 6.13, random seed to the firmware was given based on the logic | ||
| whether the device had valid OTP or not, and such devices were found | ||
| mainly on the T2 and Apple Silicon Macs. In 6.13, the logic was changed, | ||
| and the device table was used for this purpose, so as to cover the special | ||
| case of BCM43752 chip. | ||
|
|
||
| During the transition, the device table for BCM4364 and BCM4355 Wi-Fi chips | ||
| which had valid OTP was not modified, thus breaking Wi-Fi on these devices. | ||
| This patch adds does the necessary changes, similar to the ones done for | ||
| other chips. | ||
|
|
||
| Fixes: ea11a89c3ac6 ("wifi: brcmfmac: add flag for random seed during firmware download") | ||
| Cc: [email protected] | ||
| Signed-off-by: Aditya Garg <[email protected]> | ||
| --- | ||
| drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| index e4395b1f8c11..d2caa80e9412 100644 | ||
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| @@ -2712,7 +2712,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC), | ||
| - BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC), | ||
| + BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC_SEED), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC), | ||
| @@ -2723,7 +2723,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID, WCC), | ||
| - BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, WCC), | ||
| + BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, WCC_SEED), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID, BCA), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID, BCA), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID, BCA), | ||
| -- | ||
| 2.48.0.rc1 | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -30125,6 +30125,55 @@ index 9eed3683ad76..7ddbf75f4c26 100755 | |
| -- | ||
| 2.48.0.rc1 | ||
|
|
||
| From 43aaeb3514ecd4f57028f5e57d90cc49991b7310 Mon Sep 17 00:00:00 2001 | ||
| From: Aditya Garg <[email protected]> | ||
| Date: Mon, 20 Jan 2025 16:50:47 +0000 | ||
| Subject: [PATCH] wifi: brcmfmac: use random seed flag for BCM4355 and BCM4364 | ||
| firmware | ||
|
|
||
| Before 6.13, random seed to the firmware was given based on the logic | ||
| whether the device had valid OTP or not, and such devices were found | ||
| mainly on the T2 and Apple Silicon Macs. In 6.13, the logic was changed, | ||
| and the device table was used for this purpose, so as to cover the special | ||
| case of BCM43752 chip. | ||
|
|
||
| During the transition, the device table for BCM4364 and BCM4355 Wi-Fi chips | ||
| which had valid OTP was not modified, thus breaking Wi-Fi on these devices. | ||
| This patch adds does the necessary changes, similar to the ones done for | ||
| other chips. | ||
|
|
||
| Fixes: ea11a89c3ac6 ("wifi: brcmfmac: add flag for random seed during firmware download") | ||
| Cc: [email protected] | ||
| Signed-off-by: Aditya Garg <[email protected]> | ||
| --- | ||
| drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| index e4395b1f8c11..d2caa80e9412 100644 | ||
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | ||
| @@ -2712,7 +2712,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC), | ||
| - BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC), | ||
| + BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC_SEED), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC), | ||
| @@ -2723,7 +2723,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID, WCC), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID, WCC), | ||
| - BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, WCC), | ||
| + BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, WCC_SEED), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID, BCA), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID, BCA), | ||
| BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID, BCA), | ||
| -- | ||
| 2.48.0.rc1 | ||
|
|
||
| From 6f96c228cd968c7f47eb90d9e7ad6d679bf5a7f0 Mon Sep 17 00:00:00 2001 | ||
| From: Peter Jung <[email protected]> | ||
| Date: Mon, 20 Jan 2025 13:23:20 +0100 | ||
|
|
||