brcmfmac: Add initial support for BRCM4377

aunali1 · Jan 2, 2020 · d4395a3 · d4395a3
1 parent 3fce95a
commit d4395a3
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 16 deletions.
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-mbp
 	pkgdesc = Linux for MBP
 	pkgver = 5.4.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://git.archlinux.org/linux.git/log/?h=vv5.4-7
 	arch = x86_64
 	license = GPL2
@@ -68,7 +68,7 @@ pkgbase = linux-mbp
 	sha256sums = 594ee36c0bc7eee93df824017bc32c3f5afb13b14f1a396f28b665c97dc1d7c0
 	sha256sums = 41afb414a69dc9e2b022605e0e63a9e14738c8e8c87984b95969aa8ab3584d77
 	sha256sums = 717f7fc70a3e3fcfa5ffbac505c8259c1d86718ca1ca6593e8925dac3d29a835
-	sha256sums = 217c81919200903070d235098a9e8ba0039bb1ed10017ad86ae4c3fc8e0f46b7
+	sha256sums = c33b7bb818b3b81fc4db3ed7f15545ee1e38107788daed07d7d2a19700968f9d
 
 pkgname = linux-mbp
 	pkgdesc = The Linux for MBP kernel and modules

diff --git a/PKGBUILD b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=linux-mbp
 pkgver=5.4.7
 _srcname=linux-${pkgver}
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux for MBP'
 _srctag=v${pkgver%.*}-${pkgver##*.}
 url="https://git.archlinux.org/linux.git/log/?h=v$_srctag"
@@ -84,7 +84,7 @@ sha256sums=('abc9b21d9146d95853dac35f4c4489a0199aff53ee6eee4b0563d1b37079fcc9'
             '594ee36c0bc7eee93df824017bc32c3f5afb13b14f1a396f28b665c97dc1d7c0'
             '41afb414a69dc9e2b022605e0e63a9e14738c8e8c87984b95969aa8ab3584d77'
             '717f7fc70a3e3fcfa5ffbac505c8259c1d86718ca1ca6593e8925dac3d29a835'
-            '217c81919200903070d235098a9e8ba0039bb1ed10017ad86ae4c3fc8e0f46b7')
+            'c33b7bb818b3b81fc4db3ed7f15545ee1e38107788daed07d7d2a19700968f9d')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase

diff --git a/wifi.patch b/wifi.patch
@@ -1,8 +1,16 @@
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
-index 22534bf2a90c..ad12151554e9 100644
+index dd586a96b57a..39fdaf65185c 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
-@@ -698,6 +698,8 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
+@@ -667,6 +667,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
+ {
+ 	switch (ci->pub.chip) {
+ 	case BRCM_CC_4345_CHIP_ID:
++	case BRCM_CC_4377_CHIP_ID:
+ 		return 0x198000;
+ 	case BRCM_CC_4335_CHIP_ID:
+ 	case BRCM_CC_4339_CHIP_ID:
+@@ -687,6 +688,8 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
  	case BRCM_CC_4366_CHIP_ID:
  	case BRCM_CC_43664_CHIP_ID:
  		return 0x200000;
@@ -12,10 +20,10 @@ index 22534bf2a90c..ad12151554e9 100644
  		return 0x160000;
  	default:
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
-index 83e4938527f4..ea817e3448ad 100644
+index 3be60aef5465..610f99412683 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
-@@ -58,10 +58,12 @@ enum brcmf_pcie_state {
+@@ -48,15 +48,18 @@ enum brcmf_pcie_state {
  BRCMF_FW_DEF(43602, "brcmfmac43602-pcie");
  BRCMF_FW_DEF(4350, "brcmfmac4350-pcie");
  BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie");
@@ -28,7 +36,13 @@ index 83e4938527f4..ea817e3448ad 100644
  BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie");
  BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");
  BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");
-@@ -74,12 +76,14 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
+ BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
+ BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
++BRCMF_FW_DEF(4377, "brcmfmac4377-pcie");
+
+ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
+ 	BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
+@@ -64,18 +67,21 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
  	BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),
  	BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350),
  	BRCMF_FW_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C),
@@ -43,55 +57,82 @@ index 83e4938527f4..ea817e3448ad 100644
  	BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),
  	BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),
  	BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
