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
Merge remote-tracking branch 'redecorating/bcm4377'
This commit is contained in:
Houjun Liu
@@ -39,21 +39,19 @@ jobs:
|
||||
if curl -s https://github.com/Redecorating/mbp-16.1-linux-wifi/releases/tag/v${pkgver}-${pkgrel} > /dev/null
|
||||
then sudo rm *.pkg.tar.*
|
||||
fi
|
||||
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
${{ github.workspace }}/*.pkg.tar.*
|
||||
tag_name: v${{ steps.create_tag.outputs.tag }}
|
||||
draft: true
|
||||
body: |
|
||||
Install packages with `sudo pacman -U <file>`, you can use urls or file paths.
|
||||
You will need to be using `apple-bce-dkms-git` as `apple-bce-git` only works on `linux-mbp`.
|
||||
If you are looking for a debian version of this, see [here](https://github.com/AdityaGarg8/mbp-16.x-ubuntu-kernel/releases)
|
||||
|
||||
You will need wifi firmware from MacOS, as described [here](http://wiki.t2linux.org/guides/wifi/#big-sur-firmware)
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
# - name: Release
|
||||
# uses: softprops/action-gh-release@v1
|
||||
# with:
|
||||
# files: |
|
||||
# ${{ github.workspace }}/*.pkg.tar.*
|
||||
# tag_name: v${{ steps.create_tag.outputs.tag }}
|
||||
# draft: true
|
||||
# body: |
|
||||
# Install packages with `sudo pacman -U <file>`, you can use urls or file paths.
|
||||
# You will need to be using `apple-bce-dkms-git` as `apple-bce-git` only works on `linux-mbp`.
|
||||
# If you are looking for a debian version of this, see [here](https://github.com/Redecorating/mbp-ubuntu-kernel/releases)
|
||||
## You will need wifi firmware from MacOS, as described [here](https://wiki.t2linux.org/guides/wifi/#on-macos).
|
||||
# env:
|
||||
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
From ef2dddd7ecd61ffa5b055e1dabeba806f2de0a69 Mon Sep 17 00:00:00 2001
|
||||
From: Aun-Ali Zaidi <admin@kodeit.net>
|
||||
Date: Sun, 1 Nov 2020 01:39:09 -0400
|
||||
Subject: [PATCH 2/2] brcmfmac: Add initial support for the BRCM4377
|
||||
|
||||
This commit adds the required device IDs and rambase address
|
||||
for the BRCM4377 Wifi/BT combo chip. Additional changes are
|
||||
required to fully support this chip.
|
||||
|
||||
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 | 3 +++
|
||||
drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 2 ++
|
||||
3 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
||||
index 6c39415a69d6..d2392a8fdbbb 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
||||
@@ -727,6 +727,8 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
|
||||
case BRCM_CC_4364_CHIP_ID:
|
||||
case CY_CC_4373_CHIP_ID:
|
||||
return 0x160000;
|
||||
+ case BRCM_CC_4377_CHIP_ID:
|
||||
+ return 0x170000;
|
||||
case BRCM_CC_4378_CHIP_ID:
|
||||
return 0x352000;
|
||||
default:
|
||||
brcmf_err("unknown chip: %s\n", ci->pub.name);
|
||||
break;
|
||||
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||||
index 60e3b0ce4fd7..a262e2eb36af 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||||
@@ -59,6 +59,7 @@ BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");
|
||||
BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");
|
||||
BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
|
||||
BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
|
||||
+BRCMF_FW_DEF(4377, "brcmfmac4377-pcie");
|
||||
BRCMF_FW_DEF(4378, "brcmfmac4378-pcie");
|
||||
|
||||
static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
|
||||
BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
|
||||
@@ -80,6 +81,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
|
||||
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),
|
||||
BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378),
|
||||
};
|
||||
|
||||
#define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */
|
||||
@@ -2119,6 +2121,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),
|
||||
BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_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 777ffdbce230..7b50e2edf6e2 100644
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
|
||||
@@ -50,6 +50,7 @@
|
||||
#define BRCM_CC_4366_CHIP_ID 0x4366
|
||||
#define BRCM_CC_43664_CHIP_ID 43664
|
||||
#define BRCM_CC_4371_CHIP_ID 0x4371
|
||||
+#define BRCM_CC_4377_CHIP_ID 0x4377
|
||||
#define BRCM_CC_4378_CHIP_ID 0x4378
|
||||
#define CY_CC_4373_CHIP_ID 0x4373
|
||||
#define CY_CC_43012_CHIP_ID 43012
|
||||
|
||||
@@ -85,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
|
||||
#define BRCM_PCIE_4378_DEVICE_ID 0x4425
|
||||
|
||||
|
||||
/* brcmsmac IDs */
|
||||
--
|
||||
2.29.1
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
||||
@@ -1429,7 +1429,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
|
||||
reg = chip->ops->read32(chip->ctx, addr);
|
||||
return (reg & (PMU_RCTL_MACPHY_DISABLE_MASK |
|
||||
PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
|
||||
- case BRCM_CC_4378_CHIP_ID:
|
||||
+ case BRCM_CC_4377_CHIP_ID:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||||
@@ -586,23 +586,23 @@
|
||||
{
|
||||
switch(reg) {
|
||||
case BRCMF_PCIE_PCIE2REG_INTMASK:
|
||||
- if(devinfo->ci->chip == BRCM_CC_4378_CHIP_ID)
|
||||
+ if(devinfo->ci->chip == BRCM_CC_4377_CHIP_ID)
|
||||
return BRCMF_PCIE_64_PCIE2REG_INTMASK;
|
||||
return reg;
|
||||
case BRCMF_PCIE_PCIE2REG_MAILBOXINT:
|
||||
- if(devinfo->ci->chip == BRCM_CC_4378_CHIP_ID)
|
||||
+ if(devinfo->ci->chip == BRCM_CC_4377_CHIP_ID)
|
||||
return BRCMF_PCIE_64_PCIE2REG_MAILBOXINT;
|
||||
return reg;
|
||||
case BRCMF_PCIE_PCIE2REG_MAILBOXMASK:
|
||||
- if(devinfo->ci->chip == BRCM_CC_4378_CHIP_ID)
|
||||
+ if(devinfo->ci->chip == BRCM_CC_4377_CHIP_ID)
|
||||
return BRCMF_PCIE_64_PCIE2REG_MAILBOXMASK;
|
||||
return reg;
|
||||
case BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_0:
|
||||
- if(devinfo->ci->chip == BRCM_CC_4378_CHIP_ID)
|
||||
+ if(devinfo->ci->chip == BRCM_CC_4377_CHIP_ID)
|
||||
return BRCMF_PCIE_64_PCIE2REG_H2D_MAILBOX_0;
|
||||
return reg;
|
||||
case BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_1:
|
||||
- if(devinfo->ci->chip == BRCM_CC_4378_CHIP_ID)
|
||||
+ if(devinfo->ci->chip == BRCM_CC_4377_CHIP_ID)
|
||||
return BRCMF_PCIE_64_PCIE2REG_H2D_MAILBOX_1;
|
||||
return reg;
|
||||
default:
|
||||
@@ -1017,7 +1017,7 @@
|
||||
|
||||
static void brcmf_pcie_intr_enable(struct brcmf_pciedev_info *devinfo)
|
||||
{
|
||||
- if(devinfo->ci->chip == BRCM_CC_4378_CHIP_ID)
|
||||
+ if(devinfo->ci->chip == BRCM_CC_4377_CHIP_ID)
|
||||
brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_64_PCIE2REG_MAILBOXMASK,
|
||||
BRCMF_PCIE_64_MB_INT_D2H_DB);
|
||||
else
|
||||
@@ -1052,7 +1052,7 @@
|
||||
struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
|
||||
u32 status, mask;
|
||||
|
||||
- if(devinfo->ci->chip == BRCM_CC_4378_CHIP_ID)
|
||||
+ if(devinfo->ci->chip == BRCM_CC_4377_CHIP_ID)
|
||||
mask = BRCMF_PCIE_64_MB_INT_D2H_DB;
|
||||
else
|
||||
mask = BRCMF_PCIE_MB_INT_D2H_DB;
|
||||
@@ -56,7 +56,9 @@ source=(
|
||||
7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch
|
||||
|
||||
# Broadcom WIFI/BT device support
|
||||
wifi-bigsur.patch
|
||||
8001-corellium-wifi-bigsur.patch
|
||||
8002-brcmfmac-4377-mod.patch
|
||||
8003-brcmfmac-4377-64bit-regs.patch
|
||||
)
|
||||
|
||||
validpgpkeys=(
|
||||
@@ -257,4 +259,6 @@ md5sums=('9bd74571c148a7753f5a237ba52f8ee5'
|
||||
'bfc5adf91d389b52e9e0e61bc313b980'
|
||||
'6b5c2b02c39db21a9fe5c198794059d4'
|
||||
'b1d2a8aca562ad2bd6ff0bcb48fcbc70'
|
||||
'7bc42e89f69e546abae185742609ca76')
|
||||
'7bc42e89f69e546abae185742609ca76'
|
||||
'aaebba04ae61485024200dcba755da49'
|
||||
'ad2552bc11f7fd9d57ccda27272fee44')
|
||||
|
||||
Reference in New Issue
Block a user