add at24 driver

hc

2023-11-06 15ade055295d13f95d49e3d99b09f3bbfb4a43e7

 kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_static_buf.c
..
..
@@ -7,7 +7,7 @@
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)"
10
+#define	DHD_STATIC_VERSION_STR		"101.10.361.26 (wlan=r892223-20221011-1)"
11
11
 #define STATIC_ERROR_LEVEL	BIT(0)
12
12
 #define STATIC_TRACE_LEVEL	BIT(1)
13
13
 #define STATIC_MSG_LEVEL	BIT(0)
..
..
@@ -32,12 +32,19 @@
32
32
 		} \
33
33
 	} while (0)
34
34
 
35
-#define BCMDHD_SDIO
36
-#define BCMDHD_PCIE
37
-//#define BCMDHD_USB
35
+#ifdef DHD_STATIC_IN_DRIVER
36
+#if ANDROID_VERSION > 0
37
+#define CONFIG_BCMDHD_VTS { : = y}
38
+#define CONFIG_BCMDHD_DEBUG { : = y}
39
+#endif
40
+#else
41
+#define BCMSDIO
42
+#define BCMPCIE
43
+//#define BCMDBUS
38
44
 #define CONFIG_BCMDHD_VTS { : = y}
39
45
 #define CONFIG_BCMDHD_DEBUG { : = y}
40
46
 //#define BCMDHD_UNUSE_MEM
47
+#endif
41
48
 
42
49
 #ifndef MAX_NUM_ADAPTERS
43
50
 #define MAX_NUM_ADAPTERS	1
..
..
@@ -45,28 +52,28 @@
45
52
 
46
53
 enum dhd_prealloc_index {
47
54
 	DHD_PREALLOC_PROT = 0,
48
-#if defined(BCMDHD_SDIO)
55
+#if defined(BCMSDIO)
49
56
 	DHD_PREALLOC_RXBUF = 1,
50
57
 	DHD_PREALLOC_DATABUF = 2,
51
-#endif /* BCMDHD_SDIO */
58
+#endif /* BCMSDIO */
52
59
 	DHD_PREALLOC_OSL_BUF = 3,
53
60
 	DHD_PREALLOC_SKB_BUF = 4,
54
61
 	DHD_PREALLOC_WIPHY_ESCAN0 = 5,
55
62
 	DHD_PREALLOC_WIPHY_ESCAN1 = 6,
56
63
 	DHD_PREALLOC_DHD_INFO = 7,
57
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
64
+#if defined(BCMSDIO) || defined(BCMDBUS)
58
65
 	DHD_PREALLOC_DHD_WLFC_INFO = 8,
59
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
60
-#ifdef BCMDHD_PCIE
66
+#endif /* BCMSDIO | BCMDBUS */
67
+#ifdef BCMPCIE
61
68
 	DHD_PREALLOC_IF_FLOW_LKUP = 9,
62
-#endif /* BCMDHD_PCIE */
69
+#endif /* BCMPCIE */
63
70
 	DHD_PREALLOC_MEMDUMP_BUF = 10,
64
71
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
65
72
 	DHD_PREALLOC_MEMDUMP_RAM = 11,
66
73
 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
67
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
74
+#if defined(BCMSDIO) || defined(BCMDBUS)
68
75
 	DHD_PREALLOC_DHD_WLFC_HANGER = 12,
69
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
76
+#endif /* BCMSDIO | BCMDBUS */
70
77
 	DHD_PREALLOC_PKTID_MAP = 13,
71
78
 	DHD_PREALLOC_PKTID_MAP_IOCTL = 14,
72
79
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
..
..
@@ -98,7 +105,7 @@
98
105
 #define DHD_PREALLOC_DATABUF_SIZE	(64 * 1024)
99
106
 #define DHD_PREALLOC_OSL_BUF_SIZE	(STATIC_BUF_MAX_NUM * STATIC_BUF_SIZE)
100
107
 #define DHD_PREALLOC_WIPHY_ESCAN0_SIZE	(64 * 1024)
101
-#define DHD_PREALLOC_DHD_INFO_SIZE	(42 * 1024)
108
+#define DHD_PREALLOC_DHD_INFO_SIZE	(43 * 1024)
102
109
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
103
110
 #define DHD_PREALLOC_MEMDUMP_RAM_SIZE	(1290 * 1024)
104
111
 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
..
..
@@ -133,20 +140,20 @@
133
140
 #define DHD_SKB_2PAGE_BUFSIZE	(PAGE_SIZE * 2)
134
141
 #define DHD_SKB_4PAGE_BUFSIZE	(PAGE_SIZE * 4)
135
142
 
136
-#ifdef BCMDHD_PCIE
143
+#ifdef BCMPCIE
137
144
 #define DHD_SKB_1PAGE_BUF_NUM	0
138
145
 #define DHD_SKB_2PAGE_BUF_NUM	192
139
-#elif defined(BCMDHD_SDIO)
146
+#elif defined(BCMSDIO)
140
147
 #define DHD_SKB_1PAGE_BUF_NUM	8
141
148
 #define DHD_SKB_2PAGE_BUF_NUM	8
142
-#endif /* BCMDHD_PCIE */
149
+#endif /* BCMPCIE */
143
150
 #define DHD_SKB_4PAGE_BUF_NUM	1
144
151
 
145
152
 /* The number is defined in linux_osl.c
146
153
  * WLAN_SKB_1_2PAGE_BUF_NUM => STATIC_PKT_1_2PAGE_NUM
147
154
  * WLAN_SKB_BUF_NUM => STATIC_PKT_MAX_NUM
148
155
  */
149
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE)
156
+#if defined(BCMSDIO) || defined(BCMPCIE)
150
157
 #define WLAN_SKB_1_2PAGE_BUF_NUM ((DHD_SKB_1PAGE_BUF_NUM) + \
