From d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 02:45:28 +0000
Subject: [PATCH] add boot partition  size

---
 kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/include/pcie_core.h |  897 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 746 insertions(+), 151 deletions(-)

diff --git a/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/include/pcie_core.h b/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/include/pcie_core.h
index daef6f4..00ad578 100644
--- a/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/include/pcie_core.h
+++ b/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/include/pcie_core.h
@@ -1,15 +1,16 @@
-/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * BCM43XX PCIE core hardware definitions.
  *
- * Copyright (C) 1999-2019, Broadcom Corporation
- * 
+ * Portions of this code are copyright (c) 2022 Cypress Semiconductor Corporation
+ *
+ * Copyright (C) 1999-2017, Broadcom Corporation
+ *
  *      Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2 (the "GPL"),
  * available at http://www.broadcom.com/licenses/GPLv2.php, with the
  * following added to such license:
- * 
+ *
  *      As a special exception, the copyright holders of this software give you
  * permission to link this software with independent modules, and to copy and
  * distribute the resulting executable under terms of your choice, provided that
@@ -17,7 +18,7 @@
  * the license of that module.  An independent module is a module which is not
  * derived from this software.  The special exception does not apply to any
  * modifications of the software.
- * 
+ *
  *      Notwithstanding the above, under no circumstances may you combine this
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
@@ -25,7 +26,7 @@
  *
  * <<Broadcom-WL-IPTag/Open:>>
  *
- * $Id: pcie_core.h 514727 2014-11-12 03:02:48Z $
+ * $Id: pcie_core.h 698652 2017-05-10 10:39:24Z $
  */
 #ifndef	_PCIE_CORE_H
 #define	_PCIE_CORE_H
@@ -33,12 +34,14 @@
 #include <sbhnddma.h>
 #include <siutils.h>
 
+#define REV_GE_64(rev) (rev >= 64)
+
 /* cpp contortions to concatenate w/arg prescan */
 #ifndef PAD
 #define	_PADLINE(line)	pad ## line
 #define	_XSTR(line)	_PADLINE(line)
 #define	PAD		_XSTR(__LINE__)
-#endif
+#endif // endif
 
 /* PCIE Enumeration space offsets */
 #define  PCIE_CORE_CONFIG_OFFSET	0x0
@@ -48,7 +51,6 @@
 #define  PCIE_FUNC3_CONFIG_OFFSET	0x700
 #define  PCIE_SPROM_SHADOW_OFFSET	0x800
 #define  PCIE_SBCONFIG_OFFSET		0xE00
-
 
 #define PCIEDEV_MAX_DMAS			4
 
@@ -60,11 +62,14 @@
 #define PCIE_BAR0_CCCOREREG_OFFSET	0x3000
 
 /* different register spaces to access thr'u pcie indirect access */
-#define PCIE_CONFIGREGS 	1		/* Access to config space */
-#define PCIE_PCIEREGS 		2		/* Access to pcie registers */
+#define PCIE_CONFIGREGS		1		/* Access to config space */
+#define PCIE_PCIEREGS		2		/* Access to pcie registers */
+
+#define PCIEDEV_HOSTADDR_MAP_BASE     0x8000000
+#define PCIEDEV_HOSTADDR_MAP_WIN_MASK 0xFC000000
 
 /* dma regs to control the flow between host2dev and dev2host  */
