add wifi6 8852be driver

hc

2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da

 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
..
..
@@ -1,31 +1,10 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2012  Realtek Corporation.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * The full GNU General Public License is included in this distribution in the
15
- * file called LICENSE.
16
- *
17
- * Contact Information:
18
- * wlanfae <wlanfae@realtek.com>
19
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
20
- * Hsinchu 300, Taiwan.
21
- *
22
- * Larry Finger <Larry.Finger@lwfinger.net>
23
- *
24
- *****************************************************************************/
1
+// SPDX-License-Identifier: GPL-2.0
2
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
25
3
 
26
4
 #include "../wifi.h"
27
5
 #include "../pci.h"
28
6
 #include "../base.h"
7
+#include "../stats.h"
29
8
 #include "reg.h"
30
9
 #include "def.h"
31
10
 #include "phy.h"
..
..
@@ -44,31 +23,6 @@
44
23
 	return skb->priority;
45
24
 }
46
25
 
47
-static u8 _rtl92d_query_rxpwrpercentage(s8 antpower)
48
-{
49
-	if ((antpower <= -100) || (antpower >= 20))
50
-		return 0;
51
-	else if (antpower >= 0)
52
-		return 100;
53
-	else
54
-		return 100 + antpower;
55
-}
56
-
57
-static u8 _rtl92d_evm_db_to_percentage(s8 value)
58
-{
59
-	s8 ret_val = value;
60
-
61
-	if (ret_val >= 0)
62
-		ret_val = 0;
63
-	if (ret_val <= -33)
64
-		ret_val = -33;
65
-	ret_val = 0 - ret_val;
66
-	ret_val *= 3;
67
-	if (ret_val == 99)
68
-		ret_val = 100;
69
-	return ret_val;
70
-}
71
-
72
26
 static long _rtl92de_translate_todbm(struct ieee80211_hw *hw,
73
27
 				     u8 signal_strength_index)
74
28
 {
..
..
@@ -77,33 +31,6 @@
77
31
 	signal_power = (long)((signal_strength_index + 1) >> 1);
78
32
 	signal_power -= 95;
79
33
 	return signal_power;
80
-}
81
-
82
-static long _rtl92de_signal_scale_mapping(struct ieee80211_hw *hw, long currsig)
83
-{
84
-	long retsig;
85
-
86
-	if (currsig >= 61 && currsig <= 100)
87
-		retsig = 90 + ((currsig - 60) / 4);
88
-	else if (currsig >= 41 && currsig <= 60)
89
-		retsig = 78 + ((currsig - 40) / 2);
90
-	else if (currsig >= 31 && currsig <= 40)
91
-		retsig = 66 + (currsig - 30);
92
-	else if (currsig >= 21 && currsig <= 30)
93
-		retsig = 54 + (currsig - 20);
94
-	else if (currsig >= 5 && currsig <= 20)
95
-		retsig = 42 + (((currsig - 5) * 2) / 3);
96
-	else if (currsig == 4)
97
-		retsig = 36;
98
-	else if (currsig == 3)
99
-		retsig = 27;
100
-	else if (currsig == 2)
101
-		retsig = 18;
102
-	else if (currsig == 1)
103
-		retsig = 9;
104
-	else
105
-		retsig = currsig;
106
-	return retsig;
107
34
 }
108
35
 
109
36
 static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
..
..
@@ -177,7 +104,7 @@
177
104
 				break;
178
105
 			}
179
106
 		}
180
-		pwdb_all = _rtl92d_query_rxpwrpercentage(rx_pwr_all);
107
+		pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
181
108
 		/* CCK gain is smaller than OFDM/MCS gain,  */
182
109
 		/* so we add gain diff by experiences, the val is 6 */
183
110
 		pwdb_all += 6;
..
..
@@ -219,7 +146,7 @@
219
146
 				rf_rx_num++;
220
147
 			rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2)
221
148
 				    - 110;
222
-			rssi = _rtl92d_query_rxpwrpercentage(rx_pwr[i]);
149
+			rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
223
150
 			total_rssi += rssi;
224
151
 			rtlpriv->stats.rx_snr_db[i] =
