old mode 100644new mode 100755| .. | .. |
|---|
| 7 | 7 | #include <linux/err.h> |
|---|
| 8 | 8 | #include <linux/skbuff.h> |
|---|
| 9 | 9 | |
|---|
| 10 | | -#define DHD_STATIC_VERSION_STR "101.10.361.24 (wlan=r892223-20220916-1)" |
|---|
| 11 | | -#define STATIC_ERROR_LEVEL BIT(0) |
|---|
| 12 | | -#define STATIC_TRACE_LEVEL BIT(1) |
|---|
| 13 | | -#define STATIC_MSG_LEVEL BIT(0) |
|---|
| 10 | +#define DHD_STATIC_VERSION_STR "101.10.361.18 (wlan=r892223-20220519-1)" |
|---|
| 11 | +#define STATIC_ERROR_LEVEL (1 << 0) |
|---|
| 12 | +#define STATIC_TRACE_LEVEL (1 << 1) |
|---|
| 13 | +#define STATIC_MSG_LEVEL (1 << 0) |
|---|
| 14 | 14 | uint static_msg_level = STATIC_ERROR_LEVEL | STATIC_MSG_LEVEL; |
|---|
| 15 | 15 | |
|---|
| 16 | 16 | #define DHD_STATIC_MSG(x, args...) \ |
|---|
| .. | .. |
|---|
| 35 | 35 | #define BCMDHD_SDIO |
|---|
| 36 | 36 | #define BCMDHD_PCIE |
|---|
| 37 | 37 | //#define BCMDHD_USB |
|---|
| 38 | | -#define CONFIG_BCMDHD_VTS { : = y} |
|---|
| 39 | | -#define CONFIG_BCMDHD_DEBUG { : = y} |
|---|
| 38 | +#define CONFIG_BCMDHD_VTS := y |
|---|
| 39 | +#define CONFIG_BCMDHD_DEBUG := y |
|---|
| 40 | 40 | //#define BCMDHD_UNUSE_MEM |
|---|
| 41 | 41 | |
|---|
| 42 | 42 | #ifndef MAX_NUM_ADAPTERS |
|---|
| .. | .. |
|---|
| 86 | 86 | }; |
|---|
| 87 | 87 | |
|---|
| 88 | 88 | #define STATIC_BUF_MAX_NUM 20 |
|---|
| 89 | | -#define STATIC_BUF_SIZE (PAGE_SIZE * 2) |
|---|
| 89 | +#define STATIC_BUF_SIZE (PAGE_SIZE*2) |
|---|
| 90 | 90 | |
|---|
| 91 | 91 | #ifndef CUSTOM_LOG_DUMP_BUFSIZE_MB |
|---|
| 92 | | -/* DHD_LOG_DUMP_BUF_SIZE 4 MB static memory in kernel */ |
|---|
| 93 | | -#define CUSTOM_LOG_DUMP_BUFSIZE_MB 4 |
|---|
| 92 | +#define CUSTOM_LOG_DUMP_BUFSIZE_MB 4 /* DHD_LOG_DUMP_BUF_SIZE 4 MB static memory in kernel */ |
|---|
| 94 | 93 | #endif /* CUSTOM_LOG_DUMP_BUFSIZE_MB */ |
|---|
| 95 | 94 | |
|---|
| 96 | 95 | #define DHD_PREALLOC_PROT_SIZE (16 * 1024) |
|---|
| .. | .. |
|---|
| 98 | 97 | #define DHD_PREALLOC_DATABUF_SIZE (64 * 1024) |
|---|
| 99 | 98 | #define DHD_PREALLOC_OSL_BUF_SIZE (STATIC_BUF_MAX_NUM * STATIC_BUF_SIZE) |
|---|
| 100 | 99 | #define DHD_PREALLOC_WIPHY_ESCAN0_SIZE (64 * 1024) |
|---|
| 101 | | -#define DHD_PREALLOC_DHD_INFO_SIZE (42 * 1024) |
|---|
| 100 | +#define DHD_PREALLOC_DHD_INFO_SIZE (36 * 1024) |
|---|
| 102 | 101 | #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG) |
|---|
| 103 | 102 | #define DHD_PREALLOC_MEMDUMP_RAM_SIZE (1290 * 1024) |
|---|
| 104 | 103 | #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */ |
|---|
| .. | .. |
|---|
| 129 | 128 | #endif /* CONFIG_64BIT */ |
|---|
| 130 | 129 | #define WLAN_DHD_MEMDUMP_SIZE (800 * 1024) |
|---|
| 131 | 130 | |
|---|
| 132 | | -#define DHD_SKB_1PAGE_BUFSIZE (PAGE_SIZE * 1) |
|---|
| 133 | | -#define DHD_SKB_2PAGE_BUFSIZE (PAGE_SIZE * 2) |
|---|
| 134 | | -#define DHD_SKB_4PAGE_BUFSIZE (PAGE_SIZE * 4) |
|---|
| 131 | +#define DHD_SKB_1PAGE_BUFSIZE (PAGE_SIZE*1) |
|---|
| 132 | +#define DHD_SKB_2PAGE_BUFSIZE (PAGE_SIZE*2) |
|---|
| 133 | +#define DHD_SKB_4PAGE_BUFSIZE (PAGE_SIZE*4) |
|---|
| 135 | 134 | |
|---|
| 136 | 135 | #ifdef BCMDHD_PCIE |
|---|
| 137 | 136 | #define DHD_SKB_1PAGE_BUF_NUM 0 |
|---|
| .. | .. |
|---|
| 152 | 151 | #define WLAN_SKB_BUF_NUM ((WLAN_SKB_1_2PAGE_BUF_NUM) + (DHD_SKB_4PAGE_BUF_NUM)) |
|---|
| 153 | 152 | #endif |
|---|
| 154 | 153 | |
|---|
| 155 | | -void *wlan_static_prot[MAX_NUM_ADAPTERS] = {}; |
|---|
| 156 | | -void *wlan_static_rxbuf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 157 | | -void *wlan_static_databuf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 158 | | -void *wlan_static_osl_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 159 | | -void *wlan_static_scan_buf0[MAX_NUM_ADAPTERS] = {}; |
|---|
| 160 | | -void *wlan_static_scan_buf1[MAX_NUM_ADAPTERS] = {}; |
|---|
| 161 | | -void *wlan_static_dhd_info_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 162 | | -void *wlan_static_dhd_wlfc_info_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 163 | | -void *wlan_static_if_flow_lkup[MAX_NUM_ADAPTERS] = {}; |
|---|
| 164 | | -void *wlan_static_dhd_memdump_ram_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 165 | | -void *wlan_static_dhd_wlfc_hanger_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 154 | +void *wlan_static_prot[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 155 | +void *wlan_static_rxbuf [MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 156 | +void *wlan_static_databuf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 157 | +void *wlan_static_osl_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 158 | +void *wlan_static_scan_buf0[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 159 | +void *wlan_static_scan_buf1[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 160 | +void *wlan_static_dhd_info_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 161 | +void *wlan_static_dhd_wlfc_info_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 162 | +void *wlan_static_if_flow_lkup[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 163 | +void *wlan_static_dhd_memdump_ram_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 164 | +void *wlan_static_dhd_wlfc_hanger_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 166 | 165 | #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG) |
|---|
| 167 | | -void *wlan_static_dhd_log_dump_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 168 | | -void *wlan_static_dhd_log_dump_buf_ex[MAX_NUM_ADAPTERS] = {}; |
|---|
| 166 | +void *wlan_static_dhd_log_dump_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 167 | +void *wlan_static_dhd_log_dump_buf_ex[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 169 | 168 | #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */ |
|---|
| 170 | | -void *wlan_static_wl_escan_info_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 171 | | -void *wlan_static_fw_verbose_ring_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 172 | | -void *wlan_static_fw_event_ring_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 173 | | -void *wlan_static_dhd_event_ring_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 174 | | -void *wlan_static_nan_event_ring_buf[MAX_NUM_ADAPTERS] = {}; |
|---|
| 169 | +void *wlan_static_wl_escan_info_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 170 | +void *wlan_static_fw_verbose_ring_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 171 | +void *wlan_static_fw_event_ring_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 172 | +void *wlan_static_dhd_event_ring_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 173 | +void *wlan_static_nan_event_ring_buf[MAX_NUM_ADAPTERS] = {NULL}; |
|---|
| 175 | 174 | |
|---|
| 176 | 175 | #if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE) |
|---|
| 177 | | -static struct sk_buff *wlan_static_skb[MAX_NUM_ADAPTERS][WLAN_SKB_BUF_NUM] = {}; |
|---|
| 176 | +static struct sk_buff *wlan_static_skb[MAX_NUM_ADAPTERS][WLAN_SKB_BUF_NUM] = {{NULL}}; |
|---|
| 178 | 177 | #endif /* BCMDHD_SDIO | BCMDHD_PCIE */ |
|---|
| 179 | 178 | |
|---|
| 180 | 179 | void * |
|---|
| 181 | 180 | dhd_wlan_mem_prealloc( |
|---|
| 182 | | -#if defined(BCMDHD_MDRIVER) && !defined(DHD_STATIC_IN_DRIVER) |
|---|
| 181 | +#ifdef BCMDHD_MDRIVER |
|---|
| 183 | 182 | uint bus_type, int index, |
|---|
| 184 | 183 | #endif |
|---|
| 185 | 184 | int section, unsigned long size) |
|---|
| 186 | 185 | { |
|---|
| 187 | | -#if !defined(BCMDHD_MDRIVER) || defined(DHD_STATIC_IN_DRIVER) |
|---|
| 186 | +#ifndef BCMDHD_MDRIVER |
|---|
| 188 | 187 | int index = 0; |
|---|
| 189 | 188 | #endif |
|---|
| 190 | 189 | |
|---|
| 191 | | -#if defined(BCMDHD_MDRIVER) && !defined(DHD_STATIC_IN_DRIVER) |
|---|
| 192 | | - DHD_STATIC_MSG("bus_type %d, index %d, section %d, size %ld\n", |
|---|
| 190 | +#ifdef BCMDHD_MDRIVER |
|---|
| 191 | + DHD_STATIC_MSG("bus_type %d, index %d, sectoin %d, size %ld\n", |
|---|
| 193 | 192 | bus_type, index, section, size); |
|---|
| 194 | 193 | #else |
|---|
| 195 | | - DHD_STATIC_MSG("section %d, size %ld\n", section, size); |
|---|
| 194 | + DHD_STATIC_MSG("sectoin %d, size %ld\n", section, size); |
|---|
| 196 | 195 | #endif |
|---|
| 197 | 196 | |
|---|
| 198 | 197 | if (section == DHD_PREALLOC_PROT) |
|---|
| .. | .. |
|---|
| 424 | 423 | unsigned long size = 0; |
|---|
| 425 | 424 | |
|---|
| 426 | 425 | #if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE) |
|---|
| 427 | | - for (i = 0; i < WLAN_SKB_BUF_NUM; i++) |
|---|
| 426 | + for (i=0; i <WLAN_SKB_BUF_NUM; i++) { |
|---|
| 428 | 427 | wlan_static_skb[index][i] = NULL; |
|---|
| 428 | + } |
|---|
| 429 | 429 | |
|---|
| 430 | 430 | for (i = 0; i < DHD_SKB_1PAGE_BUF_NUM; i++) { |
|---|
| 431 | 431 | wlan_static_skb[index][i] = dev_alloc_skb(DHD_SKB_1PAGE_BUFSIZE); |
|---|
| 432 | | - if (!wlan_static_skb[index][i]) |
|---|
| 432 | + if (!wlan_static_skb[index][i]) { |
|---|
| 433 | 433 | goto err_mem_alloc; |
|---|
| 434 | + } |
|---|
| 434 | 435 | size += DHD_SKB_1PAGE_BUFSIZE; |
|---|
| 435 | | - DHD_STATIC_TRACE("section %d skb[%d], size=%ld\n", |
|---|
| 436 | + DHD_STATIC_TRACE("sectoin %d skb[%d], size=%ld\n", |
|---|
| 436 | 437 | DHD_PREALLOC_SKB_BUF, i, DHD_SKB_1PAGE_BUFSIZE); |
|---|
| 437 | 438 | } |
|---|
| 438 | 439 | |
|---|
| 439 | 440 | for (i = DHD_SKB_1PAGE_BUF_NUM; i < WLAN_SKB_1_2PAGE_BUF_NUM; i++) { |
|---|
| 440 | 441 | wlan_static_skb[index][i] = dev_alloc_skb(DHD_SKB_2PAGE_BUFSIZE); |
|---|
| 441 | | - if (!wlan_static_skb[index][i]) |
|---|
| 442 | + if (!wlan_static_skb[index][i]) { |
|---|
| 442 | 443 | goto err_mem_alloc; |
|---|
| 444 | + } |
|---|
| 443 | 445 | size += DHD_SKB_2PAGE_BUFSIZE; |
|---|
| 444 | | - DHD_STATIC_TRACE("section %d skb[%d], size=%ld\n", |
|---|
| 446 | + DHD_STATIC_TRACE("sectoin %d skb[%d], size=%ld\n", |
|---|
| 445 | 447 | DHD_PREALLOC_SKB_BUF, i, DHD_SKB_2PAGE_BUFSIZE); |
|---|
| 446 | 448 | } |
|---|
| 447 | 449 | #endif /* BCMDHD_SDIO | BCMDHD_PCIE */ |
|---|
| .. | .. |
|---|
| 451 | 453 | if (!wlan_static_skb[index][i]) |
|---|
| 452 | 454 | goto err_mem_alloc; |
|---|
| 453 | 455 | size += DHD_SKB_4PAGE_BUFSIZE; |
|---|
| 454 | | - DHD_STATIC_TRACE("section %d skb[%d], size=%ld\n", |
|---|
| 456 | + DHD_STATIC_TRACE("sectoin %d skb[%d], size=%ld\n", |
|---|
| 455 | 457 | DHD_PREALLOC_SKB_BUF, i, DHD_SKB_4PAGE_BUFSIZE); |
|---|
| 456 | 458 | #endif /* BCMDHD_SDIO */ |
|---|
| 457 | 459 | |
|---|
| .. | .. |
|---|
| 459 | 461 | if (!wlan_static_prot[index]) |
|---|
| 460 | 462 | goto err_mem_alloc; |
|---|
| 461 | 463 | size += DHD_PREALLOC_PROT_SIZE; |
|---|
| 462 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 464 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 463 | 465 | DHD_PREALLOC_PROT, DHD_PREALLOC_PROT_SIZE); |
|---|
| 464 | 466 | |
|---|
| 465 | 467 | #if defined(BCMDHD_SDIO) |
|---|
| .. | .. |
|---|
| 467 | 469 | if (!wlan_static_rxbuf[index]) |
|---|
| 468 | 470 | goto err_mem_alloc; |
|---|
| 469 | 471 | size += DHD_PREALLOC_RXBUF_SIZE; |
|---|
| 470 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 472 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 471 | 473 | DHD_PREALLOC_RXBUF, DHD_PREALLOC_RXBUF_SIZE); |
|---|
| 472 | 474 | |
|---|
| 473 | 475 | wlan_static_databuf[index] = kmalloc(DHD_PREALLOC_DATABUF_SIZE, GFP_KERNEL); |
|---|
| 474 | 476 | if (!wlan_static_databuf[index]) |
|---|
| 475 | 477 | goto err_mem_alloc; |
|---|
| 476 | 478 | size += DHD_PREALLOC_DATABUF_SIZE; |
|---|
| 477 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 479 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 478 | 480 | DHD_PREALLOC_DATABUF, DHD_PREALLOC_DATABUF_SIZE); |
|---|
| 479 | 481 | #endif /* BCMDHD_SDIO */ |
|---|
| 480 | 482 | |
|---|
| .. | .. |
|---|
| 482 | 484 | if (!wlan_static_osl_buf[index]) |
|---|
| 483 | 485 | goto err_mem_alloc; |
|---|
| 484 | 486 | size += DHD_PREALLOC_OSL_BUF_SIZE; |
|---|
| 485 | | - DHD_STATIC_TRACE("section %d, size=%ld\n", |
|---|
| 487 | + DHD_STATIC_TRACE("sectoin %d, size=%ld\n", |
|---|
| 486 | 488 | DHD_PREALLOC_OSL_BUF, DHD_PREALLOC_OSL_BUF_SIZE); |
|---|
| 487 | 489 | |
|---|
| 488 | 490 | wlan_static_scan_buf0[index] = kmalloc(DHD_PREALLOC_WIPHY_ESCAN0_SIZE, GFP_KERNEL); |
|---|
| 489 | 491 | if (!wlan_static_scan_buf0[index]) |
|---|
| 490 | 492 | goto err_mem_alloc; |
|---|
| 491 | 493 | size += DHD_PREALLOC_WIPHY_ESCAN0_SIZE; |
|---|
| 492 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 494 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 493 | 495 | DHD_PREALLOC_WIPHY_ESCAN0, DHD_PREALLOC_WIPHY_ESCAN0_SIZE); |
|---|
| 494 | 496 | |
|---|
| 495 | 497 | wlan_static_dhd_info_buf[index] = kmalloc(DHD_PREALLOC_DHD_INFO_SIZE, GFP_KERNEL); |
|---|
| 496 | 498 | if (!wlan_static_dhd_info_buf[index]) |
|---|
| 497 | 499 | goto err_mem_alloc; |
|---|
| 498 | 500 | size += DHD_PREALLOC_DHD_INFO_SIZE; |
|---|
| 499 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 501 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 500 | 502 | DHD_PREALLOC_DHD_INFO, DHD_PREALLOC_DHD_INFO_SIZE); |
|---|
| 501 | 503 | |
|---|
| 502 | 504 | #if defined(BCMDHD_SDIO) || defined(BCMDHD_USB) |
|---|
| .. | .. |
|---|
| 504 | 506 | if (!wlan_static_dhd_wlfc_info_buf[index]) |
|---|
| 505 | 507 | goto err_mem_alloc; |
|---|
| 506 | 508 | size += WLAN_DHD_WLFC_BUF_SIZE; |
|---|
| 507 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 509 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 508 | 510 | DHD_PREALLOC_DHD_WLFC_INFO, WLAN_DHD_WLFC_BUF_SIZE); |
|---|
| 509 | 511 | #endif /* BCMDHD_SDIO | BCMDHD_USB */ |
|---|
| 510 | 512 | |
|---|
| .. | .. |
|---|
| 513 | 515 | if (!wlan_static_if_flow_lkup[index]) |
|---|
| 514 | 516 | goto err_mem_alloc; |
|---|
| 515 | 517 | size += DHD_PREALLOC_IF_FLOW_LKUP_SIZE; |
|---|
| 516 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 518 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 517 | 519 | DHD_PREALLOC_IF_FLOW_LKUP, DHD_PREALLOC_IF_FLOW_LKUP_SIZE); |
|---|
| 518 | 520 | #endif /* BCMDHD_PCIE */ |
|---|
| 519 | 521 | |
|---|
| .. | .. |
|---|
| 522 | 524 | if (!wlan_static_dhd_memdump_ram_buf[index]) |
|---|
| 523 | 525 | goto err_mem_alloc; |
|---|
| 524 | 526 | size += DHD_PREALLOC_MEMDUMP_RAM_SIZE; |
|---|
| 525 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 527 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 526 | 528 | DHD_PREALLOC_MEMDUMP_RAM, DHD_PREALLOC_MEMDUMP_RAM_SIZE); |
|---|
| 527 | 529 | #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */ |
|---|
| 528 | 530 | |
|---|
| .. | .. |
|---|
| 531 | 533 | if (!wlan_static_dhd_wlfc_hanger_buf[index]) |
|---|
| 532 | 534 | goto err_mem_alloc; |
|---|
| 533 | 535 | size += DHD_PREALLOC_DHD_WLFC_HANGER_SIZE; |
|---|
| 534 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 536 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 535 | 537 | DHD_PREALLOC_DHD_WLFC_HANGER, DHD_PREALLOC_DHD_WLFC_HANGER_SIZE); |
|---|
| 536 | 538 | #endif /* BCMDHD_SDIO | BCMDHD_USB */ |
|---|
| 537 | 539 | |
|---|
| .. | .. |
|---|
| 540 | 542 | if (!wlan_static_dhd_log_dump_buf[index]) |
|---|
| 541 | 543 | goto err_mem_alloc; |
|---|
| 542 | 544 | size += DHD_PREALLOC_DHD_LOG_DUMP_BUF_SIZE; |
|---|
| 543 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 545 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 544 | 546 | DHD_PREALLOC_DHD_LOG_DUMP_BUF, DHD_PREALLOC_DHD_LOG_DUMP_BUF_SIZE); |
|---|
| 545 | 547 | |
|---|
| 546 | 548 | wlan_static_dhd_log_dump_buf_ex[index] = kmalloc(DHD_PREALLOC_DHD_LOG_DUMP_BUF_EX_SIZE, GFP_KERNEL); |
|---|
| 547 | 549 | if (!wlan_static_dhd_log_dump_buf_ex[index]) |
|---|
| 548 | 550 | goto err_mem_alloc; |
|---|
| 549 | 551 | size += DHD_PREALLOC_DHD_LOG_DUMP_BUF_EX_SIZE; |
|---|
| 550 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 552 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 551 | 553 | DHD_PREALLOC_DHD_LOG_DUMP_BUF_EX, DHD_PREALLOC_DHD_LOG_DUMP_BUF_EX_SIZE); |
|---|
| 552 | 554 | #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */ |
|---|
| 553 | 555 | |
|---|
| .. | .. |
|---|
| 555 | 557 | if (!wlan_static_wl_escan_info_buf[index]) |
|---|
| 556 | 558 | goto err_mem_alloc; |
|---|
| 557 | 559 | size += DHD_PREALLOC_WL_ESCAN_SIZE; |
|---|
| 558 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 560 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 559 | 561 | DHD_PREALLOC_WL_ESCAN, DHD_PREALLOC_WL_ESCAN_SIZE); |
|---|
| 560 | 562 | |
|---|
| 561 | 563 | wlan_static_fw_verbose_ring_buf[index] = kmalloc(FW_VERBOSE_RING_SIZE, GFP_KERNEL); |
|---|
| 562 | 564 | if (!wlan_static_fw_verbose_ring_buf[index]) |
|---|
| 563 | 565 | goto err_mem_alloc; |
|---|
| 564 | 566 | size += FW_VERBOSE_RING_SIZE; |
|---|
| 565 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 567 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 566 | 568 | DHD_PREALLOC_FW_VERBOSE_RING, FW_VERBOSE_RING_SIZE); |
|---|
| 567 | 569 | |
|---|
| 568 | 570 | wlan_static_fw_event_ring_buf[index] = kmalloc(FW_EVENT_RING_SIZE, GFP_KERNEL); |
|---|
| 569 | 571 | if (!wlan_static_fw_event_ring_buf[index]) |
|---|
| 570 | 572 | goto err_mem_alloc; |
|---|
| 571 | 573 | size += FW_EVENT_RING_SIZE; |
|---|
| 572 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 574 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 573 | 575 | DHD_PREALLOC_FW_EVENT_RING, FW_EVENT_RING_SIZE); |
|---|
| 574 | 576 | |
|---|
| 575 | 577 | wlan_static_dhd_event_ring_buf[index] = kmalloc(DHD_EVENT_RING_SIZE, GFP_KERNEL); |
|---|
| 576 | 578 | if (!wlan_static_dhd_event_ring_buf[index]) |
|---|
| 577 | 579 | goto err_mem_alloc; |
|---|
| 578 | 580 | size += DHD_EVENT_RING_SIZE; |
|---|
| 579 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 581 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 580 | 582 | DHD_PREALLOC_DHD_EVENT_RING, DHD_EVENT_RING_SIZE); |
|---|
| 581 | 583 | |
|---|
| 582 | 584 | #if defined(BCMDHD_UNUSE_MEM) |
|---|
| .. | .. |
|---|
| 584 | 586 | if (!wlan_static_nan_event_ring_buf[index]) |
|---|
| 585 | 587 | goto err_mem_alloc; |
|---|
| 586 | 588 | size += NAN_EVENT_RING_SIZE; |
|---|
| 587 | | - DHD_STATIC_TRACE("section %d, size=%d\n", |
|---|
| 589 | + DHD_STATIC_TRACE("sectoin %d, size=%d\n", |
|---|
| 588 | 590 | DHD_PREALLOC_NAN_EVENT_RING, NAN_EVENT_RING_SIZE); |
|---|
| 589 | 591 | #endif /* BCMDHD_UNUSE_MEM */ |
|---|
| 590 | 592 | |
|---|
| 591 | | - DHD_STATIC_MSG("prealloc ok for index %d: %ld(%ldK)\n", index, size, size / 1024); |
|---|
| 593 | + DHD_STATIC_MSG("prealloc ok for index %d: %ld(%ldK)\n", index, size, size/1024); |
|---|
| 592 | 594 | return 0; |
|---|
| 593 | 595 | |
|---|
| 594 | 596 | err_mem_alloc: |
|---|
| .. | .. |
|---|
| 638 | 640 | } |
|---|
| 639 | 641 | |
|---|
| 640 | 642 | #ifndef DHD_STATIC_IN_DRIVER |
|---|
| 643 | +MODULE_LICENSE("GPL"); |
|---|
| 641 | 644 | module_init(dhd_static_buf_init); |
|---|
| 642 | 645 | module_exit(dhd_static_buf_exit); |
|---|
| 643 | 646 | #endif |
|---|