-typedef struct pcie_devdmaregs {
+typedef volatile struct pcie_devdmaregs {
 	dma64regs_t	tx;
 	uint32		PAD[2];
 	dma64regs_t	rx;
@@ -84,34 +89,126 @@
 	uint32		dev2host_1;
 } pcie_doorbell_t;
 
+/* Flow Ring Manager */
+#define IFRM_FR_IDX_MAX	256
+#define IFRM_FR_GID_MAX 4
+#define IFRM_FR_DEV_MAX 8
+#define IFRM_FR_TID_MAX 8
+#define IFRM_FR_DEV_VALID 2
+
+#define IFRM_VEC_REG_BITS	32
+
+#define IFRM_FR_PER_VECREG			4
+#define IFRM_FR_PER_VECREG_SHIFT	2
+#define IFRM_FR_PER_VECREG_MASK		((0x1 << IFRM_FR_PER_VECREG_SHIFT) - 1)
+
+#define IFRM_VEC_BITS_PER_FR	(IFRM_VEC_REG_BITS/IFRM_FR_PER_VECREG)
+
+/* IFRM_DEV_0 : d11AC, IFRM_DEV_1 : d11AD */
+#define IFRM_DEV_0	0
+#define IFRM_DEV_1	1
+
+#define IFRM_FR_GID_0 0
+#define IFRM_FR_GID_1 1
+#define IFRM_FR_GID_2 2
+#define IFRM_FR_GID_3 3
+
+#define IFRM_TIDMASK 0xffffffff
+
+/* ifrm_ctrlst register */
+#define IFRM_EN (1<<0)
+#define IFRM_BUFF_INIT_DONE (1<<1)
+#define IFRM_COMPARE_EN0 (1<<4)
+#define IFRM_COMPARE_EN1 (1<<5)
+#define IFRM_COMPARE_EN2 (1<<6)
+#define IFRM_COMPARE_EN3 (1<<7)
+#define IFRM_INIT_DV0 (1<<8)
+#define IFRM_INIT_DV1 (1<<9)
+#define IFRM_INIT_DV2 (1<<10)
+#define IFRM_INIT_DV3 (1<<11)
+
+/* ifrm_msk_arr.addr, ifrm_tid_arr.addr register */
+#define IFRM_ADDR_SHIFT 0
+#define IFRM_FRG_ID_SHIFT 8
+
+/* ifrm_vec.diff_lat register */
+#define IFRM_DV_LAT			(1<<0)
+#define IFRM_DV_LAT_DONE	(1<<1)
+#define IFRM_SDV_OFFSET_SHIFT	4
+#define IFRM_SDV_FRGID_SHIFT	8
+#define IFRM_VECSTAT_MASK		0x3
+#define IFRM_VEC_MASK			0xff
+
+/* HMAP Windows */
+#define HMAP_MAX_WINDOWS	8
+
+/* idma frm array */
+typedef struct pcie_ifrm_array {
+	uint32		addr;
+	uint32		data;
+} pcie_ifrm_array_t;
+
+/* idma frm vector */
+typedef struct pcie_ifrm_vector {
+	uint32		diff_lat;
+	uint32		sav_tid;
+	uint32		sav_diff;
+	uint32		PAD[1];
+} pcie_ifrm_vector_t;
+
+/* idma frm interrupt */
+typedef struct pcie_ifrm_intr {
+	uint32		intstat;
+	uint32		intmask;
+} pcie_ifrm_intr_t;
+
+/* HMAP window register set */
+typedef volatile struct pcie_hmapwindow {
+	uint32 baseaddr_lo; /* BaseAddrLower */
+	uint32 baseaddr_hi; /* BaseAddrUpper */
+	uint32 windowlength; /* Window Length */
+	uint32	PAD[1];
+} pcie_hmapwindow_t;
+
+typedef volatile struct pcie_hmapviolation {
+	uint32 hmap_violationaddr_lo;	/* violating address lo */
+	uint32 hmap_violationaddr_hi;	/* violating addr hi */
+	uint32 hmap_violation_info;	/* violation info */
+	uint32	PAD[1];
+} pcie_hmapviolation_t;
 /* SB side: PCIE core and host control registers */
-typedef struct sbpcieregs {
+typedef volatile struct sbpcieregs {
 	uint32 control;		/* host mode only */
 	uint32 iocstatus;	/* PCIE2: iostatus */
 	uint32 PAD[1];
 	uint32 biststatus;	/* bist Status: 0x00C */
 	uint32 gpiosel;		/* PCIE gpio sel: 0x010 */
 	uint32 gpioouten;	/* PCIE gpio outen: 0x14 */
-	uint32 PAD[2];
+	uint32 gpioout;		/* PCIE gpio out: 0x18 */
+	uint32 PAD;
 	uint32 intstatus;	/* Interrupt status: 0x20 */
 	uint32 intmask;		/* Interrupt mask: 0x24 */
 	uint32 sbtopcimailbox;	/* sb to pcie mailbox: 0x028 */
 	uint32 obffcontrol;	/* PCIE2: 0x2C */
 	uint32 obffintstatus;	/* PCIE2: 0x30 */
 	uint32 obffdatastatus;	/* PCIE2: 0x34 */
-	uint32 PAD[2];
+	uint32 PAD[1];
+	uint32 ctoctrl;		/* PCIE2: 0x3C */
 	uint32 errlog;		/* PCIE2: 0x40 */
 	uint32 errlogaddr;	/* PCIE2: 0x44 */
 	uint32 mailboxint;	/* PCIE2: 0x48 */
 	uint32 mailboxintmsk; /* PCIE2: 0x4c */
 	uint32 ltrspacing;	/* PCIE2: 0x50 */
 	uint32 ltrhysteresiscnt;	/* PCIE2: 0x54 */
-	uint32 PAD[42];
-
+	uint32 msivectorassign;	/* PCIE2: 0x58 */
+	uint32 intmask2;	/* PCIE2: 0x5C */
+	uint32 PAD[40];
 	uint32 sbtopcie0;	/* sb to pcie translation 0: 0x100 */
 	uint32 sbtopcie1;	/* sb to pcie translation 1: 0x104 */
 	uint32 sbtopcie2;	/* sb to pcie translation 2: 0x108 */
-	uint32 PAD[5];
+	uint32 sbtopcie0upper;	/* sb to pcie translation 0: 0x10C */
+	uint32 sbtopcie1upper;	/* sb to pcie translation 1: 0x110 */
+	uint32 PAD[3];
 
 	/* pcie core supports in direct access to config space */
 	uint32 configaddr;	/* pcie config space access: Address field: 0x120 */
@@ -126,6 +223,8 @@
 			uint32 pcieinddata;	/* Data to/from the internal regsiter: 0x134 */
 			uint32 clkreqenctrl;	/* >= rev 6, Clkreq rdma control : 0x138 */
 			uint32 PAD[177];
+			/* 0x400 - 0x7FF, PCIE Cfg Space, note: not used anymore in PcieGen2 */
+			uint32 pciecfg[4][64];
 		} pcie1;
 		struct {
 			/* mdio access to serdes */
@@ -146,9 +245,20 @@
 			uint32	ltr_state;	/* 0x1A0 */
 			uint32	pwr_int_status;	/* 0x1A4 */
 			uint32	pwr_int_mask;	/* 0x1A8 */
-			uint32  PAD[13]; 	/* 0x1AC - 0x1DF */
+			uint32	pme_source; /* 0x1AC */
+			uint32	err_hdr_logreg1; /* 0x1B0 */
+			uint32	err_hdr_logreg2; /* 0x1B4 */
+			uint32	err_hdr_logreg3; /* 0x1B8 */
+			uint32	err_hdr_logreg4; /* 0x1BC */
+			uint32	err_code_logreg; /* 0x1C0 */
+			uint32	axi_dbg_ctl; /* 0x1C4 */
+			uint32	axi_dbg_data0; /* 0x1C8 */
+			uint32	axi_dbg_data1; /* 0x1CC */
+			uint32  PAD[4]; /* 0x1D0 - 0x1DF */
 			uint32  clk_ctl_st;	/* 0x1E0 */
-			uint32  PAD[7]; 	/* 0x1E4 - 0x1FF */
+			uint32  PAD[1];		/* 0x1E4 */
+			uint32	powerctl;	/* 0x1E8 */
+			uint32  PAD[5];		/* 0x1EC - 0x1FF */
 			pcie_devdmaregs_t  h2d0_dmaregs; /* 0x200 - 0x23c */
 			pcie_devdmaregs_t  d2h0_dmaregs; /* 0x240 - 0x27c */
 			pcie_devdmaregs_t  h2d1_dmaregs; /* 0x280 - 0x2bc */
@@ -157,25 +267,158 @@
 			pcie_devdmaregs_t  d2h2_dmaregs; /* 0x340 - 0x37c */
 			pcie_devdmaregs_t  h2d3_dmaregs; /* 0x380 - 0x3bc */
 			pcie_devdmaregs_t  d2h3_dmaregs; /* 0x3c0 - 0x3fc */
+			uint32	d2h_intrlazy_1; /* 0x400 */
+			uint32	h2d_intrlazy_1; /* 0x404 */
+			uint32	h2d_intstat_1;	/* 0x408 */
+			uint32	h2d_intmask_1;	/* 0x40c */
+			uint32	d2h_intstat_1;	/* 0x410 */
+			uint32	d2h_intmask_1;	/* 0x414 */
+			uint32	PAD[2];			/* 0x418 - 0x41C */
+			uint32	d2h_intrlazy_2; /* 0x420 */
+			uint32	h2d_intrlazy_2; /* 0x424 */
+			uint32	h2d_intstat_2;	/* 0x428 */
+			uint32	h2d_intmask_2;	/* 0x42c */
+			uint32	d2h_intstat_2;	/* 0x430 */
+			uint32	d2h_intmask_2;	/* 0x434 */
+			uint32	PAD[10];		/* 0x438 - 0x45F */
+			uint32	ifrm_ctrlst;	/* 0x460 */
+			uint32	PAD[1];			/* 0x464 */
+			pcie_ifrm_array_t	ifrm_msk_arr;		/* 0x468 - 0x46F */
+			pcie_ifrm_array_t	ifrm_tid_arr[IFRM_FR_DEV_VALID];
+				/* 0x470 - 0x47F */
+			pcie_ifrm_vector_t	ifrm_vec[IFRM_FR_DEV_MAX];
+				/* 0x480 - 0x4FF */
+			pcie_ifrm_intr_t	ifrm_intr[IFRM_FR_DEV_MAX];
+				/* 0x500 - 0x53F */
+				/* HMAP regs for PCIE corerev >= 24  [0x540 - 0x5DF] */
+			pcie_hmapwindow_t	hmapwindow[HMAP_MAX_WINDOWS];	/* 0x540 - 0x5BF */
+			pcie_hmapviolation_t hmapviolation;	/* 0x5C0 - 0x5CF */
+			uint32 hmap_window_config;	/* 0x5D0 */
+			uint32	PAD[3];			/* 0x5D4 - 0x5DF */
+
+			uint32	PAD[8];			/* 0x5E0 - 0x5FF */
+			uint32	PAD[2][64];		/* 0x600 - 0x7FF */
 		} pcie2;
 	} u;
-	uint32 pciecfg[4][64];	/* 0x400 - 0x7FF, PCIE Cfg Space */
-	uint16 sprom[64];	/* SPROM shadow Area */
+	uint16	sprom[64];		/* SPROM shadow Area : 0x800 - 0x880 */
+	uint32	PAD[96];		/* 0x880 - 0x9FF */
+	/* direct memory access (pcie2 rev19 and after) : 0xA00 - 0xAFF */
+	union {
+		/* corerev < 64 */
+		struct {
+			uint32		dar_ctrl;		/* 0xA00 */
+			uint32		PAD[7];			/* 0xA04-0xA1F */
+			uint32		intstatus;		/* 0xA20 */
+			uint32		PAD[1];			/* 0xA24 */
+			uint32		h2d_db_0_0;		/* 0xA28 */
+			uint32		h2d_db_0_1;		/* 0xA2C */
+			uint32		h2d_db_1_0;		/* 0xA30 */
+			uint32		h2d_db_1_1;		/* 0xA34 */
+			uint32		h2d_db_2_0;		/* 0xA38 */
+			uint32		h2d_db_2_1;		/* 0xA3C */
+			uint32		errlog;			/* 0xA40 */
+			uint32		erraddr;		/* 0xA44 */
+			uint32		mbox_int;		/* 0xA48 */
+			uint32		fis_ctrl;		/* 0xA4C */
+			uint32		PAD[36];		/* 0xA50 - 0xADC */
+			uint32		clk_ctl_st;		/* 0xAE0 */
+			uint32		PAD[1];			/* 0xAE4 */
+			uint32		powerctl;		/* 0xAE8 */
+			uint32		PAD[5];			/* 0xAEC-0xAFF */
+		} dar;
+		/* corerev > = 64 */
+		struct {
+			uint32		dar_ctrl;		/* 0xA00 */
+			uint32		dar_cap;		/* 0xA04 */
+			uint32		clk_ctl_st;		/* 0xA08 */
+			uint32		powerctl;		/* 0xA0C */
+			uint32		intstatus;		/* 0xA10 */
+			uint32		PAD[3];			/* 0xA14-0xA1F */
+			uint32		h2d_db_0_0;		/* 0xA20 */
+			uint32		h2d_db_0_1;		/* 0xA24 */
+			uint32		h2d_db_1_0;		/* 0xA28 */
+			uint32		h2d_db_1_1;		/* 0xA2C */
+			uint32		h2d_db_2_0;		/* 0xA30 */
+			uint32		h2d_db_2_1;		/* 0xA34 */
+			uint32		h2d_db_3_0;		/* 0xA38 */
+			uint32		h2d_db_3_1;		/* 0xA3C */
+			uint32		h2d_db_4_0;		/* 0xA40 */
+			uint32		h2d_db_4_1;		/* 0xA44 */
+			uint32		h2d_db_5_0;		/* 0xA48 */
+			uint32		h2d_db_5_1;		/* 0xA4C */
+			uint32		h2d_db_6_0;		/* 0xA50 */
+			uint32		h2d_db_6_1;		/* 0xA54 */
+			uint32		h2d_db_7_0;		/* 0xA58 */
+			uint32		h2d_db_7_1;		/* 0xA5C */
+			uint32		errlog;			/* 0xA60 */
+			uint32		erraddr;		/* 0xA64 */
+			uint32		mbox_int;		/* 0xA68 */
+			uint32		fis_ctrl;		/* 0xA6C */
+			uint32		PAD[4];		        /* 0xA70-0xAFF */
+			uint32		d2h_msg_reg0;		/* 0xA80 */
+			uint32		d2h_msg_reg1;		/* 0xA84 */
+			uint32		PAD[2];			/* 0xA88 - 0xA8C */
+			uint32		h2d_msg_reg0;		/* 0xA90 */
+			uint32		h2d_msg_reg1;		/* 0xA94 */
+		} dar_64;
+	} u1;
+	uint32		PAD[64];		/* 0xB00-0xBFF */
+	/* Function Control/Status Registers for corerev >= 64 */
+	/* 0xC00 - 0xCFF */
+	struct {
+		uint32		control;		/* 0xC00 */
+		uint32		iostatus;		/* 0xC04 */
+		uint32		capability;		/* 0xC08 */
+		uint32		PAD[1];			/* 0xC0C */
+		uint32		intstatus;		/* 0xC10 */
+		uint32		intmask;		/* 0xC14 */
+		uint32		pwr_intstatus;	/* 0xC18 */
+		uint32		pwr_intmask;	/* 0xC1C */
+		uint32		msi_vector;		/* 0xC20 */
+		uint32		msi_intmask;	/* 0xC24 */
+		uint32		msi_intstatus;	/* 0xC28 */
+		uint32		msi_pend_cnt;	/* 0xC2C */
+		uint32		mbox_intstatus;	/* 0xC30 */
+		uint32		mbox_intmask;	/* 0xC34 */
+		uint32		ltr_state;		/* 0xC38 */
+		uint32		PAD[1];			/* 0xC3C */
+		uint32		intr_vector;	/* 0xC40 */
+		uint32		intr_addrlow;	/* 0xC44 */
+		uint32		intr_addrhigh;	/* 0xC48 */
+		uint32		PAD[45];		/* 0xC4C-0xCFF */
+	} ftn_ctrl;
 } sbpcieregs_t;
+
+#define PCIE_CFG_DA_OFFSET 0x400	/* direct access register offset for configuration space */
 
 /* PCI control */
 #define PCIE_RST_OE	0x01	/* When set, drives PCI_RESET out to pin */
 #define PCIE_RST	0x02	/* Value driven out to pin */
 #define PCIE_SPERST	0x04	/* SurvivePeRst */
+#define PCIE_FORCECFGCLKON_ALP	0x08
 #define PCIE_DISABLE_L1CLK_GATING	0x10
 #define PCIE_DLYPERST	0x100	/* Delay PeRst to CoE Core */
 #define PCIE_DISSPROMLD	0x200	/* DisableSpromLoadOnPerst */
 #define PCIE_WakeModeL2	0x1000	/* Wake on L2 */