225
152
 					 (long)(p_drvinfo->rxsnr[i] / 2);
..
..
@@ -227,7 +154,7 @@
227
154
 				pstats->rx_mimo_signalstrength[i] = (u8) rssi;
228
155
 		}
229
156
 		rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 106;
230
-		pwdb_all = _rtl92d_query_rxpwrpercentage(rx_pwr_all);
157
+		pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
231
158
 		pstats->rx_pwdb_all = pwdb_all;
232
159
 		pstats->rxpower = rx_pwr_all;
233
160
 		pstats->recvsignalpower = rx_pwr_all;
..
..
@@ -237,7 +164,7 @@
237
164
 		else
238
165
 			max_spatial_stream = 1;
239
166
 		for (i = 0; i < max_spatial_stream; i++) {
240
-			evm = _rtl92d_evm_db_to_percentage(p_drvinfo->rxevm[i]);
167
+			evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
241
168
 			if (packet_match_bssid) {
242
169
 				if (i == 0)
243
170
 					pstats->signalquality =
..
..
@@ -248,10 +175,10 @@
248
175
 		}
249
176
 	}
250
177
 	if (is_cck_rate)
251
-		pstats->signalstrength = (u8)(_rtl92de_signal_scale_mapping(hw,
178
+		pstats->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
252
179
 				pwdb_all));
253
180
 	else if (rf_rx_num != 0)
254
-		pstats->signalstrength = (u8)(_rtl92de_signal_scale_mapping(hw,
181
+		pstats->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
255
182
 				total_rssi /= rf_rx_num));
256
183
 }
257
184
 
..
..
@@ -474,49 +401,50 @@
474
401
 
475
402
 bool rtl92de_rx_query_desc(struct ieee80211_hw *hw,	struct rtl_stats *stats,
476
403
 		struct ieee80211_rx_status *rx_status,
477
-		u8 *p_desc, struct sk_buff *skb)
404
+		u8 *pdesc8, struct sk_buff *skb)
478
405
 {
406
+	__le32 *pdesc = (__le32 *)pdesc8;
479
407
 	struct rx_fwinfo_92d *p_drvinfo;
480
-	struct rx_desc_92d *pdesc = (struct rx_desc_92d *)p_desc;
481
-	u32 phystatus = GET_RX_DESC_PHYST(pdesc);
408
+	u32 phystatus = get_rx_desc_physt(pdesc);
482
409
 
483
-	stats->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
484
-	stats->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
410
+	stats->length = (u16)get_rx_desc_pkt_len(pdesc);
411
+	stats->rx_drvinfo_size = (u8)get_rx_desc_drv_info_size(pdesc) *
485
412
 				 RX_DRV_INFO_SIZE_UNIT;
486
-	stats->rx_bufshift = (u8) (GET_RX_DESC_SHIFT(pdesc) & 0x03);
487
-	stats->icv = (u16) GET_RX_DESC_ICV(pdesc);
488
-	stats->crc = (u16) GET_RX_DESC_CRC32(pdesc);
413
+	stats->rx_bufshift = (u8)(get_rx_desc_shift(pdesc) & 0x03);
414
+	stats->icv = (u16)get_rx_desc_icv(pdesc);
415
+	stats->crc = (u16)get_rx_desc_crc32(pdesc);
489
416
 	stats->hwerror = (stats->crc | stats->icv);
490
-	stats->decrypted = !GET_RX_DESC_SWDEC(pdesc);
491
-	stats->rate = (u8) GET_RX_DESC_RXMCS(pdesc);
492
-	stats->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
493
-	stats->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
494
-	stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
495
-					 && (GET_RX_DESC_FAGGR(pdesc) == 1));
496
-	stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
497
-	stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
498
-	stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
417
+	stats->decrypted = !get_rx_desc_swdec(pdesc);
418
+	stats->rate = (u8)get_rx_desc_rxmcs(pdesc);
419
+	stats->shortpreamble = (u16)get_rx_desc_splcp(pdesc);
420
+	stats->isampdu = (bool)(get_rx_desc_paggr(pdesc) == 1);
421
+	stats->isfirst_ampdu = (bool)((get_rx_desc_paggr(pdesc) == 1) &&
422
+				      (get_rx_desc_faggr(pdesc) == 1));
423
+	stats->timestamp_low = get_rx_desc_tsfl(pdesc);
424
+	stats->rx_is40mhzpacket = (bool)get_rx_desc_bw(pdesc);
425
+	stats->is_ht = (bool)get_rx_desc_rxht(pdesc);
499
426
 	rx_status->freq = hw->conf.chandef.chan->center_freq;