151
158
 		(DHD_SKB_2PAGE_BUF_NUM))
152
159
 #define WLAN_SKB_BUF_NUM ((WLAN_SKB_1_2PAGE_BUF_NUM) + (DHD_SKB_4PAGE_BUF_NUM))
..
..
@@ -173,9 +180,9 @@
173
180
 void *wlan_static_dhd_event_ring_buf[MAX_NUM_ADAPTERS] = {};
174
181
 void *wlan_static_nan_event_ring_buf[MAX_NUM_ADAPTERS] = {};
175
182
 
176
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE)
183
+#if defined(BCMSDIO) || defined(BCMPCIE)
177
184
 static struct sk_buff *wlan_static_skb[MAX_NUM_ADAPTERS][WLAN_SKB_BUF_NUM] = {};
178
-#endif /* BCMDHD_SDIO | BCMDHD_PCIE */
185
+#endif /* BCMSDIO | BCMPCIE */
179
186
 
180
187
 void *
181
188
 dhd_wlan_mem_prealloc(
..
..
@@ -198,18 +205,18 @@
198
205
 	if (section == DHD_PREALLOC_PROT)
199
206
 		return wlan_static_prot[index];
200
207
 
201
-#if defined(BCMDHD_SDIO)
208
+#if defined(BCMSDIO)
202
209
 	if (section == DHD_PREALLOC_RXBUF)
203
210
 		return wlan_static_rxbuf[index];
204
211
 
205
212
 	if (section == DHD_PREALLOC_DATABUF)
206
213
 		return wlan_static_databuf[index];
207
-#endif /* BCMDHD_SDIO */
214
+#endif /* BCMSDIO */
208
215
 
209
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE)
216
+#if defined(BCMSDIO) || defined(BCMPCIE)
210
217
 	if (section == DHD_PREALLOC_SKB_BUF)
211
218
 		return wlan_static_skb[index];
212
-#endif /* BCMDHD_SDIO | BCMDHD_PCIE */
219
+#endif /* BCMSDIO | BCMPCIE */
213
220
 
214
221
 	if (section == DHD_PREALLOC_WIPHY_ESCAN0)
215
222
 		return wlan_static_scan_buf0[index];
..
..
@@ -234,7 +241,7 @@
234
241
 		}
235
242
 		return wlan_static_dhd_info_buf[index];
236
243
 	}