+#define PCIE_MULTIMSI_EN		0x2000	/* enable multi-vector MSI messages */
 #define PCIE_PipeIddqDisable0	0x8000	/* Disable assertion of pcie_pipe_iddq during L1.2 and L2 */
 #define PCIE_PipeIddqDisable1	0x10000	/* Disable assertion of pcie_pipe_iddq during L2 */
+#define PCIE_EN_MDIO_IN_PERST	0x20000 /* enable access to internal registers when PERST */
+#define PCIE_MSI_B2B_EN		0x100000	/* enable back-to-back MSI messages */
+#define PCIE_MSI_FIFO_CLEAR	0x200000	/* reset MSI FIFO */
+#define PCIE_IDMA_MODE_EN(rev)	(REV_GE_64(rev) ? 0x1 : 0x800000) /* implicit M2M DMA mode */
+#define PCIE_TL_CLK_DETCT	0x4000000	/* enable TL clk detection */
+
+/* Function control (corerev > 64) */
+#define PCIE_CPLCA_ENABLE		0x01
+/* 1: send CPL with CA on BP error, 0: send CPLD with SC and data is FFFF */
+#define PCIE_DLY_PERST_TO_COE	0x02
+/* when set, PERST is holding asserted until sprom-related register updates has completed */
 
 #define	PCIE_CFGADDR	0x120	/* offsetof(configaddr) */
 #define	PCIE_CFGDATA	0x124	/* offsetof(configdata) */
+#define PCIE_SWPME_FN0	0x10000
+#define PCIE_SWPME_FN0_SHF 16
 
 /* Interrupt status/mask */
 #define PCIE_INTA	0x01	/* PCIE INTA message is received */
@@ -195,37 +438,63 @@
 #define PCIE_INT_MB_FN3_0 0x4000 /* PCIE to SB Mailbox int Fn3.0 is received */
 #define PCIE_INT_MB_FN3_1 0x8000 /* PCIE to SB Mailbox int Fn3.1 is received */
 
-/* PCIE MailboxInt/MailboxIntMask register */
-#define PCIE_MB_TOSB_FN0_0   	0x0001 /* write to assert PCIEtoSB Mailbox interrupt */
-#define PCIE_MB_TOSB_FN0_1   	0x0002
-#define PCIE_MB_TOSB_FN1_0   	0x0004
-#define PCIE_MB_TOSB_FN1_1   	0x0008
-#define PCIE_MB_TOSB_FN2_0   	0x0010
-#define PCIE_MB_TOSB_FN2_1   	0x0020
-#define PCIE_MB_TOSB_FN3_0   	0x0040
-#define PCIE_MB_TOSB_FN3_1   	0x0080
-#define PCIE_MB_TOPCIE_FN0_0 	0x0100 /* int status/mask for SBtoPCIE Mailbox interrupts */
-#define PCIE_MB_TOPCIE_FN0_1 	0x0200
-#define PCIE_MB_TOPCIE_FN1_0 	0x0400
-#define PCIE_MB_TOPCIE_FN1_1 	0x0800
-#define PCIE_MB_TOPCIE_FN2_0 	0x1000
-#define PCIE_MB_TOPCIE_FN2_1 	0x2000
-#define PCIE_MB_TOPCIE_FN3_0 	0x4000
-#define PCIE_MB_TOPCIE_FN3_1 	0x8000
-#define	PCIE_MB_TOPCIE_D2H0_DB0	0x10000
-#define	PCIE_MB_TOPCIE_D2H0_DB1	0x20000
-#define	PCIE_MB_TOPCIE_D2H1_DB0	0x40000
-#define	PCIE_MB_TOPCIE_D2H1_DB1	0x80000
-#define	PCIE_MB_TOPCIE_D2H2_DB0	0x100000
-#define	PCIE_MB_TOPCIE_D2H2_DB1	0x200000
-#define	PCIE_MB_TOPCIE_D2H3_DB0	0x400000
-#define	PCIE_MB_TOPCIE_D2H3_DB1	0x800000
+/* PCIE MSI Vector Assignment register */
+#define MSIVEC_MB_0	(0x1 << 1) /* MSI Vector offset for mailbox0 is 2 */
+#define MSIVEC_MB_1	(0x1 << 2) /* MSI Vector offset for mailbox1 is 3 */
+#define MSIVEC_D2H0_DB0	(0x1 << 3) /* MSI Vector offset for interface0 door bell 0 is 4 */
+#define MSIVEC_D2H0_DB1	(0x1 << 4) /* MSI Vector offset for interface0 door bell 1 is 5 */
 
-#define PCIE_MB_D2H_MB_MASK		\
-	(PCIE_MB_TOPCIE_D2H0_DB0 | PCIE_MB_TOPCIE_D2H0_DB1 |	\
-	PCIE_MB_TOPCIE_D2H1_DB0  | PCIE_MB_TOPCIE_D2H1_DB1 |	\
-	PCIE_MB_TOPCIE_D2H2_DB0  | PCIE_MB_TOPCIE_D2H2_DB1 |	\
-	PCIE_MB_TOPCIE_D2H3_DB0  | PCIE_MB_TOPCIE_D2H3_DB1)
+/* PCIE MailboxInt/MailboxIntMask register */
+#define PCIE_MB_TOSB_FN0_0	0x0001 /* write to assert PCIEtoSB Mailbox interrupt */
+#define PCIE_MB_TOSB_FN0_1	0x0002
+#define PCIE_MB_TOSB_FN1_0	0x0004
+#define PCIE_MB_TOSB_FN1_1	0x0008
+#define PCIE_MB_TOSB_FN2_0	0x0010
+#define PCIE_MB_TOSB_FN2_1	0x0020
+#define PCIE_MB_TOSB_FN3_0	0x0040
+#define PCIE_MB_TOSB_FN3_1	0x0080
+#define PCIE_MB_TOPCIE_FN0_0	0x0100 /* int status/mask for SBtoPCIE Mailbox interrupts */
+#define PCIE_MB_TOPCIE_FN0_1	0x0200
+#define PCIE_MB_TOPCIE_FN1_0	0x0400
+#define PCIE_MB_TOPCIE_FN1_1	0x0800
+#define PCIE_MB_TOPCIE_FN2_0	0x1000
+#define PCIE_MB_TOPCIE_FN2_1	0x2000
+#define PCIE_MB_TOPCIE_FN3_0	0x4000
+#define PCIE_MB_TOPCIE_FN3_1	0x8000
+
+#define PCIE_MB_TOPCIE_DB0_D2H0(rev)	(REV_GE_64(rev) ? 0x0001 : 0x010000)
+#define PCIE_MB_TOPCIE_DB0_D2H1(rev)	(REV_GE_64(rev) ? 0x0002 : 0x020000)
+#define PCIE_MB_TOPCIE_DB1_D2H0(rev)	(REV_GE_64(rev) ? 0x0004 : 0x040000)
+#define PCIE_MB_TOPCIE_DB1_D2H1(rev)	(REV_GE_64(rev) ? 0x0008 : 0x080000)
+#define PCIE_MB_TOPCIE_DB2_D2H0(rev)	(REV_GE_64(rev) ? 0x0010 : 0x100000)
+#define PCIE_MB_TOPCIE_DB2_D2H1(rev)	(REV_GE_64(rev) ? 0x0020 : 0x200000)
+#define PCIE_MB_TOPCIE_DB3_D2H0(rev)	(REV_GE_64(rev) ? 0x0040 : 0x400000)
+#define PCIE_MB_TOPCIE_DB3_D2H1(rev)	(REV_GE_64(rev) ? 0x0080 : 0x800000)
+#define PCIE_MB_TOPCIE_DB4_D2H0(rev)	(REV_GE_64(rev) ? 0x0100 : 0x0)
+#define PCIE_MB_TOPCIE_DB4_D2H1(rev)	(REV_GE_64(rev) ? 0x0200 : 0x0)
+#define PCIE_MB_TOPCIE_DB5_D2H0(rev)	(REV_GE_64(rev) ? 0x0400 : 0x0)
+#define PCIE_MB_TOPCIE_DB5_D2H1(rev)	(REV_GE_64(rev) ? 0x0800 : 0x0)
+#define PCIE_MB_TOPCIE_DB6_D2H0(rev)	(REV_GE_64(rev) ? 0x1000 : 0x0)
+#define PCIE_MB_TOPCIE_DB6_D2H1(rev)	(REV_GE_64(rev) ? 0x2000 : 0x0)
+#define PCIE_MB_TOPCIE_DB7_D2H0(rev)	(REV_GE_64(rev) ? 0x4000 : 0x0)
+#define PCIE_MB_TOPCIE_DB7_D2H1(rev)	(REV_GE_64(rev) ? 0x8000 : 0x0)
+
+#define PCIE_MB_D2H_MB_MASK(rev)		\
+	(PCIE_MB_TOPCIE_DB0_D2H0(rev) | PCIE_MB_TOPCIE_DB0_D2H1(rev) |	\
+	PCIE_MB_TOPCIE_DB1_D2H0(rev)  | PCIE_MB_TOPCIE_DB1_D2H1(rev) |	\
+	PCIE_MB_TOPCIE_DB2_D2H0(rev)  | PCIE_MB_TOPCIE_DB2_D2H1(rev) |	\
+	PCIE_MB_TOPCIE_DB3_D2H0(rev)  | PCIE_MB_TOPCIE_DB3_D2H1(rev) |	\
+	PCIE_MB_TOPCIE_DB4_D2H0(rev)  | PCIE_MB_TOPCIE_DB4_D2H1(rev) |	\
+	PCIE_MB_TOPCIE_DB5_D2H0(rev)  | PCIE_MB_TOPCIE_DB5_D2H1(rev) |	\
+	PCIE_MB_TOPCIE_DB6_D2H0(rev)  | PCIE_MB_TOPCIE_DB6_D2H1(rev) |	\
+	PCIE_MB_TOPCIE_DB7_D2H0(rev)  | PCIE_MB_TOPCIE_DB7_D2H1(rev))
+
+#define SBTOPCIE0_BASE 0x08000000
+#define SBTOPCIE1_BASE 0x0c000000
+
+/* On chips with CCI-400, the small pcie 128 MB region base has shifted */
+#define CCI400_SBTOPCIE0_BASE  0x20000000
+#define CCI400_SBTOPCIE1_BASE  0x24000000
 
 /* SB to PCIE translation masks */
 #define SBTOPCIE0_MASK	0xfc000000