500
427
 	rx_status->band = hw->conf.chandef.chan->band;
501
-	if (GET_RX_DESC_CRC32(pdesc))
428
+	if (get_rx_desc_crc32(pdesc))
502
429
 		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
503
-	if (!GET_RX_DESC_SWDEC(pdesc))
430
+	if (!get_rx_desc_swdec(pdesc))
504
431
 		rx_status->flag |= RX_FLAG_DECRYPTED;
505
-	if (GET_RX_DESC_BW(pdesc))
432
+	if (get_rx_desc_bw(pdesc))
506
433
 		rx_status->bw = RATE_INFO_BW_40;
507
-	if (GET_RX_DESC_RXHT(pdesc))
434
+	if (get_rx_desc_rxht(pdesc))
508
435
 		rx_status->encoding = RX_ENC_HT;
509
436
 	rx_status->flag |= RX_FLAG_MACTIME_START;
510
437
 	if (stats->decrypted)
511
438
 		rx_status->flag |= RX_FLAG_DECRYPTED;
512
439
 	rx_status->rate_idx = rtlwifi_rate_mapping(hw, stats->is_ht,
513
440
 						   false, stats->rate);
514
-	rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
441
+	rx_status->mactime = get_rx_desc_tsfl(pdesc);
515
442
 	if (phystatus) {
516
443
 		p_drvinfo = (struct rx_fwinfo_92d *)(skb->data +
517
444
 						     stats->rx_bufshift);
518
445
 		_rtl92de_translate_rx_signal_stuff(hw,
519
-						   skb, stats, pdesc,
446
+						   skb, stats,
447
+						   (struct rx_desc_92d *)pdesc,
520
448
 						   p_drvinfo);
521
449
 	}
522
450
 	/*rx_status->qual = stats->signal; */
..
..
@@ -525,21 +453,23 @@
525
453
 }
526
454
 
527
455
 static void _rtl92de_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,
528
-				      u8 *virtualaddress)
456
+				      u8 *virtualaddress8)
529
457
 {
458
+	__le32 *virtualaddress = (__le32 *)virtualaddress8;
459
+
530
460
 	memset(virtualaddress, 0, 8);
531
461
 
532
-	SET_EARLYMODE_PKTNUM(virtualaddress, ptcb_desc->empkt_num);
533
-	SET_EARLYMODE_LEN0(virtualaddress, ptcb_desc->empkt_len[0]);
534
-	SET_EARLYMODE_LEN1(virtualaddress, ptcb_desc->empkt_len[1]);
535
-	SET_EARLYMODE_LEN2_1(virtualaddress, ptcb_desc->empkt_len[2] & 0xF);
536
-	SET_EARLYMODE_LEN2_2(virtualaddress, ptcb_desc->empkt_len[2] >> 4);
537
-	SET_EARLYMODE_LEN3(virtualaddress, ptcb_desc->empkt_len[3]);
538
-	SET_EARLYMODE_LEN4(virtualaddress, ptcb_desc->empkt_len[4]);
462
+	set_earlymode_pktnum(virtualaddress, ptcb_desc->empkt_num);
463
+	set_earlymode_len0(virtualaddress, ptcb_desc->empkt_len[0]);
464
+	set_earlymode_len1(virtualaddress, ptcb_desc->empkt_len[1]);
465
+	set_earlymode_len2_1(virtualaddress, ptcb_desc->empkt_len[2] & 0xF);
466
+	set_earlymode_len2_2(virtualaddress, ptcb_desc->empkt_len[2] >> 4);
467
+	set_earlymode_len3(virtualaddress, ptcb_desc->empkt_len[3]);
468
+	set_earlymode_len4(virtualaddress, ptcb_desc->empkt_len[4]);
539
469
 }
540
470
 
