forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd 
 kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_static_buf.c
old mode 100644new mode 100755
....@@ -7,10 +7,10 @@
77 #include <linux/err.h>
88 #include <linux/skbuff.h>
99 
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)
1414 uint static_msg_level = STATIC_ERROR_LEVEL | STATIC_MSG_LEVEL;
1515 
1616 #define DHD_STATIC_MSG(x, args...) \
....@@ -35,8 +35,8 @@
3535 #define BCMDHD_SDIO
3636 #define BCMDHD_PCIE
3737 //#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
4040 //#define BCMDHD_UNUSE_MEM
4141 
4242 #ifndef MAX_NUM_ADAPTERS
....@@ -86,11 +86,10 @@
8686 };
8787 
8888 #define STATIC_BUF_MAX_NUM	20
89
-#define STATIC_BUF_SIZE	(PAGE_SIZE * 2)
89
+#define STATIC_BUF_SIZE	(PAGE_SIZE*2)
9090 
9191 #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 */
9493 #endif /* CUSTOM_LOG_DUMP_BUFSIZE_MB */
9594 
9695 #define DHD_PREALLOC_PROT_SIZE	(16 * 1024)
....@@ -98,7 +97,7 @@
9897 #define DHD_PREALLOC_DATABUF_SIZE	(64 * 1024)
9998 #define DHD_PREALLOC_OSL_BUF_SIZE	(STATIC_BUF_MAX_NUM * STATIC_BUF_SIZE)
10099 #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)
102101 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
103102 #define DHD_PREALLOC_MEMDUMP_RAM_SIZE	(1290 * 1024)
104103 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
....@@ -129,9 +128,9 @@
129128 #endif /* CONFIG_64BIT */
130129 #define WLAN_DHD_MEMDUMP_SIZE	(800 * 1024)
131130 
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)
135134 
136135 #ifdef BCMDHD_PCIE
137136 #define DHD_SKB_1PAGE_BUF_NUM	0
....@@ -152,47 +151,47 @@
152151 #define WLAN_SKB_BUF_NUM ((WLAN_SKB_1_2PAGE_BUF_NUM) + (DHD_SKB_4PAGE_BUF_NUM))
153152 #endif
154153 
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};
166165 #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};
169168 #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};
175174 
176175 #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}};
178177 #endif /* BCMDHD_SDIO | BCMDHD_PCIE */
179178 
180179 void *
181180 dhd_wlan_mem_prealloc(
182
-#if defined(BCMDHD_MDRIVER) && !defined(DHD_STATIC_IN_DRIVER)
181
+#ifdef BCMDHD_MDRIVER
183182 	uint bus_type, int index,
184183 #endif
185184 	int section, unsigned long size)
186185 {
187
-#if !defined(BCMDHD_MDRIVER) || defined(DHD_STATIC_IN_DRIVER)
186
+#ifndef BCMDHD_MDRIVER
188187 	int index = 0;
189188 #endif
190189 
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",
193192 		bus_type, index, section, size);
194193 #else
195
-	DHD_STATIC_MSG("section %d, size %ld\n", section, size);
194
+	DHD_STATIC_MSG("sectoin %d, size %ld\n", section, size);
196195 #endif
197196 
198197 	if (section == DHD_PREALLOC_PROT)
....@@ -424,24 +423,27 @@
424423 	unsigned long size = 0;
425424 
426425 #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++) {
428427 		wlan_static_skb[index][i] = NULL;
428
+	}
429429 
430430 	for (i = 0; i < DHD_SKB_1PAGE_BUF_NUM; i++) {
431431 		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]) {
433433 			goto err_mem_alloc;
434
+		}
434435 		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",
436437 			DHD_PREALLOC_SKB_BUF, i, DHD_SKB_1PAGE_BUFSIZE);
437438 	}
438439 
439440 	for (i = DHD_SKB_1PAGE_BUF_NUM; i < WLAN_SKB_1_2PAGE_BUF_NUM; i++) {
440441 		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]) {
442443 			goto err_mem_alloc;
444
+		}
443445 		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",
445447 			DHD_PREALLOC_SKB_BUF, i, DHD_SKB_2PAGE_BUFSIZE);
446448 	}
447449 #endif /* BCMDHD_SDIO | BCMDHD_PCIE */
....@@ -451,7 +453,7 @@
451453 	if (!wlan_static_skb[index][i])
452454 		goto err_mem_alloc;
453455 	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",
455457 		DHD_PREALLOC_SKB_BUF, i, DHD_SKB_4PAGE_BUFSIZE);
456458 #endif /* BCMDHD_SDIO */
457459 
....@@ -459,7 +461,7 @@
459461 	if (!wlan_static_prot[index])
460462 		goto err_mem_alloc;
461463 	size += DHD_PREALLOC_PROT_SIZE;
462
-	DHD_STATIC_TRACE("section %d, size=%d\n",
464
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
463465 		DHD_PREALLOC_PROT, DHD_PREALLOC_PROT_SIZE);
464466 
465467 #if defined(BCMDHD_SDIO)
....@@ -467,14 +469,14 @@
467469 	if (!wlan_static_rxbuf[index])
468470 		goto err_mem_alloc;
469471 	size += DHD_PREALLOC_RXBUF_SIZE;
470
-	DHD_STATIC_TRACE("section %d, size=%d\n",
472
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
471473 		DHD_PREALLOC_RXBUF, DHD_PREALLOC_RXBUF_SIZE);
472474 
473475 	wlan_static_databuf[index] = kmalloc(DHD_PREALLOC_DATABUF_SIZE, GFP_KERNEL);
474476 	if (!wlan_static_databuf[index])
475477 		goto err_mem_alloc;
476478 	size += DHD_PREALLOC_DATABUF_SIZE;
477
-	DHD_STATIC_TRACE("section %d, size=%d\n",
479
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
478480 		DHD_PREALLOC_DATABUF, DHD_PREALLOC_DATABUF_SIZE);
479481 #endif /* BCMDHD_SDIO */
480482 
....@@ -482,21 +484,21 @@
482484 	if (!wlan_static_osl_buf[index])
483485 		goto err_mem_alloc;
484486 	size += DHD_PREALLOC_OSL_BUF_SIZE;
485
-	DHD_STATIC_TRACE("section %d, size=%ld\n",
487
+	DHD_STATIC_TRACE("sectoin %d, size=%ld\n",
486488 		DHD_PREALLOC_OSL_BUF, DHD_PREALLOC_OSL_BUF_SIZE);
487489 
488490 	wlan_static_scan_buf0[index] = kmalloc(DHD_PREALLOC_WIPHY_ESCAN0_SIZE, GFP_KERNEL);
489491 	if (!wlan_static_scan_buf0[index])
490492 		goto err_mem_alloc;
491493 	size += DHD_PREALLOC_WIPHY_ESCAN0_SIZE;
492
-	DHD_STATIC_TRACE("section %d, size=%d\n",
494
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
493495 		DHD_PREALLOC_WIPHY_ESCAN0, DHD_PREALLOC_WIPHY_ESCAN0_SIZE);
494496 
495497 	wlan_static_dhd_info_buf[index] = kmalloc(DHD_PREALLOC_DHD_INFO_SIZE, GFP_KERNEL);
496498 	if (!wlan_static_dhd_info_buf[index])
497499 		goto err_mem_alloc;
498500 	size += DHD_PREALLOC_DHD_INFO_SIZE;
499
-	DHD_STATIC_TRACE("section %d, size=%d\n",
501
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
500502 		DHD_PREALLOC_DHD_INFO, DHD_PREALLOC_DHD_INFO_SIZE);
501503 
502504 #if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
....@@ -504,7 +506,7 @@
504506 	if (!wlan_static_dhd_wlfc_info_buf[index])
505507 		goto err_mem_alloc;
506508 	size += WLAN_DHD_WLFC_BUF_SIZE;
507
-	DHD_STATIC_TRACE("section %d, size=%d\n",
509
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
508510 		DHD_PREALLOC_DHD_WLFC_INFO, WLAN_DHD_WLFC_BUF_SIZE);
509511 #endif /* BCMDHD_SDIO | BCMDHD_USB */
510512 
....@@ -513,7 +515,7 @@
513515 	if (!wlan_static_if_flow_lkup[index])
514516 		goto err_mem_alloc;
515517 	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",
517519 		DHD_PREALLOC_IF_FLOW_LKUP, DHD_PREALLOC_IF_FLOW_LKUP_SIZE);
518520 #endif /* BCMDHD_PCIE */
519521 
....@@ -522,7 +524,7 @@
522524 	if (!wlan_static_dhd_memdump_ram_buf[index])
523525 		goto err_mem_alloc;
524526 	size += DHD_PREALLOC_MEMDUMP_RAM_SIZE;
525
-	DHD_STATIC_TRACE("section %d, size=%d\n",
527
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
526528 		DHD_PREALLOC_MEMDUMP_RAM, DHD_PREALLOC_MEMDUMP_RAM_SIZE);
527529 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
528530 
....@@ -531,7 +533,7 @@
531533 	if (!wlan_static_dhd_wlfc_hanger_buf[index])
532534 		goto err_mem_alloc;
533535 	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",
535537 		DHD_PREALLOC_DHD_WLFC_HANGER, DHD_PREALLOC_DHD_WLFC_HANGER_SIZE);
536538 #endif /* BCMDHD_SDIO | BCMDHD_USB */
537539 
....@@ -540,14 +542,14 @@
540542 	if (!wlan_static_dhd_log_dump_buf[index])
541543 		goto err_mem_alloc;
542544 	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",
544546 		DHD_PREALLOC_DHD_LOG_DUMP_BUF, DHD_PREALLOC_DHD_LOG_DUMP_BUF_SIZE);
545547 
546548 	wlan_static_dhd_log_dump_buf_ex[index] = kmalloc(DHD_PREALLOC_DHD_LOG_DUMP_BUF_EX_SIZE, GFP_KERNEL);
547549 	if (!wlan_static_dhd_log_dump_buf_ex[index])
548550 		goto err_mem_alloc;
549551 	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",
551553 		DHD_PREALLOC_DHD_LOG_DUMP_BUF_EX, DHD_PREALLOC_DHD_LOG_DUMP_BUF_EX_SIZE);
552554 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
553555 
....@@ -555,28 +557,28 @@
555557 	if (!wlan_static_wl_escan_info_buf[index])
556558 		goto err_mem_alloc;
557559 	size += DHD_PREALLOC_WL_ESCAN_SIZE;
558
-	DHD_STATIC_TRACE("section %d, size=%d\n",
560
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
559561 		DHD_PREALLOC_WL_ESCAN, DHD_PREALLOC_WL_ESCAN_SIZE);
560562 
561563 	wlan_static_fw_verbose_ring_buf[index] = kmalloc(FW_VERBOSE_RING_SIZE, GFP_KERNEL);
562564 	if (!wlan_static_fw_verbose_ring_buf[index])
563565 		goto err_mem_alloc;
564566 	size += FW_VERBOSE_RING_SIZE;
565
-	DHD_STATIC_TRACE("section %d, size=%d\n",
567
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
566568 		DHD_PREALLOC_FW_VERBOSE_RING, FW_VERBOSE_RING_SIZE);
567569 
568570 	wlan_static_fw_event_ring_buf[index] = kmalloc(FW_EVENT_RING_SIZE, GFP_KERNEL);
569571 	if (!wlan_static_fw_event_ring_buf[index])
570572 		goto err_mem_alloc;
571573 	size += FW_EVENT_RING_SIZE;
572
-	DHD_STATIC_TRACE("section %d, size=%d\n",
574
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
573575 		DHD_PREALLOC_FW_EVENT_RING, FW_EVENT_RING_SIZE);
574576 
575577 	wlan_static_dhd_event_ring_buf[index] = kmalloc(DHD_EVENT_RING_SIZE, GFP_KERNEL);
576578 	if (!wlan_static_dhd_event_ring_buf[index])
577579 		goto err_mem_alloc;
578580 	size += DHD_EVENT_RING_SIZE;
579
-	DHD_STATIC_TRACE("section %d, size=%d\n",
581
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
580582 		DHD_PREALLOC_DHD_EVENT_RING, DHD_EVENT_RING_SIZE);
581583 
582584 #if defined(BCMDHD_UNUSE_MEM)
....@@ -584,11 +586,11 @@
584586 	if (!wlan_static_nan_event_ring_buf[index])
585587 		goto err_mem_alloc;
586588 	size += NAN_EVENT_RING_SIZE;
587
-	DHD_STATIC_TRACE("section %d, size=%d\n",
589
+	DHD_STATIC_TRACE("sectoin %d, size=%d\n",
588590 		DHD_PREALLOC_NAN_EVENT_RING, NAN_EVENT_RING_SIZE);
589591 #endif /* BCMDHD_UNUSE_MEM */
590592 
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);
592594 	return 0;
593595 
594596 err_mem_alloc:
....@@ -638,6 +640,7 @@
638640 }
639641 
640642 #ifndef DHD_STATIC_IN_DRIVER
643
+MODULE_LICENSE("GPL");
641644 module_init(dhd_static_buf_init);
642645 module_exit(dhd_static_buf_exit);
643646 #endif