@@ -260,94 +529,129 @@
 #define PCIEADDR_PL_DLLP	1
 #define PCIEADDR_PL_PLP		2
 
+#define	PCIE_CORE_REG_CONTROL		0x00u   /* Control     */
+#define	PCIE_CORE_REG_IOSTATUS		0x04u   /* IO status   */
+#define	PCIE_CORE_REG_BITSTATUS		0x0Cu   /* bitstatus   */
+#define	PCIE_CORE_REG_GPIO_SEL		0x10u   /* gpio sel    */
+#define	PCIE_CORE_REG_GPIO_OUT_EN	0x14u   /* gpio out en */
+#define	PCIE_CORE_REG_INT_STATUS	0x20u   /* int status  */
+#define	PCIE_CORE_REG_INT_MASK		0x24u   /* int mask    */
+#define	PCIE_CORE_REG_SB_PCIE_MB	0x28u   /* sbpcie mb   */
+#define	PCIE_CORE_REG_ERRLOG		0x40u   /* errlog      */
+#define	PCIE_CORE_REG_ERR_ADDR		0x44u   /* errlog addr */
+#define	PCIE_CORE_REG_MB_INTR		0x48u   /* MB intr     */
+#define	PCIE_CORE_REG_SB_PCIE_0		0x100u  /* sbpcie0 map */
+#define	PCIE_CORE_REG_SB_PCIE_1		0x104u  /* sbpcie1 map */
+#define	PCIE_CORE_REG_SB_PCIE_2		0x108u  /* sbpcie2 map */
+
+/* PCIE Config registers */
+#define	PCIE_CFG_DEV_STS_CTRL_2		0x0d4u	/* "dev_sts_control_2  */
+#define	PCIE_CFG_ADV_ERR_CAP		0x100u	/* adv_err_cap         */
+#define	PCIE_CFG_UC_ERR_STS		0x104u	/* uc_err_status       */
+#define	PCIE_CFG_UC_ERR_MASK		0x108u	/* ucorr_err_mask      */
+#define	PCIE_CFG_UNCOR_ERR_SERV		0x10cu	/* ucorr_err_sevr      */
+#define	PCIE_CFG_CORR_ERR_STS		0x110u	/* corr_err_status     */
+#define	PCIE_CFG_CORR_ERR_MASK		0x114u	/* corr_err_mask       */
+#define	PCIE_CFG_ADV_ERR_CTRL		0x118u	/* adv_err_cap_control */
+#define	PCIE_CFG_HDR_LOG1		0x11Cu	/* header_log1         */
+#define	PCIE_CFG_HDR_LOG2		0x120u	/* header_log2         */
+#define	PCIE_CFG_HDR_LOG3		0x124u	/* header_log3         */
+#define	PCIE_CFG_HDR_LOG4		0x128u	/* header_log4         */
+#define	PCIE_CFG_PML1_SUB_CAP_ID	0x240u	/* PML1sub_capID       */
+#define	PCIE_CFG_PML1_SUB_CAP_REG	0x244u	/* PML1_sub_Cap_reg    */
+#define	PCIE_CFG_PML1_SUB_CTRL1		0x248u	/* PML1_sub_control1   */
+#define	PCIE_CFG_PML1_SUB_CTRL3		0x24Cu	/* PML1_sub_control2   */
+#define	PCIE_CFG_TL_CTRL_5		0x814u	/* tl_control_5        */
+#define	PCIE_CFG_PHY_ERR_ATT_VEC	0x1820u	/* phy_err_attn_vec    */
+#define	PCIE_CFG_PHY_ERR_ATT_MASK	0x1824u	/* phy_err_attn_mask   */
+
 /* PCIE protocol PHY diagnostic registers */
-#define	PCIE_PLP_MODEREG		0x200 /* Mode */
-#define	PCIE_PLP_STATUSREG		0x204 /* Status */
-#define PCIE_PLP_LTSSMCTRLREG		0x208 /* LTSSM control */
-#define PCIE_PLP_LTLINKNUMREG		0x20c /* Link Training Link number */
-#define PCIE_PLP_LTLANENUMREG		0x210 /* Link Training Lane number */
-#define PCIE_PLP_LTNFTSREG		0x214 /* Link Training N_FTS */
-#define PCIE_PLP_ATTNREG		0x218 /* Attention */
-#define PCIE_PLP_ATTNMASKREG		0x21C /* Attention Mask */
-#define PCIE_PLP_RXERRCTR		0x220 /* Rx Error */
-#define PCIE_PLP_RXFRMERRCTR		0x224 /* Rx Framing Error */
-#define PCIE_PLP_RXERRTHRESHREG		0x228 /* Rx Error threshold */
-#define PCIE_PLP_TESTCTRLREG		0x22C /* Test Control reg */
-#define PCIE_PLP_SERDESCTRLOVRDREG	0x230 /* SERDES Control Override */
-#define PCIE_PLP_TIMINGOVRDREG		0x234 /* Timing param override */
-#define PCIE_PLP_RXTXSMDIAGREG		0x238 /* RXTX State Machine Diag */
-#define PCIE_PLP_LTSSMDIAGREG		0x23C /* LTSSM State Machine Diag */
+#define	PCIE_PLP_MODEREG		0x200u /* Mode */
+#define	PCIE_PLP_STATUSREG		0x204u /* Status */
+#define PCIE_PLP_LTSSMCTRLREG		0x208u /* LTSSM control */
+#define PCIE_PLP_LTLINKNUMREG		0x20cu /* Link Training Link number */
+#define PCIE_PLP_LTLANENUMREG		0x210u /* Link Training Lane number */
+#define PCIE_PLP_LTNFTSREG		0x214u /* Link Training N_FTS */
+#define PCIE_PLP_ATTNREG		0x218u /* Attention */
+#define PCIE_PLP_ATTNMASKREG		0x21Cu /* Attention Mask */
+#define PCIE_PLP_RXERRCTR		0x220u /* Rx Error */
+#define PCIE_PLP_RXFRMERRCTR		0x224u /* Rx Framing Error */
+#define PCIE_PLP_RXERRTHRESHREG		0x228u /* Rx Error threshold */
+#define PCIE_PLP_TESTCTRLREG		0x22Cu /* Test Control reg */
+#define PCIE_PLP_SERDESCTRLOVRDREG	0x230u /* SERDES Control Override */
+#define PCIE_PLP_TIMINGOVRDREG		0x234u /* Timing param override */
+#define PCIE_PLP_RXTXSMDIAGREG		0x238u /* RXTX State Machine Diag */
+#define PCIE_PLP_LTSSMDIAGREG		0x23Cu /* LTSSM State Machine Diag */
 
 /* PCIE protocol DLLP diagnostic registers */
-#define PCIE_DLLP_LCREG			0x100 /* Link Control */
-#define PCIE_DLLP_LSREG			0x104 /* Link Status */
-#define PCIE_DLLP_LAREG			0x108 /* Link Attention */
-#define PCIE_DLLP_LAMASKREG		0x10C /* Link Attention Mask */
-#define PCIE_DLLP_NEXTTXSEQNUMREG	0x110 /* Next Tx Seq Num */
-#define PCIE_DLLP_ACKEDTXSEQNUMREG	0x114 /* Acked Tx Seq Num */
-#define PCIE_DLLP_PURGEDTXSEQNUMREG	0x118 /* Purged Tx Seq Num */
-#define PCIE_DLLP_RXSEQNUMREG		0x11C /* Rx Sequence Number */
-#define PCIE_DLLP_LRREG			0x120 /* Link Replay */
-#define PCIE_DLLP_LACKTOREG		0x124 /* Link Ack Timeout */
-#define PCIE_DLLP_PMTHRESHREG		0x128 /* Power Management Threshold */
-#define PCIE_DLLP_RTRYWPREG		0x12C /* Retry buffer write ptr */
-#define PCIE_DLLP_RTRYRPREG		0x130 /* Retry buffer Read ptr */
-#define PCIE_DLLP_RTRYPPREG		0x134 /* Retry buffer Purged ptr */
-#define PCIE_DLLP_RTRRWREG		0x138 /* Retry buffer Read/Write */
-#define PCIE_DLLP_ECTHRESHREG		0x13C /* Error Count Threshold */
-#define PCIE_DLLP_TLPERRCTRREG		0x140 /* TLP Error Counter */
-#define PCIE_DLLP_ERRCTRREG		0x144 /* Error Counter */
-#define PCIE_DLLP_NAKRXCTRREG		0x148 /* NAK Received Counter */
-#define PCIE_DLLP_TESTREG		0x14C /* Test */
-#define PCIE_DLLP_PKTBIST		0x150 /* Packet BIST */
-#define PCIE_DLLP_PCIE11		0x154 /* DLLP PCIE 1.1 reg */
+#define PCIE_DLLP_LCREG			0x100u /* Link Control */
+#define PCIE_DLLP_LSREG			0x104u /* Link Status */
+#define PCIE_DLLP_LAREG			0x108u /* Link Attention */
+#define PCIE_DLLP_LAMASKREG		0x10Cu /* Link Attention Mask */
+#define PCIE_DLLP_NEXTTXSEQNUMREG	0x110u /* Next Tx Seq Num */
+#define PCIE_DLLP_ACKEDTXSEQNUMREG	0x114u /* Acked Tx Seq Num */
+#define PCIE_DLLP_PURGEDTXSEQNUMREG	0x118u /* Purged Tx Seq Num */
+#define PCIE_DLLP_RXSEQNUMREG		0x11Cu /* Rx Sequence Number */
+#define PCIE_DLLP_LRREG			0x120u /* Link Replay */
+#define PCIE_DLLP_LACKTOREG		0x124u /* Link Ack Timeout */
+#define PCIE_DLLP_PMTHRESHREG		0x128u /* Power Management Threshold */
+#define PCIE_DLLP_RTRYWPREG		0x12Cu /* Retry buffer write ptr */
+#define PCIE_DLLP_RTRYRPREG		0x130u /* Retry buffer Read ptr */
+#define PCIE_DLLP_RTRYPPREG		0x134u /* Retry buffer Purged ptr */
+#define PCIE_DLLP_RTRRWREG		0x138u /* Retry buffer Read/Write */
+#define PCIE_DLLP_ECTHRESHREG		0x13Cu /* Error Count Threshold */
+#define PCIE_DLLP_TLPERRCTRREG		0x140u /* TLP Error Counter */
+#define PCIE_DLLP_ERRCTRREG		0x144u /* Error Counter */
+#define PCIE_DLLP_NAKRXCTRREG		0x148u /* NAK Received Counter */
+#define PCIE_DLLP_TESTREG		0x14Cu /* Test */
+#define PCIE_DLLP_PKTBIST		0x150u /* Packet BIST */
+#define PCIE_DLLP_PCIE11		0x154u /* DLLP PCIE 1.1 reg */
 