541
471
 void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
542
-			  struct ieee80211_hdr *hdr, u8 *pdesc_tx,
472
+			  struct ieee80211_hdr *hdr, u8 *pdesc8,
543
473
 			  u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
544
474
 			  struct ieee80211_sta *sta,
545
475
 			  struct sk_buff *skb,
..
..
@@ -550,7 +480,7 @@
550
480
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
551
481
 	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
552
482
 	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
553
-	u8 *pdesc = pdesc_tx;
483
+	__le32 *pdesc = (__le32 *)pdesc8;
554
484
 	u16 seq_number;
555
485
 	__le16 fc = hdr->frame_control;
556
486
 	unsigned int buf_len = 0;
..
..
@@ -578,85 +508,86 @@
578
508
 		memset(skb->data, 0, EM_HDR_LEN);
579
509
 	}
580
510
 	buf_len = skb->len;
581
-	mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
582
-				 PCI_DMA_TODEVICE);
583
-	if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
584
-		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
585
-			 "DMA mapping error\n");
511
+	mapping = dma_map_single(&rtlpci->pdev->dev, skb->data, skb->len,
512
+				 DMA_TO_DEVICE);
513
+	if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
514
+		rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
515
+			"DMA mapping error\n");
586
516
 		return;
587
517
 	}
588
-	CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_92d));
518
+	clear_pci_tx_desc_content(pdesc, sizeof(struct tx_desc_92d));
589
519
 	if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
590
520
 		firstseg = true;
591
521
 		lastseg = true;
592
522
 	}
593
523
 	if (firstseg) {
594
524
 		if (rtlhal->earlymode_enable) {
595
-			SET_TX_DESC_PKT_OFFSET(pdesc, 1);
596
-			SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN +
525
+			set_tx_desc_pkt_offset(pdesc, 1);
526
+			set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN +
597
527
 					   EM_HDR_LEN);
598
528
 			if (ptcb_desc->empkt_num) {
599
-				RT_TRACE(rtlpriv, COMP_SEND, DBG_LOUD,
600
-					 "Insert 8 byte.pTcb->EMPktNum:%d\n",
601
-					 ptcb_desc->empkt_num);
529
+				rtl_dbg(rtlpriv, COMP_SEND, DBG_LOUD,
530
+					"Insert 8 byte.pTcb->EMPktNum:%d\n",
531
+					ptcb_desc->empkt_num);
602
532
 				_rtl92de_insert_emcontent(ptcb_desc,
603
533
 							  (u8 *)(skb->data));
604
534
 			}
605
535
 		} else {
606
-			SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
536
+			set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);
607
537
 		}
608
538
 		/* 5G have no CCK rate */
609
539
 		if (rtlhal->current_bandtype == BAND_ON_5G)
610
540
 			if (ptcb_desc->hw_rate < DESC_RATE6M)
611
541
 				ptcb_desc->hw_rate = DESC_RATE6M;
612
-		SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
542
+		set_tx_desc_tx_rate(pdesc, ptcb_desc->hw_rate);
613
543
 		if (ptcb_desc->use_shortgi || ptcb_desc->use_shortpreamble)
614
-			SET_TX_DESC_DATA_SHORTGI(pdesc, 1);
544
+			set_tx_desc_data_shortgi(pdesc, 1);
615
545
 
616
546
 		if (rtlhal->macphymode == DUALMAC_DUALPHY &&
617
547
 			ptcb_desc->hw_rate == DESC_RATEMCS7)
618
-			SET_TX_DESC_DATA_SHORTGI(pdesc, 1);
548
+			set_tx_desc_data_shortgi(pdesc, 1);
619
549
 
620
550
 		if (info->flags & IEEE80211_TX_CTL_AMPDU) {
621
-			SET_TX_DESC_AGG_ENABLE(pdesc, 1);
622
-			SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x14);
551
+			set_tx_desc_agg_enable(pdesc, 1);
552
+			set_tx_desc_max_agg_num(pdesc, 0x14);
623
553
 		}
