lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: remove usage of struct osl_info to access device

Browse Source 
For accessing the PCI or SDIO device in the driver the device is stored
in a separate structure osl_info. To get rid of the osl concept the use
of this device pointer attribute is removed from the drivers.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel
2011-02-25 16:39:24 +01:00
committed by Greg Kroah-Hartman
parent 7c0e45d7fb
commit 06d278c51a
8 changed files with 93 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
View File

@@ -442,7 +442,7 @@ void write_phy_reg(phy_info_t *pi, u16 addr, u16 val)
if (addr == 0x72) if (addr == 0x72)
(void)R_REG(osh, &regs->phyregdata); (void)R_REG(osh, &regs->phyregdata);
#else #else
W_REG(osh, (volatile u32 *)(&regs->phyregaddr), W_REG(osh, (u32 *)(&regs->phyregaddr),
addr | (val << 16)); addr | (val << 16));
if (pi->sh->bustype == PCI_BUS) { if (pi->sh->bustype == PCI_BUS) {
if (++pi->phy_wreg >= pi->phy_wreg_limit) { if (++pi->phy_wreg >= pi->phy_wreg_limit) {

4
drivers/staging/brcm80211/include/nicpci.h
View File

@@ -45,7 +45,7 @@
#else #else
struct sbpcieregs; struct sbpcieregs;
extern u8 pcicore_find_pci_capability(struct osl_info *osh, u8 req_cap_id, extern u8 pcicore_find_pci_capability(void *dev, u8 req_cap_id,
unsigned char *buf, u32 *buflen); unsigned char *buf, u32 *buflen);
extern uint pcie_readreg(struct osl_info *osh, struct sbpcieregs *pcieregs, extern uint pcie_readreg(struct osl_info *osh, struct sbpcieregs *pcieregs,
uint addrtype, uint offset); uint addrtype, uint offset);
@@ -70,7 +70,7 @@ extern u32 pcicore_pcieserdesreg(void *pch, u32 mdioslave, u32 offset,
extern u32 pcicore_pciereg(void *pch, u32 offset, u32 mask, extern u32 pcicore_pciereg(void *pch, u32 offset, u32 mask,
u32 val, uint type); u32 val, uint type);
extern bool pcicore_pmecap_fast(struct osl_info *osh); extern bool pcicore_pmecap_fast(void *pch);
extern void pcicore_pmeen(void *pch); extern void pcicore_pmeen(void *pch);
extern void pcicore_pmeclr(void *pch); extern void pcicore_pmeclr(void *pch);
extern bool pcicore_pmestat(void *pch); extern bool pcicore_pmestat(void *pch);

21
drivers/staging/brcm80211/include/osl.h
View File

@@ -66,14 +66,11 @@ extern uint osl_pci_slot(struct osl_info *osh);
#endif #endif
#if defined(BCMSDIO) #if defined(BCMSDIO)
#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) \ #define SELECT_BUS_WRITE(mmap_op, bus_op) bus_op
if ((osh)->mmbus) \ #define SELECT_BUS_READ(mmap_op, bus_op) bus_op
mmap_op else bus_op
#define SELECT_BUS_READ(osh, mmap_op, bus_op) \
((osh)->mmbus) ? mmap_op : bus_op
#else #else
#define SELECT_BUS_WRITE(osh, mmap_op, bus_op) mmap_op #define SELECT_BUS_WRITE(mmap_op, bus_op) mmap_op
#define SELECT_BUS_READ(osh, mmap_op, bus_op) mmap_op #define SELECT_BUS_READ(mmap_op, bus_op) mmap_op
#endif #endif
/* the largest reasonable packet buffer driver uses for ethernet MTU in bytes */ /* the largest reasonable packet buffer driver uses for ethernet MTU in bytes */
@@ -89,14 +86,14 @@ extern uint osl_pci_slot(struct osl_info *osh);
#ifndef IL_BIGENDIAN #ifndef IL_BIGENDIAN
#ifndef __mips__ #ifndef __mips__
#define R_REG(osh, r) (\ #define R_REG(osh, r) (\
SELECT_BUS_READ(osh, sizeof(*(r)) == sizeof(u8) ? \ SELECT_BUS_READ(sizeof(*(r)) == sizeof(u8) ? \
readb((volatile u8*)(r)) : \ readb((volatile u8*)(r)) : \
sizeof(*(r)) == sizeof(u16) ? readw((volatile u16*)(r)) : \ sizeof(*(r)) == sizeof(u16) ? readw((volatile u16*)(r)) : \
readl((volatile u32*)(r)), OSL_READ_REG(osh, r)) \ readl((volatile u32*)(r)), OSL_READ_REG(osh, r)) \
) )
#else /* __mips__ */ #else /* __mips__ */
#define R_REG(osh, r) (\ #define R_REG(osh, r) (\
SELECT_BUS_READ(osh, \ SELECT_BUS_READ( \
({ \ ({ \
__typeof(*(r)) __osl_v; \ __typeof(*(r)) __osl_v; \
__asm__ __volatile__("sync"); \ __asm__ __volatile__("sync"); \
@@ -126,7 +123,7 @@ extern uint osl_pci_slot(struct osl_info *osh);
#endif /* __mips__ */ #endif /* __mips__ */
#define W_REG(osh, r, v) do { \ #define W_REG(osh, r, v) do { \
SELECT_BUS_WRITE(osh, \ SELECT_BUS_WRITE( \
switch (sizeof(*(r))) { \ switch (sizeof(*(r))) { \
case sizeof(u8): \ case sizeof(u8): \
writeb((u8)(v), (volatile u8*)(r)); break; \ writeb((u8)(v), (volatile u8*)(r)); break; \
@@ -139,7 +136,7 @@ extern uint osl_pci_slot(struct osl_info *osh);
} while (0) } while (0)
#else /* IL_BIGENDIAN */ #else /* IL_BIGENDIAN */
#define R_REG(osh, r) (\ #define R_REG(osh, r) (\
SELECT_BUS_READ(osh, \ SELECT_BUS_READ( \
({ \ ({ \
__typeof(*(r)) __osl_v; \ __typeof(*(r)) __osl_v; \
switch (sizeof(*(r))) { \ switch (sizeof(*(r))) { \
@@ -160,7 +157,7 @@ extern uint osl_pci_slot(struct osl_info *osh);
OSL_READ_REG(osh, r)) \ OSL_READ_REG(osh, r)) \
) )
#define W_REG(osh, r, v) do { \ #define W_REG(osh, r, v) do { \
SELECT_BUS_WRITE(osh, \ SELECT_BUS_WRITE( \
switch (sizeof(*(r))) { \ switch (sizeof(*(r))) { \
case sizeof(u8): \ case sizeof(u8): \
writeb((u8)(v), \ writeb((u8)(v), \

4
drivers/staging/brcm80211/include/siutils.h
View File

@@ -212,9 +212,9 @@ typedef struct gpioh_item {
/* misc si info needed by some of the routines */ /* misc si info needed by some of the routines */
typedef struct si_info { typedef struct si_info {
struct si_pub pub; /* back plane public state (must be first field) */ struct si_pub pub; /* back plane public state (must be first) */
struct osl_info *osh; /* osl os handle */ struct osl_info *osh; /* osl os handle */
void *sdh; /* bcmsdh handle */ void *pbus; /* handle to bus (pci/sdio/..) */
uint dev_coreid; /* the core provides driver functions */ uint dev_coreid; /* the core provides driver functions */
void *intr_arg; /* interrupt callback function arg */ void *intr_arg; /* interrupt callback function arg */
si_intrsoff_t intrsoff_fn; /* turns chip interrupts off */ si_intrsoff_t intrsoff_fn; /* turns chip interrupts off */

6
drivers/staging/brcm80211/util/aiutils.c
View File

@@ -127,7 +127,7 @@ void ai_scan(si_t *sih, void *regs, uint devid)
sii->curwrap = (void *)((unsigned long)regs + SI_CORE_SIZE); sii->curwrap = (void *)((unsigned long)regs + SI_CORE_SIZE);
/* Now point the window at the erom */ /* Now point the window at the erom */
pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN, erombase); pci_write_config_dword(sii->pbus, PCI_BAR0_WIN, erombase);
eromptr = regs; eromptr = regs;
break; break;
@@ -347,10 +347,10 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
case PCI_BUS: case PCI_BUS:
/* point bar0 window */ /* point bar0 window */
pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN, addr); pci_write_config_dword(sii->pbus, PCI_BAR0_WIN, addr);
regs = sii->curmap; regs = sii->curmap;
/* point bar0 2nd 4KB window */ /* point bar0 2nd 4KB window */
pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap); pci_write_config_dword(sii->pbus, PCI_BAR0_WIN2, wrap);
break; break;
case SPI_BUS: case SPI_BUS:

34
drivers/staging/brcm80211/util/hnddma.c
View File

@@ -81,6 +81,7 @@ typedef struct dma_info {
char name[MAXNAMEL]; /* callers name for diag msgs */ char name[MAXNAMEL]; /* callers name for diag msgs */
struct osl_info *osh; /* os handle */ struct osl_info *osh; /* os handle */
void *pbus; /* bus handle */
si_t *sih; /* sb handle */ si_t *sih; /* sb handle */
bool dma64; /* this dma engine is operating in 64-bit mode */ bool dma64; /* this dma engine is operating in 64-bit mode */
@@ -201,7 +202,7 @@ static void _dma_counterreset(dma_info_t *di);
static void _dma_fifoloopbackenable(dma_info_t *di); static void _dma_fifoloopbackenable(dma_info_t *di);
static uint _dma_ctrlflags(dma_info_t *di, uint mask, uint flags); static uint _dma_ctrlflags(dma_info_t *di, uint mask, uint flags);
static u8 dma_align_sizetobits(uint size); static u8 dma_align_sizetobits(uint size);
static void *dma_ringalloc(struct osl_info *osh, u32 boundary, uint size, static void *dma_ringalloc(dma_info_t *di, u32 boundary, uint size,
u16 *alignbits, uint *alloced, u16 *alignbits, uint *alloced,
dmaaddr_t *descpa, osldma_t **dmah); dmaaddr_t *descpa, osldma_t **dmah);
@@ -338,6 +339,7 @@ struct hnddma_pub *dma_attach(struct osl_info *osh, char *name, si_t *sih,
di->osh = osh; di->osh = osh;
di->sih = sih; di->sih = sih;
di->pbus = osh->pdev;
/* save tunables */ /* save tunables */
di->ntxd = (u16) ntxd; di->ntxd = (u16) ntxd;
@@ -531,7 +533,7 @@ static bool _dma_alloc(dma_info_t *di, uint direction)
return dma64_alloc(di, direction); return dma64_alloc(di, direction);
} }
void *dma_alloc_consistent(struct osl_info *osh, uint size, u16 align_bits, void *dma_alloc_consistent(struct pci_dev *pdev, uint size, u16 align_bits,
uint *alloced, unsigned long *pap) uint *alloced, unsigned long *pap)
{ {
if (align_bits) { if (align_bits) {
@@ -540,7 +542,7 @@ void *dma_alloc_consistent(struct osl_info *osh, uint size, u16 align_bits,
size += align; size += align;
*alloced = size; *alloced = size;
} }
return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); return pci_alloc_consistent(pdev, size, (dma_addr_t *) pap);
} }
/* !! may be called with core in reset */ /* !! may be called with core in reset */
@@ -555,11 +557,11 @@ static void _dma_detach(dma_info_t *di)
/* free dma descriptor rings */ /* free dma descriptor rings */
if (di->txd64) if (di->txd64)
pci_free_consistent(di->osh->pdev, di->txdalloc, pci_free_consistent(di->pbus, di->txdalloc,
((s8 *)di->txd64 - di->txdalign), ((s8 *)di->txd64 - di->txdalign),
(di->txdpaorig)); (di->txdpaorig));
if (di->rxd64) if (di->rxd64)
pci_free_consistent(di->osh->pdev, di->rxdalloc, pci_free_consistent(di->pbus, di->rxdalloc,
((s8 *)di->rxd64 - di->rxdalign), ((s8 *)di->rxd64 - di->rxdalign),
(di->rxdpaorig)); (di->rxdpaorig));
@@ -880,7 +882,7 @@ static bool BCMFASTPATH _dma_rxfill(dma_info_t *di)
memset(&di->rxp_dmah[rxout], 0, memset(&di->rxp_dmah[rxout], 0,
sizeof(hnddma_seg_map_t)); sizeof(hnddma_seg_map_t));
pa = pci_map_single(di->osh->pdev, p->data, pa = pci_map_single(di->pbus, p->data,
di->rxbufsize, PCI_DMA_FROMDEVICE); di->rxbufsize, PCI_DMA_FROMDEVICE);
ASSERT(IS_ALIGNED(PHYSADDRLO(pa), 4)); ASSERT(IS_ALIGNED(PHYSADDRLO(pa), 4));
@@ -1086,7 +1088,7 @@ u8 dma_align_sizetobits(uint size)
* descriptor ring size aligned location. This will ensure that the ring will * descriptor ring size aligned location. This will ensure that the ring will
* not cross page boundary * not cross page boundary
*/ */
static void *dma_ringalloc(struct osl_info *osh, u32 boundary, uint size, static void *dma_ringalloc(dma_info_t *di, u32 boundary, uint size,
u16 *alignbits, uint *alloced, u16 *alignbits, uint *alloced,
dmaaddr_t *descpa, osldma_t **dmah) dmaaddr_t *descpa, osldma_t **dmah)
{ {
@@ -1094,7 +1096,7 @@ static void *dma_ringalloc(struct osl_info *osh, u32 boundary, uint size,
u32 desc_strtaddr; u32 desc_strtaddr;
u32 alignbytes = 1 << *alignbits; u32 alignbytes = 1 << *alignbits;
va = dma_alloc_consistent(osh, size, *alignbits, alloced, descpa); va = dma_alloc_consistent(di->pbus, size, *alignbits, alloced, descpa);
if (NULL == va) if (NULL == va)
return NULL; return NULL;
@@ -1103,8 +1105,8 @@ static void *dma_ringalloc(struct osl_info *osh, u32 boundary, uint size,
if (((desc_strtaddr + size - 1) & boundary) != (desc_strtaddr if (((desc_strtaddr + size - 1) & boundary) != (desc_strtaddr
& boundary)) { & boundary)) {
*alignbits = dma_align_sizetobits(size); *alignbits = dma_align_sizetobits(size);
pci_free_consistent(osh->pdev, size, va, *descpa); pci_free_consistent(di->pbus, size, va, *descpa);
va = dma_alloc_consistent(osh, size, *alignbits, va = dma_alloc_consistent(di->pbus, size, *alignbits,
alloced, descpa); alloced, descpa);
} }
return va; return va;
@@ -1228,7 +1230,7 @@ static bool dma64_alloc(dma_info_t *di, uint direction)
align = (1 << align_bits); align = (1 << align_bits);
if (direction == DMA_TX) { if (direction == DMA_TX) {
va = dma_ringalloc(di->osh, D64RINGALIGN, size, &align_bits, va = dma_ringalloc(di, D64RINGALIGN, size, &align_bits,
&alloced, &di->txdpaorig, &di->tx_dmah); &alloced, &di->txdpaorig, &di->tx_dmah);
if (va == NULL) { if (va == NULL) {
DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(ntxd) failed\n", di->name)); DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(ntxd) failed\n", di->name));
@@ -1246,7 +1248,7 @@ static bool dma64_alloc(dma_info_t *di, uint direction)
di->txdalloc = alloced; di->txdalloc = alloced;
ASSERT(IS_ALIGNED((unsigned long)di->txd64, align)); ASSERT(IS_ALIGNED((unsigned long)di->txd64, align));
} else { } else {
va = dma_ringalloc(di->osh, D64RINGALIGN, size, &align_bits, va = dma_ringalloc(di, D64RINGALIGN, size, &align_bits,
&alloced, &di->rxdpaorig, &di->rx_dmah); &alloced, &di->rxdpaorig, &di->rx_dmah);
if (va == NULL) { if (va == NULL) {
DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(nrxd) failed\n", di->name)); DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(nrxd) failed\n", di->name));
@@ -1397,7 +1399,7 @@ static int dma64_txunframed(dma_info_t *di, void *buf, uint len, bool commit)
if (len == 0) if (len == 0)
return 0; return 0;
pa = pci_map_single(di->osh->pdev, buf, len, PCI_DMA_TODEVICE); pa = pci_map_single(di->pbus, buf, len, PCI_DMA_TODEVICE);
flags = (D64_CTRL1_SOF | D64_CTRL1_IOC | D64_CTRL1_EOF); flags = (D64_CTRL1_SOF | D64_CTRL1_IOC | D64_CTRL1_EOF);
@@ -1477,7 +1479,7 @@ static int BCMFASTPATH dma64_txfast(dma_info_t *di, struct sk_buff *p0,
memset(&di->txp_dmah[txout], 0, memset(&di->txp_dmah[txout], 0,
sizeof(hnddma_seg_map_t)); sizeof(hnddma_seg_map_t));
pa = pci_map_single(di->osh->pdev, data, len, PCI_DMA_TODEVICE); pa = pci_map_single(di->pbus, data, len, PCI_DMA_TODEVICE);
if (DMASGLIST_ENAB) { if (DMASGLIST_ENAB) {
map = &di->txp_dmah[txout]; map = &di->txp_dmah[txout];
@@ -1639,7 +1641,7 @@ static void *BCMFASTPATH dma64_getnexttxp(dma_info_t *di, txd_range_t range)
i = NEXTTXD(i); i = NEXTTXD(i);
} }
pci_unmap_single(di->osh->pdev, pa, size, PCI_DMA_TODEVICE); pci_unmap_single(di->pbus, pa, size, PCI_DMA_TODEVICE);
} }
di->txin = i; di->txin = i;
@@ -1690,7 +1692,7 @@ static void *BCMFASTPATH dma64_getnextrxp(dma_info_t *di, bool forceall)
di->dataoffsethigh)); di->dataoffsethigh));
/* clear this packet from the descriptor ring */ /* clear this packet from the descriptor ring */
pci_unmap_single(di->osh->pdev, pa, di->rxbufsize, PCI_DMA_FROMDEVICE); pci_unmap_single(di->pbus, pa, di->rxbufsize, PCI_DMA_FROMDEVICE);
W_SM(&di->rxd64[i].addrlow, 0xdeadbeef); W_SM(&di->rxd64[i].addrlow, 0xdeadbeef);
W_SM(&di->rxd64[i].addrhigh, 0xdeadbeef); W_SM(&di->rxd64[i].addrhigh, 0xdeadbeef);

59
drivers/staging/brcm80211/util/nicpci.c
View File

@@ -36,6 +36,7 @@ typedef struct {
} regs; /* Memory mapped register to the core */ } regs; /* Memory mapped register to the core */
si_t *sih; /* System interconnect handle */ si_t *sih; /* System interconnect handle */
struct pci_dev *dev;
struct osl_info *osh; /* OSL handle */ struct osl_info *osh; /* OSL handle */
u8 pciecap_lcreg_offset; /* PCIE capability LCreg offset in the config space */ u8 pciecap_lcreg_offset; /* PCIE capability LCreg offset in the config space */
bool pcie_pr42767; bool pcie_pr42767;
@@ -95,12 +96,13 @@ void *pcicore_init(si_t *sih, struct osl_info *osh, void *regs)
pi->sih = sih; pi->sih = sih;
pi->osh = osh; pi->osh = osh;
pi->dev = osh->pdev;
if (sih->buscoretype == PCIE_CORE_ID) { if (sih->buscoretype == PCIE_CORE_ID) {
u8 cap_ptr; u8 cap_ptr;
pi->regs.pcieregs = (sbpcieregs_t *) regs; pi->regs.pcieregs = (sbpcieregs_t *) regs;
cap_ptr = cap_ptr =
pcicore_find_pci_capability(pi->osh, PCI_CAP_PCIECAP_ID, pcicore_find_pci_capability(pi->dev, PCI_CAP_PCIECAP_ID,
NULL, NULL); NULL, NULL);
ASSERT(cap_ptr); ASSERT(cap_ptr);
pi->pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET; pi->pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET;
@@ -122,7 +124,7 @@ void pcicore_deinit(void *pch)
/* return cap_offset if requested capability exists in the PCI config space */ /* return cap_offset if requested capability exists in the PCI config space */
/* Note that it's caller's responsibility to make sure it's a pci bus */ /* Note that it's caller's responsibility to make sure it's a pci bus */
u8 u8
pcicore_find_pci_capability(struct osl_info *osh, u8 req_cap_id, pcicore_find_pci_capability(void *dev, u8 req_cap_id,
unsigned char *buf, u32 *buflen) unsigned char *buf, u32 *buflen)
{ {
u8 cap_id; u8 cap_id;
@@ -131,29 +133,29 @@ pcicore_find_pci_capability(struct osl_info *osh, u8 req_cap_id,
u8 byte_val; u8 byte_val;
/* check for Header type 0 */ /* check for Header type 0 */
pci_read_config_byte(osh->pdev, PCI_CFG_HDR, &byte_val); pci_read_config_byte(dev, PCI_CFG_HDR, &byte_val);
if ((byte_val & 0x7f) != PCI_HEADER_NORMAL) if ((byte_val & 0x7f) != PCI_HEADER_NORMAL)
goto end; goto end;
/* check if the capability pointer field exists */ /* check if the capability pointer field exists */
pci_read_config_byte(osh->pdev, PCI_CFG_STAT, &byte_val); pci_read_config_byte(dev, PCI_CFG_STAT, &byte_val);
if (!(byte_val & PCI_CAPPTR_PRESENT)) if (!(byte_val & PCI_CAPPTR_PRESENT))
goto end; goto end;
pci_read_config_byte(osh->pdev, PCI_CFG_CAPPTR, &cap_ptr); pci_read_config_byte(dev, PCI_CFG_CAPPTR, &cap_ptr);
/* check if the capability pointer is 0x00 */ /* check if the capability pointer is 0x00 */
if (cap_ptr == 0x00) if (cap_ptr == 0x00)
goto end; goto end;
/* loop thr'u the capability list and see if the pcie capabilty exists */ /* loop thr'u the capability list and see if the pcie capabilty exists */
pci_read_config_byte(osh->pdev, cap_ptr, &cap_id); pci_read_config_byte(dev, cap_ptr, &cap_id);
while (cap_id != req_cap_id) { while (cap_id != req_cap_id) {
pci_read_config_byte(osh->pdev, cap_ptr + 1, &cap_ptr); pci_read_config_byte(dev, cap_ptr + 1, &cap_ptr);
if (cap_ptr == 0x00) if (cap_ptr == 0x00)
break; break;
pci_read_config_byte(osh->pdev, cap_ptr, &cap_id); pci_read_config_byte(dev, cap_ptr, &cap_id);
} }
if (cap_id != req_cap_id) { if (cap_id != req_cap_id) {
goto end; goto end;
@@ -172,7 +174,7 @@ pcicore_find_pci_capability(struct osl_info *osh, u8 req_cap_id,
bufsize = SZPCR - cap_data; bufsize = SZPCR - cap_data;
*buflen = bufsize; *buflen = bufsize;
while (bufsize--) { while (bufsize--) {
pci_read_config_byte(osh->pdev, cap_data, buf); pci_read_config_byte(dev, cap_data, buf);
cap_data++; cap_data++;
buf++; buf++;
} }
@@ -347,15 +349,15 @@ u8 pcie_clkreq(void *pch, u32 mask, u32 val)
if (!offset) if (!offset)
return 0; return 0;
pci_read_config_dword(pi->osh->pdev, offset, &reg_val); pci_read_config_dword(pi->dev, offset, &reg_val);
/* set operation */ /* set operation */
if (mask) { if (mask) {
if (val) if (val)
reg_val |= PCIE_CLKREQ_ENAB; reg_val |= PCIE_CLKREQ_ENAB;
else else
reg_val &= ~PCIE_CLKREQ_ENAB; reg_val &= ~PCIE_CLKREQ_ENAB;
pci_write_config_dword(pi->osh->pdev, offset, reg_val); pci_write_config_dword(pi->dev, offset, reg_val);
pci_read_config_dword(pi->osh->pdev, offset, &reg_val); pci_read_config_dword(pi->dev, offset, &reg_val);
} }
if (reg_val & PCIE_CLKREQ_ENAB) if (reg_val & PCIE_CLKREQ_ENAB)
return 1; return 1;
@@ -476,11 +478,11 @@ static void pcie_war_aspm_clkreq(pcicore_info_t *pi)
W_REG(pi->osh, reg16, val16); W_REG(pi->osh, reg16, val16);
pci_read_config_dword(pi->osh->pdev, pi->pciecap_lcreg_offset, pci_read_config_dword(pi->dev, pi->pciecap_lcreg_offset,
&w); &w);
w &= ~PCIE_ASPM_ENAB; w &= ~PCIE_ASPM_ENAB;
w |= pi->pcie_war_aspm_ovr; w |= pi->pcie_war_aspm_ovr;
pci_write_config_dword(pi->osh->pdev, pci_write_config_dword(pi->dev,
pi->pciecap_lcreg_offset, w); pi->pciecap_lcreg_offset, w);
} }
@@ -668,9 +670,9 @@ void pcicore_sleep(void *pch)
if (!pi || !PCIE_ASPM(pi->sih)) if (!pi || !PCIE_ASPM(pi->sih))
return; return;
pci_read_config_dword(pi->osh->pdev, pi->pciecap_lcreg_offset, &w); pci_read_config_dword(pi->dev, pi->pciecap_lcreg_offset, &w);
w &= ~PCIE_CAP_LCREG_ASPML1; w &= ~PCIE_CAP_LCREG_ASPML1;
pci_write_config_dword(pi->osh->pdev, pi->pciecap_lcreg_offset, w); pci_write_config_dword(pi->dev, pi->pciecap_lcreg_offset, w);
pi->pcie_pr42767 = false; pi->pcie_pr42767 = false;
} }
@@ -690,19 +692,20 @@ void pcicore_down(void *pch, int state)
/* ***** Wake-on-wireless-LAN (WOWL) support functions ***** */ /* ***** Wake-on-wireless-LAN (WOWL) support functions ***** */
/* Just uses PCI config accesses to find out, when needed before sb_attach is done */ /* Just uses PCI config accesses to find out, when needed before sb_attach is done */
bool pcicore_pmecap_fast(struct osl_info *osh) bool pcicore_pmecap_fast(void *pch)
{ {
pcicore_info_t *pi = (pcicore_info_t *) pch;
u8 cap_ptr; u8 cap_ptr;
u32 pmecap; u32 pmecap;
cap_ptr = cap_ptr =
pcicore_find_pci_capability(osh, PCI_CAP_POWERMGMTCAP_ID, NULL, pcicore_find_pci_capability(pi->dev, PCI_CAP_POWERMGMTCAP_ID, NULL,
NULL); NULL);
if (!cap_ptr) if (!cap_ptr)
return false; return false;
pci_read_config_dword(osh->pdev, cap_ptr, &pmecap); pci_read_config_dword(pi->dev, cap_ptr, &pmecap);
return (pmecap & PME_CAP_PM_STATES) != 0; return (pmecap & PME_CAP_PM_STATES) != 0;
} }
@@ -717,7 +720,7 @@ static bool pcicore_pmecap(pcicore_info_t *pi)
if (!pi->pmecap_offset) { if (!pi->pmecap_offset) {
cap_ptr = cap_ptr =
pcicore_find_pci_capability(pi->osh, pcicore_find_pci_capability(pi->dev,
PCI_CAP_POWERMGMTCAP_ID, NULL, PCI_CAP_POWERMGMTCAP_ID, NULL,
NULL); NULL);
if (!cap_ptr) if (!cap_ptr)
@@ -725,7 +728,7 @@ static bool pcicore_pmecap(pcicore_info_t *pi)
pi->pmecap_offset = cap_ptr; pi->pmecap_offset = cap_ptr;
pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset, pci_read_config_dword(pi->dev, pi->pmecap_offset,
&pmecap); &pmecap);
/* At least one state can generate PME */ /* At least one state can generate PME */
@@ -745,10 +748,10 @@ void pcicore_pmeen(void *pch)
if (!pcicore_pmecap(pi)) if (!pcicore_pmecap(pi))
return; return;
pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset + PME_CSR_OFFSET, pci_read_config_dword(pi->dev, pi->pmecap_offset + PME_CSR_OFFSET,
&w); &w);
w |= (PME_CSR_PME_EN); w |= (PME_CSR_PME_EN);
pci_write_config_dword(pi->osh->pdev, pci_write_config_dword(pi->dev,
pi->pmecap_offset + PME_CSR_OFFSET, w); pi->pmecap_offset + PME_CSR_OFFSET, w);
} }
@@ -763,7 +766,7 @@ bool pcicore_pmestat(void *pch)
if (!pcicore_pmecap(pi)) if (!pcicore_pmecap(pi))
return false; return false;
pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset + PME_CSR_OFFSET, pci_read_config_dword(pi->dev, pi->pmecap_offset + PME_CSR_OFFSET,
&w); &w);
return (w & PME_CSR_PME_STAT) == PME_CSR_PME_STAT; return (w & PME_CSR_PME_STAT) == PME_CSR_PME_STAT;
@@ -779,7 +782,7 @@ void pcicore_pmeclr(void *pch)
if (!pcicore_pmecap(pi)) if (!pcicore_pmecap(pi))
return; return;
pci_read_config_dword(pi->osh->pdev, pi->pmecap_offset + PME_CSR_OFFSET, pci_read_config_dword(pi->dev, pi->pmecap_offset + PME_CSR_OFFSET,
&w); &w);
PCI_ERROR(("pcicore_pci_pmeclr PMECSR : 0x%x\n", w)); PCI_ERROR(("pcicore_pci_pmeclr PMECSR : 0x%x\n", w));
@@ -787,7 +790,7 @@ void pcicore_pmeclr(void *pch)
/* PMESTAT is cleared by writing 1 to it */ /* PMESTAT is cleared by writing 1 to it */
w &= ~(PME_CSR_PME_EN); w &= ~(PME_CSR_PME_EN);
pci_write_config_dword(pi->osh->pdev, pci_write_config_dword(pi->dev,
pi->pmecap_offset + PME_CSR_OFFSET, w); pi->pmecap_offset + PME_CSR_OFFSET, w);
} }
@@ -803,9 +806,9 @@ u32 pcie_lcreg(void *pch, u32 mask, u32 val)
/* set operation */ /* set operation */
if (mask) if (mask)
pci_write_config_dword(pi->osh->pdev, offset, val); pci_write_config_dword(pi->dev, offset, val);
pci_read_config_dword(pi->osh->pdev, offset, &tmpval); pci_read_config_dword(pi->dev, offset, &tmpval);
return tmpval; return tmpval;
} }

53
drivers/staging/brcm80211/util/siutils.c
View File

@@ -313,7 +313,7 @@ static __used void si_nvram_process(si_info_t *sii, char *pvars)
switch (sii->pub.bustype) { switch (sii->pub.bustype) {
case PCI_BUS: case PCI_BUS:
/* do a pci config read to get subsystem id and subvendor id */ /* do a pci config read to get subsystem id and subvendor id */
pci_read_config_dword(sii->osh->pdev, PCI_CFG_SVID, &w); pci_read_config_dword(sii->pbus, PCI_CFG_SVID, &w);
/* Let nvram variables override subsystem Vend/ID */ /* Let nvram variables override subsystem Vend/ID */
sii->pub.boardvendor = (u16)si_getdevpathintvar(&sii->pub, sii->pub.boardvendor = (u16)si_getdevpathintvar(&sii->pub,
"boardvendor"); "boardvendor");
@@ -367,7 +367,7 @@ static __used void si_nvram_process(si_info_t *sii, char *pvars)
/* this has been customized for the bcm 4329 ONLY */ /* this has been customized for the bcm 4329 ONLY */
#ifdef BCMSDIO #ifdef BCMSDIO
static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh, static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
void *regs, uint bustype, void *sdh, void *regs, uint bustype, void *pbus,
char **vars, uint *varsz) char **vars, uint *varsz)
{ {
struct si_pub *sih = &sii->pub; struct si_pub *sih = &sii->pub;
@@ -385,7 +385,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
sih->buscoreidx = BADIDX; sih->buscoreidx = BADIDX;
sii->curmap = regs; sii->curmap = regs;
sii->sdh = sdh; sii->pbus = pbus;
sii->osh = osh; sii->osh = osh;
/* find Chipcommon address */ /* find Chipcommon address */
@@ -393,7 +393,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
sih->bustype = bustype; sih->bustype = bustype;
/* bus/core/clk setup for register access */ /* bus/core/clk setup for register access */
if (!si_buscore_prep(sii, bustype, devid, sdh)) { if (!si_buscore_prep(sii, bustype, devid, pbus)) {
SI_ERROR(("si_doattach: si_core_clk_prep failed %d\n", SI_ERROR(("si_doattach: si_core_clk_prep failed %d\n",
bustype)); bustype));
return NULL; return NULL;
@@ -497,7 +497,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
#else /* BCMSDIO */ #else /* BCMSDIO */
static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh, static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
void *regs, uint bustype, void *sdh, void *regs, uint bustype, void *pbus,
char **vars, uint *varsz) char **vars, uint *varsz)
{ {
struct si_pub *sih = &sii->pub; struct si_pub *sih = &sii->pub;
@@ -515,12 +515,12 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
sih->buscoreidx = BADIDX; sih->buscoreidx = BADIDX;
sii->curmap = regs; sii->curmap = regs;
sii->sdh = sdh; sii->pbus = pbus;
sii->osh = osh; sii->osh = osh;
/* check to see if we are a si core mimic'ing a pci core */ /* check to see if we are a si core mimic'ing a pci core */
if (bustype == PCI_BUS) { if (bustype == PCI_BUS) {
pci_read_config_dword(sii->osh->pdev, PCI_SPROM_CONTROL, &w); pci_read_config_dword(sii->pbus, PCI_SPROM_CONTROL, &w);
if (w == 0xffffffff) { if (w == 0xffffffff) {
SI_ERROR(("%s: incoming bus is PCI but it's a lie, " SI_ERROR(("%s: incoming bus is PCI but it's a lie, "
" switching to SI devid:0x%x\n", " switching to SI devid:0x%x\n",
@@ -531,10 +531,10 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
/* find Chipcommon address */ /* find Chipcommon address */
if (bustype == PCI_BUS) { if (bustype == PCI_BUS) {
pci_read_config_dword(sii->osh->pdev, PCI_BAR0_WIN, &savewin); pci_read_config_dword(sii->pbus, PCI_BAR0_WIN, &savewin);
if (!GOODCOREADDR(savewin, SI_ENUM_BASE)) if (!GOODCOREADDR(savewin, SI_ENUM_BASE))
savewin = SI_ENUM_BASE; savewin = SI_ENUM_BASE;
pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN, pci_write_config_dword(sii->pbus, PCI_BAR0_WIN,
SI_ENUM_BASE); SI_ENUM_BASE);
cc = (chipcregs_t *) regs; cc = (chipcregs_t *) regs;
} else { } else {
@@ -544,7 +544,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
sih->bustype = bustype; sih->bustype = bustype;
/* bus/core/clk setup for register access */ /* bus/core/clk setup for register access */
if (!si_buscore_prep(sii, bustype, devid, sdh)) { if (!si_buscore_prep(sii, bustype, devid, pbus)) {
SI_ERROR(("si_doattach: si_core_clk_prep failed %d\n", SI_ERROR(("si_doattach: si_core_clk_prep failed %d\n",
bustype)); bustype));
return NULL; return NULL;
@@ -1087,7 +1087,7 @@ static uint si_slowclk_src(si_info_t *sii)
if (sii->pub.ccrev < 6) { if (sii->pub.ccrev < 6) {
if (sii->pub.bustype == PCI_BUS) { if (sii->pub.bustype == PCI_BUS) {
pci_read_config_dword(sii->osh->pdev, PCI_GPIO_OUT, pci_read_config_dword(sii->pbus, PCI_GPIO_OUT,
&val); &val);
if (val & PCI_CFG_GPIO_SCS) if (val & PCI_CFG_GPIO_SCS)
return SCC_SS_PCI; return SCC_SS_PCI;
@@ -1274,9 +1274,9 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
if (PCIE(sii)) if (PCIE(sii))
return -1; return -1;
pci_read_config_dword(sii->osh->pdev, PCI_GPIO_IN, &in); pci_read_config_dword(sii->pbus, PCI_GPIO_IN, &in);
pci_read_config_dword(sii->osh->pdev, PCI_GPIO_OUT, &out); pci_read_config_dword(sii->pbus, PCI_GPIO_OUT, &out);
pci_read_config_dword(sii->osh->pdev, PCI_GPIO_OUTEN, &outen); pci_read_config_dword(sii->pbus, PCI_GPIO_OUTEN, &outen);
/* /*
* Avoid glitching the clock if GPRS is already using it. * Avoid glitching the clock if GPRS is already using it.
@@ -1297,9 +1297,9 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
out |= PCI_CFG_GPIO_XTAL; out |= PCI_CFG_GPIO_XTAL;
if (what & PLL) if (what & PLL)
out |= PCI_CFG_GPIO_PLL; out |= PCI_CFG_GPIO_PLL;
pci_write_config_dword(sii->osh->pdev, pci_write_config_dword(sii->pbus,
PCI_GPIO_OUT, out); PCI_GPIO_OUT, out);
pci_write_config_dword(sii->osh->pdev, pci_write_config_dword(sii->pbus,
PCI_GPIO_OUTEN, outen); PCI_GPIO_OUTEN, outen);
udelay(XTAL_ON_DELAY); udelay(XTAL_ON_DELAY);
} }
@@ -1307,7 +1307,7 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
/* turn pll on */ /* turn pll on */
if (what & PLL) { if (what & PLL) {
out &= ~PCI_CFG_GPIO_PLL; out &= ~PCI_CFG_GPIO_PLL;
pci_write_config_dword(sii->osh->pdev, pci_write_config_dword(sii->pbus,
PCI_GPIO_OUT, out); PCI_GPIO_OUT, out);
mdelay(2); mdelay(2);
} }
@@ -1316,9 +1316,9 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
out &= ~PCI_CFG_GPIO_XTAL; out &= ~PCI_CFG_GPIO_XTAL;
if (what & PLL) if (what & PLL)
out |= PCI_CFG_GPIO_PLL; out |= PCI_CFG_GPIO_PLL;
pci_write_config_dword(sii->osh->pdev, pci_write_config_dword(sii->pbus,
PCI_GPIO_OUT, out); PCI_GPIO_OUT, out);
pci_write_config_dword(sii->osh->pdev, pci_write_config_dword(sii->pbus,
PCI_GPIO_OUTEN, outen); PCI_GPIO_OUTEN, outen);
} }
@@ -1463,8 +1463,9 @@ int si_devpath(si_t *sih, char *path, int size)
case PCI_BUS: case PCI_BUS:
ASSERT((SI_INFO(sih))->osh != NULL); ASSERT((SI_INFO(sih))->osh != NULL);
slen = snprintf(path, (size_t) size, "pci/%u/%u/", slen = snprintf(path, (size_t) size, "pci/%u/%u/",
OSL_PCI_BUS((SI_INFO(sih))->osh), ((struct pci_dev *)((SI_INFO(sih))->pbus))->bus->number,
OSL_PCI_SLOT((SI_INFO(sih))->osh)); PCI_SLOT(
((struct pci_dev *)((SI_INFO(sih))->pbus))->devfn));
break; break;
#ifdef BCMSDIO #ifdef BCMSDIO
@@ -1549,7 +1550,7 @@ static __used bool si_ispcie(si_info_t *sii)
return false; return false;
cap_ptr = cap_ptr =
pcicore_find_pci_capability(sii->osh, PCI_CAP_PCIECAP_ID, NULL, pcicore_find_pci_capability(sii->pbus, PCI_CAP_PCIECAP_ID, NULL,
NULL); NULL);
if (!cap_ptr) if (!cap_ptr)
return false; return false;
@@ -1591,7 +1592,7 @@ void si_sdio_init(si_t *sih)
} }
/* enable interrupts */ /* enable interrupts */
bcmsdh_intr_enable(sii->sdh); bcmsdh_intr_enable(sii->pbus);
} }
#endif /* BCMSDIO */ #endif /* BCMSDIO */
@@ -1687,9 +1688,9 @@ void si_pci_setup(si_t *sih, uint coremask)
*/ */
if (PCIE(sii) || (PCI(sii) && ((sii->pub.buscorerev) >= 6))) { if (PCIE(sii) || (PCI(sii) && ((sii->pub.buscorerev) >= 6))) {
/* pci config write to set this core bit in PCIIntMask */ /* pci config write to set this core bit in PCIIntMask */
pci_read_config_dword(sii->osh->pdev, PCI_INT_MASK, &w); pci_read_config_dword(sii->pbus, PCI_INT_MASK, &w);
w |= (coremask << PCI_SBIM_SHIFT); w |= (coremask << PCI_SBIM_SHIFT);
pci_write_config_dword(sii->osh->pdev, PCI_INT_MASK, w); pci_write_config_dword(sii->pbus, PCI_INT_MASK, w);
} else { } else {
/* set sbintvec bit for our flag number */ /* set sbintvec bit for our flag number */
si_setint(sih, siflag); si_setint(sih, siflag);
@@ -1927,7 +1928,7 @@ bool si_deviceremoved(si_t *sih)
switch (sih->bustype) { switch (sih->bustype) {
case PCI_BUS: case PCI_BUS:
ASSERT(sii->osh != NULL); ASSERT(sii->osh != NULL);
pci_read_config_dword(sii->osh->pdev, PCI_CFG_VID, &w); pci_read_config_dword(sii->pbus, PCI_CFG_VID, &w);
if ((w & 0xFFFF) != VENDOR_BROADCOM) if ((w & 0xFFFF) != VENDOR_BROADCOM)
return true; return true;
break; break;