-#define PCIE_DLLP_LSREG_LINKUP		(1 << 16)
+#define PCIE_DLLP_LSREG_LINKUP		(1u << 16u)
 
 /* PCIE protocol TLP diagnostic registers */
-#define PCIE_TLP_CONFIGREG		0x000 /* Configuration */
-#define PCIE_TLP_WORKAROUNDSREG		0x004 /* TLP Workarounds */
-#define PCIE_TLP_WRDMAUPPER		0x010 /* Write DMA Upper Address */
-#define PCIE_TLP_WRDMALOWER		0x014 /* Write DMA Lower Address */
-#define PCIE_TLP_WRDMAREQ_LBEREG	0x018 /* Write DMA Len/ByteEn Req */
-#define PCIE_TLP_RDDMAUPPER		0x01C /* Read DMA Upper Address */
-#define PCIE_TLP_RDDMALOWER		0x020 /* Read DMA Lower Address */
-#define PCIE_TLP_RDDMALENREG		0x024 /* Read DMA Len Req */
-#define PCIE_TLP_MSIDMAUPPER		0x028 /* MSI DMA Upper Address */
-#define PCIE_TLP_MSIDMALOWER		0x02C /* MSI DMA Lower Address */
-#define PCIE_TLP_MSIDMALENREG		0x030 /* MSI DMA Len Req */
-#define PCIE_TLP_SLVREQLENREG		0x034 /* Slave Request Len */
-#define PCIE_TLP_FCINPUTSREQ		0x038 /* Flow Control Inputs */
-#define PCIE_TLP_TXSMGRSREQ		0x03C /* Tx StateMachine and Gated Req */
-#define PCIE_TLP_ADRACKCNTARBLEN	0x040 /* Address Ack XferCnt and ARB Len */
-#define PCIE_TLP_DMACPLHDR0		0x044 /* DMA Completion Hdr 0 */
-#define PCIE_TLP_DMACPLHDR1		0x048 /* DMA Completion Hdr 1 */
-#define PCIE_TLP_DMACPLHDR2		0x04C /* DMA Completion Hdr 2 */
-#define PCIE_TLP_DMACPLMISC0		0x050 /* DMA Completion Misc0 */
-#define PCIE_TLP_DMACPLMISC1		0x054 /* DMA Completion Misc1 */
-#define PCIE_TLP_DMACPLMISC2		0x058 /* DMA Completion Misc2 */
-#define PCIE_TLP_SPTCTRLLEN		0x05C /* Split Controller Req len */
-#define PCIE_TLP_SPTCTRLMSIC0		0x060 /* Split Controller Misc 0 */
-#define PCIE_TLP_SPTCTRLMSIC1		0x064 /* Split Controller Misc 1 */
-#define PCIE_TLP_BUSDEVFUNC		0x068 /* Bus/Device/Func */
-#define PCIE_TLP_RESETCTR		0x06C /* Reset Counter */
-#define PCIE_TLP_RTRYBUF		0x070 /* Retry Buffer value */
-#define PCIE_TLP_TGTDEBUG1		0x074 /* Target Debug Reg1 */
-#define PCIE_TLP_TGTDEBUG2		0x078 /* Target Debug Reg2 */
-#define PCIE_TLP_TGTDEBUG3		0x07C /* Target Debug Reg3 */
-#define PCIE_TLP_TGTDEBUG4		0x080 /* Target Debug Reg4 */
+#define PCIE_TLP_CONFIGREG		0x000u /* Configuration */
+#define PCIE_TLP_WORKAROUNDSREG		0x004u /* TLP Workarounds */
+#define PCIE_TLP_WRDMAUPPER		0x010u /* Write DMA Upper Address */
+#define PCIE_TLP_WRDMALOWER		0x014u /* Write DMA Lower Address */
+#define PCIE_TLP_WRDMAREQ_LBEREG	0x018u /* Write DMA Len/ByteEn Req */
+#define PCIE_TLP_RDDMAUPPER		0x01Cu /* Read DMA Upper Address */
+#define PCIE_TLP_RDDMALOWER		0x020u /* Read DMA Lower Address */
+#define PCIE_TLP_RDDMALENREG		0x024u /* Read DMA Len Req */
+#define PCIE_TLP_MSIDMAUPPER		0x028u /* MSI DMA Upper Address */
+#define PCIE_TLP_MSIDMALOWER		0x02Cu /* MSI DMA Lower Address */
+#define PCIE_TLP_MSIDMALENREG		0x030u /* MSI DMA Len Req */
+#define PCIE_TLP_SLVREQLENREG		0x034u /* Slave Request Len */
+#define PCIE_TLP_FCINPUTSREQ		0x038u /* Flow Control Inputs */
+#define PCIE_TLP_TXSMGRSREQ		0x03Cu /* Tx StateMachine and Gated Req */
+#define PCIE_TLP_ADRACKCNTARBLEN	0x040u /* Address Ack XferCnt and ARB Len */
+#define PCIE_TLP_DMACPLHDR0		0x044u /* DMA Completion Hdr 0 */
+#define PCIE_TLP_DMACPLHDR1		0x048u /* DMA Completion Hdr 1 */
+#define PCIE_TLP_DMACPLHDR2		0x04Cu /* DMA Completion Hdr 2 */
+#define PCIE_TLP_DMACPLMISC0		0x050u /* DMA Completion Misc0 */
+#define PCIE_TLP_DMACPLMISC1		0x054u /* DMA Completion Misc1 */
+#define PCIE_TLP_DMACPLMISC2		0x058u /* DMA Completion Misc2 */
+#define PCIE_TLP_SPTCTRLLEN		0x05Cu /* Split Controller Req len */
+#define PCIE_TLP_SPTCTRLMSIC0		0x060u /* Split Controller Misc 0 */
+#define PCIE_TLP_SPTCTRLMSIC1		0x064u /* Split Controller Misc 1 */
+#define PCIE_TLP_BUSDEVFUNC		0x068u /* Bus/Device/Func */
+#define PCIE_TLP_RESETCTR		0x06Cu /* Reset Counter */
+#define PCIE_TLP_RTRYBUF		0x070u /* Retry Buffer value */
+#define PCIE_TLP_TGTDEBUG1		0x074u /* Target Debug Reg1 */
+#define PCIE_TLP_TGTDEBUG2		0x078u /* Target Debug Reg2 */
+#define PCIE_TLP_TGTDEBUG3		0x07Cu /* Target Debug Reg3 */
+#define PCIE_TLP_TGTDEBUG4		0x080u /* Target Debug Reg4 */
 
 /* PCIE2 MDIO register offsets */
 #define PCIE2_MDIO_CONTROL    0x128
 #define PCIE2_MDIO_WR_DATA    0x12C
 #define PCIE2_MDIO_RD_DATA    0x130
 
-
 /* MDIO control */
-#define MDIOCTL_DIVISOR_MASK		0x7f	/* clock to be used on MDIO */
-#define MDIOCTL_DIVISOR_VAL		0x2
-#define MDIOCTL_PREAM_EN		0x80	/* Enable preamble sequnce */
-#define MDIOCTL_ACCESS_DONE		0x100   /* Tranaction complete */
+#define MDIOCTL_DIVISOR_MASK		0x7fu	/* clock to be used on MDIO */
+#define MDIOCTL_DIVISOR_VAL		0x2u
+#define MDIOCTL_PREAM_EN		0x80u	/* Enable preamble sequnce */
+#define MDIOCTL_ACCESS_DONE		0x100u   /* Tranaction complete */
 
 /* MDIO Data */
 #define MDIODATA_MASK			0x0000ffff	/* data 2 bytes */
@@ -377,10 +681,9 @@
 #define MDIOCTL2_SLAVE_BYPASS		0x10000000	/* IP slave bypass */
 #define MDIOCTL2_READ			0x20000000	/* IP slave bypass */
 
-#define MDIODATA2_DONE			0x80000000	/* rd/wr transaction done */
+#define MDIODATA2_DONE			0x80000000u	/* rd/wr transaction done */
 #define MDIODATA2_MASK			0x7FFFFFFF	/* rd/wr transaction data */
 #define MDIODATA2_DEVADDR_SHF		4		/* Physmedia devaddr shift */
-
 
 /* MDIO devices (SERDES modules)
  *  unlike old pcie cores (rev < 10), rev10 pcie serde organizes registers into a few blocks.
@@ -397,7 +700,6 @@
 #define MDIO_DEV_TXCTRL0	0x820
 #define MDIO_DEV_SERDESID	0x831
 #define MDIO_DEV_RXCTRL0	0x840
-
 
 /* XgxsBlk1_A Register Offsets */
 #define BLK1_PWR_MGMT0		0x16
@@ -425,8 +727,8 @@
 #define PLL_CTRL_FREQDET_EN             0x4000  /* bit 14 is FREQDET on */
 
 /* Power management threshold */
