Skip to content
This repository was archived by the owner on Feb 18, 2022. It is now read-only.

Commit 3ec1f79

Browse files
marcosfadmarcosfad
committed
Merge branch 'release/5.7'
2 parents 63b5ef7 + 23bcd72 commit 3ec1f79

2 files changed

Lines changed: 25 additions & 20 deletions

File tree

‎build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu -o pipefail
44

55
## Update docker image tag, because kernel build is using `uname -r` when defining package version variable
66
# KERNEL_VERSION=$(curl -s https://www.kernel.org | grep '<strong>' | head -3 | tail -1 | cut -d'>' -f3 | cut -d'<' -f1)
7-
KERNEL_VERSION=5.6.19
7+
KERNEL_VERSION=5.7.4
88
#KERNEL_REPOSITORY=git://kernel.ubuntu.com/virgin/linux-stable.git
99
KERNEL_REPOSITORY=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
1010
REPO_PATH=$(pwd)
@@ -50,7 +50,7 @@ echo >&2 "===]> Info: Applying patches... "
5050
exit 1
5151
}
5252
while IFS= read -r file; do
53-
echo "adding $file"
53+
echo "==> Adding $file"
5454
patch -p1 <"$file"
5555
done < <(find "${WORKING_PATH}/patches" -type f -name "*.patch" | sort)
5656

‎patches/wifi.patch‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
From: fedora kernel <fedora@kernel.org>
2-
Subject: patch wifi
3-
41
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
5-
index 22534bf2a..5c7bf9829 100644
2+
index a3a257089..b2ee4a214 100644
63
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
74
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
8-
@@ -703,6 +703,7 @@
5+
@@ -703,6 +703,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
96
switch (ci->pub.chip) {
107
case BRCM_CC_4345_CHIP_ID:
118
return 0x198000;
129
+ case BRCM_CC_4377_CHIP_ID: /* MacBookPro15,4 */
1310
case BRCM_CC_4335_CHIP_ID:
1411
case BRCM_CC_4339_CHIP_ID:
1512
case BRCM_CC_4350_CHIP_ID:
16-
@@ -721,6 +722,8 @@
13+
@@ -721,9 +722,10 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
1714
case BRCM_CC_4366_CHIP_ID:
1815
case BRCM_CC_43664_CHIP_ID:
1916
return 0x200000;
2017
+ case BRCM_CC_4355_CHIP_ID: /* MacBookAir8,x */
21-
+ case BRCM_CC_4364_CHIP_ID: /* MacBookPro15,x, 16,x */
2218
case BRCM_CC_4359_CHIP_ID:
2319
return (ci->pub.chiprev < 9) ? 0x180000 : 0x160000;
20+
- case BRCM_CC_4364_CHIP_ID:
21+
+ case BRCM_CC_4364_CHIP_ID: /* MacBookPro15,x, 16,x */
2422
case CY_CC_4373_CHIP_ID:
23+
return 0x160000;
24+
default:
2525
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
26-
index 58a6bc379..c748d9cd5 100644
26+
index 39381cbde..b7af5ee30 100644
2727
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
2828
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
29-
@@ -48,15 +48,18 @@
29+
@@ -48,16 +48,18 @@ enum brcmf_pcie_state {
3030
BRCMF_FW_DEF(43602, "brcmfmac43602-pcie");
3131
BRCMF_FW_DEF(4350, "brcmfmac4350-pcie");
3232
BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie");
@@ -35,6 +35,7 @@ index 58a6bc379..c748d9cd5 100644
3535
BRCMF_FW_DEF(43570, "brcmfmac43570-pcie");
3636
BRCMF_FW_DEF(4358, "brcmfmac4358-pcie");
3737
BRCMF_FW_DEF(4359, "brcmfmac4359-pcie");
38+
-BRCMF_FW_DEF(4364, "brcmfmac4364-pcie");
3839
+BRCMF_FW_DEF(4364, "brcmfmac4364-pcie"); /* MacBookPro15,x 16,x */
3940
BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie");
4041
BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");
@@ -45,7 +46,7 @@ index 58a6bc379..c748d9cd5 100644
4546

4647
static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
4748
BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
48-
@@ -64,18 +67,21 @@
49+
@@ -65,19 +67,21 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
4950
BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),
5051
BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350),
5152
BRCMF_FW_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C),
@@ -56,6 +57,7 @@ index 58a6bc379..c748d9cd5 100644
5657
BRCMF_FW_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570),
5758
BRCMF_FW_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
5859
BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
60+
- BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFFF, 4364),
5961
+ BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFFF, 4364), /* MacBookPro15,x 16,x */
6062
BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),
6163
BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),
@@ -67,23 +69,24 @@ index 58a6bc379..c748d9cd5 100644
6769
};
6870