624
-		SET_TX_DESC_SEQ(pdesc, seq_number);
625
-		SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable &&
626
-				       !ptcb_desc->cts_enable) ? 1 : 0));
627
-		SET_TX_DESC_HW_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable
554
+		set_tx_desc_seq(pdesc, seq_number);
555
+		set_tx_desc_rts_enable(pdesc,
556
+				       ((ptcb_desc->rts_enable &&
557
+					!ptcb_desc->cts_enable) ? 1 : 0));
558
+		set_tx_desc_hw_rts_enable(pdesc, ((ptcb_desc->rts_enable
628
559
 					  || ptcb_desc->cts_enable) ? 1 : 0));
629
-		SET_TX_DESC_CTS2SELF(pdesc, ((ptcb_desc->cts_enable) ? 1 : 0));
630
-		SET_TX_DESC_RTS_STBC(pdesc, ((ptcb_desc->rts_stbc) ? 1 : 0));
560
+		set_tx_desc_cts2self(pdesc, ((ptcb_desc->cts_enable) ? 1 : 0));
561
+		set_tx_desc_rts_stbc(pdesc, ((ptcb_desc->rts_stbc) ? 1 : 0));
631
562
 		/* 5G have no CCK rate */
632
563
 		if (rtlhal->current_bandtype == BAND_ON_5G)
633
564
 			if (ptcb_desc->rts_rate < DESC_RATE6M)
634
565
 				ptcb_desc->rts_rate = DESC_RATE6M;