237
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
244
+#if defined(BCMSDIO) || defined(BCMDBUS)
238
245
 	if (section == DHD_PREALLOC_DHD_WLFC_INFO) {
239
246
 		if (size > WLAN_DHD_WLFC_BUF_SIZE) {
240
247
 			DHD_STATIC_ERROR("request DHD_WLFC_INFO(%lu) > %d\n",
..
..
@@ -243,8 +250,8 @@
243
250
 		}
244
251
 		return wlan_static_dhd_wlfc_info_buf[index];
245
252
 	}
246
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
247
-#ifdef BCMDHD_PCIE
253
+#endif /* BCMSDIO | BCMDBUS */
254
+#ifdef BCMPCIE
248
255
 	if (section == DHD_PREALLOC_IF_FLOW_LKUP)  {
249
256
 		if (size > DHD_PREALLOC_IF_FLOW_LKUP_SIZE) {
250
257
 			DHD_STATIC_ERROR("request DHD_IF_FLOW_LKUP(%lu) > %d\n",
..
..
@@ -253,7 +260,7 @@
253
260
 		}
254
261
 		return wlan_static_if_flow_lkup[index];
255
262
 	}
256
-#endif /* BCMDHD_PCIE */
263
+#endif /* BCMPCIE */
257
264
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
258
265
 	if (section == DHD_PREALLOC_MEMDUMP_RAM) {
259
266
 		if (size > DHD_PREALLOC_MEMDUMP_RAM_SIZE) {
..
..
@@ -264,7 +271,7 @@
264
271
 		return wlan_static_dhd_memdump_ram_buf[index];
265
272
 	}
266
273
 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
267
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
274
+#if defined(BCMSDIO) || defined(BCMDBUS)
268
275
 	if (section == DHD_PREALLOC_DHD_WLFC_HANGER) {
269
276
 		if (size > DHD_PREALLOC_DHD_WLFC_HANGER_SIZE) {
270
277
 			DHD_STATIC_ERROR("request DHD_WLFC_HANGER(%lu) > %d\n",
..
..
@@ -273,7 +280,7 @@
273
280
 		}
274
281
 		return wlan_static_dhd_wlfc_hanger_buf[index];
275
282
 	}
276
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
283
+#endif /* BCMSDIO | BCMDBUS */
277
284
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
278
285
 	if (section == DHD_PREALLOC_DHD_LOG_DUMP_BUF) {
279
286
 		if (size > DHD_PREALLOC_DHD_LOG_DUMP_BUF_SIZE) {
..
..
@@ -350,18 +357,18 @@
350
357
 static void
351
358
 dhd_deinit_wlan_mem(int index)
352
359
 {
353
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE)
360
+#if defined(BCMSDIO) || defined(BCMPCIE)
354
361
 	int i;
355
-#endif /* BCMDHD_SDIO | BCMDHD_PCIE */
362
+#endif /* BCMSDIO | BCMPCIE */
356
363
 
357
364
 	if (wlan_static_prot[index])
358
365
 		kfree(wlan_static_prot[index]);
359
-#if defined(BCMDHD_SDIO)
366
+#if defined(BCMSDIO)
360
367
 	if (wlan_static_rxbuf[index])
361
368
 		kfree(wlan_static_rxbuf[index]);
362
369
 	if (wlan_static_databuf[index])
363
370
 		kfree(wlan_static_databuf[index]);
364
-#endif /* BCMDHD_SDIO */
371
+#endif /* BCMSDIO */
365
372
 	if (wlan_static_osl_buf[index])
366
373
 		kfree(wlan_static_osl_buf[index]);
367
374
 	if (wlan_static_scan_buf0[index])
..
..
@@ -370,22 +377,22 @@
370
377
 		kfree(wlan_static_scan_buf1[index]);
371
378
 	if (wlan_static_dhd_info_buf[index])
372
379
 		kfree(wlan_static_dhd_info_buf[index]);
373
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
380
+#if defined(BCMSDIO) || defined(BCMDBUS)
374
381
 	if (wlan_static_dhd_wlfc_info_buf[index])
375
382
 		kfree(wlan_static_dhd_wlfc_info_buf[index]);
376
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
377
-#ifdef BCMDHD_PCIE
383
+#endif /* BCMSDIO | BCMDBUS */
384
+#ifdef BCMPCIE
378
385
 	if (wlan_static_if_flow_lkup[index])
379
386
 		kfree(wlan_static_if_flow_lkup[index]);
380
-#endif /* BCMDHD_PCIE */
387
+#endif /* BCMPCIE */
381
388
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
382
389
 	if (wlan_static_dhd_memdump_ram_buf[index])
383
390
 		kfree(wlan_static_dhd_memdump_ram_buf[index]);
384
391
 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
385
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
392
+#if defined(BCMSDIO) || defined(BCMDBUS)
386
393
 	if (wlan_static_dhd_wlfc_hanger_buf[index])
387
394
 		kfree(wlan_static_dhd_wlfc_hanger_buf[index]);
388
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
395
+#endif /* BCMSDIO | BCMDBUS */
389
396
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
390
397
 	if (wlan_static_dhd_log_dump_buf[index])
391
398
 		kfree(wlan_static_dhd_log_dump_buf[index]);
..
..
@@ -405,12 +412,12 @@
405
412
 		kfree(wlan_static_nan_event_ring_buf[index]);
406
413
 #endif /* BCMDHD_UNUSE_MEM */
407
414
 
408
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE)
415
+#if defined(BCMSDIO) || defined(BCMPCIE)
409
416
 	for (i=0; i<WLAN_SKB_BUF_NUM; i++) {
410
417
 		if (wlan_static_skb[index][i])
411
418
 			dev_kfree_skb(wlan_static_skb[index][i]);
412
419
 	}
413
-#endif /* BCMDHD_SDIO | BCMDHD_PCIE */
420
+#endif /* BCMSDIO | BCMPCIE */
414
421
 
415
422
 	return;
416
423
 }
..
..
@@ -418,12 +425,12 @@
418
425
 static int
419
426
 dhd_init_wlan_mem(int index)
420
427
 {
421
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE)
428
+#if defined(BCMSDIO) || defined(BCMPCIE)
422
429
 	int i;
423
430
 #endif
424
431
 	unsigned long size = 0;
425
432
 
426
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_PCIE)
433
+#if defined(BCMSDIO) || defined(BCMPCIE)
427
434
 	for (i = 0; i < WLAN_SKB_BUF_NUM; i++)
428
435
 		wlan_static_skb[index][i] = NULL;
429
436
 
..
..
@@ -444,16 +451,16 @@
444
451
 		DHD_STATIC_TRACE("section %d skb[%d], size=%ld\n",
445
452
 			DHD_PREALLOC_SKB_BUF, i, DHD_SKB_2PAGE_BUFSIZE);
446
453
 	}
447
-#endif /* BCMDHD_SDIO | BCMDHD_PCIE */
454
+#endif /* BCMSDIO | BCMPCIE */
448
455
 
449
-#if defined(BCMDHD_SDIO)
456
+#if defined(BCMSDIO)
450
457
 	wlan_static_skb[index][i] = dev_alloc_skb(DHD_SKB_4PAGE_BUFSIZE);
451
458
 	if (!wlan_static_skb[index][i])
452
459
 		goto err_mem_alloc;
453
460
 	size += DHD_SKB_4PAGE_BUFSIZE;
454
461
 	DHD_STATIC_TRACE("section %d skb[%d], size=%ld\n",
455
462
 		DHD_PREALLOC_SKB_BUF, i, DHD_SKB_4PAGE_BUFSIZE);
456
-#endif /* BCMDHD_SDIO */
463
+#endif /* BCMSDIO */
457
464
 
458
465
 	wlan_static_prot[index] = kmalloc(DHD_PREALLOC_PROT_SIZE, GFP_KERNEL);
459
466
 	if (!wlan_static_prot[index])
..
..
@@ -462,7 +469,7 @@
462
469
 	DHD_STATIC_TRACE("section %d, size=%d\n",
463
470
 		DHD_PREALLOC_PROT, DHD_PREALLOC_PROT_SIZE);
464
471
 
465
-#if defined(BCMDHD_SDIO)
472
+#if defined(BCMSDIO)
466
473
 	wlan_static_rxbuf[index] = kmalloc(DHD_PREALLOC_RXBUF_SIZE, GFP_KERNEL);
467
474
 	if (!wlan_static_rxbuf[index])
468
475
 		goto err_mem_alloc;
..
..
@@ -476,7 +483,7 @@
476
483
 	size += DHD_PREALLOC_DATABUF_SIZE;
477
484
 	DHD_STATIC_TRACE("section %d, size=%d\n",
478
485
 		DHD_PREALLOC_DATABUF, DHD_PREALLOC_DATABUF_SIZE);
479
-#endif /* BCMDHD_SDIO */
486
+#endif /* BCMSDIO */
480
487
 
481
488
 	wlan_static_osl_buf[index] = kmalloc(DHD_PREALLOC_OSL_BUF_SIZE, GFP_KERNEL);
482
489
 	if (!wlan_static_osl_buf[index])
..
..
@@ -499,23 +506,23 @@
499
506
 	DHD_STATIC_TRACE("section %d, size=%d\n",
500
507
 		DHD_PREALLOC_DHD_INFO, DHD_PREALLOC_DHD_INFO_SIZE);
501
508
 
502
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
509
+#if defined(BCMSDIO) || defined(BCMDBUS)
503
510
 	wlan_static_dhd_wlfc_info_buf[index] = kmalloc(WLAN_DHD_WLFC_BUF_SIZE, GFP_KERNEL);
504
511
 	if (!wlan_static_dhd_wlfc_info_buf[index])
505
512
 		goto err_mem_alloc;
506
513
 	size += WLAN_DHD_WLFC_BUF_SIZE;
507
514
 	DHD_STATIC_TRACE("section %d, size=%d\n",
508
515
 		DHD_PREALLOC_DHD_WLFC_INFO, WLAN_DHD_WLFC_BUF_SIZE);
509
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
516
+#endif /* BCMSDIO | BCMDBUS */
510
517
 
511
-#ifdef BCMDHD_PCIE
518
+#ifdef BCMPCIE
512
519
 	wlan_static_if_flow_lkup[index] = kmalloc(DHD_PREALLOC_IF_FLOW_LKUP_SIZE, GFP_KERNEL);
513
520
 	if (!wlan_static_if_flow_lkup[index])
514
521
 		goto err_mem_alloc;
515
522
 	size += DHD_PREALLOC_IF_FLOW_LKUP_SIZE;
516
523
 	DHD_STATIC_TRACE("section %d, size=%d\n",
517
524
 		DHD_PREALLOC_IF_FLOW_LKUP, DHD_PREALLOC_IF_FLOW_LKUP_SIZE);
518
-#endif /* BCMDHD_PCIE */
525
+#endif /* BCMPCIE */
519
526
 
520
527
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
521
528
 	wlan_static_dhd_memdump_ram_buf[index] = kmalloc(DHD_PREALLOC_MEMDUMP_RAM_SIZE, GFP_KERNEL);
..
..
@@ -526,14 +533,14 @@
526
533
 		DHD_PREALLOC_MEMDUMP_RAM, DHD_PREALLOC_MEMDUMP_RAM_SIZE);
527
534
 #endif /* CONFIG_BCMDHD_VTS | CONFIG_BCMDHD_DEBUG */
528
535
 
529
-#if defined(BCMDHD_SDIO) || defined(BCMDHD_USB)
536
+#if defined(BCMSDIO) || defined(BCMDBUS)
530
537
 	wlan_static_dhd_wlfc_hanger_buf[index] = kmalloc(DHD_PREALLOC_DHD_WLFC_HANGER_SIZE, GFP_KERNEL);
531
538
 	if (!wlan_static_dhd_wlfc_hanger_buf[index])
532
539
 		goto err_mem_alloc;
533
540
 	size += DHD_PREALLOC_DHD_WLFC_HANGER_SIZE;
534
541
 	DHD_STATIC_TRACE("section %d, size=%d\n",
535
542
 		DHD_PREALLOC_DHD_WLFC_HANGER, DHD_PREALLOC_DHD_WLFC_HANGER_SIZE);
536
-#endif /* BCMDHD_SDIO | BCMDHD_USB */
543
+#endif /* BCMSDIO | BCMDBUS */
537
544
 
538
545
 #if defined(CONFIG_BCMDHD_VTS) || defined(CONFIG_BCMDHD_DEBUG)
539
546
 	wlan_static_dhd_log_dump_buf[index] = kmalloc(DHD_PREALLOC_DHD_LOG_DUMP_BUF_SIZE, GFP_KERNEL);