6971
#define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */
70-
@@ -2096,6 +2102,7 @@
72+
@@ -2098,6 +2102,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
7173
BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
7274
BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355),
7375
BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID),
7476
+ BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID), /* MacBookAir8,x */
7577
BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID),
7678
BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID),
7779
BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID),
78-
@@ -2105,6 +2112,7 @@
80+
@@ -2107,7 +2112,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
7981
BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID),
8082
BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID),
8183
BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID),
84+
- BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID),
8285
+ BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID), /* MacBookPro15,x 16,x */
8386
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),
8487
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),
8588
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),
86-
@@ -2113,6 +2121,7 @@
89+
@@ -2116,6 +2121,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
8790
BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
8891
BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
8992
BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),
@@ -92,7 +95,7 @@ index 58a6bc379..c748d9cd5 100644
9295
};
9396

9497
diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
95-
index 839980da9..da0bc47bb 100644
98+
index c6c4be051..20abac3e0 100644
9699
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
97100
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
98101
@@ -36,6 +36,7 @@
@@ -103,10 +106,11 @@ index 839980da9..da0bc47bb 100644
103106
#define BRCM_CC_4356_CHIP_ID 0x4356
104107
#define BRCM_CC_43566_CHIP_ID 43566
105108
#define BRCM_CC_43567_CHIP_ID 43567
106-
@@ -44,10 +45,12 @@
109+
@@ -44,11 +45,12 @@
107110
#define BRCM_CC_4358_CHIP_ID 0x4358
108111
#define BRCM_CC_4359_CHIP_ID 0x4359
109112
#define BRCM_CC_43602_CHIP_ID 43602
113+
-#define BRCM_CC_4364_CHIP_ID 0x4364
110114
+#define BRCM_CC_4364_CHIP_ID 0x4364 /* MacBookPro15,x 16,x */
111115
#define BRCM_CC_4365_CHIP_ID 0x4365
112116
#define BRCM_CC_4366_CHIP_ID 0x4366
@@ -116,23 +120,24 @@ index 839980da9..da0bc47bb 100644
116120
#define CY_CC_4373_CHIP_ID 0x4373
117121
#define CY_CC_43012_CHIP_ID 43012
118122

119-
@@ -65,6 +68,7 @@
123+
@@ -66,6 +68,7 @@
120124
#define BRCM_PCIE_4350_DEVICE_ID 0x43a3
121125
#define BRCM_PCIE_4354_DEVICE_ID 0x43df
122126
#define BRCM_PCIE_4354_RAW_DEVICE_ID 0x4354
123127
+#define BRCM_PCIE_4355_DEVICE_ID 0x43dc /* MacBookAir8,x */
124128
#define BRCM_PCIE_4356_DEVICE_ID 0x43ec
125129
#define BRCM_PCIE_43567_DEVICE_ID 0x43d3
126130
#define BRCM_PCIE_43570_DEVICE_ID 0x43d9
127-
@@ -74,6 +78,7 @@
131+
@@ -75,7 +78,7 @@
128132
#define BRCM_PCIE_43602_2G_DEVICE_ID 0x43bb
129133
#define BRCM_PCIE_43602_5G_DEVICE_ID 0x43bc
130134
#define BRCM_PCIE_43602_RAW_DEVICE_ID 43602
135+
-#define BRCM_PCIE_4364_DEVICE_ID 0x4464
131136
+#define BRCM_PCIE_4364_DEVICE_ID 0x4464 /* MacBookPro15,x 16,x */
132137
#define BRCM_PCIE_4365_DEVICE_ID 0x43ca
133138
#define BRCM_PCIE_4365_2G_DEVICE_ID 0x43cb
134139
#define BRCM_PCIE_4365_5G_DEVICE_ID 0x43cc
135-
@@ -81,6 +86,7 @@
140+
@@ -83,6 +86,7 @@
136141
#define BRCM_PCIE_4366_2G_DEVICE_ID 0x43c4
137142
#define BRCM_PCIE_4366_5G_DEVICE_ID 0x43c5
138143
#define BRCM_PCIE_4371_DEVICE_ID 0x440d

0 commit comments

Comments
 (0)