-@@ -2090,6 +2094,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
+ 	BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
+ 	BRCMF_FW_ENTRY(BRCM_CC_43664_CHIP_ID, 0xFFFFFFF0, 4366C),
+ 	BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
++	BRCMF_FW_ENTRY(BRCM_CC_4377_CHIP_ID, 0xFFFFFFFF, 4377),
+ };
+
+ #define BRCMF_PCIE_FW_UP_TIMEOUT		2000 /* msec */
+@@ -2098,6 +2104,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
  	BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID),
 +	BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID),
-@@ -2099,6 +2104,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
+@@ -2107,6 +2114,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID),
 +	BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),
+@@ -2115,6 +2123,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
+ 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
+ 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
+ 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),
++	BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID),
+ 	{ /* end: all zeroes */ }
+ };
+
 diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
-index 839980da9643..b33dacdf2891 100644
+index d1037b6ef2d6..53e9cdafe414 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
-@@ -47,6 +47,7 @@
+@@ -36,6 +36,7 @@
  #define BRCM_CC_4350_CHIP_ID		0x4350
  #define BRCM_CC_43525_CHIP_ID		43525
  #define BRCM_CC_4354_CHIP_ID		0x4354
 +#define BRCM_CC_4355_CHIP_ID		0x4355
  #define BRCM_CC_4356_CHIP_ID		0x4356
  #define BRCM_CC_43566_CHIP_ID		43566
  #define BRCM_CC_43567_CHIP_ID		43567
-@@ -56,6 +57,7 @@
+@@ -45,9 +46,11 @@
  #define BRCM_CC_4359_CHIP_ID		0x4359
  #define BRCM_CC_43602_CHIP_ID		43602
  #define BRCM_CC_4365_CHIP_ID		0x4365
 +#define BRCM_CC_4364_CHIP_ID		0x4364
  #define BRCM_CC_4366_CHIP_ID		0x4366
  #define BRCM_CC_43664_CHIP_ID		43664
  #define BRCM_CC_4371_CHIP_ID		0x4371
-@@ -76,6 +78,7 @@
++#define BRCM_CC_4377_CHIP_ID		0x4377
+ #define CY_CC_4373_CHIP_ID		0x4373
+ #define CY_CC_43012_CHIP_ID		43012
+
+@@ -65,6 +68,7 @@
  #define BRCM_PCIE_4350_DEVICE_ID	0x43a3
  #define BRCM_PCIE_4354_DEVICE_ID	0x43df
  #define BRCM_PCIE_4354_RAW_DEVICE_ID	0x4354
 +#define BRCM_PCIE_4355_DEVICE_ID	0x43dc
  #define BRCM_PCIE_4356_DEVICE_ID	0x43ec
  #define BRCM_PCIE_43567_DEVICE_ID	0x43d3
  #define BRCM_PCIE_43570_DEVICE_ID	0x43d9
-@@ -85,6 +88,7 @@
+@@ -74,6 +78,7 @@
  #define BRCM_PCIE_43602_2G_DEVICE_ID	0x43bb
  #define BRCM_PCIE_43602_5G_DEVICE_ID	0x43bc
  #define BRCM_PCIE_43602_RAW_DEVICE_ID	43602
 +#define BRCM_PCIE_4364_DEVICE_ID	0x4464
  #define BRCM_PCIE_4365_DEVICE_ID	0x43ca
  #define BRCM_PCIE_4365_2G_DEVICE_ID	0x43cb
  #define BRCM_PCIE_4365_5G_DEVICE_ID	0x43cc
+@@ -81,6 +86,7 @@
+ #define BRCM_PCIE_4366_2G_DEVICE_ID	0x43c4
+ #define BRCM_PCIE_4366_5G_DEVICE_ID	0x43c5
+ #define BRCM_PCIE_4371_DEVICE_ID	0x440d
++#define BRCM_PCIE_4377_DEVICE_ID	0x4488
+
+
+ /* brcmsmac IDs */