-#define PCIE_L0THRESHOLDTIME_MASK       0xFF00	/* bits 0 - 7 */
-#define PCIE_L1THRESHOLDTIME_MASK       0xFF00	/* bits 8 - 15 */
+#define PCIE_L0THRESHOLDTIME_MASK       0xFF00u	/* bits 0 - 7 */
+#define PCIE_L1THRESHOLDTIME_MASK       0xFF00u	/* bits 8 - 15 */
 #define PCIE_L1THRESHOLDTIME_SHIFT      8	/* PCIE_L1THRESHOLDTIME_SHIFT */
 #define PCIE_L1THRESHOLD_WARVAL         0x72	/* WAR value */
 #define PCIE_ASPMTIMER_EXTEND		0x01000000	/* > rev7: enable extend ASPM timer */
@@ -437,20 +739,84 @@
 #define SRSH_ASPM_L1_ENB		0x10	/* bit 4 */
 #define SRSH_ASPM_L0s_ENB		0x8	/* bit 3 */
 #define SRSH_PCIE_MISC_CONFIG		5	/* word 5 */
-#define SRSH_L23READY_EXIT_NOPERST	0x8000	/* bit 15 */
+#define SRSH_L23READY_EXIT_NOPERST	0x8000u	/* bit 15 */
 #define SRSH_CLKREQ_OFFSET_REV5		20	/* word 20 for srom rev <= 5 */
 #define SRSH_CLKREQ_OFFSET_REV8		52	/* word 52 for srom rev 8 */
 #define SRSH_CLKREQ_ENB			0x0800	/* bit 11 */
 #define SRSH_BD_OFFSET                  6       /* word 6 */
 #define SRSH_AUTOINIT_OFFSET            18      /* auto initialization enable */
 
+/* PCI Capability ID's
+ * Reference include/linux/pci_regs.h
+ * #define  PCI_CAP_LIST_ID	0       // Capability ID
+ * #define  PCI_CAP_ID_PM		0x01    // Power Management
+ * #define  PCI_CAP_ID_AGP		0x02    // Accelerated Graphics Port
+ * #define  PCI_CAP_ID_VPD		0x03    // Vital Product Data
+ * #define  PCI_CAP_ID_SLOTID	0x04    // Slot Identification
+ * #define  PCI_CAP_ID_MSI		0x05    // Message Signalled Interrupts
+ * #define  PCI_CAP_ID_CHSWP       0x06    // CompactPCI HotSwap
+ * #define  PCI_CAP_ID_PCIX        0x07    // PCI-X
+ * #define  PCI_CAP_ID_HT          0x08    // HyperTransport
+ * #define  PCI_CAP_ID_VNDR        0x09    // Vendor-Specific
+ * #define  PCI_CAP_ID_DBG         0x0A    // Debug port
+ * #define  PCI_CAP_ID_CCRC        0x0B    // CompactPCI Central Resource Control
+ * #define  PCI_CAP_ID_SHPC        0x0C    // PCI Standard Hot-Plug Controller
+ * #define  PCI_CAP_ID_SSVID       0x0D    // Bridge subsystem vendor/device ID
+ * #define  PCI_CAP_ID_AGP3        0x0E    // AGP Target PCI-PCI bridge
+ * #define  PCI_CAP_ID_SECDEV      0x0F    // Secure Device
+ * #define  PCI_CAP_ID_MSIX        0x11    // MSI-X
+ * #define  PCI_CAP_ID_SATA        0x12    // SATA Data/Index Conf.
+ * #define  PCI_CAP_ID_AF          0x13    // PCI Advanced Features
+ * #define  PCI_CAP_ID_EA          0x14    // PCI Enhanced Allocation
+ * #define  PCI_CAP_ID_MAX         PCI_CAP_ID_EA
+ */
+
+#define  PCIE_CAP_ID_EXP         0x10    // PCI Express
+
+/* PCIe Capabilities Offsets
+ * Reference include/linux/pci_regs.h
+ * #define PCIE_CAP_FLAGS           2       // Capabilities register
+ * #define PCIE_CAP_DEVCAP          4       // Device capabilities
+ * #define PCIE_CAP_DEVCTL          8       // Device Control
+ * #define PCIE_CAP_DEVSTA          10      // Device Status
+ * #define PCIE_CAP_LNKCAP          12      // Link Capabilities
+ * #define PCIE_CAP_LNKCTL          16      // Link Control
+ * #define PCIE_CAP_LNKSTA          18      // Link Status
+ * #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V1  20      // v1 endpoints end here
+ * #define PCIE_CAP_SLTCAP          20      // Slot Capabilities
+ * #define PCIE_CAP_SLTCTL          24      // Slot Control
+ * #define PCIE_CAP_SLTSTA          26      // Slot Status
+ * #define PCIE_CAP_RTCTL           28      // Root Control
+ * #define PCIE_CAP_RTCAP           30      // Root Capabilities
+ * #define PCIE_CAP_RTSTA           32      // Root Status
+ */
+
+/* Linkcapability reg offset in PCIE Cap */
+#define PCIE_CAP_LINKCAP_OFFSET         12      /* linkcap offset in pcie cap */
+#define PCIE_CAP_LINKCAP_LNKSPEED_MASK	0xf     /* Supported Link Speeds */
+#define PCIE_CAP_LINKCAP_GEN2           0x2     /* Value for GEN2 */
+
+/* Uc_Err reg offset in AER Cap */
+#define PCIE_EXTCAP_ID_ERR		0x01	/* Advanced Error Reporting */
+#define PCIE_EXTCAP_AER_UCERR_OFFSET	4	/* Uc_Err reg offset in AER Cap */
+#define PCIE_EXTCAP_ERR_HEADER_LOG_0	28
+#define PCIE_EXTCAP_ERR_HEADER_LOG_1	32
+#define PCIE_EXTCAP_ERR_HEADER_LOG_2	36
+#define PCIE_EXTCAP_ERR_HEADER_LOG_3	40
+
+/* L1SS reg offset in L1SS Ext Cap */
+#define PCIE_EXTCAP_ID_L1SS		0x1e	/* PCI Express L1 PM Substates Capability */
+#define PCIE_EXTCAP_L1SS_CAP_OFFSET	4	/* L1SSCap reg offset in L1SS Cap */
+#define PCIE_EXTCAP_L1SS_CONTROL_OFFSET	8	/* L1SSControl reg offset in L1SS Cap */
+#define PCIE_EXTCAP_L1SS_CONTROL2_OFFSET	0xc	/* L1SSControl reg offset in L1SS Cap */
+
 /* Linkcontrol reg offset in PCIE Cap */
 #define PCIE_CAP_LINKCTRL_OFFSET	16	/* linkctrl offset in pcie cap */
 #define PCIE_CAP_LCREG_ASPML0s		0x01	/* ASPM L0s in linkctrl */
 #define PCIE_CAP_LCREG_ASPML1		0x02	/* ASPM L1 in linkctrl */
 #define PCIE_CLKREQ_ENAB		0x100	/* CLKREQ Enab in linkctrl */
-#define PCIE_LINKSPEED_MASK       	0xF0000	/* bits 0 - 3 of high word */
-#define PCIE_LINKSPEED_SHIFT      	16	/* PCIE_LINKSPEED_SHIFT */
+#define PCIE_LINKSPEED_MASK		0xF0000u	/* bits 0 - 3 of high word */
+#define PCIE_LINKSPEED_SHIFT		16	/* PCIE_LINKSPEED_SHIFT */
 
 /* Devcontrol reg offset in PCIE Cap */
 #define PCIE_CAP_DEVCTRL_OFFSET		8	/* devctrl offset in pcie cap */
@@ -467,6 +833,7 @@
 #define PCIE_CAP_DEVCTRL_MPS_512B	2	/* 512 Byte */
 #define PCIE_CAP_DEVCTRL_MPS_1024B	3	/* 1024 Byte */
 
+#define PCIE_ASPM_CTRL_MASK		3	/* bit 0 and 1 */
 #define PCIE_ASPM_ENAB			3	/* ASPM L0s & L1 in linkctrl */
 #define PCIE_ASPM_L1_ENAB		2	/* ASPM L0s & L1 in linkctrl */
 #define PCIE_ASPM_L0s_ENAB		1	/* ASPM L0s & L1 in linkctrl */
@@ -475,6 +842,15 @@
 #define PCIE_ASPM_L11_ENAB		8	/* ASPM L1.1 in PML1_sub_control2 */
 #define PCIE_ASPM_L12_ENAB		4	/* ASPM L1.2 in PML1_sub_control2 */
 
+#define PCIE_EXT_L1SS_MASK		0xf	/* Bits [3:0] of L1SSControl 0x248 */
+#define PCIE_EXT_L1SS_ENAB		0xf	/* Bits [3:0] of L1SSControl 0x248 */
+
+/* NumMsg and NumMsgEn in PCIE MSI Cap */
+#define MSICAP_NUM_MSG_SHF		17
+#define MSICAP_NUM_MSG_MASK		(0x7 << MSICAP_NUM_MSG_SHF)
+#define MSICAP_NUM_MSG_EN_SHF	20
+#define MSICAP_NUM_MSG_EN_MASK	(0x7 << MSICAP_NUM_MSG_EN_SHF)
+
 /* Devcontrol2 reg offset in PCIE Cap */
 #define PCIE_CAP_DEVCTRL2_OFFSET	0x28	/* devctrl2 offset in pcie cap */
 #define PCIE_CAP_DEVCTRL2_LTR_ENAB_MASK	0x400	/* Latency Tolerance Reporting Enable */
@@ -482,22 +858,26 @@
 #define PCIE_CAP_DEVCTRL2_OBFF_ENAB_MASK 0x6000	/* Enable OBFF mechanism, select signaling method */
 
 /* LTR registers in PCIE Cap */