635
-		SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
636
-		SET_TX_DESC_RTS_BW(pdesc, 0);
637
-		SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
638
-		SET_TX_DESC_RTS_SHORT(pdesc, ((ptcb_desc->rts_rate <=
566
+		set_tx_desc_rts_rate(pdesc, ptcb_desc->rts_rate);
567
+		set_tx_desc_rts_bw(pdesc, 0);
568
+		set_tx_desc_rts_sc(pdesc, ptcb_desc->rts_sc);
569
+		set_tx_desc_rts_short(pdesc, ((ptcb_desc->rts_rate <=
639
570
 			DESC_RATE54M) ?
640
571
 			(ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
641
572
 			(ptcb_desc->rts_use_shortgi ? 1 : 0)));
642
573
 		if (bw_40) {
643
574
 			if (ptcb_desc->packet_bw) {
644
-				SET_TX_DESC_DATA_BW(pdesc, 1);
645
-				SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
575
+				set_tx_desc_data_bw(pdesc, 1);
576
+				set_tx_desc_tx_sub_carrier(pdesc, 3);
646
577
 			} else {
647
-				SET_TX_DESC_DATA_BW(pdesc, 0);
648
-				SET_TX_DESC_TX_SUB_CARRIER(pdesc,
578
+				set_tx_desc_data_bw(pdesc, 0);
579
+				set_tx_desc_tx_sub_carrier(pdesc,
649
580
 							mac->cur_40_prime_sc);
650
581
 			}
651
582
 		} else {
652
-			SET_TX_DESC_DATA_BW(pdesc, 0);
653
-			SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
583
+			set_tx_desc_data_bw(pdesc, 0);
584
+			set_tx_desc_tx_sub_carrier(pdesc, 0);
654
585
 		}
655
-		SET_TX_DESC_LINIP(pdesc, 0);
656
-		SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb_len);
586
+		set_tx_desc_linip(pdesc, 0);
587
+		set_tx_desc_pkt_size(pdesc, (u16)skb_len);
657
588
 		if (sta) {
658
589
 			u8 ampdu_density = sta->ht_cap.ampdu_density;
659
-			SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
590
+			set_tx_desc_ampdu_density(pdesc, ampdu_density);
660
591
 		}
661
592
 		if (info->control.hw_key) {
662
593
 			struct ieee80211_key_conf *keyconf;
..
..
@@ -666,66 +597,66 @@
666
597
 			case WLAN_CIPHER_SUITE_WEP40:
667
598
 			case WLAN_CIPHER_SUITE_WEP104:
668
599
 			case WLAN_CIPHER_SUITE_TKIP:
669
-				SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
600
+				set_tx_desc_sec_type(pdesc, 0x1);
670
601
 				break;
671
602
 			case WLAN_CIPHER_SUITE_CCMP:
672
-				SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
603
+				set_tx_desc_sec_type(pdesc, 0x3);
673
604
 				break;
674
605
 			default:
675
-				SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
606
+				set_tx_desc_sec_type(pdesc, 0x0);
676
607
 				break;
677
608
 
678
609
 			}
679
610
 		}
680
-		SET_TX_DESC_PKT_ID(pdesc, 0);
681
-		SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
682
-		SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
683
-		SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
684
-		SET_TX_DESC_DISABLE_FB(pdesc, ptcb_desc->disable_ratefallback ?
611
+		set_tx_desc_pkt_id(pdesc, 0);
612
+		set_tx_desc_queue_sel(pdesc, fw_qsel);
613
+		set_tx_desc_data_rate_fb_limit(pdesc, 0x1F);
614
+		set_tx_desc_rts_rate_fb_limit(pdesc, 0xF);
615
+		set_tx_desc_disable_fb(pdesc, ptcb_desc->disable_ratefallback ?
685
616
 				       1 : 0);
686
-		SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
617
+		set_tx_desc_use_rate(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
687
618
 
688
619
 		/* Set TxRate and RTSRate in TxDesc  */
689
620
 		/* This prevent Tx initial rate of new-coming packets */
690
621
 		/* from being overwritten by retried  packet rate.*/
691
622
 		if (!ptcb_desc->use_driver_rate) {
692
-			SET_TX_DESC_RTS_RATE(pdesc, 0x08);
693
-			/* SET_TX_DESC_TX_RATE(pdesc, 0x0b); */
623
+			set_tx_desc_rts_rate(pdesc, 0x08);
624
+			/* set_tx_desc_tx_rate(pdesc, 0x0b); */
694
625
 		}
695
626
 		if (ieee80211_is_data_qos(fc)) {
696
627
 			if (mac->rdg_en) {
697
-				RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
698
-					 "Enable RDG function\n");
699
-				SET_TX_DESC_RDG_ENABLE(pdesc, 1);
700
-				SET_TX_DESC_HTC(pdesc, 1);
628
+				rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
629
+					"Enable RDG function\n");
630
+				set_tx_desc_rdg_enable(pdesc, 1);
631
+				set_tx_desc_htc(pdesc, 1);
701
632
 			}
702
633
 		}
703
634
 	}
704
635
 
705
-	SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
706
-	SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
707
-	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) buf_len);
708
-	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
636
+	set_tx_desc_first_seg(pdesc, (firstseg ? 1 : 0));
637
+	set_tx_desc_last_seg(pdesc, (lastseg ? 1 : 0));
638
+	set_tx_desc_tx_buffer_size(pdesc, (u16)buf_len);
639
+	set_tx_desc_tx_buffer_address(pdesc, mapping);
709
640
 	if (rtlpriv->dm.useramask) {
710
-		SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
711
-		SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
641
+		set_tx_desc_rate_id(pdesc, ptcb_desc->ratr_index);
642
+		set_tx_desc_macid(pdesc, ptcb_desc->mac_id);
712
643
 	} else {
713
-		SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
714
-		SET_TX_DESC_MACID(pdesc, ptcb_desc->ratr_index);
644
+		set_tx_desc_rate_id(pdesc, 0xC + ptcb_desc->ratr_index);
645
+		set_tx_desc_macid(pdesc, ptcb_desc->ratr_index);
715
646
 	}
716
647
 	if (ieee80211_is_data_qos(fc))
717
-		SET_TX_DESC_QOS(pdesc, 1);
648
+		set_tx_desc_qos(pdesc, 1);
718
649
 
719
650
 	if ((!ieee80211_is_data_qos(fc)) && ppsc->fwctrl_lps) {
720
-		SET_TX_DESC_HWSEQ_EN(pdesc, 1);
721
-		SET_TX_DESC_PKT_ID(pdesc, 8);
651
+		set_tx_desc_hwseq_en(pdesc, 1);
652
+		set_tx_desc_pkt_id(pdesc, 8);
722
653
 	}
723
-	SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
724
-	RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
654
+	set_tx_desc_more_frag(pdesc, (lastseg ? 0 : 1));
655
+	rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
725
656
 }
726
657
 
727
658
 void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
