hc
2024-05-11 297b60346df8beafee954a0fd7c2d64f33f3b9bc
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/bcmsdh_sdmmc.c
old mode 100644new mode 100755
....@@ -103,8 +103,6 @@
103103 #define CUSTOM_SDIO_F1_BLKSIZE DEFAULT_SDIO_F1_BLKSIZE
104104 #endif
105105
106
-#define COPY_BUF_SIZE (SDPCM_MAXGLOM_SIZE * 1600)
107
-
108106 #define MAX_IO_RW_EXTENDED_BLK 511
109107
110108 uint sd_sdmode = SDIOH_MODE_SD4; /* Use SD4 mode by default */
....@@ -211,14 +209,6 @@
211209 return NULL;
212210 }
213211 bzero((char *)sd, sizeof(sdioh_info_t));
214
-#if defined(BCMSDIOH_TXGLOM) && defined(BCMSDIOH_STATIC_COPY_BUF)
215
- sd->copy_buf = MALLOC(osh, COPY_BUF_SIZE);
216
- if (sd->copy_buf == NULL) {
217
- sd_err(("%s: MALLOC of %d-byte copy_buf failed\n",
218
- __FUNCTION__, COPY_BUF_SIZE));
219
- goto fail;
220
- }
221
-#endif
222212 sd->osh = osh;
223213 sd->fake_func0.num = 0;
224214 sd->fake_func0.card = func->card;
....@@ -283,9 +273,6 @@
283273 return sd;
284274
285275 fail:
286
-#if defined(BCMSDIOH_TXGLOM) && defined(BCMSDIOH_STATIC_COPY_BUF)
287
- MFREE(sd->osh, sd->copy_buf, COPY_BUF_SIZE);
288
-#endif
289276 MFREE(sd->osh, sd, sizeof(sdioh_info_t));
290277 return NULL;
291278 }
....@@ -314,9 +301,6 @@
314301 sd->func[1] = NULL;
315302 sd->func[2] = NULL;
316303
317
-#if defined(BCMSDIOH_TXGLOM) && defined(BCMSDIOH_STATIC_COPY_BUF)
318
- MFREE(sd->osh, sd->copy_buf, COPY_BUF_SIZE);
319
-#endif
320304 MFREE(sd->osh, sd, sizeof(sdioh_info_t));
321305 }
322306 return SDIOH_API_RC_SUCCESS;
....@@ -1372,8 +1356,7 @@
13721356 return SDIOH_API_RC_FAIL;
13731357 }
13741358 }
1375
- }
1376
- else if(sd->txglom_mode == SDPCM_TXGLOM_CPY) {
1359
+ } else if(sd->txglom_mode == SDPCM_TXGLOM_CPY) {
13771360 for (pnext = pkt; pnext; pnext = PKTNEXT(sd->osh, pnext)) {
13781361 ttl_len += PKTLEN(sd->osh, pnext);
13791362 }
....@@ -1382,20 +1365,16 @@
13821365 for (pnext = pkt; pnext; pnext = PKTNEXT(sd->osh, pnext)) {
13831366 uint8 *buf = (uint8*)PKTDATA(sd->osh, pnext);
13841367 pkt_len = PKTLEN(sd->osh, pnext);
1368
+
13851369 if (!localbuf) {
1386
-#ifdef BCMSDIOH_STATIC_COPY_BUF
1387
- if (ttl_len <= COPY_BUF_SIZE)
1388
- localbuf = sd->copy_buf;
1389
-#else
13901370 localbuf = (uint8 *)MALLOC(sd->osh, ttl_len);
1391
-#endif
13921371 if (localbuf == NULL) {
1393
- sd_err(("%s: %s localbuf malloc FAILED ttl_len=%d\n",
1394
- __FUNCTION__, (write) ? "TX" : "RX", ttl_len));
1395
- ttl_len -= pkt_len;
1372
+ sd_err(("%s: %s TXGLOM: localbuf malloc FAILED\n",
1373
+ __FUNCTION__, (write) ? "TX" : "RX"));
13961374 goto txglomfail;
13971375 }
13981376 }
1377
+
13991378 bcopy(buf, (localbuf + local_plen), pkt_len);
14001379 local_plen += pkt_len;
14011380 if (PKTNEXT(sd->osh, pnext))
....@@ -1440,10 +1419,8 @@
14401419 return SDIOH_API_RC_FAIL;
14411420 }
14421421
1443
-#ifndef BCMSDIOH_STATIC_COPY_BUF
14441422 if (localbuf)
14451423 MFREE(sd->osh, localbuf, ttl_len);
1446
-#endif
14471424
14481425 #ifndef PKT_STATICS
14491426 if (sd_msglevel & SDH_COST_VAL)