Skip to content

Commit 4d6ede4

Browse files
marcanjannau
authored andcommitted
wifi: brcmfmac: Add missing shared area defines to pcie.c
There are many newer flags and extended shared area fields used by newer firmwares that are not yet defined. Add them for future usage. Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 0ff41df commit 4d6ede4

1 file changed

Lines changed: 58 additions & 0 deletions

File tree

  • drivers/net/wireless/broadcom/brcm80211/brcmfmac

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,64 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
217217
#define BRCMF_PCIE_SHARED_VERSION_MASK 0x00FF
218218
#define BRCMF_PCIE_SHARED_DMA_INDEX 0x10000
219219
#define BRCMF_PCIE_SHARED_DMA_2B_IDX 0x100000
220+
#define BRCMF_PCIE_SHARED_USE_MAILBOX 0x2000000
221+
#define BRCMF_PCIE_SHARED_TIMESTAMP_DB0 0x8000000
220222
#define BRCMF_PCIE_SHARED_HOSTRDY_DB1 0x10000000
223+
#define BRCMF_PCIE_SHARED_NO_OOB_DW 0x20000000
224+
#define BRCMF_PCIE_SHARED_INBAND_DS 0x40000000
225+
#define BRCMF_PCIE_SHARED_DAR 0x80000000
226+
227+
#define BRCMF_PCIE_SHARED2_EXTENDED_TRAP_DATA 0x1
228+
#define BRCMF_PCIE_SHARED2_TXSTATUS_METADATA 0x2
229+
#define BRCMF_PCIE_SHARED2_BT_LOGGING 0x4
230+
#define BRCMF_PCIE_SHARED2_SNAPSHOT_UPLOAD 0x8
231+
#define BRCMF_PCIE_SHARED2_SUBMIT_COUNT_WAR 0x10
232+
#define BRCMF_PCIE_SHARED2_FAST_DELETE_RING 0x20
233+
#define BRCMF_PCIE_SHARED2_EVTBUF_MAX_MASK 0xC0
234+
#define BRCMF_PCIE_SHARED2_PKT_TX_STATUS 0x100
235+
#define BRCMF_PCIE_SHARED2_FW_SMALL_MEMDUMP 0x200
236+
#define BRCMF_PCIE_SHARED2_FW_HC_ON_TRAP 0x400
237+
#define BRCMF_PCIE_SHARED2_HSCB 0x800
238+
#define BRCMF_PCIE_SHARED2_EDL_RING 0x1000
239+
#define BRCMF_PCIE_SHARED2_DEBUG_BUF_DEST 0x2000
240+
#define BRCMF_PCIE_SHARED2_PCIE_ENUM_RESET_FLR 0x4000
241+
#define BRCMF_PCIE_SHARED2_PKT_TIMESTAMP 0x8000
242+
#define BRCMF_PCIE_SHARED2_HP2P 0x10000
243+
#define BRCMF_PCIE_SHARED2_HWA 0x20000
244+
#define BRCMF_PCIE_SHARED2_TRAP_ON_HOST_DB7 0x40000
245+
#define BRCMF_PCIE_SHARED2_DURATION_SCALE 0x100000
246+
#define BRCMF_PCIE_SHARED2_D2H_D11_TX_STATUS 0x40000000
247+
#define BRCMF_PCIE_SHARED2_H2D_D11_TX_STATUS 0x80000000
221248

222249
#define BRCMF_PCIE_FLAGS_HTOD_SPLIT 0x4000
223250
#define BRCMF_PCIE_FLAGS_DTOH_SPLIT 0x8000
224251

252+
#define BRCMF_HOSTCAP_PCIEAPI_VERSION_MASK 0x000000FF
253+
#define BRCMF_HOSTCAP_H2D_VALID_PHASE 0x00000100
254+
#define BRCMF_HOSTCAP_H2D_ENABLE_TRAP_ON_BADPHASE 0x00000200
255+
#define BRCMF_HOSTCAP_H2D_ENABLE_HOSTRDY 0x400
256+
#define BRCMF_HOSTCAP_DB0_TIMESTAMP 0x800
257+
#define BRCMF_HOSTCAP_DS_NO_OOB_DW 0x1000
258+
#define BRCMF_HOSTCAP_DS_INBAND_DW 0x2000
259+
#define BRCMF_HOSTCAP_H2D_IDMA 0x4000
260+
#define BRCMF_HOSTCAP_H2D_IFRM 0x8000
261+
#define BRCMF_HOSTCAP_H2D_DAR 0x10000
262+
#define BRCMF_HOSTCAP_EXTENDED_TRAP_DATA 0x20000
263+
#define BRCMF_HOSTCAP_TXSTATUS_METADATA 0x40000
264+
#define BRCMF_HOSTCAP_BT_LOGGING 0x80000
265+
#define BRCMF_HOSTCAP_SNAPSHOT_UPLOAD 0x100000
266+
#define BRCMF_HOSTCAP_FAST_DELETE_RING 0x200000
267+
#define BRCMF_HOSTCAP_PKT_TXSTATUS 0x400000
268+
#define BRCMF_HOSTCAP_UR_FW_NO_TRAP 0x800000
269+
#define BRCMF_HOSTCAP_HSCB 0x2000000
270+
#define BRCMF_HOSTCAP_EXT_TRAP_DBGBUF 0x4000000
271+
#define BRCMF_HOSTCAP_EDL_RING 0x10000000
272+
#define BRCMF_HOSTCAP_PKT_TIMESTAMP 0x20000000
273+
#define BRCMF_HOSTCAP_PKT_HP2P 0x40000000
274+
#define BRCMF_HOSTCAP_HWA 0x80000000
275+
#define BRCMF_HOSTCAP2_DURATION_SCALE_MASK 0x3F
276+
277+
#define BRCMF_SHARED_FLAGS_OFFSET 0
225278
#define BRCMF_SHARED_MAX_RXBUFPOST_OFFSET 34
226279
#define BRCMF_SHARED_RING_BASE_OFFSET 52
227280
#define BRCMF_SHARED_RX_DATAOFFSET_OFFSET 36
@@ -233,6 +286,11 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
233286
#define BRCMF_SHARED_DMA_SCRATCH_ADDR_OFFSET 56
234287
#define BRCMF_SHARED_DMA_RINGUPD_LEN_OFFSET 64
235288
#define BRCMF_SHARED_DMA_RINGUPD_ADDR_OFFSET 68
289+
#define BRCMF_SHARED_FLAGS2_OFFSET 80
290+
#define BRCMF_SHARED_HOST_CAP_OFFSET 84
291+
#define BRCMF_SHARED_FLAGS3_OFFSET 108
292+
#define BRCMF_SHARED_HOST_CAP2_OFFSET 112
293+
#define BRCMF_SHARED_HOST_CAP3_OFFSET 116
236294

237295
#define BRCMF_RING_H2D_RING_COUNT_OFFSET 0
238296
#define BRCMF_RING_D2H_RING_COUNT_OFFSET 1

0 commit comments

Comments
 (0)