From 81f8e42235e5ebedddd9f7fc8b7d578c978edca9 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 1 Jun 2011 13:45:22 +0200 Subject: [PATCH] --- yaml --- r: 259377 b: refs/heads/master c: 4b1681163cbe5a07d322332b1ec238ffdf43a084 h: refs/heads/master i: 259375: 4084dec5a2dfc6e0160addf88d1533221b1f256f v: v3 --- [refs] | 2 +- .../staging/brcm80211/brcmsmac/aiutils.c | 1 - .../staging/brcm80211/brcmsmac/bcmsrom.c | 2 +- .../staging/brcm80211/brcmsmac/nicpci.c | 3 +- .../staging/brcm80211/brcmsmac/wl_mac80211.c | 2 +- .../staging/brcm80211/brcmsmac/wlc_bmac.c | 2 +- .../staging/brcm80211/brcmsmac/wlc_main.c | 1 - .../staging/brcm80211/brcmsmac/wlc_phy_shim.c | 2 - .../staging/brcm80211/include/nicpci.h | 42 ++++++++++++++++++- 9 files changed, 46 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a631629f2066..4037bbb9dade 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e40514c2001334da200ba1e019cfecb0650335d8 +refs/heads/master: 4b1681163cbe5a07d322332b1ec238ffdf43a084 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c b/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c index 9aec0848eb99..bae40fe26d90 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c @@ -24,7 +24,6 @@ #include #include #include -#include #include /* ********** from siutils.c *********** */ diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c index 952bc402263b..e0899c86a0bc 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c b/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c index 806b2ca0a8c9..a96173d37b7f 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c @@ -27,7 +27,6 @@ #include #include #include -#include /* chipcontrol */ #define CHIPCTRL_4321_PLL_DOWN 0x800000 /* serdes PLL down override */ @@ -83,7 +82,7 @@ static bool pcicore_pmecap(pcicore_info_t *pi); /* Initialize the PCI core. It's caller's responsibility to make sure that this is done * only once */ -void *pcicore_init(si_t *sih, void *pdev, void *regs) +void *pcicore_init(struct si_pub *sih, void *pdev, void *regs) { pcicore_info_t *pi; diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 3d9f791cd318..ee026d32c23f 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include "phy/wlc_phy_int.h" diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index a7994e4031f4..2ee078532f80 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c index c50f335d17b7..18a54638ad3a 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index 7bb122b7c786..c94b4592394e 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c @@ -23,14 +23,12 @@ #include #include -#include #include #include #include #include #include -#include #include #include #include diff --git a/trunk/drivers/staging/brcm80211/include/nicpci.h b/trunk/drivers/staging/brcm80211/include/nicpci.h index f901c608210d..e9058c607e8f 100644 --- a/trunk/drivers/staging/brcm80211/include/nicpci.h +++ b/trunk/drivers/staging/brcm80211/include/nicpci.h @@ -17,7 +17,47 @@ #ifndef _NICPCI_H #define _NICPCI_H +/* PCI configuration address space size */ +#define PCI_SZPCR 256 + +/* Brcm PCI configuration registers */ +/* backplane address space accessed by BAR0 */ +#define PCI_BAR0_WIN 0x80 +/* sprom property control */ +#define PCI_SPROM_CONTROL 0x88 +/* mask of PCI and other cores interrupts */ +#define PCI_INT_MASK 0x94 +/* backplane core interrupt mask bits offset */ +#define PCI_SBIM_SHIFT 8 +/* backplane address space accessed by second 4KB of BAR0 */ +#define PCI_BAR0_WIN2 0xac +/* pci config space gpio input (>=rev3) */ +#define PCI_GPIO_IN 0xb0 +/* pci config space gpio output (>=rev3) */ +#define PCI_GPIO_OUT 0xb4 +/* pci config space gpio output enable (>=rev3) */ +#define PCI_GPIO_OUTEN 0xb8 + +/* bar0 + 4K accesses external sprom */ +#define PCI_BAR0_SPROM_OFFSET (4 * 1024) +/* bar0 + 6K accesses pci core registers */ +#define PCI_BAR0_PCIREGS_OFFSET (6 * 1024) +/* + * pci core SB registers are at the end of the + * 8KB window, so their address is the "regular" + * address plus 4K + */ +#define PCI_BAR0_PCISBR_OFFSET (4 * 1024) +/* bar0 window size Match with corerev 13 */ +#define PCI_BAR0_WINSZ (16 * 1024) +/* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */ +/* bar0 + 8K accesses pci/pcie core registers */ +#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024) +/* bar0 + 12K accesses chipc core registers */ +#define PCI_16KB0_CCREGS_OFFSET (12 * 1024) + struct sbpcieregs; +struct si_pub; extern u8 pcicore_find_pci_capability(void *dev, u8 req_cap_id, unsigned char *buf, u32 *buflen); @@ -29,7 +69,7 @@ extern uint pcie_writereg(struct sbpcieregs *pcieregs, extern u8 pcie_clkreq(void *pch, u32 mask, u32 val); extern u32 pcie_lcreg(void *pch, u32 mask, u32 val); -extern void *pcicore_init(si_t *sih, void *pdev, void *regs); +extern void *pcicore_init(struct si_pub *sih, void *pdev, void *regs); extern void pcicore_deinit(void *pch); extern void pcicore_attach(void *pch, char *pvars, int state); extern void pcicore_hwup(void *pch);