728
-			     u8 *pdesc, bool firstseg,
659
+			     u8 *pdesc8, bool firstseg,
729
660
 			     bool lastseg, struct sk_buff *skb)
730
661
 {
731
662
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
..
..
@@ -733,65 +664,68 @@
733
664
 	struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
734
665
 	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
735
666
 	u8 fw_queue = QSLT_BEACON;
736
-	dma_addr_t mapping = pci_map_single(rtlpci->pdev,
737
-		    skb->data, skb->len, PCI_DMA_TODEVICE);
667
+	dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
668
+					    skb->len, DMA_TO_DEVICE);
738
669
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
739
670
 	__le16 fc = hdr->frame_control;
671
+	__le32 *pdesc = (__le32 *)pdesc8;
740
672
 
741
-	if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
742
-		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
743
-			 "DMA mapping error\n");
673
+	if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
674
+		rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
675
+			"DMA mapping error\n");
744
676
 		return;
745
677
 	}
746
-	CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);
678
+	clear_pci_tx_desc_content(pdesc, TX_DESC_SIZE);
747
679
 	if (firstseg)
748
-		SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
680
+		set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);
749
681
 	/* 5G have no CCK rate
750
682
 	 * Caution: The macros below are multi-line expansions.
751
683
 	 * The braces are needed no matter what checkpatch says
752
684
 	 */
753
685
 	if (rtlhal->current_bandtype == BAND_ON_5G) {
754
-		SET_TX_DESC_TX_RATE(pdesc, DESC_RATE6M);
686
+		set_tx_desc_tx_rate(pdesc, DESC_RATE6M);
755
687
 	} else {
756
-		SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);
688
+		set_tx_desc_tx_rate(pdesc, DESC_RATE1M);
757
689
 	}
758
-	SET_TX_DESC_SEQ(pdesc, 0);
759
-	SET_TX_DESC_LINIP(pdesc, 0);
760
-	SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
761
-	SET_TX_DESC_FIRST_SEG(pdesc, 1);
762
-	SET_TX_DESC_LAST_SEG(pdesc, 1);
763
-	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)skb->len);
764
-	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
765
-	SET_TX_DESC_RATE_ID(pdesc, 7);
766
-	SET_TX_DESC_MACID(pdesc, 0);
767
-	SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len));
768
-	SET_TX_DESC_FIRST_SEG(pdesc, 1);
769
-	SET_TX_DESC_LAST_SEG(pdesc, 1);
770
-	SET_TX_DESC_OFFSET(pdesc, 0x20);
771
-	SET_TX_DESC_USE_RATE(pdesc, 1);
690
+	set_tx_desc_seq(pdesc, 0);
691
+	set_tx_desc_linip(pdesc, 0);
692
+	set_tx_desc_queue_sel(pdesc, fw_queue);
693
+	set_tx_desc_first_seg(pdesc, 1);
694
+	set_tx_desc_last_seg(pdesc, 1);
695
+	set_tx_desc_tx_buffer_size(pdesc, (u16)skb->len);
696
+	set_tx_desc_tx_buffer_address(pdesc, mapping);
697
+	set_tx_desc_rate_id(pdesc, 7);
698
+	set_tx_desc_macid(pdesc, 0);
699
+	set_tx_desc_pkt_size(pdesc, (u16)(skb->len));
700
+	set_tx_desc_first_seg(pdesc, 1);
701
+	set_tx_desc_last_seg(pdesc, 1);
702
+	set_tx_desc_offset(pdesc, 0x20);
703
+	set_tx_desc_use_rate(pdesc, 1);
772
704
 
773
705
 	if (!ieee80211_is_data_qos(fc) && ppsc->fwctrl_lps) {
774
-		SET_TX_DESC_HWSEQ_EN(pdesc, 1);
775
-		SET_TX_DESC_PKT_ID(pdesc, 8);
706
+		set_tx_desc_hwseq_en(pdesc, 1);
707
+		set_tx_desc_pkt_id(pdesc, 8);
776
708
 	}
777
709
 
778
710
 	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
779
711
 		      "H2C Tx Cmd Content", pdesc, TX_DESC_SIZE);
780
712
 	wmb();