-#define PCIE_LTR0_REG_OFFSET	0x844	/* ltr0_reg offset in pcie cap */
-#define PCIE_LTR1_REG_OFFSET	0x848	/* ltr1_reg offset in pcie cap */
-#define PCIE_LTR2_REG_OFFSET	0x84c	/* ltr2_reg offset in pcie cap */
-#define PCIE_LTR0_REG_DEFAULT_60	0x883c883c	/* active latency default to 60usec */
-#define PCIE_LTR0_REG_DEFAULT_150	0x88968896	/* active latency default to 150usec */
-#define PCIE_LTR1_REG_DEFAULT		0x88648864	/* idle latency default to 100usec */
-#define PCIE_LTR2_REG_DEFAULT		0x90039003	/* sleep latency default to 3msec */
+#define PCIE_LTR0_REG_OFFSET	0x844u	/* ltr0_reg offset in pcie cap */
+#define PCIE_LTR1_REG_OFFSET	0x848u	/* ltr1_reg offset in pcie cap */
+#define PCIE_LTR2_REG_OFFSET	0x84cu	/* ltr2_reg offset in pcie cap */
+#define PCIE_LTR0_REG_DEFAULT_60	0x883c883cu	/* active latency default to 60usec */
+#define PCIE_LTR0_REG_DEFAULT_150	0x88968896u	/* active latency default to 150usec */
+#define PCIE_LTR1_REG_DEFAULT		0x88648864u	/* idle latency default to 100usec */
+#define PCIE_LTR2_REG_DEFAULT		0x90039003u	/* sleep latency default to 3msec */
+#define PCIE_LTR_LAT_VALUE_MASK		0x3FF		/* LTR Latency mask */
+#define PCIE_LTR_LAT_SCALE_SHIFT	10		/* LTR Scale shift */
+#define PCIE_LTR_LAT_SCALE_MASK		0x1C00		/* LTR Scale mask */
+#define PCIE_LTR_SNOOP_REQ_SHIFT	15		/* LTR SNOOP REQ shift */
+#define PCIE_LTR_SNOOP_REQ_MASK		0x8000		/* LTR SNOOP REQ mask */
 
 /* Status reg PCIE_PLP_STATUSREG */
 #define PCIE_PLP_POLARITYINV_STAT	0x10
 
-
 /* PCIE BRCM Vendor CAP REVID reg  bits */
-#define BRCMCAP_PCIEREV_CT_MASK			0xF00
-#define BRCMCAP_PCIEREV_CT_SHIFT		8
-#define BRCMCAP_PCIEREV_REVID_MASK		0xFF
+#define BRCMCAP_PCIEREV_CT_MASK			0xF00u
+#define BRCMCAP_PCIEREV_CT_SHIFT		8u
+#define BRCMCAP_PCIEREV_REVID_MASK		0xFFu
 #define BRCMCAP_PCIEREV_REVID_SHIFT		0
 
 #define PCIE_REVREG_CT_PCIE1		0
@@ -529,15 +909,30 @@
 #define PCIECFGREG_MSI_ADDR_L		0x5C
 #define PCIECFGREG_MSI_ADDR_H		0x60
 #define PCIECFGREG_MSI_DATA		0x64
-#define PCIECFGREG_LINK_STATUS_CTRL	0xBC
-#define PCIECFGREG_LINK_STATUS_CTRL2	0xDC
+#define PCIECFGREG_REVID		0x6c
+#define PCIECFGREG_SPROM_CTRL           0x88
+#define PCIECFGREG_LINK_STATUS_CTRL	0xBCu
+#define PCIECFGREG_LINK_STATUS_CTRL2	0xDCu
+#define PCIECFGREG_DEV_STATUS_CTRL 0xB4u
+#define PCIECFGGEN_DEV_STATUS_CTRL2	0xD4
 #define PCIECFGREG_RBAR_CTRL		0x228
 #define PCIECFGREG_PML1_SUB_CTRL1	0x248
+#define PCIECFGREG_PML1_SUB_CTRL2	0x24C
 #define PCIECFGREG_REG_BAR2_CONFIG	0x4E0
 #define PCIECFGREG_REG_BAR3_CONFIG	0x4F4
 #define PCIECFGREG_PDL_CTRL1		0x1004
 #define PCIECFGREG_PDL_IDDQ		0x1814
 #define PCIECFGREG_REG_PHY_CTL7		0x181c
+#define PCIECFGREG_PHY_DBG_CLKREQ0		0x1E10
+#define PCIECFGREG_PHY_DBG_CLKREQ1		0x1E14
+#define PCIECFGREG_PHY_DBG_CLKREQ2		0x1E18
+#define PCIECFGREG_PHY_DBG_CLKREQ3		0x1E1C
+#define PCIECFGREG_PHY_LTSSM_HIST_0		0x1CEC
+#define PCIECFGREG_PHY_LTSSM_HIST_1		0x1CF0
+#define PCIECFGREG_PHY_LTSSM_HIST_2		0x1CF4
+#define PCIECFGREG_PHY_LTSSM_HIST_3		0x1CF8
+#define PCIECFGREG_TREFUP			0x1814
+#define PCIECFGREG_TREFUP_EXT			0x1818
 
 /* PCIECFGREG_PML1_SUB_CTRL1 Bit Definition */
 #define PCI_PM_L1_2_ENA_MASK		0x00000001	/* PCI-PM L1.2 Enabled */
@@ -557,17 +952,119 @@
 
 /* enumeration Core regs */
 #define PCIH2D_MailBox  0x140
-#define PCIH2D_DB1 0x144
+#define PCIH2D_DB1		0x144
 #define PCID2H_MailBox  0x148
-#define PCIMailBoxInt	0x48
-#define PCIMailBoxMask	0x4C
+#define PCIH2D_MailBox_1	0x150  /* for dma channel1 */
+#define PCIH2D_DB1_1		0x154
+#define PCID2H_MailBox_1	0x158
+#define PCIH2D_MailBox_2	0x160  /* for dma channel2 which will be used for Implicit DMA */
+#define PCIH2D_DB1_2		0x164
+#define PCID2H_MailBox_2	0x168
+#define PCIE_CLK_CTRL		0x1E0
+#define PCIE_PWR_CTRL		0x1E8
+
+#define PCIControl(rev)		(REV_GE_64(rev) ? 0xC00 : 0x00)
+/* for corerev < 64 idma_en is in PCIControl regsiter */
+#define IDMAControl(rev)	(REV_GE_64(rev) ? 0x480 : 0x00)
+#define PCIMailBoxInt(rev)	(REV_GE_64(rev) ? 0xC30 : 0x48)
+#define PCIMailBoxMask(rev)	(REV_GE_64(rev) ? 0xC34 : 0x4C)
+#define PCIFunctionIntstatus(rev)	(REV_GE_64(rev) ? 0xC10 : 0x20)
+#define PCIFunctionIntmask(rev)	(REV_GE_64(rev) ? 0xC14 : 0x24)
+#define PCIPowerIntstatus(rev)	(REV_GE_64(rev) ? 0xC18 : 0x1A4)
+#define PCIPowerIntmask(rev)	(REV_GE_64(rev) ? 0xC1C : 0x1A8)
+#define PCIDARClkCtl(rev)	(REV_GE_64(rev) ? 0xA08 : 0xAE0)
+#define PCIDARPwrCtl(rev)	(REV_GE_64(rev) ? 0xA0C : 0xAE8)
+#define PCIDARFunctionIntstatus(rev)	(REV_GE_64(rev) ? 0xA10 : 0xA20)
+#define PCIDARH2D_DB0(rev)	(REV_GE_64(rev) ? 0xA20 : 0xA28)
+#define PCIDARErrlog(rev)	(REV_GE_64(rev) ? 0xA60 : 0xA40)
+#define PCIDARErrlog_Addr(rev)	(REV_GE_64(rev) ? 0xA64 : 0xA44)
+#define PCIDARMailboxint(rev)	(REV_GE_64(rev) ? 0xA68 : 0xA48)
+
+#define PCIMSIVecAssign	0x58
+
+/* HMAP Registers */
+/* base of all HMAP window registers */
+#define PCI_HMAP_WINDOW_BASE(rev)		(REV_GE_64(rev) ? 0x580u : 0x540u)
+#define PCI_HMAP_VIOLATION_ADDR_L(rev)		(REV_GE_64(rev) ? 0x600u : 0x5C0u)
+#define PCI_HMAP_VIOLATION_ADDR_U(rev)		(REV_GE_64(rev) ? 0x604u : 0x5C4u)
+#define PCI_HMAP_VIOLATION_INFO(rev)		(REV_GE_64(rev) ? 0x608u : 0x5C8u)
+#define PCI_HMAP_WINDOW_CONFIG(rev)		(REV_GE_64(rev) ? 0x610u : 0x5D0u)
+#define PCI_HMAP_NWINDOWS_SHIFT		8
+#define PCI_HMAP_NWINDOWS_MASK		0x0000ff00 /* bits 8:15 */
 
 #define I_F0_B0         (0x1 << 8) /* Mail box interrupt Function 0 interrupt, bit 0 */
 #define I_F0_B1         (0x1 << 9) /* Mail box interrupt Function 0 interrupt, bit 1 */
 
 #define PCIECFGREG_DEVCONTROL	0xB4
+#define PCIECFGREG_BASEADDR0	0x10
+#define PCIECFGREG_BASEADDR1	0x18
+#define PCIECFGREG_SECURE_MODE_SHIFT	31
 #define PCIECFGREG_DEVCONTROL_MRRS_SHFT	12
 #define PCIECFGREG_DEVCONTROL_MRRS_MASK	(0x7 << PCIECFGREG_DEVCONTROL_MRRS_SHFT)
