From: nohee ko Date: Wed, 6 Oct 2010 18:56:28 +0000 (-0700) Subject: staging: brcm80211: removed duplicated file, linux_osl.c X-Git-Tag: v2.6.37-rc1~60^2~3^2~299 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=194c60720dd96039ba46743743c4d8bc52d56364;p=karo-tx-linux.git staging: brcm80211: removed duplicated file, linux_osl.c Removed duplicated file, linux_osl.c from brcmfmac. linux_osl.c under brcm80211/util/ will be shared between softmac & fullmac drivers Signed-off-by: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index 276e3ac30b4e..1dd989d2d1d6 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -41,7 +41,7 @@ ccflags-y := \ -Idrivers/staging/brcm80211/include \ -Idrivers/staging/brcm80211/util -DHDOFILES = dhd_linux.o linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \ +DHDOFILES = dhd_linux.o ../util/linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \ wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o \ dhd_linux_sched.o dhd_cdc.o bcmsdh_sdmmc.o bcmsdh.o bcmsdh_linux.o \ bcmsdh_sdmmc_linux.o diff --git a/drivers/staging/brcm80211/brcmfmac/linux_osl.c b/drivers/staging/brcm80211/brcmfmac/linux_osl.c deleted file mode 100644 index c30422cb2331..000000000000 --- a/drivers/staging/brcm80211/brcmfmac/linux_osl.c +++ /dev/null @@ -1,591 +0,0 @@ -/* - * Copyright (c) 2010 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 - -#define LINUX_OSL -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define PCI_CFG_RETRY 10 - -#define OS_HANDLE_MAGIC 0x1234abcd -#define BCM_MEM_FILENAME_LEN 24 - -#ifdef DHD_USE_STATIC_BUF -#define MAX_STATIC_BUF_NUM 16 -#define STATIC_BUF_SIZE (PAGE_SIZE*2) -#define STATIC_BUF_TOTAL_LEN (MAX_STATIC_BUF_NUM*STATIC_BUF_SIZE) -typedef struct bcm_static_buf { - struct semaphore static_sem; - unsigned char *buf_ptr; - unsigned char buf_use[MAX_STATIC_BUF_NUM]; -} bcm_static_buf_t; - -static bcm_static_buf_t *bcm_static_buf; - -#define MAX_STATIC_PKT_NUM 8 -typedef struct bcm_static_pkt { - struct sk_buff *skb_4k[MAX_STATIC_PKT_NUM]; - struct sk_buff *skb_8k[MAX_STATIC_PKT_NUM]; - struct semaphore osl_pkt_sem; - unsigned char pkt_use[MAX_STATIC_PKT_NUM * 2]; -} bcm_static_pkt_t; -static bcm_static_pkt_t *bcm_static_skb; -#endif /* DHD_USE_STATIC_BUF */ - -typedef struct bcm_mem_link { - struct bcm_mem_link *prev; - struct bcm_mem_link *next; - uint size; - int line; - char file[BCM_MEM_FILENAME_LEN]; -} bcm_mem_link_t; - -struct osl_info { - osl_pubinfo_t pub; - uint magic; - void *pdev; - uint malloced; - uint failed; - uint bustype; - bcm_mem_link_t *dbgmem_list; -}; - -static int16 linuxbcmerrormap[] = { 0, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -E2BIG, - -E2BIG, - -EBUSY, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EFAULT, - -ENOMEM, - -EOPNOTSUPP, - -EMSGSIZE, - -EINVAL, - -EPERM, - -ENOMEM, - -EINVAL, - -ERANGE, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EINVAL, - -EIO, - -ENODEV, - -EINVAL, - -EIO, - -EIO, - -EINVAL, - -EINVAL, - -ENODATA, - -#if BCME_LAST != BCME_NONRESIDENT -#error "You need to add a OS error translation in the linuxbcmerrormap \ - for new error code defined in bcmutils.h" -#endif -}; - -/* Global ASSERT type flag */ -uint32 g_assert_type; - -int osl_error(int bcmerror) -{ - if (bcmerror > 0) - bcmerror = 0; - else if (bcmerror < BCME_LAST) - bcmerror = BCME_ERROR; - - return linuxbcmerrormap[-bcmerror]; -} - -void *dhd_os_prealloc(int section, unsigned long size); -osl_t *osl_attach(void *pdev, uint bustype, bool pkttag) -{ - osl_t *osh; - - osh = kmalloc(sizeof(osl_t), GFP_ATOMIC); - ASSERT(osh); - - bzero(osh, sizeof(osl_t)); - - ASSERT(ABS(BCME_LAST) == (ARRAYSIZE(linuxbcmerrormap) - 1)); - - osh->magic = OS_HANDLE_MAGIC; - osh->malloced = 0; - osh->failed = 0; - osh->dbgmem_list = NULL; - osh->pdev = pdev; - osh->pub.pkttag = pkttag; - osh->bustype = bustype; - - switch (bustype) { - case PCI_BUS: - case SI_BUS: - case PCMCIA_BUS: - osh->pub.mmbus = TRUE; - break; - case JTAG_BUS: - case SDIO_BUS: - case USB_BUS: - case SPI_BUS: - osh->pub.mmbus = FALSE; - break; - default: - ASSERT(FALSE); - break; - } - -#ifdef DHD_USE_STATIC_BUF - - if (!bcm_static_buf) { - bcm_static_buf = (bcm_static_buf_t *) dhd_os_prealloc(3, - STATIC_BUF_SIZE + STATIC_BUF_TOTAL_LEN); - if (!bcm_static_buf) { - printk(KERN_ERR "can not alloc static buf!\n"); - } else - printk(KERN_ERR "alloc static buf at %x!\n", - (unsigned int)bcm_static_buf); - - init_MUTEX(&bcm_static_buf->static_sem); - - bcm_static_buf->buf_ptr = - (unsigned char *)bcm_static_buf + STATIC_BUF_SIZE; - - } - - if (!bcm_static_skb) { - int i; - void *skb_buff_ptr = 0; - bcm_static_skb = - (bcm_static_pkt_t *) ((char *)bcm_static_buf + 2048); - skb_buff_ptr = dhd_os_prealloc(4, 0); - - bcopy(skb_buff_ptr, bcm_static_skb, - sizeof(struct sk_buff *) * 16); - for (i = 0; i < MAX_STATIC_PKT_NUM * 2; i++) - bcm_static_skb->pkt_use[i] = 0; - - init_MUTEX(&bcm_static_skb->osl_pkt_sem); - } -#endif /* DHD_USE_STATIC_BUF */ - return osh; -} - -void osl_detach(osl_t *osh) -{ - if (osh == NULL) - return; - -#ifdef DHD_USE_STATIC_BUF - if (bcm_static_buf) - bcm_static_buf = 0; - - if (bcm_static_skb) - bcm_static_skb = 0; -#endif - ASSERT(osh->magic == OS_HANDLE_MAGIC); - kfree(osh); -} - -void *osl_pktget(osl_t *osh, uint len) -{ - struct sk_buff *skb; - - skb = dev_alloc_skb(len); - if (skb) { - skb_put(skb, len); - skb->priority = 0; - - osh->pub.pktalloced++; - } - - return (void *)skb; -} - -void osl_pktfree(osl_t *osh, void *p, bool send) -{ - struct sk_buff *skb, *nskb; - - skb = (struct sk_buff *)p; - - if (send && osh->pub.tx_fn) - osh->pub.tx_fn(osh->pub.tx_ctx, p, 0); - - while (skb) { - nskb = skb->next; - skb->next = NULL; - - if (skb->destructor) - dev_kfree_skb_any(skb); - else - dev_kfree_skb(skb); - - osh->pub.pktalloced--; - - skb = nskb; - } -} - -#ifdef DHD_USE_STATIC_BUF -void *osl_pktget_static(osl_t *osh, uint len) -{ - int i = 0; - struct sk_buff *skb; - - if (len > (PAGE_SIZE * 2)) { - printk(KERN_ERR "Do we really need this big skb??\n"); - return osl_pktget(osh, len); - } - - down(&bcm_static_skb->osl_pkt_sem); - if (len <= PAGE_SIZE) { - for (i = 0; i < MAX_STATIC_PKT_NUM; i++) { - if (bcm_static_skb->pkt_use[i] == 0) - break; - } - - if (i != MAX_STATIC_PKT_NUM) { - bcm_static_skb->pkt_use[i] = 1; - up(&bcm_static_skb->osl_pkt_sem); - - skb = bcm_static_skb->skb_4k[i]; - skb->tail = skb->data + len; - skb->len = len; - - return skb; - } - } - - for (i = 0; i < MAX_STATIC_PKT_NUM; i++) { - if (bcm_static_skb->pkt_use[i + MAX_STATIC_PKT_NUM] == 0) - break; - } - - if (i != MAX_STATIC_PKT_NUM) { - bcm_static_skb->pkt_use[i + MAX_STATIC_PKT_NUM] = 1; - up(&bcm_static_skb->osl_pkt_sem); - skb = bcm_static_skb->skb_8k[i]; - skb->tail = skb->data + len; - skb->len = len; - - return skb; - } - - up(&bcm_static_skb->osl_pkt_sem); - printk(KERN_ERR "all static pkt in use!\n"); - return osl_pktget(osh, len); -} - -void osl_pktfree_static(osl_t *osh, void *p, bool send) -{ - int i; - - for (i = 0; i < MAX_STATIC_PKT_NUM * 2; i++) { - if (p == bcm_static_skb->skb_4k[i]) { - down(&bcm_static_skb->osl_pkt_sem); - bcm_static_skb->pkt_use[i] = 0; - up(&bcm_static_skb->osl_pkt_sem); - - return; - } - } - return osl_pktfree(osh, p, send); -} -#endif /* DHD_USE_STATIC_BUF */ - -uint32 osl_pci_read_config(osl_t *osh, uint offset, uint size) -{ - uint val = 0; - uint retry = PCI_CFG_RETRY; - - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - ASSERT(size == 4); - - do { - pci_read_config_dword(osh->pdev, offset, &val); - if (val != 0xffffffff) - break; - } while (retry--); - - return val; -} - -void osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val) -{ - uint retry = PCI_CFG_RETRY; - - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - ASSERT(size == 4); - - do { - pci_write_config_dword(osh->pdev, offset, val); - if (offset != PCI_BAR0_WIN) - break; - if (osl_pci_read_config(osh, offset, size) == val) - break; - } while (retry--); - -} - -uint osl_pci_bus(osl_t *osh) -{ - ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev); - - return ((struct pci_dev *)osh->pdev)->bus->number; -} - -uint osl_pci_slot(osl_t *osh) -{ - ASSERT(osh && (osh->magic == OS_HANDLE_MAGIC) && osh->pdev); - - return PCI_SLOT(((struct pci_dev *)osh->pdev)->devfn); -} - -static void -osl_pcmcia_attr(osl_t *osh, uint offset, char *buf, int size, bool write) -{ -} - -void osl_pcmcia_read_attr(osl_t *osh, uint offset, void *buf, int size) -{ - osl_pcmcia_attr(osh, offset, (char *)buf, size, FALSE); -} - -void osl_pcmcia_write_attr(osl_t *osh, uint offset, void *buf, int size) -{ - osl_pcmcia_attr(osh, offset, (char *)buf, size, TRUE); -} - -void *osl_malloc(osl_t *osh, uint size) -{ - void *addr; - - if (osh) - ASSERT(osh->magic == OS_HANDLE_MAGIC); - -#ifdef DHD_USE_STATIC_BUF - if (bcm_static_buf) { - int i = 0; - if ((size >= PAGE_SIZE) && (size <= STATIC_BUF_SIZE)) { - down(&bcm_static_buf->static_sem); - for (i = 0; i < MAX_STATIC_BUF_NUM; i++) { - if (bcm_static_buf->buf_use[i] == 0) - break; - } - if (i == MAX_STATIC_BUF_NUM) { - up(&bcm_static_buf->static_sem); - printk(KERN_ERR "all static buff in use!\n"); - goto original; - } - bcm_static_buf->buf_use[i] = 1; - up(&bcm_static_buf->static_sem); - - bzero(bcm_static_buf->buf_ptr + STATIC_BUF_SIZE * i, - size); - if (osh) - osh->malloced += size; - - return (void *)(bcm_static_buf->buf_ptr + - STATIC_BUF_SIZE * i); - } - } -original: -#endif /* DHD_USE_STATIC_BUF */ - - addr = kmalloc(size, GFP_ATOMIC); - if (addr == NULL) { - if (osh) - osh->failed++; - return NULL; - } - if (osh) - osh->malloced += size; - - return addr; -} - -void osl_mfree(osl_t *osh, void *addr, uint size) -{ -#ifdef DHD_USE_STATIC_BUF - if (bcm_static_buf) { - if ((addr > (void *)bcm_static_buf) && ((unsigned char *)addr - <= ((unsigned char *) - bcm_static_buf + - STATIC_BUF_TOTAL_LEN))) { - int buf_idx = 0; - buf_idx = - ((unsigned char *)addr - - bcm_static_buf->buf_ptr) / STATIC_BUF_SIZE; - down(&bcm_static_buf->static_sem); - bcm_static_buf->buf_use[buf_idx] = 0; - up(&bcm_static_buf->static_sem); - - if (osh) { - ASSERT(osh->magic == OS_HANDLE_MAGIC); - osh->malloced -= size; - } - return; - } - } -#endif /* DHD_USE_STATIC_BUF */ - if (osh) { - ASSERT(osh->magic == OS_HANDLE_MAGIC); - osh->malloced -= size; - } - kfree(addr); -} - -uint osl_malloced(osl_t *osh) -{ - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - return osh->malloced; -} - -uint osl_malloc_failed(osl_t *osh) -{ - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - return osh->failed; -} - -void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap) -{ - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - - return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); -} - -void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa) -{ - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - - pci_free_consistent(osh->pdev, size, va, (dma_addr_t) pa); -} - -uint osl_dma_map(osl_t *osh, void *va, uint size, int direction) -{ - int dir; - - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - dir = (direction == DMA_TX) ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE; - return pci_map_single(osh->pdev, va, size, dir); -} - -void osl_dma_unmap(osl_t *osh, uint pa, uint size, int direction) -{ - int dir; - - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - dir = (direction == DMA_TX) ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE; - pci_unmap_single(osh->pdev, (uint32) pa, size, dir); -} - -#if defined(BCMDBG_ASSERT) -void osl_assert(char *exp, char *file, int line) -{ - char tempbuf[256]; - char *basename; - - basename = strrchr(file, '/'); - /* skip the '/' */ - if (basename) - basename++; - - if (!basename) - basename = file; - -#ifdef BCMDBG_ASSERT - snprintf(tempbuf, 256, - "assertion \"%s\" failed: file \"%s\", line %d\n", exp, - basename, line); - - /* Print assert message and give it time to be written - to /var/log/messages */ - if (!in_interrupt()) { - const int delay = 3; - printk(KERN_ERR "%s", tempbuf); - printk(KERN_ERR "panic in %d seconds\n", delay); - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(delay * HZ); - } - - switch (g_assert_type) { - case 0: - panic(KERN_ERR "%s", tempbuf); - break; - case 1: - printk(KERN_ERR "%s", tempbuf); - BUG(); - break; - case 2: - printk(KERN_ERR "%s", tempbuf); - break; - default: - break; - } -#endif /* BCMDBG_ASSERT */ - -} -#endif /* defined(BCMDBG_ASSERT) */ - -void osl_delay(uint usec) -{ - uint d; - - while (usec > 0) { - d = MIN(usec, 1000); - udelay(d); - usec -= d; - } -} - -void *osl_pktdup(osl_t *osh, void *skb) -{ - void *p; - - p = skb_clone((struct sk_buff *)skb, GFP_ATOMIC); - if (p == NULL) - return NULL; - - if (osh->pub.pkttag) - bzero((void *)((struct sk_buff *)p)->cb, OSL_PKTTAG_SZ); - - osh->pub.pktalloced++; - return p; -} diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index c7628965c0e5..f6046fe480bd 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -33,6 +33,27 @@ #define OS_HANDLE_MAGIC 0x1234abcd /* Magic # to recognise osh */ #define BCM_MEM_FILENAME_LEN 24 /* Mem. filename length */ +#ifdef DHD_USE_STATIC_BUF +#define MAX_STATIC_BUF_NUM 16 +#define STATIC_BUF_SIZE (PAGE_SIZE*2) +#define STATIC_BUF_TOTAL_LEN (MAX_STATIC_BUF_NUM*STATIC_BUF_SIZE) +typedef struct bcm_static_buf { + struct semaphore static_sem; + unsigned char *buf_ptr; + unsigned char buf_use[MAX_STATIC_BUF_NUM]; +} bcm_static_buf_t; + +static bcm_static_buf_t *bcm_static_buf = 0; + +#define MAX_STATIC_PKT_NUM 8 +typedef struct bcm_static_pkt { + struct sk_buff *skb_4k[MAX_STATIC_PKT_NUM]; + struct sk_buff *skb_8k[MAX_STATIC_PKT_NUM]; + struct semaphore osl_pkt_sem; + unsigned char pkt_use[MAX_STATIC_PKT_NUM * 2]; +} bcm_static_pkt_t; +static bcm_static_pkt_t *bcm_static_skb = 0; +#endif /* DHD_USE_STATIC_BUF */ typedef struct bcm_mem_link { struct bcm_mem_link *prev; struct bcm_mem_link *next; @@ -143,6 +164,7 @@ osl_t *osl_attach(void *pdev, uint bustype, bool pkttag) switch (bustype) { case PCI_BUS: case SI_BUS: + case PCMCIA_BUS: osh->pub.mmbus = TRUE; break; case JTAG_BUS: @@ -157,7 +179,40 @@ osl_t *osl_attach(void *pdev, uint bustype, bool pkttag) break; } -#ifdef BCMDBG +#ifdef DHD_USE_STATIC_BUF + + if (!bcm_static_buf) { + if (!(bcm_static_buf = + (bcm_static_buf_t *) dhd_os_prealloc(3, + STATIC_BUF_SIZE + STATIC_BUF_TOTAL_LEN))) { + printk(KERN_ERR "can not alloc static buf!\n"); + } else + printk(KERN_ERR "alloc static buf at %x!\n", + (unsigned int)bcm_static_buf); + + init_MUTEX(&bcm_static_buf->static_sem); + + bcm_static_buf->buf_ptr = + (unsigned char *)bcm_static_buf + STATIC_BUF_SIZE; + + } + + if (!bcm_static_skb) { + int i; + void *skb_buff_ptr = 0; + bcm_static_skb = + (bcm_static_pkt_t *) ((char *)bcm_static_buf + 2048); + skb_buff_ptr = dhd_os_prealloc(4, 0); + + bcopy(skb_buff_ptr, bcm_static_skb, + sizeof(struct sk_buff *) * 16); + for (i = 0; i < MAX_STATIC_PKT_NUM * 2; i++) + bcm_static_skb->pkt_use[i] = 0; + + init_MUTEX(&bcm_static_skb->osl_pkt_sem); + } +#endif /* DHD_USE_STATIC_BUF */ +#if defined(BCMDBG) && !defined(BRCM_FULLMAC) if (pkttag) { struct sk_buff *skb; ASSERT(OSL_PKTTAG_SZ <= sizeof(skb->cb)); @@ -171,6 +226,13 @@ void osl_detach(osl_t *osh) if (osh == NULL) return; +#ifdef DHD_USE_STATIC_BUF + if (bcm_static_buf) + bcm_static_buf = 0; + + if (bcm_static_skb) + bcm_static_skb = 0; +#endif ASSERT(osh->magic == OS_HANDLE_MAGIC); kfree(osh); } @@ -225,6 +287,72 @@ void BCMFASTPATH osl_pktfree(osl_t *osh, void *p, bool send) } } +#ifdef DHD_USE_STATIC_BUF +void *osl_pktget_static(osl_t *osh, uint len) +{ + int i = 0; + struct sk_buff *skb; + + if (len > (PAGE_SIZE * 2)) { + printk(KERN_ERR "Do we really need this big skb??\n"); + return osl_pktget(osh, len); + } + + down(&bcm_static_skb->osl_pkt_sem); + if (len <= PAGE_SIZE) { + for (i = 0; i < MAX_STATIC_PKT_NUM; i++) { + if (bcm_static_skb->pkt_use[i] == 0) + break; + } + + if (i != MAX_STATIC_PKT_NUM) { + bcm_static_skb->pkt_use[i] = 1; + up(&bcm_static_skb->osl_pkt_sem); + + skb = bcm_static_skb->skb_4k[i]; + skb->tail = skb->data + len; + skb->len = len; + + return skb; + } + } + + for (i = 0; i < MAX_STATIC_PKT_NUM; i++) { + if (bcm_static_skb->pkt_use[i + MAX_STATIC_PKT_NUM] == 0) + break; + } + + if (i != MAX_STATIC_PKT_NUM) { + bcm_static_skb->pkt_use[i + MAX_STATIC_PKT_NUM] = 1; + up(&bcm_static_skb->osl_pkt_sem); + skb = bcm_static_skb->skb_8k[i]; + skb->tail = skb->data + len; + skb->len = len; + + return skb; + } + + up(&bcm_static_skb->osl_pkt_sem); + printk(KERN_ERR "all static pkt in use!\n"); + return osl_pktget(osh, len); +} + +void osl_pktfree_static(osl_t *osh, void *p, bool send) +{ + int i; + + for (i = 0; i < MAX_STATIC_PKT_NUM * 2; i++) { + if (p == bcm_static_skb->skb_4k[i]) { + down(&bcm_static_skb->osl_pkt_sem); + bcm_static_skb->pkt_use[i] = 0; + up(&bcm_static_skb->osl_pkt_sem); + + return; + } + } + return osl_pktfree(osh, p, send); +} +#endif /* DHD_USE_STATIC_BUF */ uint32 osl_pci_read_config(osl_t *osh, uint offset, uint size) { uint val = 0; @@ -267,7 +395,7 @@ void osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val) break; } while (retry--); -#ifdef BCMDBG +#if defined(BCMDBG) && !defined(BRCM_FULLMAC) if (retry < PCI_CFG_RETRY) printk("PCI CONFIG WRITE access to %d required %d retries\n", offset, (PCI_CFG_RETRY - retry)); @@ -313,6 +441,35 @@ void *osl_malloc(osl_t *osh, uint size) if (osh) ASSERT(osh->magic == OS_HANDLE_MAGIC); +#ifdef DHD_USE_STATIC_BUF + if (bcm_static_buf) { + int i = 0; + if ((size >= PAGE_SIZE) && (size <= STATIC_BUF_SIZE)) { + down(&bcm_static_buf->static_sem); + for (i = 0; i < MAX_STATIC_BUF_NUM; i++) { + if (bcm_static_buf->buf_use[i] == 0) + break; + } + if (i == MAX_STATIC_BUF_NUM) { + up(&bcm_static_buf->static_sem); + printk(KERN_ERR "all static buff in use!\n"); + goto original; + } + bcm_static_buf->buf_use[i] = 1; + up(&bcm_static_buf->static_sem); + + bzero(bcm_static_buf->buf_ptr + STATIC_BUF_SIZE * i, + size); + if (osh) + osh->malloced += size; + + return (void *)(bcm_static_buf->buf_ptr + + STATIC_BUF_SIZE * i); + } + } + original: +#endif /* DHD_USE_STATIC_BUF */ + addr = kmalloc(size, GFP_ATOMIC); if (addr == NULL) { if (osh) @@ -327,6 +484,28 @@ void *osl_malloc(osl_t *osh, uint size) void osl_mfree(osl_t *osh, void *addr, uint size) { +#ifdef DHD_USE_STATIC_BUF + if (bcm_static_buf) { + if ((addr > (void *)bcm_static_buf) && ((unsigned char *)addr + <= ((unsigned char *) + bcm_static_buf + + STATIC_BUF_TOTAL_LEN))) { + int buf_idx = 0; + buf_idx = + ((unsigned char *)addr - + bcm_static_buf->buf_ptr) / STATIC_BUF_SIZE; + down(&bcm_static_buf->static_sem); + bcm_static_buf->buf_use[buf_idx] = 0; + up(&bcm_static_buf->static_sem); + + if (osh) { + ASSERT(osh->magic == OS_HANDLE_MAGIC); + osh->malloced -= size; + } + return; + } + } +#endif /* DHD_USE_STATIC_BUF */ if (osh) { ASSERT(osh->magic == OS_HANDLE_MAGIC); osh->malloced -= size; @@ -351,6 +530,14 @@ uint osl_dma_consistent_align(void) return PAGE_SIZE; } +#ifdef BRCM_FULLMAC +void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap) +{ + ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); + + return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); +} +#else /* !BRCM_FULLMAC */ void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align_bits, uint *alloced, unsigned long *pap) { @@ -363,6 +550,7 @@ void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align_bits, return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); } +#endif /* BRCM_FULLMAC */ void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa) { @@ -411,22 +599,22 @@ void osl_assert(char *exp, char *file, int line) /* Print assert message and give it time to be written to /var/log/messages */ if (!in_interrupt()) { const int delay = 3; - printk("%s", tempbuf); - printk("panic in %d seconds\n", delay); + printk(KERN_ERR "%s", tempbuf); + printk(KERN_ERR "panic in %d seconds\n", delay); set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(delay * HZ); } switch (g_assert_type) { case 0: - panic("%s", tempbuf); + panic(KERN_ERR "%s", tempbuf); break; case 1: - printk("%s", tempbuf); + printk(KERN_ERR "%s", tempbuf); BUG(); break; case 2: - printk("%s", tempbuf); + printk(KERN_ERR "%s", tempbuf); break; default: break; @@ -467,7 +655,7 @@ void *osl_pktdup(osl_t *osh, void *skb) return p; } -#ifdef BCMSDIO +#if defined(BCMSDIO) && !defined(BRCM_FULLMAC) u8 osl_readb(osl_t *osh, volatile u8 *r) { osl_rreg_fn_t rreg = ((osl_pubinfo_t *) osh)->rreg_fn;