781
-	SET_TX_DESC_OWN(pdesc, 1);
713
+	set_tx_desc_own(pdesc, 1);
782
714
 }
783
715
 
784
-void rtl92de_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
716
+void rtl92de_set_desc(struct ieee80211_hw *hw, u8 *pdesc8, bool istx,
785
717
 		      u8 desc_name, u8 *val)
786
718
 {
719
+	__le32  *pdesc = (__le32 *)pdesc8;
720
+
787
721
 	if (istx) {
788
722
 		switch (desc_name) {
789
723
 		case HW_DESC_OWN:
790
724
 			wmb();
791
-			SET_TX_DESC_OWN(pdesc, 1);
725
+			set_tx_desc_own(pdesc, 1);
792
726
 			break;
793
727
 		case HW_DESC_TX_NEXTDESC_ADDR:
794
-			SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
728
+			set_tx_desc_next_desc_address(pdesc, *(u32 *)val);
795
729
 			break;
796
730
 		default:
797
731
 			WARN_ONCE(true, "rtl8192de: ERR txdesc :%d not processed\n",
..
..
@@ -802,16 +736,16 @@
802
736
 		switch (desc_name) {
803
737
 		case HW_DESC_RXOWN:
804
738
 			wmb();
805
-			SET_RX_DESC_OWN(pdesc, 1);
739
+			set_rx_desc_own(pdesc, 1);
806
740
 			break;
807
741
 		case HW_DESC_RXBUFF_ADDR:
808
-			SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *) val);
742
+			set_rx_desc_buff_addr(pdesc, *(u32 *)val);
809
743
 			break;
810
744
 		case HW_DESC_RXPKT_LEN:
811
-			SET_RX_DESC_PKT_LEN(pdesc, *(u32 *) val);
745
+			set_rx_desc_pkt_len(pdesc, *(u32 *)val);
812
746
 			break;
813
747
 		case HW_DESC_RXERO:
814
-			SET_RX_DESC_EOR(pdesc, 1);
748
+			set_rx_desc_eor(pdesc, 1);
815
749
 			break;
816
750
 		default:
817
751
 			WARN_ONCE(true, "rtl8192de: ERR rxdesc :%d not processed\n",
..
..
@@ -822,17 +756,18 @@
822
756
 }
823
757
 
824
758
 u64 rtl92de_get_desc(struct ieee80211_hw *hw,
825
-		     u8 *p_desc, bool istx, u8 desc_name)
759
+		     u8 *p_desc8, bool istx, u8 desc_name)
826
760
 {
761
+	__le32 *p_desc = (__le32 *)p_desc8;
827
762
 	u32 ret = 0;
828
763
 
829
764
 	if (istx) {
830
765
 		switch (desc_name) {
831
766
 		case HW_DESC_OWN:
832
-			ret = GET_TX_DESC_OWN(p_desc);
767
+			ret = get_tx_desc_own(p_desc);
833
768
 			break;
834
769
 		case HW_DESC_TXBUFF_ADDR:
835
-			ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);
770
+			ret = get_tx_desc_tx_buffer_address(p_desc);
836
771
 			break;
837
772
 		default:
838
773
 			WARN_ONCE(true, "rtl8192de: ERR txdesc :%d not processed\n",
..
..
@@ -842,13 +777,13 @@
842
777
 	} else {
843
778
 		switch (desc_name) {
844
779
 		case HW_DESC_OWN:
845
-			ret = GET_RX_DESC_OWN(p_desc);
780
+			ret = get_rx_desc_own(p_desc);
846
781
 			break;
847
782
 		case HW_DESC_RXPKT_LEN:
848
-			ret = GET_RX_DESC_PKT_LEN(p_desc);
849
-			break;
783
+			ret = get_rx_desc_pkt_len(p_desc);
784
+		break;
850
785
 		case HW_DESC_RXBUFF_ADDR:
851
-			ret = GET_RX_DESC_BUFF_ADDR(p_desc);
786
+			ret = get_rx_desc_buff_addr(p_desc);
852
787
 			break;
853
788
 		default:
854
789
 			WARN_ONCE(true, "rtl8192de: ERR rxdesc :%d not processed\n",