+#define PCIECFGREG_DEVCTRL_MPS_SHFT	5
+#define PCIECFGREG_DEVCTRL_MPS_MASK (0x7 << PCIECFGREG_DEVCTRL_MPS_SHFT)
+#define PCIECFGREG_PM_CSR_STATE_MASK 0x00000003
+#define PCIECFGREG_PM_CSR_STATE_D0 0
+#define PCIECFGREG_PM_CSR_STATE_D1 1
+#define PCIECFGREG_PM_CSR_STATE_D2 2
+#define PCIECFGREG_PM_CSR_STATE_D3_HOT 3
+#define PCIECFGREG_PM_CSR_STATE_D3_COLD 4
+
+/* Direct Access regs */
+#define DAR_ERRADDR(rev)		(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.erraddr) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.erraddr))
+#define DAR_ERRLOG(rev)			(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.errlog) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.errlog))
+#define DAR_PCIH2D_DB0_0(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_0_0) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.h2d_db_0_0))
+#define DAR_PCIH2D_DB0_1(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_0_1) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.h2d_db_0_1))
+#define DAR_PCIH2D_DB1_0(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_1_0) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.h2d_db_1_0))
+#define DAR_PCIH2D_DB1_1(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_1_1) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.h2d_db_1_1))
+#define DAR_PCIH2D_DB2_0(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_2_0) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.h2d_db_2_0))
+#define DAR_PCIH2D_DB2_1(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_2_1) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.h2d_db_2_1))
+#define DAR_PCIH2D_DB3_0(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_3_0)
+#define DAR_PCIH2D_DB3_1(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_3_1)
+#define DAR_PCIH2D_DB4_0(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_4_0)
+#define DAR_PCIH2D_DB4_1(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_4_1)
+#define DAR_PCIH2D_DB5_0(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_5_0)
+#define DAR_PCIH2D_DB5_1(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_5_1)
+#define DAR_PCIH2D_DB6_0(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_6_0)
+#define DAR_PCIH2D_DB6_1(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_6_1)
+#define DAR_PCIH2D_DB7_0(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_7_0)
+#define DAR_PCIH2D_DB7_1(rev)	OFFSETOF(sbpcieregs_t, u1.dar_64.h2d_db_7_1)
+
+#define DAR_PCIMailBoxInt(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.mbox_int) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.mbox_int))
+#define DAR_PCIE_PWR_CTRL(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.powerctl) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.powerctl))
+#define DAR_CLK_CTRL(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.clk_ctl_st) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.clk_ctl_st))
+#define DAR_INTSTAT(rev)	(REV_GE_64(rev) ? \
+						OFFSETOF(sbpcieregs_t, u1.dar_64.intstatus) : \
+						OFFSETOF(sbpcieregs_t, u1.dar.intstatus))
+
+#define DAR_FIS_CTRL(rev)      OFFSETOF(sbpcieregs_t, u1.dar_64.fis_ctrl)
+
+#define DAR_FIS_START_SHIFT	0u
+#define DAR_FIS_START_MASK	(1u << DAR_FIS_START_SHIFT)
+
+#define PCIE_PWR_REQ_PCIE		(0x1 << 8)
 
 /* SROM hardware region */
 #define SROM_OFFSET_BAR1_CTRL  52
@@ -620,6 +1117,11 @@
 #define SBTOPCIE_MB_FUNC2_SHIFT 12
 #define SBTOPCIE_MB_FUNC3_SHIFT 14
 
+#define SBTOPCIE_MB1_FUNC0_SHIFT 9
+#define SBTOPCIE_MB1_FUNC1_SHIFT 11
+#define SBTOPCIE_MB1_FUNC2_SHIFT 13
+#define SBTOPCIE_MB1_FUNC3_SHIFT 15
+
 /* pcieiocstatus */
 #define PCIEGEN2_IOC_D0_STATE_SHIFT		8
 #define PCIEGEN2_IOC_D1_STATE_SHIFT		9
@@ -629,6 +1131,7 @@
 #define PCIEGEN2_IOC_L1_LINK_SHIFT		13
 #define PCIEGEN2_IOC_L1L2_LINK_SHIFT		14
 #define PCIEGEN2_IOC_L2_L3_LINK_SHIFT		15
+#define PCIEGEN2_IOC_BME_SHIFT			20
 
 #define PCIEGEN2_IOC_D0_STATE_MASK		(1 << PCIEGEN2_IOC_D0_STATE_SHIFT)
 #define PCIEGEN2_IOC_D1_STATE_MASK		(1 << PCIEGEN2_IOC_D1_STATE_SHIFT)
@@ -638,6 +1141,7 @@
 #define PCIEGEN2_IOC_L1_LINK_MASK		(1 << PCIEGEN2_IOC_L1_LINK_SHIFT)
 #define PCIEGEN2_IOC_L1L2_LINK_MASK		(1 << PCIEGEN2_IOC_L1L2_LINK_SHIFT)
 #define PCIEGEN2_IOC_L2_L3_LINK_MASK		(1 << PCIEGEN2_IOC_L2_L3_LINK_SHIFT)
+#define PCIEGEN2_IOC_BME_MASK			(1 << PCIEGEN2_IOC_BME_SHIFT)
 
 /* stat_ctrl */
 #define PCIE_STAT_CTRL_RESET		0x1
@@ -645,9 +1149,100 @@
 #define PCIE_STAT_CTRL_INTENABLE	0x4
 #define PCIE_STAT_CTRL_INTSTATUS	0x8
 
+/* SPROMControl */
+#define PCIE_BAR1COHERENTACCEN			(1 << 8)
+#define PCIE_BAR2COHERENTACCEN			(1 << 9)
+
+/* cpl_timeout_ctrl_reg */
+#define PCIE_CTO_TO_THRESHOLD_SHIFT	0
+#define PCIE_CTO_TO_THRESHHOLD_MASK	(0xfffff << PCIE_CTO_TO_THRESHOLD_SHIFT)
+
+#define PCIE_CTO_CLKCHKCNT_SHIFT		24
+#define PCIE_CTO_CLKCHKCNT_MASK		(0xf << PCIE_CTO_CLKCHKCNT_SHIFT)
+
+#define PCIE_CTO_ENAB_SHIFT			31
+#define PCIE_CTO_ENAB_MASK			(0x1 << PCIE_CTO_ENAB_SHIFT)
+
+#define PCIE_CTO_TO_THRESH_DEFAULT	0x58000
+#define PCIE_CTO_CLKCHKCNT_VAL		0xA
+
+/* ErrLog */
+#define PCIE_SROMRD_ERR_SHIFT			5
+#define PCIE_SROMRD_ERR_MASK			(0x1 << PCIE_SROMRD_ERR_SHIFT)
+
+#define PCIE_CTO_ERR_SHIFT			8
+#define PCIE_CTO_ERR_MASK				(0x1 << PCIE_CTO_ERR_SHIFT)
+
+#define PCIE_CTO_ERR_CODE_SHIFT		9
+#define PCIE_CTO_ERR_CODE_MASK		(0x3 << PCIE_CTO_ERR_CODE_SHIFT)
+
+#define PCIE_BP_CLK_OFF_ERR_SHIFT		12
+#define PCIE_BP_CLK_OFF_ERR_MASK		(0x1 << PCIE_BP_CLK_OFF_ERR_SHIFT)
+
+#define PCIE_BP_IN_RESET_ERR_SHIFT	13
+#define PCIE_BP_IN_RESET_ERR_MASK		(0x1 << PCIE_BP_IN_RESET_ERR_SHIFT)
+
 #ifdef BCMDRIVER
-void pcie_watchdog_reset(osl_t *osh, si_t *sih, sbpcieregs_t *sbpcieregs);
+void pcie_watchdog_reset(osl_t *osh, si_t *sih, uint32 wd_mask, uint32 wd_val);
 void pcie_serdes_iddqdisable(osl_t *osh, si_t *sih, sbpcieregs_t *sbpcieregs);
+void pcie_set_trefup_time_100us(si_t *sih);
 #endif /* BCMDRIVER */
 
+/* DMA intstatus and intmask */
+#define	I_PC		(1 << 10)	/* pci descriptor error */
+#define	I_PD		(1 << 11)	/* pci data error */
+#define	I_DE		(1 << 12)	/* descriptor protocol error */
+#define	I_RU		(1 << 13)	/* receive descriptor underflow */
+#define	I_RO		(1 << 14)	/* receive fifo overflow */
+#define	I_XU		(1 << 15)	/* transmit fifo underflow */
+#define	I_RI		(1 << 16)	/* receive interrupt */
+#define	I_XI		(1 << 24)	/* transmit interrupt */
+
+/* PCIEGen2 message exchange registers */
+/* http://twiki.cypress.com/do/view/Mwgroup/Pciegen2Rev70#Message_Exchange_Registers */
+#define PCIE_DAR_MSG_D2H_REG0_OFFSET	0xA80
+#define PCIE_DAR_MSG_H2D_REG0_OFFSET	0xA90
+#define PCIE_DAR_MSG_D2H_REG1_OFFSET	0xA84
+#define PCIE_DAR_MSG_H2D_REG1_OFFSET	0xA94
+
+#define HS_POLL_PERIOD_US 10
+#ifdef BCMQT
+#define D2H_READY_WD_RESET_COUNT (84) /* ~84secs >~ BL ready time after wd rst */
+#define D2H_READY_WD_RESET_US 1000000		/* 1s */
+#define D2H_READY_TIMEOUT_US (1000000 * 60 * 3) /* 3 Mins >~ FW download time */
+#define D2H_VALDN_DONE_TIMEOUT_US (1000000 * 60 * 5) /* 5 Mins >~ Validation time */
+#define D2H_TRX_HDR_PARSE_DONE_TIMEOUT_US (1000000 * 60 * 1) /* 1 Mins >~ TRX Parsing */
+#else
+#define D2H_READY_WD_RESET_COUNT (200) /* ~200ms >~ BL ready time after wd rst */
+#define D2H_READY_WD_RESET_US 1000		/* 1ms */
+#define D2H_READY_TIMEOUT_US (100000) /* 100ms >~ FW download time */
+#define D2H_VALDN_DONE_TIMEOUT_US (250000) /* 250ms >~ Validation time */
+#define D2H_TRX_HDR_PARSE_DONE_TIMEOUT_US (50000) /* 50ms >~ TRX Parsing */
+#endif // endif
+
+typedef struct bl_hs_address {
+	volatile void *d2h;
+	volatile void *h2d;
+} hs_addrs_t;
+
+/* [D2H] Dongle to host handshake bits shift */
+enum {
+	D2H_START_SHIFT			= 0,
+	D2H_READY_SHIFT			= 1,
+	D2H_STEADY_SHIFT		= 2,
+	D2H_TRX_HDR_PARSE_DONE_SHIFT	= 3,
+	D2H_VALDN_START_SHIFT		= 4,
+	D2H_VALDN_RESULT_SHIFT		= 5,
+	D2H_VALDN_DONE_SHIFT		= 6
+	/* Bits 31:7 reserved for future */
+};
+
+/* [H2D] Host to dongle handshake bits shift */
+enum {
+	H2D_DL_START_SHIFT		= 0,
+	H2D_DL_DONE_SHIFT		= 1,
+	H2D_DL_NVRAM_DONE_SHIFT		= 2,
+	H2D_BL_RESET_ON_ERROR_SHIFT	= 3
+	/* Bits 31:4 reserved for future */
+};
 #endif	/* _PCIE_CORE_H */

--
Gitblit v1.6.2