brcmfmac: Adding PCIe bus layer support.
authorHante Meuleman <meuleman@broadcom.com>
Wed, 30 Jul 2014 11:20:04 +0000 (13:20 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 31 Jul 2014 17:45:26 +0000 (13:45 -0400)
This patch will add PCIe support. With this patch the PCIe chipsets
43602, 4354, 4356, 43567, and 43570 will be supported.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/Kconfig
drivers/net/wireless/brcm80211/brcmfmac/Makefile
drivers/net/wireless/brcm80211/brcmfmac/chip.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/brcm80211/brcmfmac/pcie.c [new file with mode: 0644]
drivers/net/wireless/brcm80211/brcmfmac/pcie.h [new file with mode: 0644]
drivers/net/wireless/brcm80211/include/brcm_hw_ids.h

index fcfed6b99a62d6e16e66634df2df85198cbb64da..b8e2561ea6458212c29c847a47e25ddd21b4497d 100644 (file)
@@ -48,6 +48,16 @@ config BRCMFMAC_USB
          IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to
          use the driver for an USB wireless card.
 
+config BRCMFMAC_PCIE
+       bool "PCIE bus interface support for FullMAC driver"
+       depends on BRCMFMAC
+       depends on PCI
+       select FW_LOADER
+       ---help---
+         This option enables the PCIE bus interface support for Broadcom
+         IEEE802.11ac embedded FullMAC WLAN driver. Say Y if you want to
+         use the driver for an PCIE wireless card.
+
 config BRCM_TRACING
        bool "Broadcom device tracing"
        depends on BRCMSMAC || BRCMFMAC
index 0447a47fe237a58e7e36466073dc22ba18387765..c35adf4bc70b72e584969b6bfd4bae251d21b7fe 100644 (file)
@@ -45,6 +45,8 @@ brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
                bcmsdh.o
 brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
                usb.o
+brcmfmac-$(CONFIG_BRCMFMAC_PCIE) += \
+               pcie.o
 brcmfmac-$(CONFIG_BRCMDBG) += \
                dhd_dbg.o
 brcmfmac-$(CONFIG_BRCM_TRACING) += \
index 96800db0536b578922cc8bf8aea924ede640cadc..95efde868db82e6b36e0c954fe4d0ad2cd797721 100644 (file)
@@ -506,9 +506,17 @@ static void brcmf_chip_get_raminfo(struct brcmf_chip_priv *ci)
                break;
        case BRCM_CC_4339_CHIP_ID:
        case BRCM_CC_4354_CHIP_ID:
+       case BRCM_CC_4356_CHIP_ID:
+       case BRCM_CC_43567_CHIP_ID:
+       case BRCM_CC_43569_CHIP_ID:
+       case BRCM_CC_43570_CHIP_ID:
                ci->pub.ramsize = 0xc0000;
                ci->pub.rambase = 0x180000;
                break;
+       case BRCM_CC_43602_CHIP_ID:
+               ci->pub.ramsize = 0xf0000;
+               ci->pub.rambase = 0x180000;
+               break;
        default:
                brcmf_err("unknown chip: %s\n", ci->pub.name);
                break;
index 4053368eb743c1ae615422e1e398247a19c3a7a9..3122b86050a1a6adddf37dbda41fdd1bcc5bd8f1 100644 (file)
@@ -120,6 +120,7 @@ struct brcmf_bus {
        union {
                struct brcmf_sdio_dev *sdio;
                struct brcmf_usbdev *usb;
+               struct brcmf_pciedev *pcie;
        } bus_priv;
        enum brcmf_bus_protocol_type proto_type;
        struct device *dev;
index 6804eeca76884e500850fdfef11ec6bb87736084..dec40d316c829129cfd86b5043cfc3fbdedb03b4 100644 (file)
@@ -36,6 +36,7 @@
 #define BRCMF_BCDC_VAL         0x00010000
 #define BRCMF_SDIO_VAL         0x00020000
 #define BRCMF_MSGBUF_VAL       0x00040000
+#define BRCMF_PCIE_VAL         0x00080000
 
 /* set default print format */
 #undef pr_fmt
index 7e14e5fa47449be6036b13de7f9f04f561a6ed5e..b456bcb7f9164cb46d6063ad18eb4a1b0530d93b 100644 (file)
@@ -32,6 +32,7 @@
 #include "fwsignal.h"
 #include "feature.h"
 #include "proto.h"
+#include "pcie.h"
 
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
@@ -1084,6 +1085,9 @@ static void brcmf_driver_register(struct work_struct *work)
 #ifdef CONFIG_BRCMFMAC_USB
        brcmf_usb_register();
 #endif
+#ifdef CONFIG_BRCMFMAC_PCIE
+       brcmf_pcie_register();
+#endif
 }
 static DECLARE_WORK(brcmf_driver_work, brcmf_driver_register);
 
@@ -1108,6 +1112,9 @@ static void __exit brcmfmac_module_exit(void)
 #endif
 #ifdef CONFIG_BRCMFMAC_USB
        brcmf_usb_exit();
+#endif
+#ifdef CONFIG_BRCMFMAC_PCIE
+       brcmf_pcie_exit();
 #endif
        brcmf_debugfs_exit();
 }
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
new file mode 100644 (file)
index 0000000..89be96d
--- /dev/null
@@ -0,0 +1,1811 @@
+/* Copyright (c) 2014 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/firmware.h>
+#include <linux/pci.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/unaligned/access_ok.h>
+#include <linux/interrupt.h>
+#include <linux/bcma/bcma.h>
+#include <linux/sched.h>
+
+#include <soc.h>
+#include <chipcommon.h>
+#include <brcmu_utils.h>
+#include <brcmu_wifi.h>
+#include <brcm_hw_ids.h>
+
+#include "dhd_dbg.h"
+#include "dhd_bus.h"
+#include "commonring.h"
+#include "msgbuf.h"
+#include "pcie.h"
+#include "firmware.h"
+#include "chip.h"
+
+
+enum brcmf_pcie_state {
+       BRCMFMAC_PCIE_STATE_DOWN,
+       BRCMFMAC_PCIE_STATE_UP
+};
+
+
+#define BRCMF_PCIE_43602_FW_NAME               "brcm/brcmfmac43602-pcie.bin"
+#define BRCMF_PCIE_43602_NVRAM_NAME            "brcm/brcmfmac43602-pcie.txt"
+#define BRCMF_PCIE_4354_FW_NAME                        "brcm/brcmfmac4354-pcie.bin"
+#define BRCMF_PCIE_4354_NVRAM_NAME             "brcm/brcmfmac4354-pcie.txt"
+#define BRCMF_PCIE_4356_FW_NAME                        "brcm/brcmfmac4356-pcie.bin"
+#define BRCMF_PCIE_4356_NVRAM_NAME             "brcm/brcmfmac4356-pcie.txt"
+#define BRCMF_PCIE_43570_FW_NAME               "brcm/brcmfmac43570-pcie.bin"
+#define BRCMF_PCIE_43570_NVRAM_NAME            "brcm/brcmfmac43570-pcie.txt"
+
+#define BRCMF_PCIE_FW_UP_TIMEOUT               2000 /* msec */
+
+#define BRCMF_PCIE_TCM_MAP_SIZE                        (4096 * 1024)
+#define BRCMF_PCIE_REG_MAP_SIZE                        (32 * 1024)
+
+/* backplane addres space accessed by BAR0 */
+#define        BRCMF_PCIE_BAR0_WINDOW                  0x80
+#define BRCMF_PCIE_BAR0_REG_SIZE               0x1000
+#define        BRCMF_PCIE_BAR0_WRAPPERBASE             0x70
+
+#define BRCMF_PCIE_BAR0_WRAPBASE_DMP_OFFSET    0x1000
+#define BRCMF_PCIE_BARO_PCIE_ENUM_OFFSET       0x2000
+
+#define BRCMF_PCIE_ARMCR4REG_BANKIDX           0x40
+#define BRCMF_PCIE_ARMCR4REG_BANKPDA           0x4C
+
+#define BRCMF_PCIE_REG_INTSTATUS               0x90
+#define BRCMF_PCIE_REG_INTMASK                 0x94
+#define BRCMF_PCIE_REG_SBMBX                   0x98
+
+#define BRCMF_PCIE_PCIE2REG_INTMASK            0x24
+#define BRCMF_PCIE_PCIE2REG_MAILBOXINT         0x48
+#define BRCMF_PCIE_PCIE2REG_MAILBOXMASK                0x4C
+#define BRCMF_PCIE_PCIE2REG_CONFIGADDR         0x120
+#define BRCMF_PCIE_PCIE2REG_CONFIGDATA         0x124
+#define BRCMF_PCIE_PCIE2REG_H2D_MAILBOX                0x140
+
+#define BRCMF_PCIE_GENREV1                     1
+#define BRCMF_PCIE_GENREV2                     2
+
+#define BRCMF_PCIE2_INTA                       0x01
+#define BRCMF_PCIE2_INTB                       0x02
+
+#define BRCMF_PCIE_INT_0                       0x01
+#define BRCMF_PCIE_INT_1                       0x02
+#define BRCMF_PCIE_INT_DEF                     (BRCMF_PCIE_INT_0 | \
+                                                BRCMF_PCIE_INT_1)
+
+#define BRCMF_PCIE_MB_INT_FN0_0                        0x0100
+#define BRCMF_PCIE_MB_INT_FN0_1                        0x0200
+#define        BRCMF_PCIE_MB_INT_D2H0_DB0              0x10000
+#define        BRCMF_PCIE_MB_INT_D2H0_DB1              0x20000
+#define        BRCMF_PCIE_MB_INT_D2H1_DB0              0x40000
+#define        BRCMF_PCIE_MB_INT_D2H1_DB1              0x80000
+#define        BRCMF_PCIE_MB_INT_D2H2_DB0              0x100000
+#define        BRCMF_PCIE_MB_INT_D2H2_DB1              0x200000
+#define        BRCMF_PCIE_MB_INT_D2H3_DB0              0x400000
+#define        BRCMF_PCIE_MB_INT_D2H3_DB1              0x800000
+
+#define BRCMF_PCIE_MB_INT_D2H_DB               (BRCMF_PCIE_MB_INT_D2H0_DB0 | \
+                                                BRCMF_PCIE_MB_INT_D2H0_DB1 | \
+                                                BRCMF_PCIE_MB_INT_D2H1_DB0 | \
+                                                BRCMF_PCIE_MB_INT_D2H1_DB1 | \
+                                                BRCMF_PCIE_MB_INT_D2H2_DB0 | \
+                                                BRCMF_PCIE_MB_INT_D2H2_DB1 | \
+                                                BRCMF_PCIE_MB_INT_D2H3_DB0 | \
+                                                BRCMF_PCIE_MB_INT_D2H3_DB1)
+
+#define BRCMF_PCIE_MIN_SHARED_VERSION          4
+#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
+
+#define BRCMF_SHARED_MAX_RXBUFPOST_OFFSET      34
+#define BRCMF_SHARED_RING_BASE_OFFSET          52
+#define BRCMF_SHARED_RX_DATAOFFSET_OFFSET      36
+#define BRCMF_SHARED_CONSOLE_ADDR_OFFSET       20
+#define BRCMF_SHARED_HTOD_MB_DATA_ADDR_OFFSET  40
+#define BRCMF_SHARED_DTOH_MB_DATA_ADDR_OFFSET  44
+#define BRCMF_SHARED_RING_INFO_ADDR_OFFSET     48
+#define BRCMF_SHARED_DMA_SCRATCH_LEN_OFFSET    52
+#define BRCMF_SHARED_DMA_SCRATCH_ADDR_OFFSET   56
+#define BRCMF_SHARED_DMA_RINGUPD_LEN_OFFSET    64
+#define BRCMF_SHARED_DMA_RINGUPD_ADDR_OFFSET   68
+
+#define BRCMF_RING_H2D_RING_COUNT_OFFSET       0
+#define BRCMF_RING_D2H_RING_COUNT_OFFSET       1
+#define BRCMF_RING_H2D_RING_MEM_OFFSET         4
+#define BRCMF_RING_H2D_RING_STATE_OFFSET       8
+
+#define BRCMF_RING_MEM_BASE_ADDR_OFFSET                8
+#define BRCMF_RING_MAX_ITEM_OFFSET             4
+#define BRCMF_RING_LEN_ITEMS_OFFSET            6
+#define BRCMF_RING_MEM_SZ                      16
+#define BRCMF_RING_STATE_SZ                    8
+
+#define BRCMF_SHARED_RING_H2D_W_IDX_PTR_OFFSET 4
+#define BRCMF_SHARED_RING_H2D_R_IDX_PTR_OFFSET 8
+#define BRCMF_SHARED_RING_D2H_W_IDX_PTR_OFFSET 12
+#define BRCMF_SHARED_RING_D2H_R_IDX_PTR_OFFSET 16
+#define BRCMF_SHARED_RING_TCM_MEMLOC_OFFSET    0
+#define BRCMF_SHARED_RING_MAX_SUB_QUEUES       52
+
+#define BRCMF_DEF_MAX_RXBUFPOST                        255
+
+#define BRCMF_CONSOLE_BUFADDR_OFFSET           8
+#define BRCMF_CONSOLE_BUFSIZE_OFFSET           12
+#define BRCMF_CONSOLE_WRITEIDX_OFFSET          16
+
+#define BRCMF_DMA_D2H_SCRATCH_BUF_LEN          8
+#define BRCMF_DMA_D2H_RINGUPD_BUF_LEN          1024
+
+#define BRCMF_D2H_DEV_D3_ACK                   0x00000001
+#define BRCMF_D2H_DEV_DS_ENTER_REQ             0x00000002
+#define BRCMF_D2H_DEV_DS_EXIT_NOTE             0x00000004
+
+#define BRCMF_H2D_HOST_D3_INFORM               0x00000001
+#define BRCMF_H2D_HOST_DS_ACK                  0x00000002
+
+#define BRCMF_PCIE_MBDATA_TIMEOUT              2000
+
+
+MODULE_FIRMWARE(BRCMF_PCIE_43602_FW_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_43602_NVRAM_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4354_FW_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4354_NVRAM_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_43570_FW_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_43570_NVRAM_NAME);
+
+
+struct brcmf_pcie_console {
+       u32 base_addr;
+       u32 buf_addr;
+       u32 bufsize;
+       u32 read_idx;
+       u8 log_str[256];
+       u8 log_idx;
+};
+
+struct brcmf_pcie_shared_info {
+       u32 tcm_base_address;
+       u32 flags;
+       struct brcmf_pcie_ringbuf *commonrings[BRCMF_NROF_COMMON_MSGRINGS];
+       struct brcmf_pcie_ringbuf *flowrings;
+       u16 max_rxbufpost;
+       u32 nrof_flowrings;
+       u32 rx_dataoffset;
+       u32 htod_mb_data_addr;
+       u32 dtoh_mb_data_addr;
+       u32 ring_info_addr;
+       struct brcmf_pcie_console console;
+       void *scratch;
+       dma_addr_t scratch_dmahandle;
+       void *ringupd;
+       dma_addr_t ringupd_dmahandle;
+};
+
+struct brcmf_pcie_core_info {
+       u32 base;
+       u32 wrapbase;
+};
+
+struct brcmf_pciedev_info {
+       enum brcmf_pcie_state state;
+       bool in_irq;
+       bool irq_requested;
+       struct pci_dev *pdev;
+       char fw_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
+       char nvram_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
+       void __iomem *regs;
+       void __iomem *tcm;
+       u32 tcm_size;
+       u32 ram_base;
+       u32 ram_size;
+       struct brcmf_chip *ci;
+       u32 coreid;
+       u32 generic_corerev;
+       struct brcmf_pcie_shared_info shared;
+       void (*ringbell)(struct brcmf_pciedev_info *devinfo);
+       wait_queue_head_t mbdata_resp_wait;
+       bool mbdata_completed;
+       bool irq_allocated;
+};
+
+struct brcmf_pcie_ringbuf {
+       struct brcmf_commonring commonring;
+       dma_addr_t dma_handle;
+       u32 w_idx_addr;
+       u32 r_idx_addr;
+       struct brcmf_pciedev_info *devinfo;
+       u8 id;
+};
+
+
+static const u32 brcmf_ring_max_item[BRCMF_NROF_COMMON_MSGRINGS] = {
+       BRCMF_H2D_MSGRING_CONTROL_SUBMIT_MAX_ITEM,
+       BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM,
+       BRCMF_D2H_MSGRING_CONTROL_COMPLETE_MAX_ITEM,
+       BRCMF_D2H_MSGRING_TX_COMPLETE_MAX_ITEM,
+       BRCMF_D2H_MSGRING_RX_COMPLETE_MAX_ITEM
+};
+
+static const u32 brcmf_ring_itemsize[BRCMF_NROF_COMMON_MSGRINGS] = {
+       BRCMF_H2D_MSGRING_CONTROL_SUBMIT_ITEMSIZE,
+       BRCMF_H2D_MSGRING_RXPOST_SUBMIT_ITEMSIZE,
+       BRCMF_D2H_MSGRING_CONTROL_COMPLETE_ITEMSIZE,
+       BRCMF_D2H_MSGRING_TX_COMPLETE_ITEMSIZE,
+       BRCMF_D2H_MSGRING_RX_COMPLETE_ITEMSIZE
+};
+
+
+/* dma flushing needs implementation for mips and arm platforms. Should
+ * be put in util. Note, this is not real flushing. It is virtual non
+ * cached memory. Only write buffers should have to be drained. Though
+ * this may be different depending on platform......
+ */
+#define brcmf_dma_flush(addr, len)
+#define brcmf_dma_invalidate_cache(addr, len)
+
+
+static u32
+brcmf_pcie_read_reg32(struct brcmf_pciedev_info *devinfo, u32 reg_offset)
+{
+       void __iomem *address = devinfo->regs + reg_offset;
+
+       return (ioread32(address));
+}
+
+
+static void
+brcmf_pcie_write_reg32(struct brcmf_pciedev_info *devinfo, u32 reg_offset,
+                      u32 value)
+{
+       void __iomem *address = devinfo->regs + reg_offset;
+
+       iowrite32(value, address);
+}
+
+
+static u8
+brcmf_pcie_read_tcm8(struct brcmf_pciedev_info *devinfo, u32 mem_offset)
+{
+       void __iomem *address = devinfo->tcm + mem_offset;
+
+       return (ioread8(address));
+}
+
+
+static u16
+brcmf_pcie_read_tcm16(struct brcmf_pciedev_info *devinfo, u32 mem_offset)
+{
+       void __iomem *address = devinfo->tcm + mem_offset;
+
+       return (ioread16(address));
+}
+
+
+static void
+brcmf_pcie_write_tcm16(struct brcmf_pciedev_info *devinfo, u32 mem_offset,
+                      u16 value)
+{
+       void __iomem *address = devinfo->tcm + mem_offset;
+
+       iowrite16(value, address);
+}
+
+
+static u32
+brcmf_pcie_read_tcm32(struct brcmf_pciedev_info *devinfo, u32 mem_offset)
+{
+       void __iomem *address = devinfo->tcm + mem_offset;
+
+       return (ioread32(address));
+}
+
+
+static void
+brcmf_pcie_write_tcm32(struct brcmf_pciedev_info *devinfo, u32 mem_offset,
+                      u32 value)
+{
+       void __iomem *address = devinfo->tcm + mem_offset;
+
+       iowrite32(value, address);
+}
+
+
+static u32
+brcmf_pcie_read_ram32(struct brcmf_pciedev_info *devinfo, u32 mem_offset)
+{
+       void __iomem *addr = devinfo->tcm + devinfo->ci->rambase + mem_offset;
+
+       return (ioread32(addr));
+}
+
+
+static void
+brcmf_pcie_write_ram32(struct brcmf_pciedev_info *devinfo, u32 mem_offset,
+                      u32 value)
+{
+       void __iomem *addr = devinfo->tcm + devinfo->ci->rambase + mem_offset;
+
+       iowrite32(value, addr);
+}
+
+
+static void
+brcmf_pcie_copy_mem_todev(struct brcmf_pciedev_info *devinfo, u32 mem_offset,
+                         void *srcaddr, u32 len)
+{
+       void __iomem *address = devinfo->tcm + mem_offset;
+       __le32 *src32;
+       __le16 *src16;
+       u8 *src8;
+
+       if (((ulong)address & 4) || ((ulong)srcaddr & 4) || (len & 4)) {
+               if (((ulong)address & 2) || ((ulong)srcaddr & 2) || (len & 2)) {
+                       src8 = (u8 *)srcaddr;
+                       while (len) {
+                               iowrite8(*src8, address);
+                               address++;
+                               src8++;
+                               len--;
+                       }
+               } else {
+                       len = len / 2;
+                       src16 = (__le16 *)srcaddr;
+                       while (len) {
+                               iowrite16(le16_to_cpu(*src16), address);
+                               address += 2;
+                               src16++;
+                               len--;
+                       }
+               }
+       } else {
+               len = len / 4;
+               src32 = (__le32 *)srcaddr;
+               while (len) {
+                       iowrite32(le32_to_cpu(*src32), address);
+                       address += 4;
+                       src32++;
+                       len--;
+               }
+       }
+}
+
+
+#define WRITECC32(devinfo, reg, value) brcmf_pcie_write_reg32(devinfo, \
+               CHIPCREGOFFS(reg), value)
+
+
+static void
+brcmf_pcie_select_core(struct brcmf_pciedev_info *devinfo, u16 coreid)
+{
+       const struct pci_dev *pdev = devinfo->pdev;
+       struct brcmf_core *core;
+       u32 bar0_win;
+
+       core = brcmf_chip_get_core(devinfo->ci, coreid);
+       if (core) {
+               bar0_win = core->base;
+               pci_write_config_dword(pdev, BRCMF_PCIE_BAR0_WINDOW, bar0_win);
+               if (pci_read_config_dword(pdev, BRCMF_PCIE_BAR0_WINDOW,
+                                         &bar0_win) == 0) {
+                       if (bar0_win != core->base) {
+                               bar0_win = core->base;
+                               pci_write_config_dword(pdev,
+                                                      BRCMF_PCIE_BAR0_WINDOW,
+                                                      bar0_win);
+                       }
+               }
+       } else {
+               brcmf_err("Unsupported core selected %x\n", coreid);
+       }
+}
+
+
+static void brcmf_pcie_detach(struct brcmf_pciedev_info *devinfo)
+{
+       u16 cfg_offset[] = { 0x4,  0x4C, 0x58, 0x5C, 0x60, 0x64, 0xDC, 0x228,
+                            0x248,  0x4e0, 0x4f4 };
+       u32 i;
+       u32 val;
+
+       if (!devinfo->ci)
+               return;
+
+       brcmf_pcie_select_core(devinfo, BCMA_CORE_CHIPCOMMON);
+       WRITECC32(devinfo, watchdog, 0x4e0);
+
+       msleep(100);
+
+       brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2);
+       for (i = 0; i < ARRAY_SIZE(cfg_offset); i++) {
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGADDR,
+                                      cfg_offset[i]);
+               val = brcmf_pcie_read_reg32(devinfo,
+                                           BRCMF_PCIE_PCIE2REG_CONFIGDATA);
+               brcmf_dbg(PCIE, "config offset 0x%04x, value 0x%04x\n",
+                         cfg_offset[i], val);
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGDATA,
+                                      val);
+       }
+}
+
+
+static void brcmf_pcie_attach(struct brcmf_pciedev_info *devinfo)
+{
+       u32 config;
+
+       brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2);
+       if (brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_INTMASK) != 0)
+               brcmf_pcie_detach(devinfo);
+       /* BAR1 window may not be sized properly */
+       brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2);
+       brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGADDR, 0x4e0);
+       config = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGDATA);
+       brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGDATA, config);
+
+       device_wakeup_enable(&devinfo->pdev->dev);
+}
+
+
+static int brcmf_pcie_enter_download_state(struct brcmf_pciedev_info *devinfo)
+{
+       brcmf_chip_enter_download(devinfo->ci);
+
+       if (devinfo->ci->chip == BRCM_CC_43602_CHIP_ID) {
+               brcmf_pcie_select_core(devinfo, BCMA_CORE_ARM_CR4);
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX,
+                                      5);
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKPDA,
+                                      0);
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX,
+                                      7);
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKPDA,
+                                      0);
+       }
+       return 0;
+}
+
+
+static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo,
+                                         u32 resetintr)
+{
+       struct brcmf_core *core;
+
+       if (devinfo->ci->chip == BRCM_CC_43602_CHIP_ID) {
+               core = brcmf_chip_get_core(devinfo->ci, BCMA_CORE_INTERNAL_MEM);
+               brcmf_chip_resetcore(core, 0, 0, 0);
+       }
+
+       return !brcmf_chip_exit_download(devinfo->ci, resetintr);
+}
+
+
+static void
+brcmf_pcie_send_mb_data(struct brcmf_pciedev_info *devinfo, u32 htod_mb_data)
+{
+       struct brcmf_pcie_shared_info *shared;
+       u32 addr;
+       u32 cur_htod_mb_data;
+       u32 i;
+
+       shared = &devinfo->shared;
+       addr = shared->htod_mb_data_addr;
+       cur_htod_mb_data = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       if (cur_htod_mb_data != 0)
+               brcmf_dbg(PCIE, "MB transaction is already pending 0x%04x\n",
+                         cur_htod_mb_data);
+
+       i = 0;
+       while (cur_htod_mb_data != 0) {
+               msleep(10);
+               i++;
+               if (i > 100)
+                       break;
+               cur_htod_mb_data = brcmf_pcie_read_tcm32(devinfo, addr);
+       }
+
+       brcmf_pcie_write_tcm32(devinfo, addr, htod_mb_data);
+       pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_SBMBX, 1);
+       pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_SBMBX, 1);
+}
+
+
+static void brcmf_pcie_handle_mb_data(struct brcmf_pciedev_info *devinfo)
+{
+       struct brcmf_pcie_shared_info *shared;
+       u32 addr;
+       u32 dtoh_mb_data;
+
+       shared = &devinfo->shared;
+       addr = shared->dtoh_mb_data_addr;
+       dtoh_mb_data = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       if (!dtoh_mb_data)
+               return;
+
+       brcmf_pcie_write_tcm32(devinfo, addr, 0);
+
+       brcmf_dbg(PCIE, "D2H_MB_DATA: 0x%04x\n", dtoh_mb_data);
+       if (dtoh_mb_data & BRCMF_D2H_DEV_DS_ENTER_REQ)  {
+               brcmf_dbg(PCIE, "D2H_MB_DATA: DEEP SLEEP REQ\n");
+               brcmf_pcie_send_mb_data(devinfo, BRCMF_H2D_HOST_DS_ACK);
+               brcmf_dbg(PCIE, "D2H_MB_DATA: sent DEEP SLEEP ACK\n");
+       }
+       if (dtoh_mb_data & BRCMF_D2H_DEV_DS_EXIT_NOTE)
+               brcmf_dbg(PCIE, "D2H_MB_DATA: DEEP SLEEP EXIT\n");
+       if (dtoh_mb_data & BRCMF_D2H_DEV_D3_ACK)
+               brcmf_dbg(PCIE, "D2H_MB_DATA: D3 ACK\n");
+               if (waitqueue_active(&devinfo->mbdata_resp_wait)) {
+                       devinfo->mbdata_completed = true;
+                       wake_up(&devinfo->mbdata_resp_wait);
+               }
+}
+
+
+static void brcmf_pcie_bus_console_init(struct brcmf_pciedev_info *devinfo)
+{
+       struct brcmf_pcie_shared_info *shared;
+       struct brcmf_pcie_console *console;
+       u32 addr;
+
+       shared = &devinfo->shared;
+       console = &shared->console;
+       addr = shared->tcm_base_address + BRCMF_SHARED_CONSOLE_ADDR_OFFSET;
+       console->base_addr = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       addr = console->base_addr + BRCMF_CONSOLE_BUFADDR_OFFSET;
+       console->buf_addr = brcmf_pcie_read_tcm32(devinfo, addr);
+       addr = console->base_addr + BRCMF_CONSOLE_BUFSIZE_OFFSET;
+       console->bufsize = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       brcmf_dbg(PCIE, "Console: base %x, buf %x, size %d\n",
+                 console->base_addr, console->buf_addr, console->bufsize);
+}
+
+
+static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo)
+{
+       struct brcmf_pcie_console *console;
+       u32 addr;
+       u8 ch;
+       u32 newidx;
+
+       console = &devinfo->shared.console;
+       addr = console->base_addr + BRCMF_CONSOLE_WRITEIDX_OFFSET;
+       newidx = brcmf_pcie_read_tcm32(devinfo, addr);
+       while (newidx != console->read_idx) {
+               addr = console->buf_addr + console->read_idx;
+               ch = brcmf_pcie_read_tcm8(devinfo, addr);
+               console->read_idx++;
+               if (console->read_idx == console->bufsize)
+                       console->read_idx = 0;
+               if (ch == '\r')
+                       continue;
+               console->log_str[console->log_idx] = ch;
+               console->log_idx++;
+               if ((ch != '\n') &&
+                   (console->log_idx == (sizeof(console->log_str) - 2))) {
+                       ch = '\n';
+                       console->log_str[console->log_idx] = ch;
+                       console->log_idx++;
+               }
+
+               if (ch == '\n') {
+                       console->log_str[console->log_idx] = 0;
+                       brcmf_dbg(PCIE, "CONSOLE: %s\n", console->log_str);
+                       console->log_idx = 0;
+               }
+       }
+}
+
+
+static __used void brcmf_pcie_ringbell_v1(struct brcmf_pciedev_info *devinfo)
+{
+       u32 reg_value;
+
+       brcmf_dbg(PCIE, "RING !\n");
+       reg_value = brcmf_pcie_read_reg32(devinfo,
+                                         BRCMF_PCIE_PCIE2REG_MAILBOXINT);
+       reg_value |= BRCMF_PCIE2_INTB;
+       brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT,
+                              reg_value);
+}
+
+
+static void brcmf_pcie_ringbell_v2(struct brcmf_pciedev_info *devinfo)
+{
+       brcmf_dbg(PCIE, "RING !\n");
+       /* Any arbitrary value will do, lets use 1 */
+       brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_H2D_MAILBOX, 1);
+}
+
+
+static void brcmf_pcie_intr_disable(struct brcmf_pciedev_info *devinfo)
+{
+       if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1)
+               pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_INTMASK,
+                                      0);
+       else
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK,
+                                      0);
+}
+
+
+static void brcmf_pcie_intr_enable(struct brcmf_pciedev_info *devinfo)
+{
+       if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1)
+               pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_INTMASK,
+                                      BRCMF_PCIE_INT_DEF);
+       else
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK,
+                                      BRCMF_PCIE_MB_INT_D2H_DB |
+                                      BRCMF_PCIE_MB_INT_FN0_0 |
+                                      BRCMF_PCIE_MB_INT_FN0_1);
+}
+
+
+static irqreturn_t brcmf_pcie_quick_check_isr_v1(int irq, void *arg)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
+       u32 status;
+
+       status = 0;
+       pci_read_config_dword(devinfo->pdev, BRCMF_PCIE_REG_INTSTATUS, &status);
+       if (status) {
+               brcmf_pcie_intr_disable(devinfo);
+               brcmf_dbg(PCIE, "Enter\n");
+               return IRQ_WAKE_THREAD;
+       }
+       return IRQ_NONE;
+}
+
+
+static irqreturn_t brcmf_pcie_quick_check_isr_v2(int irq, void *arg)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
+
+       if (brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT)) {
+               brcmf_pcie_intr_disable(devinfo);
+               brcmf_dbg(PCIE, "Enter\n");
+               return IRQ_WAKE_THREAD;
+       }
+       return IRQ_NONE;
+}
+
+
+static irqreturn_t brcmf_pcie_isr_thread_v1(int irq, void *arg)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
+       const struct pci_dev *pdev = devinfo->pdev;
+       u32 status;
+
+       devinfo->in_irq = true;
+       status = 0;
+       pci_read_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, &status);
+       brcmf_dbg(PCIE, "Enter %x\n", status);
+       if (status) {
+               pci_write_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, status);
+               if (devinfo->state == BRCMFMAC_PCIE_STATE_UP)
+                       brcmf_proto_msgbuf_rx_trigger(&devinfo->pdev->dev);
+       }
+       if (devinfo->state == BRCMFMAC_PCIE_STATE_UP)
+               brcmf_pcie_intr_enable(devinfo);
+       devinfo->in_irq = false;
+       return IRQ_HANDLED;
+}
+
+
+static irqreturn_t brcmf_pcie_isr_thread_v2(int irq, void *arg)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
+       u32 status;
+
+       devinfo->in_irq = true;
+       status = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT);
+       brcmf_dbg(PCIE, "Enter %x\n", status);
+       if (status) {
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT,
+                                      status);
+               if (status & (BRCMF_PCIE_MB_INT_FN0_0 |
+                             BRCMF_PCIE_MB_INT_FN0_1))
+                       brcmf_pcie_handle_mb_data(devinfo);
+               if (status & BRCMF_PCIE_MB_INT_D2H_DB) {
+                       if (devinfo->state == BRCMFMAC_PCIE_STATE_UP)
+                               brcmf_proto_msgbuf_rx_trigger(
+                                                       &devinfo->pdev->dev);
+               }
+       }
+       brcmf_pcie_bus_console_read(devinfo);
+       if (devinfo->state == BRCMFMAC_PCIE_STATE_UP)
+               brcmf_pcie_intr_enable(devinfo);
+       devinfo->in_irq = false;
+       return IRQ_HANDLED;
+}
+
+
+static int brcmf_pcie_request_irq(struct brcmf_pciedev_info *devinfo)
+{
+       struct pci_dev *pdev;
+
+       pdev = devinfo->pdev;
+
+       brcmf_pcie_intr_disable(devinfo);
+
+       brcmf_dbg(PCIE, "Enter\n");
+       /* is it a v1 or v2 implementation */
+       devinfo->irq_requested = false;
+       if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1) {
+               if (request_threaded_irq(pdev->irq,
+                                        brcmf_pcie_quick_check_isr_v1,
+                                        brcmf_pcie_isr_thread_v1,
+                                        IRQF_SHARED, "brcmf_pcie_intr",
+                                        devinfo)) {
+                       brcmf_err("Failed to request IRQ %d\n", pdev->irq);
+                       return -EIO;
+               }
+       } else {
+               if (request_threaded_irq(pdev->irq,
+                                        brcmf_pcie_quick_check_isr_v2,
+                                        brcmf_pcie_isr_thread_v2,
+                                        IRQF_SHARED, "brcmf_pcie_intr",
+                                        devinfo)) {
+                       brcmf_err("Failed to request IRQ %d\n", pdev->irq);
+                       return -EIO;
+               }
+       }
+       devinfo->irq_requested = true;
+       devinfo->irq_allocated = true;
+       return 0;
+}
+
+
+static void brcmf_pcie_release_irq(struct brcmf_pciedev_info *devinfo)
+{
+       struct pci_dev *pdev;
+       u32 status;
+       u32 count;
+
+       if (!devinfo->irq_allocated)
+               return;
+
+       pdev = devinfo->pdev;
+
+       brcmf_pcie_intr_disable(devinfo);
+       if (!devinfo->irq_requested)
+               return;
+       devinfo->irq_requested = false;
+       free_irq(pdev->irq, devinfo);
+
+       msleep(50);
+       count = 0;
+       while ((devinfo->in_irq) && (count < 20)) {
+               msleep(50);
+               count++;
+       }
+       if (devinfo->in_irq)
+               brcmf_err("Still in IRQ (processing) !!!\n");
+
+       if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1) {
+               status = 0;
+               pci_read_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, &status);
+               pci_write_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, status);
+       } else {
+               status = brcmf_pcie_read_reg32(devinfo,
+                                              BRCMF_PCIE_PCIE2REG_MAILBOXINT);
+               brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT,
+                                      status);
+       }
+       devinfo->irq_allocated = false;
+}
+
+
+static int brcmf_pcie_ring_mb_write_rptr(void *ctx)
+{
+       struct brcmf_pcie_ringbuf *ring = (struct brcmf_pcie_ringbuf *)ctx;
+       struct brcmf_pciedev_info *devinfo = ring->devinfo;
+       struct brcmf_commonring *commonring = &ring->commonring;
+
+       if (devinfo->state != BRCMFMAC_PCIE_STATE_UP)
+               return -EIO;
+
+       brcmf_dbg(PCIE, "W r_ptr %d (%d), ring %d\n", commonring->r_ptr,
+                 commonring->w_ptr, ring->id);
+
+       brcmf_pcie_write_tcm16(devinfo, ring->r_idx_addr, commonring->r_ptr);
+
+       return 0;
+}
+
+
+static int brcmf_pcie_ring_mb_write_wptr(void *ctx)
+{
+       struct brcmf_pcie_ringbuf *ring = (struct brcmf_pcie_ringbuf *)ctx;
+       struct brcmf_pciedev_info *devinfo = ring->devinfo;
+       struct brcmf_commonring *commonring = &ring->commonring;
+
+       if (devinfo->state != BRCMFMAC_PCIE_STATE_UP)
+               return -EIO;
+
+       brcmf_dbg(PCIE, "W w_ptr %d (%d), ring %d\n", commonring->w_ptr,
+                 commonring->r_ptr, ring->id);
+
+       brcmf_pcie_write_tcm16(devinfo, ring->w_idx_addr, commonring->w_ptr);
+
+       return 0;
+}
+
+
+static int brcmf_pcie_ring_mb_ring_bell(void *ctx)
+{
+       struct brcmf_pcie_ringbuf *ring = (struct brcmf_pcie_ringbuf *)ctx;
+       struct brcmf_pciedev_info *devinfo = ring->devinfo;
+
+       if (devinfo->state != BRCMFMAC_PCIE_STATE_UP)
+               return -EIO;
+
+       devinfo->ringbell(devinfo);
+
+       return 0;
+}
+
+
+static int brcmf_pcie_ring_mb_update_rptr(void *ctx)
+{
+       struct brcmf_pcie_ringbuf *ring = (struct brcmf_pcie_ringbuf *)ctx;
+       struct brcmf_pciedev_info *devinfo = ring->devinfo;
+       struct brcmf_commonring *commonring = &ring->commonring;
+
+       if (devinfo->state != BRCMFMAC_PCIE_STATE_UP)
+               return -EIO;
+
+       commonring->r_ptr = brcmf_pcie_read_tcm16(devinfo, ring->r_idx_addr);
+
+       brcmf_dbg(PCIE, "R r_ptr %d (%d), ring %d\n", commonring->r_ptr,
+                 commonring->w_ptr, ring->id);
+
+       return 0;
+}
+
+
+static int brcmf_pcie_ring_mb_update_wptr(void *ctx)
+{
+       struct brcmf_pcie_ringbuf *ring = (struct brcmf_pcie_ringbuf *)ctx;
+       struct brcmf_pciedev_info *devinfo = ring->devinfo;
+       struct brcmf_commonring *commonring = &ring->commonring;
+
+       if (devinfo->state != BRCMFMAC_PCIE_STATE_UP)
+               return -EIO;
+
+       commonring->w_ptr = brcmf_pcie_read_tcm16(devinfo, ring->w_idx_addr);
+
+       brcmf_dbg(PCIE, "R w_ptr %d (%d), ring %d\n", commonring->w_ptr,
+                 commonring->r_ptr, ring->id);
+
+       return 0;
+}
+
+
+static void *
+brcmf_pcie_init_dmabuffer_for_device(struct brcmf_pciedev_info *devinfo,
+                                    u32 size, u32 tcm_dma_phys_addr,
+                                    dma_addr_t *dma_handle)
+{
+       void *ring;
+       long long address;
+
+       ring = dma_alloc_coherent(&devinfo->pdev->dev, size, dma_handle,
+                                 GFP_KERNEL);
+       if (!ring)
+               return NULL;
+
+       address = (long long)(long)*dma_handle;
+       brcmf_pcie_write_tcm32(devinfo, tcm_dma_phys_addr,
+                              address & 0xffffffff);
+       brcmf_pcie_write_tcm32(devinfo, tcm_dma_phys_addr + 4, address >> 32);
+
+       memset(ring, 0, size);
+
+       return (ring);
+}
+
+
+static struct brcmf_pcie_ringbuf *
+brcmf_pcie_alloc_dma_and_ring(struct brcmf_pciedev_info *devinfo, u32 ring_id,
+                             u32 tcm_ring_phys_addr)
+{
+       void *dma_buf;
+       dma_addr_t dma_handle;
+       struct brcmf_pcie_ringbuf *ring;
+       u32 size;
+       u32 addr;
+
+       size = brcmf_ring_max_item[ring_id] * brcmf_ring_itemsize[ring_id];
+       dma_buf = brcmf_pcie_init_dmabuffer_for_device(devinfo, size,
+                       tcm_ring_phys_addr + BRCMF_RING_MEM_BASE_ADDR_OFFSET,
+                       &dma_handle);
+       if (!dma_buf)
+               return NULL;
+
+       addr = tcm_ring_phys_addr + BRCMF_RING_MAX_ITEM_OFFSET;
+       brcmf_pcie_write_tcm16(devinfo, addr, brcmf_ring_max_item[ring_id]);
+       addr = tcm_ring_phys_addr + BRCMF_RING_LEN_ITEMS_OFFSET;
+       brcmf_pcie_write_tcm16(devinfo, addr, brcmf_ring_itemsize[ring_id]);
+
+       ring = kzalloc(sizeof(*ring), GFP_KERNEL);
+       if (!ring) {
+               dma_free_coherent(&devinfo->pdev->dev, size, dma_buf,
+                                 dma_handle);
+               return NULL;
+       }
+       brcmf_commonring_config(&ring->commonring, brcmf_ring_max_item[ring_id],
+                               brcmf_ring_itemsize[ring_id], dma_buf);
+       ring->dma_handle = dma_handle;
+       ring->devinfo = devinfo;
+       brcmf_commonring_register_cb(&ring->commonring,
+                                    brcmf_pcie_ring_mb_ring_bell,
+                                    brcmf_pcie_ring_mb_update_rptr,
+                                    brcmf_pcie_ring_mb_update_wptr,
+                                    brcmf_pcie_ring_mb_write_rptr,
+                                    brcmf_pcie_ring_mb_write_wptr, ring);
+
+       return (ring);
+}
+
+
+static void brcmf_pcie_release_ringbuffer(struct device *dev,
+                                         struct brcmf_pcie_ringbuf *ring)
+{
+       void *dma_buf;
+       u32 size;
+
+       if (!ring)
+               return;
+
+       dma_buf = ring->commonring.buf_addr;
+       if (dma_buf) {
+               size = ring->commonring.depth * ring->commonring.item_len;
+               dma_free_coherent(dev, size, dma_buf, ring->dma_handle);
+       }
+       kfree(ring);
+}
+
+
+static void brcmf_pcie_release_ringbuffers(struct brcmf_pciedev_info *devinfo)
+{
+       u32 i;
+
+       for (i = 0; i < BRCMF_NROF_COMMON_MSGRINGS; i++) {
+               brcmf_pcie_release_ringbuffer(&devinfo->pdev->dev,
+                                             devinfo->shared.commonrings[i]);
+               devinfo->shared.commonrings[i] = NULL;
+       }
+       kfree(devinfo->shared.flowrings);
+       devinfo->shared.flowrings = NULL;
+}
+
+
+static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo)
+{
+       struct brcmf_pcie_ringbuf *ring;
+       struct brcmf_pcie_ringbuf *rings;
+       u32 ring_addr;
+       u32 d2h_w_idx_ptr;
+       u32 d2h_r_idx_ptr;
+       u32 h2d_w_idx_ptr;
+       u32 h2d_r_idx_ptr;
+       u32 addr;
+       u32 ring_mem_ptr;
+       u32 i;
+       u16 max_sub_queues;
+
+       ring_addr = devinfo->shared.ring_info_addr;
+       brcmf_dbg(PCIE, "Base ring addr = 0x%08x\n", ring_addr);
+
+       addr = ring_addr + BRCMF_SHARED_RING_D2H_W_IDX_PTR_OFFSET;
+       d2h_w_idx_ptr = brcmf_pcie_read_tcm32(devinfo, addr);
+       addr = ring_addr + BRCMF_SHARED_RING_D2H_R_IDX_PTR_OFFSET;
+       d2h_r_idx_ptr = brcmf_pcie_read_tcm32(devinfo, addr);
+       addr = ring_addr + BRCMF_SHARED_RING_H2D_W_IDX_PTR_OFFSET;
+       h2d_w_idx_ptr = brcmf_pcie_read_tcm32(devinfo, addr);
+       addr = ring_addr + BRCMF_SHARED_RING_H2D_R_IDX_PTR_OFFSET;
+       h2d_r_idx_ptr = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       addr = ring_addr + BRCMF_SHARED_RING_TCM_MEMLOC_OFFSET;
+       ring_mem_ptr = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       for (i = 0; i < BRCMF_NROF_H2D_COMMON_MSGRINGS; i++) {
+               ring = brcmf_pcie_alloc_dma_and_ring(devinfo, i, ring_mem_ptr);
+               if (!ring)
+                       goto fail;
+               ring->w_idx_addr = h2d_w_idx_ptr;
+               ring->r_idx_addr = h2d_r_idx_ptr;
+               ring->id = i;
+               devinfo->shared.commonrings[i] = ring;
+
+               h2d_w_idx_ptr += sizeof(u32);
+               h2d_r_idx_ptr += sizeof(u32);
+               ring_mem_ptr += BRCMF_RING_MEM_SZ;
+       }
+
+       for (i = BRCMF_NROF_H2D_COMMON_MSGRINGS;
+            i < BRCMF_NROF_COMMON_MSGRINGS; i++) {
+               ring = brcmf_pcie_alloc_dma_and_ring(devinfo, i, ring_mem_ptr);
+               if (!ring)
+                       goto fail;
+               ring->w_idx_addr = d2h_w_idx_ptr;
+               ring->r_idx_addr = d2h_r_idx_ptr;
+               ring->id = i;
+               devinfo->shared.commonrings[i] = ring;
+
+               d2h_w_idx_ptr += sizeof(u32);
+               d2h_r_idx_ptr += sizeof(u32);
+               ring_mem_ptr += BRCMF_RING_MEM_SZ;
+       }
+
+       addr = ring_addr + BRCMF_SHARED_RING_MAX_SUB_QUEUES;
+       max_sub_queues = brcmf_pcie_read_tcm16(devinfo, addr);
+       devinfo->shared.nrof_flowrings =
+                       max_sub_queues - BRCMF_NROF_H2D_COMMON_MSGRINGS;
+       rings = kcalloc(devinfo->shared.nrof_flowrings, sizeof(*ring),
+                       GFP_KERNEL);
+       if (!rings)
+               goto fail;
+
+       brcmf_dbg(PCIE, "Nr of flowrings is %d\n",
+                 devinfo->shared.nrof_flowrings);
+
+       for (i = 0; i < devinfo->shared.nrof_flowrings; i++) {
+               ring = &rings[i];
+               ring->devinfo = devinfo;
+               ring->id = i + BRCMF_NROF_COMMON_MSGRINGS;
+               brcmf_commonring_register_cb(&ring->commonring,
+                                            brcmf_pcie_ring_mb_ring_bell,
+                                            brcmf_pcie_ring_mb_update_rptr,
+                                            brcmf_pcie_ring_mb_update_wptr,
+                                            brcmf_pcie_ring_mb_write_rptr,
+                                            brcmf_pcie_ring_mb_write_wptr,
+                                            ring);
+               ring->w_idx_addr = h2d_w_idx_ptr;
+               ring->r_idx_addr = h2d_r_idx_ptr;
+               h2d_w_idx_ptr += sizeof(u32);
+               h2d_r_idx_ptr += sizeof(u32);
+       }
+       devinfo->shared.flowrings = rings;
+
+       return 0;
+
+fail:
+       brcmf_err("Allocating commonring buffers failed\n");
+       brcmf_pcie_release_ringbuffers(devinfo);
+       return -ENOMEM;
+}
+
+
+static void
+brcmf_pcie_release_scratchbuffers(struct brcmf_pciedev_info *devinfo)
+{
+       if (devinfo->shared.scratch)
+               dma_free_coherent(&devinfo->pdev->dev,
+                                 BRCMF_DMA_D2H_SCRATCH_BUF_LEN,
+                                 devinfo->shared.scratch,
+                                 devinfo->shared.scratch_dmahandle);
+       if (devinfo->shared.ringupd)
+               dma_free_coherent(&devinfo->pdev->dev,
+                                 BRCMF_DMA_D2H_RINGUPD_BUF_LEN,
+                                 devinfo->shared.ringupd,
+                                 devinfo->shared.ringupd_dmahandle);
+}
+
+static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
+{
+       long long address;
+       u32 addr;
+
+       devinfo->shared.scratch = dma_alloc_coherent(&devinfo->pdev->dev,
+               BRCMF_DMA_D2H_SCRATCH_BUF_LEN,
+               &devinfo->shared.scratch_dmahandle, GFP_KERNEL);
+       if (!devinfo->shared.scratch)
+               goto fail;
+
+       memset(devinfo->shared.scratch, 0, BRCMF_DMA_D2H_SCRATCH_BUF_LEN);
+       brcmf_dma_flush(devinfo->shared.scratch, BRCMF_DMA_D2H_SCRATCH_BUF_LEN);
+
+       addr = devinfo->shared.tcm_base_address +
+              BRCMF_SHARED_DMA_SCRATCH_ADDR_OFFSET;
+       address = (long long)(long)devinfo->shared.scratch_dmahandle;
+       brcmf_pcie_write_tcm32(devinfo, addr, address & 0xffffffff);
+       brcmf_pcie_write_tcm32(devinfo, addr + 4, address >> 32);
+       addr = devinfo->shared.tcm_base_address +
+              BRCMF_SHARED_DMA_SCRATCH_LEN_OFFSET;
+       brcmf_pcie_write_tcm32(devinfo, addr, BRCMF_DMA_D2H_SCRATCH_BUF_LEN);
+
+       devinfo->shared.ringupd = dma_alloc_coherent(&devinfo->pdev->dev,
+               BRCMF_DMA_D2H_RINGUPD_BUF_LEN,
+               &devinfo->shared.ringupd_dmahandle, GFP_KERNEL);
+       if (!devinfo->shared.ringupd)
+               goto fail;
+
+       memset(devinfo->shared.ringupd, 0, BRCMF_DMA_D2H_RINGUPD_BUF_LEN);
+       brcmf_dma_flush(devinfo->shared.ringupd, BRCMF_DMA_D2H_RINGUPD_BUF_LEN);
+
+       addr = devinfo->shared.tcm_base_address +
+              BRCMF_SHARED_DMA_RINGUPD_ADDR_OFFSET;
+       address = (long long)(long)devinfo->shared.ringupd_dmahandle;
+       brcmf_pcie_write_tcm32(devinfo, addr, address & 0xffffffff);
+       brcmf_pcie_write_tcm32(devinfo, addr + 4, address >> 32);
+       addr = devinfo->shared.tcm_base_address +
+              BRCMF_SHARED_DMA_RINGUPD_LEN_OFFSET;
+       brcmf_pcie_write_tcm32(devinfo, addr, BRCMF_DMA_D2H_RINGUPD_BUF_LEN);
+       return 0;
+
+fail:
+       brcmf_err("Allocating scratch buffers failed\n");
+       brcmf_pcie_release_scratchbuffers(devinfo);
+       return -ENOMEM;
+}
+
+
+static void brcmf_pcie_down(struct device *dev)
+{
+}
+
+
+static int brcmf_pcie_tx(struct device *dev, struct sk_buff *skb)
+{
+       return 0;
+}
+
+
+static int brcmf_pcie_tx_ctlpkt(struct device *dev, unsigned char *msg,
+                               uint len)
+{
+       return 0;
+}
+
+
+static int brcmf_pcie_rx_ctlpkt(struct device *dev, unsigned char *msg,
+                               uint len)
+{
+       return 0;
+}
+
+
+static struct brcmf_bus_ops brcmf_pcie_bus_ops = {
+       .txdata = brcmf_pcie_tx,
+       .stop = brcmf_pcie_down,
+       .txctl = brcmf_pcie_tx_ctlpkt,
+       .rxctl = brcmf_pcie_rx_ctlpkt,
+};
+
+
+static int
+brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
+                              u32 sharedram_addr)
+{
+       struct brcmf_pcie_shared_info *shared;
+       u32 addr;
+       u32 version;
+
+       shared = &devinfo->shared;
+       shared->tcm_base_address = sharedram_addr;
+
+       shared->flags = brcmf_pcie_read_tcm32(devinfo, sharedram_addr);
+       version = shared->flags & BRCMF_PCIE_SHARED_VERSION_MASK;
+       brcmf_dbg(PCIE, "PCIe protocol version %d\n", version);
+       if ((version > BRCMF_PCIE_MAX_SHARED_VERSION) ||
+           (version < BRCMF_PCIE_MIN_SHARED_VERSION)) {
+               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);
+       if (shared->max_rxbufpost == 0)
+               shared->max_rxbufpost = BRCMF_DEF_MAX_RXBUFPOST;
+
+       addr = sharedram_addr + BRCMF_SHARED_RX_DATAOFFSET_OFFSET;
+       shared->rx_dataoffset = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       addr = sharedram_addr + BRCMF_SHARED_HTOD_MB_DATA_ADDR_OFFSET;
+       shared->htod_mb_data_addr = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       addr = sharedram_addr + BRCMF_SHARED_DTOH_MB_DATA_ADDR_OFFSET;
+       shared->dtoh_mb_data_addr = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       addr = sharedram_addr + BRCMF_SHARED_RING_INFO_ADDR_OFFSET;
+       shared->ring_info_addr = brcmf_pcie_read_tcm32(devinfo, addr);
+
+       brcmf_dbg(PCIE, "max rx buf post %d, rx dataoffset %d\n",
+                 shared->max_rxbufpost, shared->rx_dataoffset);
+
+       brcmf_pcie_bus_console_init(devinfo);
+
+       return 0;
+}
+
+
+static int brcmf_pcie_get_fwnames(struct brcmf_pciedev_info *devinfo)
+{
+       char *fw_name;
+       char *nvram_name;
+       uint fw_len, nv_len;
+       char end;
+
+       brcmf_dbg(PCIE, "Enter, chip 0x%04x chiprev %d\n", devinfo->ci->chip,
+                 devinfo->ci->chiprev);
+
+       switch (devinfo->ci->chip) {
+       case BRCM_CC_43602_CHIP_ID:
+               fw_name = BRCMF_PCIE_43602_FW_NAME;
+               nvram_name = BRCMF_PCIE_43602_NVRAM_NAME;
+               break;
+       case BRCM_CC_4354_CHIP_ID:
+               fw_name = BRCMF_PCIE_4354_FW_NAME;
+               nvram_name = BRCMF_PCIE_4354_NVRAM_NAME;
+               break;
+       case BRCM_CC_4356_CHIP_ID:
+               fw_name = BRCMF_PCIE_4356_FW_NAME;
+               nvram_name = BRCMF_PCIE_4356_NVRAM_NAME;
+               break;
+       case BRCM_CC_43567_CHIP_ID:
+       case BRCM_CC_43569_CHIP_ID:
+       case BRCM_CC_43570_CHIP_ID:
+               fw_name = BRCMF_PCIE_43570_FW_NAME;
+               nvram_name = BRCMF_PCIE_43570_NVRAM_NAME;
+               break;
+       default:
+               brcmf_err("Unsupported chip 0x%04x\n", devinfo->ci->chip);
+               return -ENODEV;
+       }
+
+       fw_len = sizeof(devinfo->fw_name) - 1;
+       nv_len = sizeof(devinfo->nvram_name) - 1;
+       /* check if firmware path is provided by module parameter */
+       if (brcmf_firmware_path[0] != '\0') {
+               strncpy(devinfo->fw_name, brcmf_firmware_path, fw_len);
+               strncpy(devinfo->nvram_name, brcmf_firmware_path, nv_len);
+               fw_len -= strlen(devinfo->fw_name);
+               nv_len -= strlen(devinfo->nvram_name);
+
+               end = brcmf_firmware_path[strlen(brcmf_firmware_path) - 1];
+               if (end != '/') {
+                       strncat(devinfo->fw_name, "/", fw_len);
+                       strncat(devinfo->nvram_name, "/", nv_len);
+                       fw_len--;
+                       nv_len--;
+               }
+       }
+       strncat(devinfo->fw_name, fw_name, fw_len);
+       strncat(devinfo->nvram_name, nvram_name, nv_len);
+
+       return 0;
+}
+
+
+static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo,
+                                       const struct firmware *fw, void *nvram,
+                                       u32 nvram_len)
+{
+       u32 sharedram_addr;
+       u32 sharedram_addr_written;
+       u32 loop_counter;
+       int err;
+       u32 address;
+       u32 resetintr;
+
+       devinfo->ringbell = brcmf_pcie_ringbell_v2;
+       devinfo->generic_corerev = BRCMF_PCIE_GENREV2;
+
+       brcmf_dbg(PCIE, "Halt ARM.\n");
+       err = brcmf_pcie_enter_download_state(devinfo);
+       if (err)
+               return err;
+
+       brcmf_dbg(PCIE, "Download FW %s\n", devinfo->fw_name);
+       brcmf_pcie_copy_mem_todev(devinfo, devinfo->ci->rambase,
+                                 (void *)fw->data, fw->size);
+
+       resetintr = get_unaligned_le32(fw->data);
+       release_firmware(fw);
+
+       /* reset last 4 bytes of RAM address. to be used for shared
+        * area. This identifies when FW is running
+        */
+       brcmf_pcie_write_ram32(devinfo, devinfo->ci->ramsize - 4, 0);
+
+       if (nvram) {
+               brcmf_dbg(PCIE, "Download NVRAM %s\n", devinfo->nvram_name);
+               address = devinfo->ci->rambase + devinfo->ci->ramsize -
+                         nvram_len;
+               brcmf_pcie_copy_mem_todev(devinfo, address, nvram, nvram_len);
+               brcmf_fw_nvram_free(nvram);
+       } else {
+               brcmf_dbg(PCIE, "No matching NVRAM file found %s\n",
+                         devinfo->nvram_name);
+       }
+
+       sharedram_addr_written = brcmf_pcie_read_ram32(devinfo,
+                                                      devinfo->ci->ramsize -
+                                                      4);
+       brcmf_dbg(PCIE, "Bring ARM in running state\n");
+       err = brcmf_pcie_exit_download_state(devinfo, resetintr);
+       if (err)
+               return err;
+
+       brcmf_dbg(PCIE, "Wait for FW init\n");
+       sharedram_addr = sharedram_addr_written;
+       loop_counter = BRCMF_PCIE_FW_UP_TIMEOUT / 50;
+       while ((sharedram_addr == sharedram_addr_written) && (loop_counter)) {
+               msleep(50);
+               sharedram_addr = brcmf_pcie_read_ram32(devinfo,
+                                                      devinfo->ci->ramsize -
+                                                      4);
+               loop_counter--;
+       }
+       if (sharedram_addr == sharedram_addr_written) {
+               brcmf_err("FW failed to initialize\n");
+               return -ENODEV;
+       }
+       brcmf_dbg(PCIE, "Shared RAM addr: 0x%08x\n", sharedram_addr);
+
+       return (brcmf_pcie_init_share_ram_info(devinfo, sharedram_addr));
+}
+
+
+static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo)
+{
+       struct pci_dev *pdev;
+       int err;
+       phys_addr_t  bar0_addr, bar1_addr;
+       ulong bar1_size;
+
+       pdev = devinfo->pdev;
+
+       err = pci_enable_device(pdev);
+       if (err) {
+               brcmf_err("pci_enable_device failed err=%d\n", err);
+               return err;
+       }
+
+       pci_set_master(pdev);
+
+       /* Bar-0 mapped address */
+       bar0_addr = pci_resource_start(pdev, 0);
+       /* Bar-1 mapped address */
+       bar1_addr = pci_resource_start(pdev, 2);
+       /* read Bar-1 mapped memory range */
+       bar1_size = pci_resource_len(pdev, 2);
+       if ((bar1_size == 0) || (bar1_addr == 0)) {
+               brcmf_err("BAR1 Not enabled, device size=%ld, addr=%#016llx\n",
+                         bar1_size, (unsigned long long)bar1_addr);
+               return -EINVAL;
+       }
+
+       devinfo->regs = ioremap_nocache(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);
+       devinfo->tcm = ioremap_nocache(bar1_addr, BRCMF_PCIE_TCM_MAP_SIZE);
+       devinfo->tcm_size = BRCMF_PCIE_TCM_MAP_SIZE;
+
+       if (!devinfo->regs || !devinfo->tcm) {
+               brcmf_err("ioremap() failed (%p,%p)\n", devinfo->regs,
+                         devinfo->tcm);
+               return -EINVAL;
+       }
+       brcmf_dbg(PCIE, "Phys addr : reg space = %p base addr %#016llx\n",
+                 devinfo->regs, (unsigned long long)bar0_addr);
+       brcmf_dbg(PCIE, "Phys addr : mem space = %p base addr %#016llx\n",
+                 devinfo->tcm, (unsigned long long)bar1_addr);
+
+       return 0;
+}
+
+
+static void brcmf_pcie_release_resource(struct brcmf_pciedev_info *devinfo)
+{
+       if (devinfo->tcm)
+               iounmap(devinfo->tcm);
+       if (devinfo->regs)
+               iounmap(devinfo->regs);
+
+       pci_disable_device(devinfo->pdev);
+}
+
+
+static int brcmf_pcie_attach_bus(struct device *dev)
+{
+       int ret;
+
+       /* Attach to the common driver interface */
+       ret = brcmf_attach(dev);
+       if (ret) {
+               brcmf_err("brcmf_attach failed\n");
+       } else {
+               ret = brcmf_bus_start(dev);
+               if (ret)
+                       brcmf_err("dongle is not responding\n");
+       }
+
+       return ret;
+}
+
+
+static u32 brcmf_pcie_buscore_prep_addr(const struct pci_dev *pdev, u32 addr)
+{
+       u32 ret_addr;
+
+       ret_addr = addr & (BRCMF_PCIE_BAR0_REG_SIZE - 1);
+       addr &= ~(BRCMF_PCIE_BAR0_REG_SIZE - 1);
+       pci_write_config_dword(pdev, BRCMF_PCIE_BAR0_WINDOW, addr);
+
+       return ret_addr;
+}
+
+
+static u32 brcmf_pcie_buscore_read32(void *ctx, u32 addr)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
+
+       addr = brcmf_pcie_buscore_prep_addr(devinfo->pdev, addr);
+       return brcmf_pcie_read_reg32(devinfo, addr);
+}
+
+
+static void brcmf_pcie_buscore_write32(void *ctx, u32 addr, u32 value)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
+
+       addr = brcmf_pcie_buscore_prep_addr(devinfo->pdev, addr);
+       brcmf_pcie_write_reg32(devinfo, addr, value);
+}
+
+
+static int brcmf_pcie_buscoreprep(void *ctx)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
+       int err;
+
+       err = brcmf_pcie_get_resource(devinfo);
+       if (err == 0) {
+               /* Set CC watchdog to reset all the cores on the chip to bring
+                * back dongle to a sane state.
+                */
+               brcmf_pcie_buscore_write32(ctx, CORE_CC_REG(SI_ENUM_BASE,
+                                                           watchdog), 4);
+               msleep(100);
+       }
+
+       return err;
+}
+
+
+static void brcmf_pcie_buscore_exitdl(void *ctx, struct brcmf_chip *chip,
+                                     u32 rstvec)
+{
+       struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
+
+       brcmf_pcie_write_tcm32(devinfo, 0, rstvec);
+}
+
+
+static const struct brcmf_buscore_ops brcmf_pcie_buscore_ops = {
+       .prepare = brcmf_pcie_buscoreprep,
+       .exit_dl = brcmf_pcie_buscore_exitdl,
+       .read32 = brcmf_pcie_buscore_read32,
+       .write32 = brcmf_pcie_buscore_write32,
+};
+
+static void brcmf_pcie_setup(struct device *dev, const struct firmware *fw,
+                            void *nvram, u32 nvram_len)
+{
+       struct brcmf_bus *bus = dev_get_drvdata(dev);
+       struct brcmf_pciedev *pcie_bus_dev = bus->bus_priv.pcie;
+       struct brcmf_pciedev_info *devinfo = pcie_bus_dev->devinfo;
+       struct brcmf_commonring **flowrings;
+       int ret;
+       u32 i;
+
+       brcmf_pcie_attach(devinfo);
+
+       ret = brcmf_pcie_download_fw_nvram(devinfo, fw, nvram, nvram_len);
+       if (ret)
+               goto fail;
+
+       devinfo->state = BRCMFMAC_PCIE_STATE_UP;
+
+       ret = brcmf_pcie_init_ringbuffers(devinfo);
+       if (ret)
+               goto fail;
+
+       ret = brcmf_pcie_init_scratchbuffers(devinfo);
+       if (ret)
+               goto fail;
+
+       brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2);
+       ret = brcmf_pcie_request_irq(devinfo);
+       if (ret)
+               goto fail;
+
+       /* hook the commonrings in the bus structure. */
+       for (i = 0; i < BRCMF_NROF_COMMON_MSGRINGS; i++)
+               bus->msgbuf->commonrings[i] =
+                               &devinfo->shared.commonrings[i]->commonring;
+
+       flowrings = kcalloc(devinfo->shared.nrof_flowrings, sizeof(flowrings),
+                           GFP_KERNEL);
+       if (!flowrings)
+               goto fail;
+
+       for (i = 0; i < devinfo->shared.nrof_flowrings; i++)
+               flowrings[i] = &devinfo->shared.flowrings[i].commonring;
+       bus->msgbuf->flowrings = flowrings;
+
+       bus->msgbuf->rx_dataoffset = devinfo->shared.rx_dataoffset;
+       bus->msgbuf->max_rxbufpost = devinfo->shared.max_rxbufpost;
+       bus->msgbuf->nrof_flowrings = devinfo->shared.nrof_flowrings;
+
+       init_waitqueue_head(&devinfo->mbdata_resp_wait);
+
+       brcmf_pcie_intr_enable(devinfo);
+       if (brcmf_pcie_attach_bus(bus->dev) == 0)
+               return;
+
+       brcmf_pcie_bus_console_read(devinfo);
+
+fail:
+       device_release_driver(dev);
+}
+
+static int
+brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+       int ret;
+       struct brcmf_pciedev_info *devinfo;
+       struct brcmf_pciedev *pcie_bus_dev;
+       struct brcmf_bus *bus;
+
+       brcmf_dbg(PCIE, "Enter %x:%x\n", pdev->vendor, pdev->device);
+
+       ret = -ENOMEM;
+       devinfo = kzalloc(sizeof(*devinfo), GFP_KERNEL);
+       if (devinfo == NULL)
+               return ret;
+
+       devinfo->pdev = pdev;
+       pcie_bus_dev = NULL;
+       devinfo->ci = brcmf_chip_attach(devinfo, &brcmf_pcie_buscore_ops);
+       if (IS_ERR(devinfo->ci)) {
+               ret = PTR_ERR(devinfo->ci);
+               devinfo->ci = NULL;
+               goto fail;
+       }
+
+       pcie_bus_dev = kzalloc(sizeof(*pcie_bus_dev), GFP_KERNEL);
+       if (pcie_bus_dev == NULL) {
+               ret = -ENOMEM;
+               goto fail;
+       }
+
+       bus = kzalloc(sizeof(*bus), GFP_KERNEL);
+       if (!bus) {
+               ret = -ENOMEM;
+               goto fail;
+       }
+       bus->msgbuf = kzalloc(sizeof(*bus->msgbuf), GFP_KERNEL);
+       if (!bus->msgbuf) {
+               ret = -ENOMEM;
+               kfree(bus);
+               goto fail;
+       }
+
+       /* hook it all together. */
+       pcie_bus_dev->devinfo = devinfo;
+       pcie_bus_dev->bus = bus;
+       bus->dev = &pdev->dev;
+       bus->bus_priv.pcie = pcie_bus_dev;
+       bus->ops = &brcmf_pcie_bus_ops;
+       bus->proto_type = BRCMF_PROTO_MSGBUF;
+       bus->chip = devinfo->coreid;
+       dev_set_drvdata(&pdev->dev, bus);
+
+       ret = brcmf_pcie_get_fwnames(devinfo);
+       if (ret)
+               goto fail_bus;
+
+       ret = brcmf_fw_get_firmwares(bus->dev, BRCMF_FW_REQUEST_NVRAM |
+                                              BRCMF_FW_REQ_NV_OPTIONAL,
+                                    devinfo->fw_name, devinfo->nvram_name,
+                                    brcmf_pcie_setup);
+       if (ret == 0)
+               return 0;
+fail_bus:
+       kfree(bus->msgbuf);
+       kfree(bus);
+fail:
+       brcmf_err("failed %x:%x\n", pdev->vendor, pdev->device);
+       brcmf_pcie_release_resource(devinfo);
+       if (devinfo->ci)
+               brcmf_chip_detach(devinfo->ci);
+       kfree(pcie_bus_dev);
+       kfree(devinfo);
+       return ret;
+}
+
+
+static void
+brcmf_pcie_remove(struct pci_dev *pdev)
+{
+       struct brcmf_pciedev_info *devinfo;
+       struct brcmf_bus *bus;
+
+       brcmf_dbg(PCIE, "Enter\n");
+
+       bus = dev_get_drvdata(&pdev->dev);
+       if (bus == NULL)
+               return;
+
+       devinfo = bus->bus_priv.pcie->devinfo;
+
+       devinfo->state = BRCMFMAC_PCIE_STATE_DOWN;
+       if (devinfo->ci)
+               brcmf_pcie_intr_disable(devinfo);
+
+       brcmf_detach(&pdev->dev);
+
+       kfree(bus->bus_priv.pcie);
+       kfree(bus->msgbuf->flowrings);
+       kfree(bus->msgbuf);
+       kfree(bus);
+
+       brcmf_pcie_release_irq(devinfo);
+       brcmf_pcie_release_scratchbuffers(devinfo);
+       brcmf_pcie_release_ringbuffers(devinfo);
+       brcmf_pcie_detach(devinfo);
+       brcmf_pcie_release_resource(devinfo);
+
+       if (devinfo->ci)
+               brcmf_chip_detach(devinfo->ci);
+
+       kfree(devinfo);
+       dev_set_drvdata(&pdev->dev, NULL);
+}
+
+
+#ifdef CONFIG_PM
+
+
+static int brcmf_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       struct brcmf_pciedev_info *devinfo;
+       struct brcmf_bus *bus;
+       int err;
+
+       brcmf_dbg(PCIE, "Enter, state=%d, pdev=%p\n", state.event, pdev);
+
+       bus = dev_get_drvdata(&pdev->dev);
+       devinfo = bus->bus_priv.pcie->devinfo;
+
+       brcmf_bus_change_state(bus, BRCMF_BUS_DOWN);
+
+       devinfo->mbdata_completed = false;
+       brcmf_pcie_send_mb_data(devinfo, BRCMF_H2D_HOST_D3_INFORM);
+
+       wait_event_timeout(devinfo->mbdata_resp_wait,
+                          devinfo->mbdata_completed,
+                          msecs_to_jiffies(BRCMF_PCIE_MBDATA_TIMEOUT));
+       if (!devinfo->mbdata_completed) {
+               brcmf_err("Timeout on response for entering D3 substate\n");
+               return -EIO;
+       }
+       brcmf_pcie_release_irq(devinfo);
+
+       err = pci_save_state(pdev);
+       if (err) {
+               brcmf_err("pci_save_state failed, err=%d\n", err);
+               return err;
+       }
+
+       brcmf_chip_detach(devinfo->ci);
+       devinfo->ci = NULL;
+
+       brcmf_pcie_remove(pdev);
+
+       return pci_prepare_to_sleep(pdev);
+}
+
+
+static int brcmf_pcie_resume(struct pci_dev *pdev)
+{
+       int err;
+
+       brcmf_dbg(PCIE, "Enter, pdev=%p\n", pdev);
+
+       err = pci_set_power_state(pdev, PCI_D0);
+       if (err) {
+               brcmf_err("pci_set_power_state failed, err=%d\n", err);
+               return err;
+       }
+       pci_restore_state(pdev);
+
+       err = brcmf_pcie_probe(pdev, NULL);
+       if (err)
+               brcmf_err("probe after resume failed, err=%d\n", err);
+
+       return err;
+}
+
+
+#endif /* CONFIG_PM */
+
+
+#define BRCMF_PCIE_DEVICE(dev_id)      { BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
+       PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
+
+static struct pci_device_id brcmf_pcie_devid_table[] = {
+       BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_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),
+       BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_DEVICE_ID),
+       { /* end: all zeroes */ }
+};
+
+
+MODULE_DEVICE_TABLE(pci, brcmf_pcie_devid_table);
+
+
+static struct pci_driver brcmf_pciedrvr = {
+       .node = {},
+       .name = KBUILD_MODNAME,
+       .id_table = brcmf_pcie_devid_table,
+       .probe = brcmf_pcie_probe,
+       .remove = brcmf_pcie_remove,
+#ifdef CONFIG_PM
+       .suspend = brcmf_pcie_suspend,
+       .resume = brcmf_pcie_resume
+#endif /* CONFIG_PM */
+};
+
+
+void brcmf_pcie_register(void)
+{
+       int err;
+
+       brcmf_dbg(PCIE, "Enter\n");
+       err = pci_register_driver(&brcmf_pciedrvr);
+       if (err)
+               brcmf_err("PCIE driver registration failed, err=%d\n", err);
+}
+
+
+void brcmf_pcie_exit(void)
+{
+       brcmf_dbg(PCIE, "Enter\n");
+       pci_unregister_driver(&brcmf_pciedrvr);
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.h b/drivers/net/wireless/brcm80211/brcmfmac/pcie.h
new file mode 100644 (file)
index 0000000..6edaaf8
--- /dev/null
@@ -0,0 +1,29 @@
+/* Copyright (c) 2014 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef BRCMFMAC_PCIE_H
+#define BRCMFMAC_PCIE_H
+
+
+struct brcmf_pciedev {
+       struct brcmf_bus *bus;
+       struct brcmf_pciedev_info *devinfo;
+};
+
+
+void brcmf_pcie_exit(void);
+void brcmf_pcie_register(void);
+
+
+#endif /* BRCMFMAC_PCIE_H */
index 64d1a7ba040ccc430dc65e7f5f3b662dbcd388f0..af26e0de1e5c6b5325dc895b3c28c1f30af8c8c4 100644 (file)
 #define BRCM_CC_4335_CHIP_ID           0x4335
 #define BRCM_CC_4339_CHIP_ID           0x4339
 #define BRCM_CC_4354_CHIP_ID           0x4354
+#define BRCM_CC_4356_CHIP_ID           0x4356
 #define BRCM_CC_43566_CHIP_ID          43566
+#define BRCM_CC_43567_CHIP_ID          43567
 #define BRCM_CC_43569_CHIP_ID          43569
+#define BRCM_CC_43570_CHIP_ID          43570
+#define BRCM_CC_43602_CHIP_ID          43602
 
 /* SDIO Device IDs */
 #define BRCM_SDIO_43143_DEVICE_ID      BRCM_CC_43143_CHIP_ID
 #define BRCM_USB_43569_DEVICE_ID       0xbd27
 #define BRCM_USB_BCMFW_DEVICE_ID       0x0bdc
 
+/* PCIE Device IDs */
+#define BRCM_PCIE_4354_DEVICE_ID       0x43df
+#define BRCM_PCIE_4356_DEVICE_ID       0x43ec
+#define BRCM_PCIE_43567_DEVICE_ID      0x43d3
+#define BRCM_PCIE_43570_DEVICE_ID      0x43d9
+#define BRCM_PCIE_43602_DEVICE_ID      0x43ba
+
 /* brcmsmac IDs */
 #define BCM4313_D11N2G_ID      0x4727  /* 4313 802.11n 2.4G device */
 #define BCM43224_D11N_ID       0x4353  /* 43224 802.11n dualband device */