42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From: Franky Lin <frankyl@broadcom.com>
|
|
Date: Wed, 20 May 2015 14:09:49 +0200
|
|
Subject: [PATCH] brcmfmac: remove pci shared structure rev4 support
|
|
|
|
All pcie full dongle chips supported by fmac are using rev 5+ shared
|
|
structure. This patch removes the rev4 related code.
|
|
|
|
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
|
|
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
|
|
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
|
|
Signed-off-by: Franky Lin <frankyl@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
|
|
@@ -112,10 +112,9 @@ enum brcmf_pcie_state {
|
|
BRCMF_PCIE_MB_INT_D2H3_DB0 | \
|
|
BRCMF_PCIE_MB_INT_D2H3_DB1)
|
|
|
|
-#define BRCMF_PCIE_MIN_SHARED_VERSION 4
|
|
+#define BRCMF_PCIE_MIN_SHARED_VERSION 5
|
|
#define BRCMF_PCIE_MAX_SHARED_VERSION 5
|
|
#define BRCMF_PCIE_SHARED_VERSION_MASK 0x00FF
|
|
-#define BRCMF_PCIE_SHARED_TXPUSH_SUPPORT 0x4000
|
|
|
|
#define BRCMF_PCIE_FLAGS_HTOD_SPLIT 0x4000
|
|
#define BRCMF_PCIE_FLAGS_DTOH_SPLIT 0x8000
|
|
@@ -1280,11 +1279,6 @@ brcmf_pcie_init_share_ram_info(struct br
|
|
brcmf_err("Unsupported PCIE version %d\n", version);
|
|
return -EINVAL;
|
|
}
|
|
- if (shared->flags & BRCMF_PCIE_SHARED_TXPUSH_SUPPORT) {
|
|
- brcmf_err("Unsupported legacy TX mode 0x%x\n",
|
|
- shared->flags & BRCMF_PCIE_SHARED_TXPUSH_SUPPORT);
|
|
- return -EINVAL;
|
|
- }
|
|
|
|
addr = sharedram_addr + BRCMF_SHARED_MAX_RXBUFPOST_OFFSET;
|
|
shared->max_rxbufpost = brcmf_pcie_read_tcm16(devinfo, addr);
|