rtlwifi: Remove special macros used to manipulate RX and TX descriptors
v2 cover rtlwifi: Remove special macros used to manipulate RX and TX descriptors
These patches continue the set of changes that remove the special macros to read or write the RX and TX descriptors. The bit manipulations in the __le32 words use GENMASK() and BIT() operations.
The final patch removes unused macros for C2H operations.
---
V2 - Add a missing inline direective in rtl8723be/trx.h
Larry Finger (9):
rtlwifi: rtl8723ae: Remove unused GET_XXX and SET_XXX macros
rtlwifi: rtl8723ae: Replace local bit manipulation macros
rtlwifi: rtl8723ae: Convert macros that set descriptor
rtlwifi: rtl8723ae: Convert inline routines to little-endian words
rtlwifi: rtl8723be: Remove unused SET_XXX and GET_XXX macros
rtlwifi: rtl8723be: Replace local bit manipulation macros
rtlwifi: rtl8723be: Convert macros that set descriptor
rtlwifi: rtl8723be: Convert inline routines to little-endian words
rtlwifi: rtl8188ee: rtl8192ce: rtl8192de: rtl8723ae: rtl8821ae: Remove
some unused bit manipulation macros
drivers/net/wireless/realtek/rtlwifi/base.h | 27 - .../wireless/realtek/rtlwifi/rtl8188ee/def.h | 29 - .../wireless/realtek/rtlwifi/rtl8192ce/def.h | 33 - .../wireless/realtek/rtlwifi/rtl8192de/def.h | 31 - .../wireless/realtek/rtlwifi/rtl8723ae/def.h | 31 - .../wireless/realtek/rtlwifi/rtl8723ae/trx.c | 212 ++--- .../wireless/realtek/rtlwifi/rtl8723ae/trx.h | 794 +++++++----------- .../wireless/realtek/rtlwifi/rtl8723be/trx.c | 236 +++--- .../wireless/realtek/rtlwifi/rtl8723be/trx.h | 718 ++++++++-------- .../wireless/realtek/rtlwifi/rtl8821ae/def.h | 31 - 10 files changed, 922 insertions(+), 1220 deletions(-)
Signature · 1 line
2.23.0
PATCH v2 1/9 rtlwifi: rtl8723ae: Remove unused GET_XXX and SET_XXX macros
As the first step in converting from macros that get/set information in the RX and TX descriptors, unused macros are being removed.
---
v2 - no changes
--- .../wireless/realtek/rtlwifi/rtl8723ae/trx.h | 336 +----------------- 1 file changed, 4 insertions(+), 332 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h +4 -332
@@ -28,31 +28,9 @@ SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val)#define SET_TX_DESC_LINIP (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val) -#define SET_TX_DESC_NO_ACM (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 29, 1, __val) -#define SET_TX_DESC_GF (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)#define SET_TX_DESC_OWN (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val) -#define GET_TX_DESC_PKT_SIZE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 0, 16) -#define GET_TX_DESC_OFFSET (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 16, 8) -#define GET_TX_DESC_BMC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 24, 1) -#define GET_TX_DESC_HTC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 25, 1) -#define GET_TX_DESC_LAST_SEG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 26, 1) -#define GET_TX_DESC_FIRST_SEG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 27, 1) -#define GET_TX_DESC_LINIP (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 28, 1) -#define GET_TX_DESC_NO_ACM (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 29, 1) -#define GET_TX_DESC_GF (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 30, 1)#define GET_TX_DESC_OWN (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 31, 1)
@@ -60,127 +38,26 @@ SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 5, __val)#define SET_TX_DESC_AGG_BREAK (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 5, 1, __val) -#define SET_TX_DESC_BK (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 6, 1, __val)#define SET_TX_DESC_RDG_ENABLE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 7, 1, __val)#define SET_TX_DESC_QUEUE_SEL (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val) -#define SET_TX_DESC_RDG_NAV_EXT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 13, 1, __val) -#define SET_TX_DESC_LSIG_TXOP_EN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 14, 1, __val) -#define SET_TX_DESC_PIFS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 15, 1, __val)#define SET_TX_DESC_RATE_ID (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 4, __val) -#define SET_TX_DESC_NAV_USE_HDR (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 20, 1, __val) -#define SET_TX_DESC_EN_DESC_ID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 21, 1, __val)#define SET_TX_DESC_SEC_TYPE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val) -#define SET_TX_DESC_PKT_OFFSET (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 8, __val) - -#define GET_TX_DESC_MACID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 0, 5) -#define GET_TX_DESC_AGG_ENABLE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 5, 1) -#define GET_TX_DESC_AGG_BREAK (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 6, 1) -#define GET_TX_DESC_RDG_ENABLE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 7, 1) -#define GET_TX_DESC_QUEUE_SEL (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 8, 5) -#define GET_TX_DESC_RDG_NAV_EXT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 13, 1) -#define GET_TX_DESC_LSIG_TXOP_EN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 14, 1) -#define GET_TX_DESC_PIFS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 15, 1) -#define GET_TX_DESC_RATE_ID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 16, 4) -#define GET_TX_DESC_NAV_USE_HDR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 20, 1) -#define GET_TX_DESC_EN_DESC_ID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 21, 1) -#define GET_TX_DESC_SEC_TYPE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 22, 2) -#define GET_TX_DESC_PKT_OFFSET (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 24, 8) - -#define SET_TX_DESC_RTS_RC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 6, __val) -#define SET_TX_DESC_DATA_RC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 6, 6, __val) -#define SET_TX_DESC_BAR_RTY_TH (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 14, 2, __val) +#define SET_TX_DESC_MORE_FRAG (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val) -#define SET_TX_DESC_RAW (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 18, 1, __val) -#define SET_TX_DESC_CCX (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 19, 1, __val)#define SET_TX_DESC_AMPDU_DENSITY (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val) -#define SET_TX_DESC_ANTSEL_A (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 24, 1, __val) -#define SET_TX_DESC_ANTSEL_B (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 25, 1, __val) -#define SET_TX_DESC_TX_ANT_CCK (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 26, 2, __val) -#define SET_TX_DESC_TX_ANTL (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 28, 2, __val) -#define SET_TX_DESC_TX_ANT_HT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 30, 2, __val) - -#define GET_TX_DESC_RTS_RC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 0, 6) -#define GET_TX_DESC_DATA_RC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 6, 6) -#define GET_TX_DESC_BAR_RTY_TH (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 14, 2) -#define GET_TX_DESC_MORE_FRAG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 17, 1) -#define GET_TX_DESC_RAW (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 18, 1) -#define GET_TX_DESC_CCX (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 19, 1) -#define GET_TX_DESC_AMPDU_DENSITY (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 20, 3) -#define GET_TX_DESC_ANTSEL_A (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 24, 1) -#define GET_TX_DESC_ANTSEL_B (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 25, 1) -#define GET_TX_DESC_TX_ANT_CCK (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 26, 2) -#define GET_TX_DESC_TX_ANTL (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 28, 2) -#define GET_TX_DESC_TX_ANT_HT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 30, 2) - -#define SET_TX_DESC_NEXT_HEAP_PAGE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 0, 8, __val) -#define SET_TX_DESC_TAIL_PAGE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 8, 8, __val) +#define SET_TX_DESC_SEQ (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 12, __val)#define SET_TX_DESC_PKT_ID (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 28, 4, __val) -#define GET_TX_DESC_NEXT_HEAP_PAGE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 0, 8) -#define GET_TX_DESC_TAIL_PAGE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 8, 8) -#define GET_TX_DESC_SEQ (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 16, 12) -#define GET_TX_DESC_PKT_ID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 28, 4) -/* For RTL8723 */ -#define SET_TX_DESC_TRIGGER_INT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 30, 1, __val)#define SET_TX_DESC_HWSEQ_EN_8723 (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 31, 1, __val)#define SET_TX_DESC_HWSEQ_SEL_8723 (__txdesc, __value) \
@@ -188,16 +65,8 @@#define SET_TX_DESC_RTS_RATE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 5, __val) -#define SET_TX_DESC_AP_DCFE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 5, 1, __val) -#define SET_TX_DESC_QOS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 6, 1, __val) -#define SET_TX_DESC_HWSEQ_EN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 7, 1, __val)#define SET_TX_DESC_USE_RATE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 1, __val) -#define SET_TX_DESC_DISABLE_RTS_FB (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 9, 1, __val)#define SET_TX_DESC_DISABLE_FB (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 10, 1, __val)#define SET_TX_DESC_CTS2SELF (__pdesc, __val) \
@@ -206,18 +75,8 @@ SET_BITS_TO_LE_4BYTE(__pdesc+16, 12, 1, __val)#define SET_TX_DESC_HW_RTS_ENABLE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 1, __val) -#define SET_TX_DESC_PORT_ID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 14, 1, __val) -#define SET_TX_DESC_WAIT_DCTS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 18, 1, __val) -#define SET_TX_DESC_CTS2AP_EN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 19, 1, __val)#define SET_TX_DESC_TX_SUB_CARRIER (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 20, 2, __val) -#define SET_TX_DESC_TX_STBC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 22, 2, __val) -#define SET_TX_DESC_DATA_SHORT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 24, 1, __val)#define SET_TX_DESC_DATA_BW (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 25, 1, __val)#define SET_TX_DESC_RTS_SHORT (__pdesc, __val) \
@@ -229,158 +88,29 @@#define SET_TX_DESC_RTS_STBC (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 30, 2, __val) -#define GET_TX_DESC_RTS_RATE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 0, 5) -#define GET_TX_DESC_AP_DCFE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 5, 1) -#define GET_TX_DESC_QOS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 6, 1) -#define GET_TX_DESC_HWSEQ_EN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 7, 1) -#define GET_TX_DESC_USE_RATE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 8, 1) -#define GET_TX_DESC_DISABLE_RTS_FB (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 9, 1) -#define GET_TX_DESC_DISABLE_FB (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 10, 1) -#define GET_TX_DESC_CTS2SELF (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 11, 1) -#define GET_TX_DESC_RTS_ENABLE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 12, 1) -#define GET_TX_DESC_HW_RTS_ENABLE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 13, 1) -#define GET_TX_DESC_PORT_ID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 14, 1) -#define GET_TX_DESC_WAIT_DCTS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 18, 1) -#define GET_TX_DESC_CTS2AP_EN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 19, 1) -#define GET_TX_DESC_TX_SUB_CARRIER (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 20, 2) -#define GET_TX_DESC_TX_STBC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 22, 2) -#define GET_TX_DESC_DATA_SHORT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 24, 1) -#define GET_TX_DESC_DATA_BW (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 25, 1) -#define GET_TX_DESC_RTS_SHORT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 26, 1) -#define GET_TX_DESC_RTS_BW (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 27, 1) -#define GET_TX_DESC_RTS_SC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 28, 2) -#define GET_TX_DESC_RTS_STBC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 30, 2) -#define SET_TX_DESC_TX_RATE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 6, __val)#define SET_TX_DESC_DATA_SHORTGI (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 6, 1, __val) -#define SET_TX_DESC_CCX_TAG (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 7, 1, __val)#define SET_TX_DESC_DATA_RATE_FB_LIMIT (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 8, 5, __val)#define SET_TX_DESC_RTS_RATE_FB_LIMIT (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val) -#define SET_TX_DESC_RETRY_LIMIT_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 17, 1, __val) -#define SET_TX_DESC_DATA_RETRY_LIMIT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 18, 6, __val) -#define SET_TX_DESC_USB_TXAGG_NUM (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 24, 8, __val) - -#define GET_TX_DESC_TX_RATE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 0, 6) -#define GET_TX_DESC_DATA_SHORTGI (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 6, 1) -#define GET_TX_DESC_CCX_TAG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 7, 1) -#define GET_TX_DESC_DATA_RATE_FB_LIMIT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 8, 5) -#define GET_TX_DESC_RTS_RATE_FB_LIMIT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 13, 4) -#define GET_TX_DESC_RETRY_LIMIT_ENABLE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 17, 1) -#define GET_TX_DESC_DATA_RETRY_LIMIT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 18, 6) -#define GET_TX_DESC_USB_TXAGG_NUM (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 24, 8) - -#define SET_TX_DESC_TXAGC_A (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 5, __val) -#define SET_TX_DESC_TXAGC_B (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 5, 5, __val) -#define SET_TX_DESC_USE_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 10, 1, __val) +#define SET_TX_DESC_MAX_AGG_NUM (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+24, 11, 5, __val) -#define SET_TX_DESC_MCSG1_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 16, 4, __val) -#define SET_TX_DESC_MCSG2_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 20, 4, __val) -#define SET_TX_DESC_MCSG3_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 24, 4, __val) -#define SET_TX_DESC_MCS7_SGI_MAX_LEN (__pdesc, __val)\ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 28, 4, __val) - -#define GET_TX_DESC_TXAGC_A (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 0, 5) -#define GET_TX_DESC_TXAGC_B (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 5, 5) -#define GET_TX_DESC_USE_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 10, 1) -#define GET_TX_DESC_MAX_AGG_NUM (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 11, 5) -#define GET_TX_DESC_MCSG1_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 16, 4) -#define GET_TX_DESC_MCSG2_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 20, 4) -#define GET_TX_DESC_MCSG3_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 24, 4) -#define GET_TX_DESC_MCS7_SGI_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 28, 4)#define SET_TX_DESC_TX_BUFFER_SIZE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val) -#define SET_TX_DESC_MCSG4_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 16, 4, __val) -#define SET_TX_DESC_MCSG5_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 20, 4, __val) -#define SET_TX_DESC_MCSG6_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 24, 4, __val) -#define SET_TX_DESC_MCS15_SGI_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 28, 4, __val) - -#define GET_TX_DESC_TX_BUFFER_SIZE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 0, 16) -#define GET_TX_DESC_MCSG4_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 16, 4) -#define GET_TX_DESC_MCSG5_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 20, 4) -#define GET_TX_DESC_MCSG6_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 24, 4) -#define GET_TX_DESC_MCS15_SGI_MAX_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 28, 4)#define SET_TX_DESC_TX_BUFFER_ADDRESS (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+32, 0, 32, __val) -#define SET_TX_DESC_TX_BUFFER_ADDRESS64 (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+36, 0, 32, __val)#define GET_TX_DESC_TX_BUFFER_ADDRESS (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+32, 0, 32) -#define GET_TX_DESC_TX_BUFFER_ADDRESS64 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+36, 0, 32)#define SET_TX_DESC_NEXT_DESC_ADDRESS (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val) -#define SET_TX_DESC_NEXT_DESC_ADDRESS64 (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+44, 0, 32, __val) - -#define GET_TX_DESC_NEXT_DESC_ADDRESS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+40, 0, 32) -#define GET_TX_DESC_NEXT_DESC_ADDRESS64 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+44, 0, 32)#define GET_RX_DESC_PKT_LEN (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 0, 14)
@@ -390,22 +120,12 @@ LE_BITS_TO_4BYTE(__pdesc, 15, 1)#define GET_RX_DESC_DRV_INFO_SIZE (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 16, 4) -#define GET_RX_DESC_SECURITY (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 20, 3) -#define GET_RX_DESC_QOS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 23, 1)#define GET_RX_DESC_SHIFT (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 24, 2)#define GET_RX_DESC_PHYST (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 26, 1)#define GET_RX_DESC_SWDEC (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 27, 1) -#define GET_RX_DESC_LS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 28, 1) -#define GET_RX_DESC_FS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 29, 1) -#define GET_RX_DESC_EOR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 30, 1)#define GET_RX_DESC_OWN (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 31, 1)
@@ -416,44 +136,10 @@#define SET_RX_DESC_OWN (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val) -#define GET_RX_DESC_MACID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 0, 5) -#define GET_RX_DESC_TID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 5, 4) -#define GET_RX_DESC_HWRSVD (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 9, 5)#define GET_RX_DESC_PAGGR (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)#define GET_RX_DESC_FAGGR (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+4, 15, 1) -#define GET_RX_DESC_A1_FIT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 16, 4) -#define GET_RX_DESC_A2_FIT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 20, 4) -#define GET_RX_DESC_PAM (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 24, 1) -#define GET_RX_DESC_PWR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 25, 1) -#define GET_RX_DESC_MD (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 26, 1) -#define GET_RX_DESC_MF (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 27, 1) -#define GET_RX_DESC_TYPE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 28, 2) -#define GET_RX_DESC_MC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 30, 1) -#define GET_RX_DESC_BC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 31, 1) -#define GET_RX_DESC_SEQ (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 0, 12) -#define GET_RX_DESC_FRAG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 12, 4) -#define GET_RX_DESC_NEXT_PKT_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 16, 14) -#define GET_RX_DESC_NEXT_IND (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 30, 1) -#define GET_RX_DESC_RSVD (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 31, 1)#define GET_RX_DESC_RXMCS (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+12, 0, 6)
@@ -463,29 +149,15 @@ LE_BITS_TO_4BYTE(__pdesc+12, 8, 1)#define GET_RX_DESC_BW (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+12, 9, 1) -#define GET_RX_DESC_HTC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 10, 1) -#define GET_RX_DESC_HWPC_ERR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 14, 1) -#define GET_RX_DESC_HWPC_IND (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 15, 1) -#define GET_RX_DESC_IV0 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 16, 16) - -#define GET_RX_DESC_IV1 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 0, 32) +#define GET_RX_DESC_TSFL (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+20, 0, 32)#define GET_RX_DESC_BUFF_ADDR (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+24, 0, 32) -#define GET_RX_DESC_BUFF_ADDR64 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 0, 32)#define SET_RX_DESC_BUFF_ADDR (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val) -#define SET_RX_DESC_BUFF_ADDR64 (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 32, __val)#define CLEAR_PCI_TX_DESC_CONTENT (__pdesc, _size) \ do { \
Signature · 1 line
2.23.0
Re: [PATCH v2 1/9] rtlwifi: rtl8723ae: Remove unused GET_XXX and SET_XXX macros
Quoted 4 lines · Larry Finger
As the first step in converting from macros that get/set information in the RX and TX descriptors, unused macros are being removed.
Signed-off-by Larry Finger <[email protected]>
9 patches applied to wireless-drivers-next.git, thanks.
eb4b2d33c167 rtlwifi: rtl8723ae: Remove unused GET_XXX and SET_XXX macros05e2a0cb8ce3 rtlwifi: rtl8723ae: Replace local bit manipulation macrosa9db071f7816 rtlwifi: rtl8723ae: Convert macros that set descriptor773755d9112b rtlwifi: rtl8723ae: Convert inline routines to little-endian words64578a3d3426 rtlwifi: rtl8723be: Remove unused SET_XXX and GET_XXX macros360226fdc53d rtlwifi: rtl8723be: Replace local bit manipulation macrosd7b259fe6971 rtlwifi: rtl8723be: Convert macros that set descriptorfca13fd03da7 rtlwifi: rtl8723be: Convert inline routines to little-endian wordse6e5ec3042fe rtlwifi: rtl8188ee: rtl8192ce: rtl8192de: rtl8723ae: rtl8821ae: Remove some unused bit manipulation macros
Signature · 3 lines
https://patchwork.kernel.org/patch/11137143/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH v2 2/9 rtlwifi: rtl8723ae: Replace local bit manipulation macros
In reply to Larry FingerThis driver uses a set of local macros to manipulate the RX and TX descriptors, which are all little-endian quantities. These macros are replaced by the bitfield macros le32p_replace_bits() and le32_get_bits(). In several places, the macros operated on an entire 32-bit word. In these cases, a direct read or replacement is used.
---
v2 - no changes
--- .../wireless/realtek/rtlwifi/rtl8723ae/trx.h | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h +62 -62
@@ -15,149 +15,149 @@#define CRCLENGTH 4#define SET_TX_DESC_PKT_SIZE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 0, 16, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, GENMASK(15, 0))#define SET_TX_DESC_OFFSET (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 16, 8, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, GENMASK(23, 16))#define SET_TX_DESC_BMC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 24, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(24))#define SET_TX_DESC_HTC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 25, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(25))#define SET_TX_DESC_LAST_SEG (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 26, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(26))#define SET_TX_DESC_FIRST_SEG (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(27))#define SET_TX_DESC_LINIP (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(28))#define SET_TX_DESC_OWN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(31))#define GET_TX_DESC_OWN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 31, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(31))#define SET_TX_DESC_MACID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(4, 0))#define SET_TX_DESC_AGG_BREAK (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 5, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, BIT(5))#define SET_TX_DESC_RDG_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 7, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, BIT(7))#define SET_TX_DESC_QUEUE_SEL (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(12, 8))#define SET_TX_DESC_RATE_ID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 4, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(19, 16))#define SET_TX_DESC_SEC_TYPE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(23, 22))#define SET_TX_DESC_MORE_FRAG (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 8), __val, BIT(17))#define SET_TX_DESC_AMPDU_DENSITY (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val) + le32p_replace_bits((__le32 *)(__pdesc + 8), __val, GENMASK(22, 20))#define SET_TX_DESC_SEQ (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 12, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, GENMASK(27, 16))#define SET_TX_DESC_PKT_ID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 28, 4, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, GENMASK(31, 28))/* For RTL8723 */ #define SET_TX_DESC_HWSEQ_EN_8723 (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 31, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, BIT(31))#define SET_TX_DESC_HWSEQ_SEL_8723 (__txdesc, __value) \ - SET_BITS_TO_LE_4BYTE(__txdesc+16, 6, 2, __value) + le32p_replace_bits((__le32 *)(__txdesc + 16), __value, GENMASK(7, 6))#define SET_TX_DESC_RTS_RATE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(4, 0))#define SET_TX_DESC_USE_RATE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(8))#define SET_TX_DESC_DISABLE_FB (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 10, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(10))#define SET_TX_DESC_CTS2SELF (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 11, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(11))#define SET_TX_DESC_RTS_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 12, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(12))#define SET_TX_DESC_HW_RTS_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(13))#define SET_TX_DESC_TX_SUB_CARRIER (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 20, 2, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(21, 20))#define SET_TX_DESC_DATA_BW (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 25, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(25))#define SET_TX_DESC_RTS_SHORT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 26, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(26))#define SET_TX_DESC_RTS_BW (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 27, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, BIT(27))#define SET_TX_DESC_RTS_SC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 28, 2, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(29, 28))#define SET_TX_DESC_RTS_STBC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 30, 2, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(31, 30))#define SET_TX_DESC_TX_RATE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 6, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, GENMASK(5, 0))#define SET_TX_DESC_DATA_SHORTGI (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 6, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, BIT(6))#define SET_TX_DESC_DATA_RATE_FB_LIMIT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 8, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, GENMASK(12, 8))#define SET_TX_DESC_RTS_RATE_FB_LIMIT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, GENMASK(16, 13))#define SET_TX_DESC_MAX_AGG_NUM (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 11, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 24), __val, GENMASK(15, 11))#define SET_TX_DESC_TX_BUFFER_SIZE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val) + le32p_replace_bits((__le32 *)(__pdesc + 28), __val, GENMASK(15, 0))#define SET_TX_DESC_TX_BUFFER_ADDRESS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+32, 0, 32, __val) + *(__le32 *)(__pdesc + 32) = cpu_to_le32(__val)#define GET_TX_DESC_TX_BUFFER_ADDRESS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+32, 0, 32) + le32_to_cpu(*(__le32 *)(__pdesc + 32))#define SET_TX_DESC_NEXT_DESC_ADDRESS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val) + *(__le32 *)(__pdesc + 40) = cpu_to_le32(__val)#define GET_RX_DESC_PKT_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 0, 14) + le32_get_bits(*(__le32 *)__pdesc, GENMASK(13, 0))#define GET_RX_DESC_CRC32 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 14, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(14))#define GET_RX_DESC_ICV (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 15, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(15))#define GET_RX_DESC_DRV_INFO_SIZE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 16, 4) + le32_get_bits(*(__le32 *)__pdesc, GENMASK(19, 16))#define GET_RX_DESC_SHIFT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 24, 2) + le32_get_bits(*(__le32 *)__pdesc, GENMASK(25, 24))#define GET_RX_DESC_PHYST (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 26, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(26))#define GET_RX_DESC_SWDEC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 27, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(27))#define GET_RX_DESC_OWN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 31, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(31))#define SET_RX_DESC_PKT_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 0, 14, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, GENMASK(13, 0))#define SET_RX_DESC_EOR (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(30))#define SET_RX_DESC_OWN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(31))#define GET_RX_DESC_PAGGR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 14, 1) + le32_get_bits(*(__le32 *)(__pdesc + 4), BIT(14))#define GET_RX_DESC_FAGGR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 15, 1) + le32_get_bits(*(__le32 *)(__pdesc + 4), BIT(15))#define GET_RX_DESC_RXMCS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 0, 6) + le32_get_bits(*(__le32 *)(__pdesc + 12), GENMASK(5, 0))#define GET_RX_DESC_RXHT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 6, 1) + le32_get_bits(*(__le32 *)(__pdesc + 12), BIT(6))#define GET_RX_DESC_SPLCP (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 8, 1) + le32_get_bits(*(__le32 *)(__pdesc + 12), BIT(8))#define GET_RX_DESC_BW (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 9, 1) + le32_get_bits(*(__le32 *)(__pdesc + 12), BIT(9))#define GET_RX_DESC_TSFL (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 0, 32) + le32_to_cpu(*(__le32 *)(__pdesc + 20))#define GET_RX_DESC_BUFF_ADDR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 0, 32) + le32_to_cpu(*(__le32 *)(__pdesc + 24))#define SET_RX_DESC_BUFF_ADDR (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val) + *(__le32 *)(__pdesc + 24) = cpu_to_le32(__val)#define CLEAR_PCI_TX_DESC_CONTENT (__pdesc, _size) \ do { \
Signature · 1 line
2.23.0
PATCH v2 3/9 rtlwifi: rtl8723ae: Convert macros that set descriptor
In reply to Larry FingerAs a first step in the conversion, the macros that set the RX and TX descriptors are converted to static inline routines, and the names are changed from upper to lower case. To minimize the changes in a given step, the input descriptor information is left as as a byte array (u8 *), even though it should be a little-endian word array (__le32 *). That will be changed in the next patch.
Several places where checkpatch.pl reports lines too long are fixed.
---
v2 - no changes
--- .../wireless/realtek/rtlwifi/rtl8723ae/trx.c | 190 +++---- .../wireless/realtek/rtlwifi/rtl8723ae/trx.h | 466 ++++++++++++------ 2 files changed, 411 insertions(+), 245 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c +95 -95
@@ -264,24 +264,24 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw, {struct rx_fwinfo_8723e *p_drvinfo;struct ieee80211_hdr *hdr; -u32 phystatus =GET_RX_DESC_PHYST (pdesc); +u32 phystatus =get_rx_desc_physt (pdesc); - status->length = (u16 )GET_RX_DESC_PKT_LEN (pdesc); - status->rx_drvinfo_size = (u8 )GET_RX_DESC_DRV_INFO_SIZE (pdesc) * + status->length = (u16 )get_rx_desc_pkt_len (pdesc); + status->rx_drvinfo_size = (u8 )get_rx_desc_drv_info_size (pdesc) *RX_DRV_INFO_SIZE_UNIT ; - status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT (pdesc) &0x03 ); - status->icv = (u16 )GET_RX_DESC_ICV (pdesc); - status->crc = (u16 )GET_RX_DESC_CRC32 (pdesc); + status->rx_bufshift = (u8)(get_rx_desc_shift (pdesc) &0x03 ); + status->icv = (u16 )get_rx_desc_icv (pdesc); + status->crc = (u16 )get_rx_desc_crc32 (pdesc); status->hwerror = (status->crc | status->icv); - status->decrypted = !GET_RX_DESC_SWDEC (pdesc); - status->rate = (u8 )GET_RX_DESC_RXMCS (pdesc); - status->shortpreamble = (u16 )GET_RX_DESC_SPLCP (pdesc); - status->isampdu = (bool )(GET_RX_DESC_PAGGR (pdesc) ==1 ); - status->isfirst_ampdu = (bool )((GET_RX_DESC_PAGGR (pdesc) ==1 ) && - (GET_RX_DESC_FAGGR (pdesc) ==1 )); - status->timestamp_low =GET_RX_DESC_TSFL (pdesc); - status->rx_is40mhzpacket = (bool )GET_RX_DESC_BW (pdesc); - status->is_ht = (bool )GET_RX_DESC_RXHT (pdesc); + status->decrypted = !get_rx_desc_swdec (pdesc); + status->rate = (u8 )get_rx_desc_rxmcs (pdesc); + status->shortpreamble = (u16 )get_rx_desc_splcp (pdesc); + status->isampdu = (bool )(get_rx_desc_paggr (pdesc) ==1 ); + status->isfirst_ampdu = (bool )((get_rx_desc_paggr (pdesc) ==1 ) && + (get_rx_desc_faggr (pdesc) ==1 )); + status->timestamp_low =get_rx_desc_tsfl (pdesc); + status->rx_is40mhzpacket = (bool )get_rx_desc_bw (pdesc); + status->is_ht = (bool )get_rx_desc_rxht (pdesc); status->is_cck =RX_HAL_IS_CCK_RATE (status->rate);
@@ -391,58 +391,58 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw, }if (firstseg) { -SET_TX_DESC_OFFSET (pdesc,USB_HWDESC_HEADER_LEN ); +set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN ); -SET_TX_DESC_TX_RATE (pdesc, ptcb_desc->hw_rate); +set_tx_desc_tx_rate (pdesc, ptcb_desc->hw_rate);if (ptcb_desc->use_shortgi || ptcb_desc->use_shortpreamble) -SET_TX_DESC_DATA_SHORTGI (pdesc,1 ); +set_tx_desc_data_shortgi (pdesc,1 );if (info->flags &IEEE80211_TX_CTL_AMPDU ) { -SET_TX_DESC_AGG_BREAK (pdesc,1 ); -SET_TX_DESC_MAX_AGG_NUM (pdesc,0x14 ); +set_tx_desc_agg_break (pdesc,1 ); +set_tx_desc_max_agg_num (pdesc,0x14 ); } -SET_TX_DESC_SEQ (pdesc, seq_number); +set_tx_desc_seq (pdesc, seq_number); -SET_TX_DESC_RTS_ENABLE (pdesc, +set_tx_desc_rts_enable (pdesc, ((ptcb_desc->rts_enable && !ptcb_desc->cts_enable) ?1 :0 )); -SET_TX_DESC_HW_RTS_ENABLE (pdesc, +set_tx_desc_hw_rts_enable (pdesc, ((ptcb_desc->rts_enable || ptcb_desc->cts_enable) ?1 :0 )); -SET_TX_DESC_CTS2SELF (pdesc, +set_tx_desc_cts2self (pdesc, ((ptcb_desc->cts_enable) ?1 :0 )); -SET_TX_DESC_RTS_STBC (pdesc, +set_tx_desc_rts_stbc (pdesc, ((ptcb_desc->rts_stbc) ?1 :0 )); -SET_TX_DESC_RTS_RATE (pdesc, ptcb_desc->rts_rate); -SET_TX_DESC_RTS_BW (pdesc,0 ); -SET_TX_DESC_RTS_SC (pdesc, ptcb_desc->rts_sc); -SET_TX_DESC_RTS_SHORT (pdesc, +set_tx_desc_rts_rate (pdesc, ptcb_desc->rts_rate); +set_tx_desc_rts_bw (pdesc,0 ); +set_tx_desc_rts_sc (pdesc, ptcb_desc->rts_sc); +set_tx_desc_rts_short (pdesc, ((ptcb_desc->rts_rate <=DESC92C_RATE54M ) ? (ptcb_desc->rts_use_shortpreamble ?1 :0 ) : (ptcb_desc->rts_use_shortgi ?1 :0 )));if (bw_40) {if (ptcb_desc->packet_bw ==HT_CHANNEL_WIDTH_20_40 ) { -SET_TX_DESC_DATA_BW (pdesc,1 ); -SET_TX_DESC_TX_SUB_CARRIER (pdesc,3 ); +set_tx_desc_data_bw (pdesc,1 ); +set_tx_desc_tx_sub_carrier (pdesc,3 ); }else { -SET_TX_DESC_DATA_BW (pdesc,0 ); -SET_TX_DESC_TX_SUB_CARRIER (pdesc, +set_tx_desc_data_bw (pdesc,0 ); +set_tx_desc_tx_sub_carrier (pdesc, mac->cur_40_prime_sc); } }else { -SET_TX_DESC_DATA_BW (pdesc,0 ); -SET_TX_DESC_TX_SUB_CARRIER (pdesc,0 ); +set_tx_desc_data_bw (pdesc,0 ); +set_tx_desc_tx_sub_carrier (pdesc,0 ); } -SET_TX_DESC_LINIP (pdesc,0 ); -SET_TX_DESC_PKT_SIZE (pdesc, (u16 ) skb->len); +set_tx_desc_linip (pdesc,0 ); +set_tx_desc_pkt_size (pdesc, (u16 )skb->len);if (sta) {u8 ampdu_density = sta->ht_cap.ampdu_density; -SET_TX_DESC_AMPDU_DENSITY (pdesc, ampdu_density); +set_tx_desc_ampdu_density (pdesc, ampdu_density); }if (info->control.hw_key) {
@@ -453,66 +453,66 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,case WLAN_CIPHER_SUITE_WEP40 :case WLAN_CIPHER_SUITE_WEP104 :case WLAN_CIPHER_SUITE_TKIP : -SET_TX_DESC_SEC_TYPE (pdesc,0x1 ); +set_tx_desc_sec_type (pdesc,0x1 );break ;case WLAN_CIPHER_SUITE_CCMP : -SET_TX_DESC_SEC_TYPE (pdesc,0x3 ); +set_tx_desc_sec_type (pdesc,0x3 );break ;default : -SET_TX_DESC_SEC_TYPE (pdesc,0x0 ); +set_tx_desc_sec_type (pdesc,0x0 );break ; } } -SET_TX_DESC_PKT_ID (pdesc,0 ); -SET_TX_DESC_QUEUE_SEL (pdesc, fw_qsel); +set_tx_desc_pkt_id (pdesc,0 ); +set_tx_desc_queue_sel (pdesc, fw_qsel); -SET_TX_DESC_DATA_RATE_FB_LIMIT (pdesc,0x1F ); -SET_TX_DESC_RTS_RATE_FB_LIMIT (pdesc,0xF ); -SET_TX_DESC_DISABLE_FB (pdesc,0 ); -SET_TX_DESC_USE_RATE (pdesc, ptcb_desc->use_driver_rate ?1 :0 ); +set_tx_desc_data_rate_fb_limit (pdesc,0x1F ); +set_tx_desc_rts_rate_fb_limit (pdesc,0xF ); +set_tx_desc_disable_fb (pdesc,0 ); +set_tx_desc_use_rate (pdesc, ptcb_desc->use_driver_rate ?1 :0 );if (ieee80211_is_data_qos (fc)) {if (mac->rdg_en) {RT_TRACE (rtlpriv,COMP_SEND ,DBG_TRACE ,"Enable RDG function.\n" ); -SET_TX_DESC_RDG_ENABLE (pdesc,1 ); -SET_TX_DESC_HTC (pdesc,1 ); +set_tx_desc_rdg_enable (pdesc,1 ); +set_tx_desc_htc (pdesc,1 ); } } } -SET_TX_DESC_FIRST_SEG (pdesc, (firstseg ?1 :0 )); -SET_TX_DESC_LAST_SEG (pdesc, (lastseg ?1 :0 )); +set_tx_desc_first_seg (pdesc, (firstseg ?1 :0 )); +set_tx_desc_last_seg (pdesc, (lastseg ?1 :0 )); -SET_TX_DESC_TX_BUFFER_SIZE (pdesc, (u16 ) skb->len); +set_tx_desc_tx_buffer_size (pdesc, (u16 )skb->len); -SET_TX_DESC_TX_BUFFER_ADDRESS (pdesc, mapping); +set_tx_desc_tx_buffer_address (pdesc, mapping);if (rtlpriv->dm.useramask) { -SET_TX_DESC_RATE_ID (pdesc, ptcb_desc->ratr_index); -SET_TX_DESC_MACID (pdesc, ptcb_desc->mac_id); +set_tx_desc_rate_id (pdesc, ptcb_desc->ratr_index); +set_tx_desc_macid (pdesc, ptcb_desc->mac_id); }else { -SET_TX_DESC_RATE_ID (pdesc,0xC + ptcb_desc->ratr_index); -SET_TX_DESC_MACID (pdesc, ptcb_desc->ratr_index); +set_tx_desc_rate_id (pdesc,0xC + ptcb_desc->ratr_index); +set_tx_desc_macid (pdesc, ptcb_desc->ratr_index); }if ((!ieee80211_is_data_qos (fc)) && ppsc->fwctrl_lps) { -SET_TX_DESC_HWSEQ_EN_8723 (pdesc,1 ); -/* SET_TX_DESC_HWSEQ_EN(pdesc, 1); */ -/* SET_TX_DESC_PKT_ID(pdesc, 8); */ +set_tx_desc_hwseq_en_8723 (pdesc,1 ); +/* set_tx_desc_hwseq_en(pdesc, 1); */ +/* set_tx_desc_pkt_id(pdesc, 8); */ if (!b_defaultadapter) -SET_TX_DESC_HWSEQ_SEL_8723 (pdesc,1 ); -/* SET_TX_DESC_QOS(pdesc, 1); */ +set_tx_desc_hwseq_sel_8723 (pdesc,1 ); +/* set_tx_desc_qos(pdesc, 1); */ } -SET_TX_DESC_MORE_FRAG (pdesc, (lastseg ?0 :1 )); +set_tx_desc_more_frag (pdesc, (lastseg ?0 :1 ));if (is_multicast_ether_addr (ieee80211_get_DA (hdr)) ||is_broadcast_ether_addr (ieee80211_get_DA (hdr))) { -SET_TX_DESC_BMC (pdesc,1 ); +set_tx_desc_bmc (pdesc,1 ); }RT_TRACE (rtlpriv,COMP_SEND ,DBG_TRACE ,"\n" );
@@ -541,41 +541,41 @@ void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,CLEAR_PCI_TX_DESC_CONTENT (pdesc,TX_DESC_SIZE );if (firstseg) -SET_TX_DESC_OFFSET (pdesc,USB_HWDESC_HEADER_LEN ); +set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN ); -SET_TX_DESC_TX_RATE (pdesc,DESC92C_RATE1M ); +set_tx_desc_tx_rate (pdesc,DESC92C_RATE1M ); -SET_TX_DESC_SEQ (pdesc,0 ); +set_tx_desc_seq (pdesc,0 ); -SET_TX_DESC_LINIP (pdesc,0 ); +set_tx_desc_linip (pdesc,0 ); -SET_TX_DESC_QUEUE_SEL (pdesc, fw_queue); +set_tx_desc_queue_sel (pdesc, fw_queue); -SET_TX_DESC_FIRST_SEG (pdesc,1 ); -SET_TX_DESC_LAST_SEG (pdesc,1 ); +set_tx_desc_first_seg (pdesc,1 ); +set_tx_desc_last_seg (pdesc,1 ); -SET_TX_DESC_TX_BUFFER_SIZE (pdesc, (u16) (skb->len)); +set_tx_desc_tx_buffer_size (pdesc, (u16)(skb->len)); -SET_TX_DESC_TX_BUFFER_ADDRESS (pdesc, mapping); +set_tx_desc_tx_buffer_address (pdesc, mapping); -SET_TX_DESC_RATE_ID (pdesc,7 ); -SET_TX_DESC_MACID (pdesc,0 ); +set_tx_desc_rate_id (pdesc,7 ); +set_tx_desc_macid (pdesc,0 ); -SET_TX_DESC_OWN (pdesc,1 ); +set_tx_desc_own (pdesc,1 ); -SET_TX_DESC_PKT_SIZE ((u8 *)pdesc, (u16)(skb->len)); +set_tx_desc_pkt_size ((u8 *)pdesc, (u16)(skb->len)); -SET_TX_DESC_FIRST_SEG (pdesc,1 ); -SET_TX_DESC_LAST_SEG (pdesc,1 ); +set_tx_desc_first_seg (pdesc,1 ); +set_tx_desc_last_seg (pdesc,1 ); -SET_TX_DESC_OFFSET (pdesc,0x20 ); +set_tx_desc_offset (pdesc,0x20 ); -SET_TX_DESC_USE_RATE (pdesc,1 ); +set_tx_desc_use_rate (pdesc,1 );if (!ieee80211_is_data_qos (fc)) { -SET_TX_DESC_HWSEQ_EN_8723 (pdesc,1 ); -/* SET_TX_DESC_HWSEQ_EN(pdesc, 1); */ -/* SET_TX_DESC_PKT_ID(pdesc, 8); */ +set_tx_desc_hwseq_en_8723 (pdesc,1 ); +/* set_tx_desc_hwseq_en(pdesc, 1); */ +/* set_tx_desc_pkt_id(pdesc, 8); */ } RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
@@ -589,10 +589,10 @@ void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc,if (istx == true) {switch (desc_name) {case HW_DESC_OWN : -SET_TX_DESC_OWN (pdesc,1 ); +set_tx_desc_own (pdesc,1 );break ;case HW_DESC_TX_NEXTDESC_ADDR : -SET_TX_DESC_NEXT_DESC_ADDRESS (pdesc, *(u32 *) val); +set_tx_desc_next_desc_address (pdesc, *(u32 *)val);break ;default : WARN_ONCE(true, "rtl8723ae: ERR txdesc :%d not processed\n",
@@ -602,16 +602,16 @@ void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc, }else {switch (desc_name) {case HW_DESC_RXOWN : -SET_RX_DESC_OWN (pdesc,1 ); +set_rx_desc_own (pdesc,1 );break ;case HW_DESC_RXBUFF_ADDR : -SET_RX_DESC_BUFF_ADDR (pdesc, *(u32 *) val); +set_rx_desc_buff_addr (pdesc, *(u32 *)val);break ;case HW_DESC_RXPKT_LEN : -SET_RX_DESC_PKT_LEN (pdesc, *(u32 *) val); +set_rx_desc_pkt_len (pdesc, *(u32 *)val);break ;case HW_DESC_RXERO : -SET_RX_DESC_EOR (pdesc,1 ); +set_rx_desc_eor (pdesc,1 );break ;default : WARN_ONCE(true, "rtl8723ae: ERR rxdesc :%d not processed\n",
@@ -629,10 +629,10 @@ u64 rtl8723e_get_desc(struct ieee80211_hw *hw,if (istx == true) {switch (desc_name) {case HW_DESC_OWN : - ret =GET_TX_DESC_OWN (pdesc); + ret =get_tx_desc_own (pdesc);break ;case HW_DESC_TXBUFF_ADDR : - ret =GET_TX_DESC_TX_BUFFER_ADDRESS (pdesc); + ret =get_tx_desc_tx_buffer_address (pdesc);break ;default : WARN_ONCE(true, "rtl8723ae: ERR txdesc :%d not processed\n",
@@ -642,13 +642,13 @@ u64 rtl8723e_get_desc(struct ieee80211_hw *hw, }else {switch (desc_name) {case HW_DESC_OWN : - ret =GET_RX_DESC_OWN (pdesc); + ret =get_rx_desc_own (pdesc);break ;case HW_DESC_RXPKT_LEN : - ret =GET_RX_DESC_PKT_LEN (pdesc); + ret =get_rx_desc_pkt_len (pdesc);break ;case HW_DESC_RXBUFF_ADDR : - ret =GET_RX_DESC_BUFF_ADDR (pdesc); + ret =get_rx_desc_buff_addr (pdesc);break ;default : WARN_ONCE(true, "rtl8723ae: ERR rxdesc :%d not processed\n",
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h +316 -150
474 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 4/9 rtlwifi: rtl8723ae: Convert inline routines to little-endian words
In reply to Larry FingerIn this step, the read/write routines for the descriptors are converted to use __le32 quantities, thus a lot of casts can be removed. Callback routines still use the 8-bit arrays, but these are changed within the specified routine.
The macro that cleared a descriptor has now been converted into an inline routine.
---
v2 - no changes
--- .../wireless/realtek/rtlwifi/rtl8723ae/trx.c | 24 +- .../wireless/realtek/rtlwifi/rtl8723ae/trx.h | 250 +++++++++--------- 2 files changed, 140 insertions(+), 134 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c +15 -9
@@ -260,10 +260,11 @@ static void translate_rx_signal_stuff(struct ieee80211_hw *hw,bool rtl8723e_rx_query_desc (struct ieee80211_hw *hw,struct rtl_stats *status,struct ieee80211_rx_status *rx_status, -u8 *pdesc,struct sk_buff *skb) +u8 *pdesc8,struct sk_buff *skb) {struct rx_fwinfo_8723e *p_drvinfo;struct ieee80211_hdr *hdr; +__le32 *pdesc = (__le32 *)pdesc8;u32 phystatus =get_rx_desc_physt (pdesc); status->length = (u16 )get_rx_desc_pkt_len (pdesc);
@@ -331,7 +332,7 @@ bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw, p_drvinfo = (struct rx_fwinfo_8723e *)(skb->data + status->rx_bufshift); -translate_rx_signal_stuff (hw, skb, status, pdesc, p_drvinfo); +translate_rx_signal_stuff (hw, skb, status, pdesc8, p_drvinfo); } rx_status->signal = status->recvsignalpower +10 ;return true;
@@ -350,7 +351,8 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,struct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));bool b_defaultadapter = true;/* bool b_trigger_ac = false; */ -u8 *pdesc = (u8 *)pdesc_tx; +u8 *pdesc8 = (u8 *)pdesc_tx; +__le32 *pdesc = (__le32 *)pdesc8;u16 seq_number;__le16 fc = hdr->frame_control;u8 fw_qsel =_rtl8723e_map_hwqueue_to_fwqueue (skb, hw_queue);
@@ -383,7 +385,7 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,rtl_get_tcb_desc (hw, info, sta, skb, ptcb_desc); -CLEAR_PCI_TX_DESC_CONTENT (pdesc,sizeof (struct tx_desc_8723e )); +clear_pci_tx_desc_content (pdesc,sizeof (struct tx_desc_8723e ));if (ieee80211_is_nullfunc (fc) ||ieee80211_is_ctl (fc)) { firstseg = true;
@@ -519,12 +521,13 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw, }void rtl8723e_tx_fill_cmddesc (struct ieee80211_hw *hw, -u8 *pdesc,bool firstseg, +u8 *pdesc8,bool firstseg,bool lastseg,struct sk_buff *skb) {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));u8 fw_queue =QSLT_BEACON ; +__le32 *pdesc = (__le32 *)pdesc8; dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
@@ -538,7 +541,7 @@ void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw, "DMA mapping error\n");return ; } -CLEAR_PCI_TX_DESC_CONTENT (pdesc,TX_DESC_SIZE ); +clear_pci_tx_desc_content (pdesc,TX_DESC_SIZE );if (firstseg)set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN );
@@ -563,7 +566,7 @@ void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,set_tx_desc_own (pdesc,1 ); -set_tx_desc_pkt_size ((u8 *)pdesc, (u16)(skb->len)); +set_tx_desc_pkt_size (pdesc, (u16)(skb->len));set_tx_desc_first_seg (pdesc,1 );set_tx_desc_last_seg (pdesc,1 );
@@ -583,9 +586,11 @@ void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw, pdesc, TX_DESC_SIZE); } -void rtl8723e_set_desc (struct ieee80211_hw *hw,u8 *pdesc, +void rtl8723e_set_desc (struct ieee80211_hw *hw,u8 *pdesc8,bool istx,u8 desc_name,u8 *val) { +__le32 *pdesc = (__le32 *)pdesc8; +if (istx == true) {switch (desc_name) {case HW_DESC_OWN :
@@ -622,9 +627,10 @@ void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc, }u64 rtl8723e_get_desc (struct ieee80211_hw *hw, -u8 *pdesc,bool istx,u8 desc_name) +u8 *pdesc8,bool istx,u8 desc_name) {u32 ret =0 ; +__le32 *pdesc = (__le32 *)pdesc8;if (istx == true) {switch (desc_name) {
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h +125 -125
443 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 5/9 rtlwifi: rtl8723be: Remove unused SET_XXX and GET_XXX macros
In reply to Larry FingeriAs the first step in converting from macros that get/set information in the RX and TX descriptors, unused macros are being removed.
---
v2 - no changes
--- .../wireless/realtek/rtlwifi/rtl8723be/trx.h | 167 +----------------- 1 file changed, 2 insertions(+), 165 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h +2 -165
@@ -28,31 +28,9 @@ SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val)#define SET_TX_DESC_LINIP (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val) -#define SET_TX_DESC_NO_ACM (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 29, 1, __val) -#define SET_TX_DESC_GF (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val)#define SET_TX_DESC_OWN (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val) -#define GET_TX_DESC_PKT_SIZE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 0, 16) -#define GET_TX_DESC_OFFSET (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 16, 8) -#define GET_TX_DESC_BMC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 24, 1) -#define GET_TX_DESC_HTC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 25, 1) -#define GET_TX_DESC_LAST_SEG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 26, 1) -#define GET_TX_DESC_FIRST_SEG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 27, 1) -#define GET_TX_DESC_LINIP (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 28, 1) -#define GET_TX_DESC_NO_ACM (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 29, 1) -#define GET_TX_DESC_GF (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 30, 1)#define GET_TX_DESC_OWN (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 31, 1)
@@ -60,60 +38,26 @@ SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 7, __val)#define SET_TX_DESC_QUEUE_SEL (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val) -#define SET_TX_DESC_RDG_NAV_EXT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 13, 1, __val) -#define SET_TX_DESC_LSIG_TXOP_EN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 14, 1, __val) -#define SET_TX_DESC_PIFS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 15, 1, __val)#define SET_TX_DESC_RATE_ID (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 5, __val) -#define SET_TX_DESC_EN_DESC_ID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 21, 1, __val)#define SET_TX_DESC_SEC_TYPE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val)#define SET_TX_DESC_PKT_OFFSET (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 5, __val) - -#define SET_TX_DESC_PAID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 0, 9, __val) -#define SET_TX_DESC_CCA_RTS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 10, 2, __val)#define SET_TX_DESC_AGG_ENABLE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+8, 12, 1, __val)#define SET_TX_DESC_RDG_ENABLE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+8, 13, 1, __val) -#define SET_TX_DESC_BAR_RTY_TH (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 8, 14, 2, __val) -#define SET_TX_DESC_AGG_BREAK (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 16, 1, __val)#define SET_TX_DESC_MORE_FRAG (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val) -#define SET_TX_DESC_RAW (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 18, 1, __val) -#define SET_TX_DESC_SPE_RPT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 8, 19, 1, __val)#define SET_TX_DESC_AMPDU_DENSITY (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val) -#define SET_TX_DESC_BT_INT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 23, 1, __val) -#define SET_TX_DESC_GID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 24, 6, __val) - - -#define SET_TX_DESC_WHEADER_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 0, 4, __val) -#define SET_TX_DESC_CHK_EN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 4, 1, __val) -#define SET_TX_DESC_EARLY_MODE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 5, 1, __val) +#define SET_TX_DESC_HWSEQ_SEL (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 6, 2, __val)#define SET_TX_DESC_USE_RATE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 8, 1, __val) -#define SET_TX_DESC_DISABLE_RTS_FB (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 9, 1, __val)#define SET_TX_DESC_DISABLE_FB (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 10, 1, __val)#define SET_TX_DESC_CTS2SELF (__pdesc, __val) \
@@ -124,15 +68,8 @@ SET_BITS_TO_LE_4BYTE(__pdesc+12, 13, 1, __val)#define SET_TX_DESC_NAV_USE_HDR (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 15, 1, __val) -#define SET_TX_DESC_USE_MAX_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 16, 1, __val)#define SET_TX_DESC_MAX_AGG_NUM (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+12, 17, 5, __val) -#define SET_TX_DESC_NDPA (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 22, 2, __val) -#define SET_TX_DESC_AMPDU_MAX_TIME (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 24, 8, __val) -#define SET_TX_DESC_TX_RATE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 7, __val)
@@ -140,50 +77,23 @@ SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 5, __val)#define SET_TX_DESC_RTS_RATE_FB_LIMIT (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 4, __val) -#define SET_TX_DESC_RETRY_LIMIT_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 17, 1, __val) -#define SET_TX_DESC_DATA_RETRY_LIMIT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 18, 6, __val)#define SET_TX_DESC_RTS_RATE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+16, 24, 5, __val) -#define SET_TX_DESC_TX_SUB_CARRIER (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 4, __val)#define SET_TX_DESC_DATA_SHORTGI (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 4, 1, __val)#define SET_TX_DESC_DATA_BW (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 5, 2, __val) -#define SET_TX_DESC_DATA_LDPC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 7, 1, __val) -#define SET_TX_DESC_DATA_STBC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 8, 2, __val) -#define SET_TX_DESC_CTROL_STBC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 10, 2, __val)#define SET_TX_DESC_RTS_SHORT (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 12, 1, __val)#define SET_TX_DESC_RTS_SC (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val) -#define SET_TX_DESC_SW_DEFINE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 0, 12, __val) -#define SET_TX_DESC_MBSSID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 12, 4, __val) -#define SET_TX_DESC_ANTSEL_A (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 16, 3, __val) -#define SET_TX_DESC_ANTSEL_B (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 19, 3, __val) -#define SET_TX_DESC_ANTSEL_C (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 22, 3, __val) -#define SET_TX_DESC_ANTSEL_D (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE((__pdesc) + 24, 25, 3, __val) -#define SET_TX_DESC_TX_BUFFER_SIZE (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val) -#define GET_TX_DESC_TX_BUFFER_SIZE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 0, 16) -#define SET_TX_DESC_HWSEQ_EN (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+32, 15, 1, __val)
@@ -196,13 +106,9 @@#define GET_TX_DESC_TX_BUFFER_ADDRESS (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+40, 0, 32) -#define SET_TX_DESC_NEXT_DESC_ADDRESS (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+48, 0, 32, __val) -#define GET_TX_DESC_NEXT_DESC_ADDRESS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+48, 0, 32) -#define GET_RX_DESC_PKT_LEN (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 0, 14)#define GET_RX_DESC_CRC32 (__pdesc) \
@@ -211,22 +117,12 @@ LE_BITS_TO_4BYTE(__pdesc, 15, 1)#define GET_RX_DESC_DRV_INFO_SIZE (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 16, 4) -#define GET_RX_DESC_SECURITY (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 20, 3) -#define GET_RX_DESC_QOS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 23, 1)#define GET_RX_DESC_SHIFT (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 24, 2)#define GET_RX_DESC_PHYST (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 26, 1)#define GET_RX_DESC_SWDEC (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 27, 1) -#define GET_RX_DESC_LS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 28, 1) -#define GET_RX_DESC_FS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 29, 1) -#define GET_RX_DESC_EOR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 30, 1)#define GET_RX_DESC_OWN (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc, 31, 1)
@@ -239,64 +135,16 @@#define GET_RX_DESC_MACID (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+4, 0, 7) -#define GET_RX_DESC_TID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 8, 4) -#define GET_RX_DESC_AMSDU (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 13, 1) -#define GET_RX_STATUS_DESC_RXID_MATCH (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 14, 1)#define GET_RX_DESC_PAGGR (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+4, 15, 1) -#define GET_RX_DESC_A1_FIT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 16, 4) -#define GET_RX_DESC_CHKERR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 20, 1) -#define GET_RX_DESC_IPVER (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 21, 1) -#define GET_RX_STATUS_DESC_IS_TCPUDP (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 22, 1) -#define GET_RX_STATUS_DESC_CHK_VLD (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 23, 1) -#define GET_RX_DESC_PAM (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 24, 1) -#define GET_RX_DESC_PWR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 25, 1) -#define GET_RX_DESC_MD (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 26, 1) -#define GET_RX_DESC_MF (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 27, 1) -#define GET_RX_DESC_TYPE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 28, 2) -#define GET_RX_DESC_MC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 30, 1) -#define GET_RX_DESC_BC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 31, 1) - - -#define GET_RX_DESC_SEQ (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 0, 12) -#define GET_RX_DESC_FRAG (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 12, 4) -#define GET_RX_STATUS_DESC_RX_IS_QOS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 16, 1) -#define GET_RX_STATUS_DESC_WLANHD_IV_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 18, 6) +#define GET_RX_STATUS_DESC_RPT_SEL (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+8, 28, 1) -#define GET_RX_DESC_RXMCS (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+12, 0, 7)#define GET_RX_DESC_RXHT (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+12, 6, 1) -#define GET_RX_STATUS_DESC_RX_GF (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 7, 1) -#define GET_RX_DESC_HTC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 10, 1) -#define GET_RX_STATUS_DESC_EOSP (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 11, 1) -#define GET_RX_STATUS_DESC_BSSID_FIT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 12, 2)#define GET_RX_STATUS_DESC_PATTERN_MATCH (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+12, 29, 1)
@@ -307,10 +155,6 @@#define GET_RX_DESC_SPLCP (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+16, 0, 1) -#define GET_RX_STATUS_DESC_LDPC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 1, 1) -#define GET_RX_STATUS_DESC_STBC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 2, 1)#define GET_RX_DESC_BW (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+16, 4, 2)
@@ -319,19 +163,12 @@#define GET_RX_DESC_BUFF_ADDR (__pdesc) \ LE_BITS_TO_4BYTE(__pdesc+24, 0, 32) -#define GET_RX_DESC_BUFF_ADDR64 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+28, 0, 32)#define SET_RX_DESC_BUFF_ADDR (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val) -#define SET_RX_DESC_BUFF_ADDR64 (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 32, __val) -/* TX report 2 format in Rx desc*/ -#define GET_RX_RPT2_DESC_PKT_LEN (__rxstatusdesc) \ - LE_BITS_TO_4BYTE(__rxstatusdesc, 0, 9)#define GET_RX_RPT2_DESC_MACID_VALID_1 (__rxstatusdesc) \ LE_BITS_TO_4BYTE(__rxstatusdesc+16, 0, 32)#define GET_RX_RPT2_DESC_MACID_VALID_2 (__rxstatusdesc) \
Signature · 1 line
2.23.0
PATCH v2 6/9 rtlwifi: rtl8723be: Replace local bit manipulation macros
In reply to Larry FingerThis driver uses a set of local macros to manipulate the RX and TX descriptors, which are all little-endian quantities. These macros are replaced by the bitfield macros le32p_replace_bits() and le32_get_bits(). In several places, the macros operated on an entire 32-bit word. In these cases, a direct read or replacement is used.
---
v2 - no changes
--- .../wireless/realtek/rtlwifi/rtl8723be/trx.h | 149 +++++++++--------- 1 file changed, 74 insertions(+), 75 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h +74 -75
@@ -15,179 +15,178 @@#define CRCLENGTH 4#define SET_TX_DESC_PKT_SIZE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 0, 16, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, GENMASK(15, 0))#define SET_TX_DESC_OFFSET (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 16, 8, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, GENMASK(23, 16))#define SET_TX_DESC_BMC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 24, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(24))#define SET_TX_DESC_HTC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 25, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(25))#define SET_TX_DESC_LAST_SEG (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 26, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(26))#define SET_TX_DESC_FIRST_SEG (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 27, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(27))#define SET_TX_DESC_LINIP (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 28, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(28))#define SET_TX_DESC_OWN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(31))#define GET_TX_DESC_OWN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 31, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(31))#define SET_TX_DESC_MACID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 0, 7, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(6, 0))#define SET_TX_DESC_QUEUE_SEL (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 8, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(12, 8))#define SET_TX_DESC_RATE_ID (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 16, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(20, 16))#define SET_TX_DESC_SEC_TYPE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 22, 2, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(23, 22))#define SET_TX_DESC_PKT_OFFSET (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+4, 24, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 4), __val, GENMASK(28, 24))#define SET_TX_DESC_AGG_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 12, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 8), __val, BIT(12))#define SET_TX_DESC_RDG_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 13, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 8), __val, BIT(13))#define SET_TX_DESC_MORE_FRAG (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 17, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 8), __val, BIT(17))#define SET_TX_DESC_AMPDU_DENSITY (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+8, 20, 3, __val) + le32p_replace_bits((__le32 *)(__pdesc + 8), __val, GENMASK(22, 20))#define SET_TX_DESC_HWSEQ_SEL (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 6, 2, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, GENMASK(7, 6))#define SET_TX_DESC_USE_RATE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 8, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, BIT(8))#define SET_TX_DESC_DISABLE_FB (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 10, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, BIT(10))#define SET_TX_DESC_CTS2SELF (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 11, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, BIT(11))#define SET_TX_DESC_RTS_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 12, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, BIT(12))#define SET_TX_DESC_HW_RTS_ENABLE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 13, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, BIT(13))#define SET_TX_DESC_NAV_USE_HDR (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 15, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, BIT(15))#define SET_TX_DESC_MAX_AGG_NUM (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+12, 17, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 12), __val, GENMASK(21, 17))#define SET_TX_DESC_TX_RATE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 0, 7, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(6, 0))#define SET_TX_DESC_DATA_RATE_FB_LIMIT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 8, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(12, 8))#define SET_TX_DESC_RTS_RATE_FB_LIMIT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 13, 4, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(16, 13))#define SET_TX_DESC_RTS_RATE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+16, 24, 5, __val) + le32p_replace_bits((__le32 *)(__pdesc + 16), __val, GENMASK(28, 24))#define SET_TX_DESC_TX_SUB_CARRIER (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 0, 4, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, GENMASK(3, 0))#define SET_TX_DESC_DATA_SHORTGI (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 4, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, BIT(4))#define SET_TX_DESC_DATA_BW (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 5, 2, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, GENMASK(6, 5))#define SET_TX_DESC_RTS_SHORT (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 12, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, BIT(12))#define SET_TX_DESC_RTS_SC (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val) + le32p_replace_bits((__le32 *)(__pdesc + 20), __val, GENMASK(16, 13))#define SET_TX_DESC_TX_BUFFER_SIZE (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val) + le32p_replace_bits((__le32 *)(__pdesc + 28), __val, GENMASK(15, 0))#define SET_TX_DESC_HWSEQ_EN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+32, 15, 1, __val) + le32p_replace_bits((__le32 *)(__pdesc + 32), __val, BIT(15))#define SET_TX_DESC_SEQ (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+36, 12, 12, __val) + le32p_replace_bits((__le32 *)(__pdesc + 36), __val, GENMASK(23, 12))#define SET_TX_DESC_TX_BUFFER_ADDRESS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+40, 0, 32, __val) + *(__le32 *)(__pdesc + 40) = cpu_to_le32(__val)#define GET_TX_DESC_TX_BUFFER_ADDRESS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+40, 0, 32) + le32_to_cpu(*((__le32 *)(__pdesc + 40)))#define SET_TX_DESC_NEXT_DESC_ADDRESS (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+48, 0, 32, __val) + *(__le32 *)(__pdesc + 48) = cpu_to_le32(__val)#define GET_RX_DESC_PKT_LEN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 0, 14) + le32_get_bits(*(__le32 *)__pdesc, GENMASK(13, 0))#define GET_RX_DESC_CRC32 (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 14, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(14))#define GET_RX_DESC_ICV (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 15, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(15))#define GET_RX_DESC_DRV_INFO_SIZE (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 16, 4) + le32_get_bits(*(__le32 *)__pdesc, GENMASK(19, 16))#define GET_RX_DESC_SHIFT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 24, 2) + le32_get_bits(*(__le32 *)__pdesc, GENMASK(25, 24))#define GET_RX_DESC_PHYST (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 26, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(26))#define GET_RX_DESC_SWDEC (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 27, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(27))#define GET_RX_DESC_OWN (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc, 31, 1) + le32_get_bits(*(__le32 *)__pdesc, BIT(31))#define SET_RX_DESC_PKT_LEN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 0, 14, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, GENMASK(13, 0))#define SET_RX_DESC_EOR (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 30, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(30))#define SET_RX_DESC_OWN (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc, 31, 1, __val) + le32p_replace_bits((__le32 *)__pdesc, __val, BIT(31))#define GET_RX_DESC_MACID (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 0, 7) + le32_get_bits(*(__le32 *)(__pdesc + 4), GENMASK(6, 0))#define GET_RX_DESC_PAGGR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+4, 15, 1) + le32_get_bits(*(__le32 *)(__pdesc + 4), BIT(15))#define GET_RX_STATUS_DESC_RPT_SEL (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+8, 28, 1) + le32_get_bits(*(__le32 *)(__pdesc + 8), BIT(28))#define GET_RX_DESC_RXMCS (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 0, 7) + le32_get_bits(*(__le32 *)(__pdesc + 12), GENMASK(6, 0))#define GET_RX_DESC_RXHT (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 6, 1) - + le32_get_bits(*(__le32 *)(__pdesc + 12), BIT(6))#define GET_RX_STATUS_DESC_PATTERN_MATCH (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 29, 1) + le32_get_bits(*(__le32 *)(__pdesc + 12), BIT(29))#define GET_RX_STATUS_DESC_UNICAST_MATCH (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 30, 1) + le32_get_bits(*(__le32 *)(__pdesc + 12), BIT(30))#define GET_RX_STATUS_DESC_MAGIC_MATCH (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+12, 31, 1) + le32_get_bits(*(__le32 *)(__pdesc + 12), BIT(31))#define GET_RX_DESC_SPLCP (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 0, 1) + le32_get_bits(*(__le32 *)(__pdesc + 16), BIT(0))#define GET_RX_DESC_BW (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+16, 4, 2) + le32_get_bits(*(__le32 *)(__pdesc + 16), GENMASK(5, 4))#define GET_RX_DESC_TSFL (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+20, 0, 32) + le32_to_cpu(*((__le32 *)(__pdesc + 20)))#define GET_RX_DESC_BUFF_ADDR (__pdesc) \ - LE_BITS_TO_4BYTE(__pdesc+24, 0, 32) + le32_to_cpu(*((__le32 *)(__pdesc + 24)))#define SET_RX_DESC_BUFF_ADDR (__pdesc, __val) \ - SET_BITS_TO_LE_4BYTE(__pdesc+24, 0, 32, __val) + *(__le32 *)(__pdesc + 24) = cpu_to_le32(__val)/* TX report 2 format in Rx desc*/ #define GET_RX_RPT2_DESC_MACID_VALID_1 (__rxstatusdesc) \ - LE_BITS_TO_4BYTE(__rxstatusdesc+16, 0, 32) + le32_to_cpu(*((__le32 *)(__rxstatusdesc + 16)))#define GET_RX_RPT2_DESC_MACID_VALID_2 (__rxstatusdesc) \ - LE_BITS_TO_4BYTE(__rxstatusdesc+20, 0, 32) + le32_to_cpu(*((__le32 *)(__rxstatusdesc + 20)))#define SET_EARLYMODE_PKTNUM (__paddr, __value) \ - SET_BITS_TO_LE_4BYTE(__paddr, 0, 4, __value) + le32p_replace_bits((__le32 *)__paddr, __value, GENMASK(3, 0))#define SET_EARLYMODE_LEN0 (__paddr, __value) \ - SET_BITS_TO_LE_4BYTE(__paddr, 4, 12, __value) + le32p_replace_bits((__le32 *)__paddr, __value, GENMASK(15, 4))#define SET_EARLYMODE_LEN1 (__paddr, __value) \ - SET_BITS_TO_LE_4BYTE(__paddr, 16, 12, __value) + le32p_replace_bits((__le32 *)__paddr, __value, GENMASK(27, 16))#define SET_EARLYMODE_LEN2_1 (__paddr, __value) \ - SET_BITS_TO_LE_4BYTE(__paddr, 28, 4, __value) + le32p_replace_bits((__le32 *)__paddr, __value, GENMASK(31, 28))#define SET_EARLYMODE_LEN2_2 (__paddr, __value) \ - SET_BITS_TO_LE_4BYTE(__paddr+4, 0, 8, __value) + le32p_replace_bits((__le32 *)(__paddr + 4), __value, GENMASK(7, 0))#define SET_EARLYMODE_LEN3 (__paddr, __value) \ - SET_BITS_TO_LE_4BYTE(__paddr+4, 8, 12, __value) + le32p_replace_bits((__le32 *)(__paddr + 4), __value, GENMASK(19, 8))#define SET_EARLYMODE_LEN4 (__paddr, __value) \ - SET_BITS_TO_LE_4BYTE(__paddr+4, 20, 12, __value) + le32p_replace_bits((__le32 *)(__paddr + 4), __value, GENMASK(31, 20))#define CLEAR_PCI_TX_DESC_CONTENT (__pdesc, _size) \ do { \
Signature · 1 line
2.23.0
PATCH v2 7/9 rtlwifi: rtl8723be: Convert macros that set descriptor
In reply to Larry FingerAs a first step in the conversion, the macros that set the RX and TX descriptors are converted to static inline routines, and the names are changed from upper to lower case. To minimize the changes in a given step, the input descriptor information is left as as a byte array (u8 *), even though it should be a little-endian word array (__le32 *). That will be changed in the next patch.
Several places where checkpatch.pl complains about a space after a cast are fixed.
---
v2 - no changes
--- .../wireless/realtek/rtlwifi/rtl8723be/trx.c | 204 +++---- .../wireless/realtek/rtlwifi/rtl8723be/trx.h | 538 ++++++++++++------ 2 files changed, 470 insertions(+), 272 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c +102 -102
@@ -247,7 +247,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,u32 dwtmp =0 ;memset (virtualaddress,0 ,8 ); -SET_EARLYMODE_PKTNUM (virtualaddress, ptcb_desc->empkt_num); +set_earlymode_pktnum (virtualaddress, ptcb_desc->empkt_num);if (ptcb_desc->empkt_num ==1 ) { dwtmp = ptcb_desc->empkt_len[0 ]; }else {
@@ -255,7 +255,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc, dwtmp += ((dwtmp %4 ) ? (4 - dwtmp %4 ) :0 ) +4 ; dwtmp += ptcb_desc->empkt_len[1 ]; } -SET_EARLYMODE_LEN0 (virtualaddress, dwtmp); +set_earlymode_len0 (virtualaddress, dwtmp);if (ptcb_desc->empkt_num <=3 ) { dwtmp = ptcb_desc->empkt_len[2 ];
@@ -264,7 +264,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc, dwtmp += ((dwtmp %4 ) ? (4 - dwtmp %4 ) :0 ) +4 ; dwtmp += ptcb_desc->empkt_len[3 ]; } -SET_EARLYMODE_LEN1 (virtualaddress, dwtmp); +set_earlymode_len1 (virtualaddress, dwtmp);if (ptcb_desc->empkt_num <=5 ) { dwtmp = ptcb_desc->empkt_len[4 ]; }else {
@@ -272,8 +272,8 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc, dwtmp += ((dwtmp %4 ) ? (4 - dwtmp %4 ) :0 ) +4 ; dwtmp += ptcb_desc->empkt_len[5 ]; } -SET_EARLYMODE_LEN2_1 (virtualaddress, dwtmp &0xF ); -SET_EARLYMODE_LEN2_2 (virtualaddress, dwtmp >>4 ); +set_earlymode_len2_1 (virtualaddress, dwtmp &0xF ); +set_earlymode_len2_2 (virtualaddress, dwtmp >>4 );if (ptcb_desc->empkt_num <=7 ) { dwtmp = ptcb_desc->empkt_len[6 ]; }else {
@@ -281,7 +281,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc, dwtmp += ((dwtmp %4 ) ? (4 - dwtmp %4 ) :0 ) +4 ; dwtmp += ptcb_desc->empkt_len[7 ]; } -SET_EARLYMODE_LEN3 (virtualaddress, dwtmp); +set_earlymode_len3 (virtualaddress, dwtmp);if (ptcb_desc->empkt_num <=9 ) { dwtmp = ptcb_desc->empkt_len[8 ]; }else {
@@ -289,7 +289,7 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc, dwtmp += ((dwtmp %4 ) ? (4 - dwtmp %4 ) :0 ) +4 ; dwtmp += ptcb_desc->empkt_len[9 ]; } -SET_EARLYMODE_LEN4 (virtualaddress, dwtmp); +set_earlymode_len4 (virtualaddress, dwtmp); } bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,
@@ -301,39 +301,39 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw,struct rx_fwinfo_8723be *p_drvinfo;struct ieee80211_hdr *hdr;u8 wake_match; -u32 phystatus =GET_RX_DESC_PHYST (pdesc); +u32 phystatus =get_rx_desc_physt (pdesc); - status->length = (u16 )GET_RX_DESC_PKT_LEN (pdesc); - status->rx_drvinfo_size = (u8 )GET_RX_DESC_DRV_INFO_SIZE (pdesc) * + status->length = (u16 )get_rx_desc_pkt_len (pdesc); + status->rx_drvinfo_size = (u8 )get_rx_desc_drv_info_size (pdesc) *RX_DRV_INFO_SIZE_UNIT ; - status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT (pdesc) &0x03 ); - status->icv = (u16 )GET_RX_DESC_ICV (pdesc); - status->crc = (u16 )GET_RX_DESC_CRC32 (pdesc); + status->rx_bufshift = (u8)(get_rx_desc_shift (pdesc) &0x03 ); + status->icv = (u16 )get_rx_desc_icv (pdesc); + status->crc = (u16 )get_rx_desc_crc32 (pdesc); status->hwerror = (status->crc | status->icv); - status->decrypted = !GET_RX_DESC_SWDEC (pdesc); - status->rate = (u8 )GET_RX_DESC_RXMCS (pdesc); - status->shortpreamble = (u16 )GET_RX_DESC_SPLCP (pdesc); - status->isampdu = (bool )(GET_RX_DESC_PAGGR (pdesc) ==1 ); - status->isfirst_ampdu = (bool )(GET_RX_DESC_PAGGR (pdesc) ==1 ); - status->timestamp_low =GET_RX_DESC_TSFL (pdesc); - status->rx_is40mhzpacket = (bool )GET_RX_DESC_BW (pdesc); - status->bandwidth = (u8 )GET_RX_DESC_BW (pdesc); - status->macid =GET_RX_DESC_MACID (pdesc); - status->is_ht = (bool )GET_RX_DESC_RXHT (pdesc); + status->decrypted = !get_rx_desc_swdec (pdesc); + status->rate = (u8 )get_rx_desc_rxmcs (pdesc); + status->shortpreamble = (u16 )get_rx_desc_splcp (pdesc); + status->isampdu = (bool )(get_rx_desc_paggr (pdesc) ==1 ); + status->isfirst_ampdu = (bool )(get_rx_desc_paggr (pdesc) ==1 ); + status->timestamp_low =get_rx_desc_tsfl (pdesc); + status->rx_is40mhzpacket = (bool )get_rx_desc_bw (pdesc); + status->bandwidth = (u8 )get_rx_desc_bw (pdesc); + status->macid =get_rx_desc_macid (pdesc); + status->is_ht = (bool )get_rx_desc_rxht (pdesc); status->is_cck =RX_HAL_IS_CCK_RATE (status->rate); -if (GET_RX_STATUS_DESC_RPT_SEL (pdesc)) +if (get_rx_status_desc_rpt_sel (pdesc)) status->packet_report_type =C2H_PACKET ;else status->packet_report_type =NORMAL_RX ; -if (GET_RX_STATUS_DESC_PATTERN_MATCH (pdesc)) +if (get_rx_status_desc_pattern_match (pdesc)) wake_match =BIT (2 ); -else if (GET_RX_STATUS_DESC_MAGIC_MATCH (pdesc)) +else if (get_rx_status_desc_magic_match (pdesc)) wake_match =BIT (1 ); -else if (GET_RX_STATUS_DESC_UNICAST_MATCH (pdesc)) +else if (get_rx_status_desc_unicast_match (pdesc)) wake_match =BIT (0 );else wake_match =0 ;
@@ -392,9 +392,9 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw, rx_status->signal = status->recvsignalpower +10 ;if (status->packet_report_type ==TX_REPORT2 ) { status->macid_valid_entry[0 ] = -GET_RX_RPT2_DESC_MACID_VALID_1 (pdesc); +get_rx_rpt2_desc_macid_valid_1 (pdesc); status->macid_valid_entry[1 ] = -GET_RX_RPT2_DESC_MACID_VALID_2 (pdesc); +get_rx_rpt2_desc_macid_valid_2 (pdesc); }return true; }
@@ -453,8 +453,8 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw, }if (firstseg) {if (rtlhal->earlymode_enable) { -SET_TX_DESC_PKT_OFFSET (pdesc,1 ); -SET_TX_DESC_OFFSET (pdesc,USB_HWDESC_HEADER_LEN + +set_tx_desc_pkt_offset (pdesc,1 ); +set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN +EM_HDR_LEN );if (ptcb_desc->empkt_num) { RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
@@ -464,60 +464,60 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw, (u8 *)(skb->data)); } }else { -SET_TX_DESC_OFFSET (pdesc,USB_HWDESC_HEADER_LEN ); +set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN ); }/* ptcb_desc->use_driver_rate = true; */ -SET_TX_DESC_TX_RATE (pdesc, ptcb_desc->hw_rate); +set_tx_desc_tx_rate (pdesc, ptcb_desc->hw_rate);if (ptcb_desc->hw_rate >DESC92C_RATEMCS0 ) short_gi = (ptcb_desc->use_shortgi) ?1 :0 ;else short_gi = (ptcb_desc->use_shortpreamble) ?1 :0 ; -SET_TX_DESC_DATA_SHORTGI (pdesc, short_gi); +set_tx_desc_data_shortgi (pdesc, short_gi);if (info->flags &IEEE80211_TX_CTL_AMPDU ) { -SET_TX_DESC_AGG_ENABLE (pdesc,1 ); -SET_TX_DESC_MAX_AGG_NUM (pdesc,0x14 ); +set_tx_desc_agg_enable (pdesc,1 ); +set_tx_desc_max_agg_num (pdesc,0x14 ); } -SET_TX_DESC_SEQ (pdesc, seq_number); -SET_TX_DESC_RTS_ENABLE (pdesc, ((ptcb_desc->rts_enable && +set_tx_desc_seq (pdesc, seq_number); +set_tx_desc_rts_enable (pdesc, ((ptcb_desc->rts_enable && !ptcb_desc->cts_enable) ?1 :0 )); -SET_TX_DESC_HW_RTS_ENABLE (pdesc,0 ); -SET_TX_DESC_CTS2SELF (pdesc, ((ptcb_desc->cts_enable) ? +set_tx_desc_hw_rts_enable (pdesc,0 ); +set_tx_desc_cts2self (pdesc, ((ptcb_desc->cts_enable) ?1 :0 )); -SET_TX_DESC_RTS_RATE (pdesc, ptcb_desc->rts_rate); +set_tx_desc_rts_rate (pdesc, ptcb_desc->rts_rate); -SET_TX_DESC_RTS_SC (pdesc, ptcb_desc->rts_sc); -SET_TX_DESC_RTS_SHORT (pdesc, +set_tx_desc_rts_sc (pdesc, ptcb_desc->rts_sc); +set_tx_desc_rts_short (pdesc, ((ptcb_desc->rts_rate <=DESC92C_RATE54M ) ? (ptcb_desc->rts_use_shortpreamble ?1 :0 ) : (ptcb_desc->rts_use_shortgi ?1 :0 )));if (ptcb_desc->tx_enable_sw_calc_duration) -SET_TX_DESC_NAV_USE_HDR (pdesc,1 ); +set_tx_desc_nav_use_hdr (pdesc,1 );if (bw_40) {if (ptcb_desc->packet_bw ==HT_CHANNEL_WIDTH_20_40 ) { -SET_TX_DESC_DATA_BW (pdesc,1 ); -SET_TX_DESC_TX_SUB_CARRIER (pdesc,3 ); +set_tx_desc_data_bw (pdesc,1 ); +set_tx_desc_tx_sub_carrier (pdesc,3 ); }else { -SET_TX_DESC_DATA_BW (pdesc,0 ); -SET_TX_DESC_TX_SUB_CARRIER (pdesc, mac->cur_40_prime_sc); +set_tx_desc_data_bw (pdesc,0 ); +set_tx_desc_tx_sub_carrier (pdesc, mac->cur_40_prime_sc); } }else { -SET_TX_DESC_DATA_BW (pdesc,0 ); -SET_TX_DESC_TX_SUB_CARRIER (pdesc,0 ); +set_tx_desc_data_bw (pdesc,0 ); +set_tx_desc_tx_sub_carrier (pdesc,0 ); } -SET_TX_DESC_LINIP (pdesc,0 ); -SET_TX_DESC_PKT_SIZE (pdesc, (u16 ) skb_len); +set_tx_desc_linip (pdesc,0 ); +set_tx_desc_pkt_size (pdesc, (u16 )skb_len);if (sta) {u8 ampdu_density = sta->ht_cap.ampdu_density; -SET_TX_DESC_AMPDU_DENSITY (pdesc, ampdu_density); +set_tx_desc_ampdu_density (pdesc, ampdu_density); }if (info->control.hw_key) { struct ieee80211_key_conf *keyconf =
@@ -526,23 +526,23 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,case WLAN_CIPHER_SUITE_WEP40 :case WLAN_CIPHER_SUITE_WEP104 :case WLAN_CIPHER_SUITE_TKIP : -SET_TX_DESC_SEC_TYPE (pdesc,0x1 ); +set_tx_desc_sec_type (pdesc,0x1 );break ;case WLAN_CIPHER_SUITE_CCMP : -SET_TX_DESC_SEC_TYPE (pdesc,0x3 ); +set_tx_desc_sec_type (pdesc,0x3 );break ;default : -SET_TX_DESC_SEC_TYPE (pdesc,0x0 ); +set_tx_desc_sec_type (pdesc,0x0 );break ; } } -SET_TX_DESC_QUEUE_SEL (pdesc, fw_qsel); -SET_TX_DESC_DATA_RATE_FB_LIMIT (pdesc,0x1F ); -SET_TX_DESC_RTS_RATE_FB_LIMIT (pdesc,0xF ); -SET_TX_DESC_DISABLE_FB (pdesc, ptcb_desc->disable_ratefallback ? +set_tx_desc_queue_sel (pdesc, fw_qsel); +set_tx_desc_data_rate_fb_limit (pdesc,0x1F ); +set_tx_desc_rts_rate_fb_limit (pdesc,0xF ); +set_tx_desc_disable_fb (pdesc, ptcb_desc->disable_ratefallback ?1 :0 ); -SET_TX_DESC_USE_RATE (pdesc, ptcb_desc->use_driver_rate ?1 :0 ); +set_tx_desc_use_rate (pdesc, ptcb_desc->use_driver_rate ?1 :0 );/* Set TxRate and RTSRate in TxDesc */ /* This prevent Tx initial rate of new-coming packets */
@@ -551,34 +551,34 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,if (mac->rdg_en) {RT_TRACE (rtlpriv,COMP_SEND ,DBG_TRACE ,"Enable RDG function.\n" ); -SET_TX_DESC_RDG_ENABLE (pdesc,1 ); -SET_TX_DESC_HTC (pdesc,1 ); +set_tx_desc_rdg_enable (pdesc,1 ); +set_tx_desc_htc (pdesc,1 ); } }/* tx report */ rtl_set_tx_report (ptcb_desc, pdesc, hw, tx_info); } -SET_TX_DESC_FIRST_SEG (pdesc, (firstseg ?1 :0 )); -SET_TX_DESC_LAST_SEG (pdesc, (lastseg ?1 :0 )); -SET_TX_DESC_TX_BUFFER_SIZE (pdesc, (u16 ) buf_len); -SET_TX_DESC_TX_BUFFER_ADDRESS (pdesc, mapping); +set_tx_desc_first_seg (pdesc, (firstseg ?1 :0 )); +set_tx_desc_last_seg (pdesc, (lastseg ?1 :0 )); +set_tx_desc_tx_buffer_size (pdesc, (u16 )buf_len); +set_tx_desc_tx_buffer_address (pdesc, mapping);/* if (rtlpriv->dm.useramask) { */ if (1 ) { -SET_TX_DESC_RATE_ID (pdesc, ptcb_desc->ratr_index); -SET_TX_DESC_MACID (pdesc, ptcb_desc->mac_id); +set_tx_desc_rate_id (pdesc, ptcb_desc->ratr_index); +set_tx_desc_macid (pdesc, ptcb_desc->mac_id); }else { -SET_TX_DESC_RATE_ID (pdesc,0xC + ptcb_desc->ratr_index); -SET_TX_DESC_MACID (pdesc, ptcb_desc->mac_id); +set_tx_desc_rate_id (pdesc,0xC + ptcb_desc->ratr_index); +set_tx_desc_macid (pdesc, ptcb_desc->mac_id); }if (!ieee80211_is_data_qos (fc)) { -SET_TX_DESC_HWSEQ_EN (pdesc,1 ); -SET_TX_DESC_HWSEQ_SEL (pdesc,0 ); +set_tx_desc_hwseq_en (pdesc,1 ); +set_tx_desc_hwseq_sel (pdesc,0 ); } -SET_TX_DESC_MORE_FRAG (pdesc, (lastseg ?0 :1 )); +set_tx_desc_more_frag (pdesc, (lastseg ?0 :1 ));if (is_multicast_ether_addr (ieee80211_get_DA (hdr)) ||is_broadcast_ether_addr (ieee80211_get_DA (hdr))) { -SET_TX_DESC_BMC (pdesc,1 ); +set_tx_desc_bmc (pdesc,1 ); }RT_TRACE (rtlpriv,COMP_SEND ,DBG_TRACE ,"\n" );
@@ -603,34 +603,34 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, }CLEAR_PCI_TX_DESC_CONTENT (pdesc,TX_DESC_SIZE ); -SET_TX_DESC_OFFSET (pdesc,USB_HWDESC_HEADER_LEN ); +set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN ); -SET_TX_DESC_TX_RATE (pdesc,DESC92C_RATE1M ); +set_tx_desc_tx_rate (pdesc,DESC92C_RATE1M ); -SET_TX_DESC_SEQ (pdesc,0 ); +set_tx_desc_seq (pdesc,0 ); -SET_TX_DESC_LINIP (pdesc,0 ); +set_tx_desc_linip (pdesc,0 ); -SET_TX_DESC_QUEUE_SEL (pdesc, fw_queue); +set_tx_desc_queue_sel (pdesc, fw_queue); -SET_TX_DESC_FIRST_SEG (pdesc,1 ); -SET_TX_DESC_LAST_SEG (pdesc,1 ); +set_tx_desc_first_seg (pdesc,1 ); +set_tx_desc_last_seg (pdesc,1 ); -SET_TX_DESC_TX_BUFFER_SIZE (pdesc, (u16)(skb->len)); +set_tx_desc_tx_buffer_size (pdesc, (u16)(skb->len)); -SET_TX_DESC_TX_BUFFER_ADDRESS (pdesc, mapping); +set_tx_desc_tx_buffer_address (pdesc, mapping); -SET_TX_DESC_RATE_ID (pdesc,0 ); -SET_TX_DESC_MACID (pdesc,0 ); +set_tx_desc_rate_id (pdesc,0 ); +set_tx_desc_macid (pdesc,0 ); -SET_TX_DESC_OWN (pdesc,1 ); +set_tx_desc_own (pdesc,1 ); -SET_TX_DESC_PKT_SIZE ((u8 *)pdesc, (u16)(skb->len)); +set_tx_desc_pkt_size ((u8 *)pdesc, (u16)(skb->len)); -SET_TX_DESC_FIRST_SEG (pdesc,1 ); -SET_TX_DESC_LAST_SEG (pdesc,1 ); +set_tx_desc_first_seg (pdesc,1 ); +set_tx_desc_last_seg (pdesc,1 ); -SET_TX_DESC_USE_RATE (pdesc,1 ); +set_tx_desc_use_rate (pdesc,1 );RT_PRINT_DATA (rtlpriv,COMP_CMD ,DBG_LOUD ,"H2C Tx Cmd Content\n" , pdesc,TX_DESC_SIZE );
@@ -642,10 +642,10 @@ void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc,if (istx) {switch (desc_name) {case HW_DESC_OWN : -SET_TX_DESC_OWN (pdesc,1 ); +set_tx_desc_own (pdesc,1 );break ;case HW_DESC_TX_NEXTDESC_ADDR : -SET_TX_DESC_NEXT_DESC_ADDRESS (pdesc, *(u32 *)val); +set_tx_desc_next_desc_address (pdesc, *(u32 *)val);break ;default : WARN_ONCE(true, "rtl8723be: ERR txdesc :%d not processed\n",
@@ -655,16 +655,16 @@ void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc, }else {switch (desc_name) {case HW_DESC_RXOWN : -SET_RX_DESC_OWN (pdesc,1 ); +set_rx_desc_own (pdesc,1 );break ;case HW_DESC_RXBUFF_ADDR : -SET_RX_DESC_BUFF_ADDR (pdesc, *(u32 *)val); +set_rx_desc_buff_addr (pdesc, *(u32 *)val);break ;case HW_DESC_RXPKT_LEN : -SET_RX_DESC_PKT_LEN (pdesc, *(u32 *)val); +set_rx_desc_pkt_len (pdesc, *(u32 *)val);break ;case HW_DESC_RXERO : -SET_RX_DESC_EOR (pdesc,1 ); +set_rx_desc_eor (pdesc,1 );break ;default : WARN_ONCE(true, "rtl8723be: ERR rxdesc :%d not process\n",
@@ -682,10 +682,10 @@ u64 rtl8723be_get_desc(struct ieee80211_hw *hw,if (istx) {switch (desc_name) {case HW_DESC_OWN : - ret =GET_TX_DESC_OWN (pdesc); + ret =get_tx_desc_own (pdesc);break ;case HW_DESC_TXBUFF_ADDR : - ret =GET_TX_DESC_TX_BUFFER_ADDRESS (pdesc); + ret =get_tx_desc_tx_buffer_address (pdesc);break ;default : WARN_ONCE(true, "rtl8723be: ERR txdesc :%d not process\n",
@@ -695,13 +695,13 @@ u64 rtl8723be_get_desc(struct ieee80211_hw *hw, }else {switch (desc_name) {case HW_DESC_OWN : - ret =GET_RX_DESC_OWN (pdesc); + ret =get_rx_desc_own (pdesc);break ;case HW_DESC_RXPKT_LEN : - ret =GET_RX_DESC_PKT_LEN (pdesc); + ret =get_rx_desc_pkt_len (pdesc);break ;case HW_DESC_RXBUFF_ADDR : - ret =GET_RX_DESC_BUFF_ADDR (pdesc); + ret =get_rx_desc_buff_addr (pdesc);break ;default : WARN_ONCE(true, "rtl8723be: ERR rxdesc :%d not processed\n",
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h +368 -170
547 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 8/9 rtlwifi: rtl8723be: Convert inline routines to little-endian words
In reply to Larry FingerIn this step, the read/write routines for the descriptors are converted to use __le32 quantities, thus a lot of casts can be removed. Callback routines still use the 8-bit arrays, but these are changed within the specified routine.
The macro that cleared a descriptor has now been converted into an inline routine.
---
V2 - Add a missing inline direective in rtl8723be/trx.h
--- .../wireless/realtek/rtlwifi/rtl8723be/trx.c | 34 +- .../wireless/realtek/rtlwifi/rtl8723be/trx.h | 310 +++++++++--------- 2 files changed, 175 insertions(+), 169 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c +20 -14
@@ -26,7 +26,8 @@ static u8 _rtl8723be_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue) } static void _rtl8723be_query_rxphystatus(struct ieee80211_hw *hw, - struct rtl_stats *pstatus, u8 *pdesc, + struct rtl_stats *pstatus, + __le32 *pdesc, struct rx_fwinfo_8723be *p_drvinfo, bool bpacket_match_bssid, bool bpacket_toself,
@@ -189,7 +190,7 @@ static void _rtl8723be_query_rxphystatus(struct ieee80211_hw *hw,static void _rtl8723be_translate_rx_signal_stuff (struct ieee80211_hw *hw,struct sk_buff *skb,struct rtl_stats *pstatus, -u8 *pdesc, +__le32 *pdesc,struct rx_fwinfo_8723be *p_drvinfo) {struct rtl_mac *mac =rtl_mac (rtl_priv (hw));
@@ -242,7 +243,7 @@ static void _rtl8723be_translate_rx_signal_stuff(struct ieee80211_hw *hw, }static void _rtl8723be_insert_emcontent (struct rtl_tcb_desc *ptcb_desc, -u8 *virtualaddress) +__le32 *virtualaddress) {u32 dwtmp =0 ;memset (virtualaddress,0 ,8 );
@@ -295,12 +296,13 @@ static void _rtl8723be_insert_emcontent(struct rtl_tcb_desc *ptcb_desc,bool rtl8723be_rx_query_desc (struct ieee80211_hw *hw,struct rtl_stats *status,struct ieee80211_rx_status *rx_status, -u8 *pdesc,struct sk_buff *skb) +u8 *pdesc8,struct sk_buff *skb) {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rx_fwinfo_8723be *p_drvinfo;struct ieee80211_hdr *hdr;u8 wake_match; +__le32 *pdesc = (__le32 *)pdesc8;u32 phystatus =get_rx_desc_physt (pdesc); status->length = (u16 )get_rx_desc_pkt_len (pdesc);
@@ -400,7 +402,7 @@ bool rtl8723be_rx_query_desc(struct ieee80211_hw *hw, }void rtl8723be_tx_fill_desc (struct ieee80211_hw *hw, -struct ieee80211_hdr *hdr,u8 *pdesc_tx, +struct ieee80211_hdr *hdr,u8 *pdesc8,u8 *txbd,struct ieee80211_tx_info *info,struct ieee80211_sta *sta,struct sk_buff *skb,u8 hw_queue,struct rtl_tcb_desc *ptcb_desc)
@@ -410,7 +412,7 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));struct rtl_hal *rtlhal =rtl_hal (rtlpriv);struct rtlwifi_tx_info *tx_info =rtl_tx_skb_cb_info (skb); -u8 *pdesc = (u8 *)pdesc_tx; +__le32 *pdesc = (__le32 *)pdesc8;u16 seq_number;__le16 fc = hdr->frame_control;unsigned int buf_len =0 ;
@@ -446,7 +448,7 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,RT_TRACE (rtlpriv,COMP_SEND ,DBG_TRACE ,"DMA mapping error\n" );return ; } -CLEAR_PCI_TX_DESC_CONTENT (pdesc,sizeof (struct tx_desc_8723be )); +clear_pci_tx_desc_content (pdesc,sizeof (struct tx_desc_8723be ));if (ieee80211_is_nullfunc (fc) ||ieee80211_is_ctl (fc)) { firstseg = true; lastseg = true;
@@ -461,7 +463,7 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,"Insert 8 byte.pTcb->EMPktNum:%d\n" , ptcb_desc->empkt_num);_rtl8723be_insert_emcontent (ptcb_desc, - (u8 *)(skb->data)); + (__le32 *)(skb->data)); } }else {set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN );
@@ -556,7 +558,7 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw, } }/* tx report */ -rtl_set_tx_report (ptcb_desc, pdesc, hw, tx_info); +rtl_set_tx_report (ptcb_desc, pdesc8, hw, tx_info); }set_tx_desc_first_seg (pdesc, (firstseg ?1 :0 ));
@@ -584,13 +586,14 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,RT_TRACE (rtlpriv,COMP_SEND ,DBG_TRACE ,"\n" ); } -void rtl8723be_tx_fill_cmddesc (struct ieee80211_hw *hw,u8 *pdesc, +void rtl8723be_tx_fill_cmddesc (struct ieee80211_hw *hw,u8 *pdesc8,bool firstseg,bool lastseg,struct sk_buff *skb) {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));u8 fw_queue =QSLT_BEACON ; +__le32 *pdesc = (__le32 *)pdesc8; dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
@@ -601,7 +604,7 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, "DMA mapping error\n");return ; } -CLEAR_PCI_TX_DESC_CONTENT (pdesc,TX_DESC_SIZE ); +clear_pci_tx_desc_content (pdesc,TX_DESC_SIZE );set_tx_desc_offset (pdesc,USB_HWDESC_HEADER_LEN );
@@ -625,7 +628,7 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,set_tx_desc_own (pdesc,1 ); -set_tx_desc_pkt_size ((u8 *)pdesc, (u16)(skb->len)); +set_tx_desc_pkt_size (pdesc, (u16)(skb->len));set_tx_desc_first_seg (pdesc,1 );set_tx_desc_last_seg (pdesc,1 );
@@ -636,9 +639,11 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, "H2C Tx Cmd Content\n", pdesc, TX_DESC_SIZE); } -void rtl8723be_set_desc (struct ieee80211_hw *hw,u8 *pdesc, +void rtl8723be_set_desc (struct ieee80211_hw *hw,u8 *pdesc8,bool istx,u8 desc_name,u8 *val) { +__le32 *pdesc = (__le32 *)pdesc8; +if (istx) {switch (desc_name) {case HW_DESC_OWN :
@@ -675,9 +680,10 @@ void rtl8723be_set_desc(struct ieee80211_hw *hw, u8 *pdesc, }u64 rtl8723be_get_desc (struct ieee80211_hw *hw, -u8 *pdesc,bool istx,u8 desc_name) +u8 *pdesc8,bool istx,u8 desc_name) {u32 ret =0 ; +__le32 *pdesc = (__le32 *)pdesc8;if (istx) {switch (desc_name) {
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h +155 -155
540 lines not on this page · raw message
Signature · 1 line
2.23.0
PATCH v2 9/9 rtlwifi: rtl8188ee: rtl8192ce: rtl8192de: rtl8723ae: rtl8821ae: Remove some unused bit manipulation macros
In reply to Larry FingerEach of these drivers defines some device to host macros that are never used, thus they can be removed.
---
v2 - no changes
--- drivers/net/wireless/realtek/rtlwifi/base.h | 27 --------------- .../wireless/realtek/rtlwifi/rtl8188ee/def.h | 29 ---------------- .../wireless/realtek/rtlwifi/rtl8192ce/def.h | 33 ------------------- .../wireless/realtek/rtlwifi/rtl8192de/def.h | 31 ----------------- .../wireless/realtek/rtlwifi/rtl8723ae/def.h | 31 ----------------- .../wireless/realtek/rtlwifi/rtl8821ae/def.h | 31 ----------------- 6 files changed, 182 deletions(-)
drivers/net/wireless/realtek/rtlwifi/base.h +0 -27
@@ -46,15 +46,6 @@ enum ap_peer {#define MAX_LISTEN_INTERVAL 10#define MAX_RATE_TRIES 4 -#define SET_80211_HDR_FRAME_CONTROL (_hdr, _val) \ - WRITEEF2BYTE(_hdr, _val) -#define SET_80211_HDR_TYPE_AND_SUBTYPE (_hdr, _val) \ - WRITEEF1BYTE(_hdr, _val) -#define SET_80211_HDR_PWR_MGNT (_hdr, _val) \ - SET_BITS_TO_LE_2BYTE(_hdr, 12, 1, _val) -#define SET_80211_HDR_TO_DS (_hdr, _val) \ - SET_BITS_TO_LE_2BYTE(_hdr, 8, 1, _val) -#define SET_80211_PS_POLL_AID (_hdr, _val) \ (*(u16 *)((u8 *)(_hdr) + 2) = _val)#define SET_80211_PS_POLL_BSSID (_hdr, _val) \
@@ -62,30 +53,12 @@ enum ap_peer {#define SET_80211_PS_POLL_TA (_hdr, _val) \ ether_addr_copy(((u8 *)(_hdr))+10, (u8 *)(_val)) -#define SET_80211_HDR_DURATION (_hdr, _val) \ - (*(u16 *)((u8 *)(_hdr) + FRAME_OFFSET_DURATION) = le16_to_cpu(_val))#define SET_80211_HDR_ADDRESS1 (_hdr, _val) \ CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS1, (u8 *)(_val))#define SET_80211_HDR_ADDRESS2 (_hdr, _val) \ CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS2, (u8 *)(_val))#define SET_80211_HDR_ADDRESS3 (_hdr, _val) \ CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS3, (u8 *)(_val)) -#define SET_80211_HDR_FRAGMENT_SEQUENCE (_hdr, _val) \ - WRITEEF2BYTE((u8 *)(_hdr)+FRAME_OFFSET_SEQUENCE, _val) - -#define SET_BEACON_PROBE_RSP_TIME_STAMP_LOW (__phdr, __val) \ - WRITEEF4BYTE(((u8 *)(__phdr)) + 24, __val) -#define SET_BEACON_PROBE_RSP_TIME_STAMP_HIGH (__phdr, __val) \ - WRITEEF4BYTE(((u8 *)(__phdr)) + 28, __val) -#define SET_BEACON_PROBE_RSP_BEACON_INTERVAL (__phdr, __val) \ - WRITEEF2BYTE(((u8 *)(__phdr)) + 32, __val) -#define GET_BEACON_PROBE_RSP_CAPABILITY_INFO (__phdr) \ - READEF2BYTE(((u8 *)(__phdr)) + 34) -#define SET_BEACON_PROBE_RSP_CAPABILITY_INFO (__phdr, __val) \ - WRITEEF2BYTE(((u8 *)(__phdr)) + 34, __val) -#define MASK_BEACON_PROBE_RSP_CAPABILITY_INFO (__phdr, __val) \ - SET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, \ - (GET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr) & (~(__val))))#define SET_TX_DESC_SPE_RPT (__pdesc, __val) \ SET_BITS_TO_LE_4BYTE((__pdesc) + 8, 19, 1, __val)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h +0 -29
@@ -12,35 +12,6 @@#define RX_CMD_QUEUE 1#define C2H_RX_CMD_HDR_LEN 8 -#define GET_C2H_CMD_CMD_LEN (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 0, 16) -#define GET_C2H_CMD_ELEMENT_ID (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 16, 8) -#define GET_C2H_CMD_CMD_SEQ (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 24, 7) -#define GET_C2H_CMD_CONTINUE (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 31, 1) -#define GET_C2H_CMD_CONTENT (__prxhdr) \ - ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN) - -#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_LEN (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16) -#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_VALID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_TOK (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_QSEL (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4) -#define GET_C2H_CMD_FEEDBACK_CCX_SEQ (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)#define CHIP_BONDING_IDENTIFIER (_value) (((_value)>>22)&0x3)
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h +0 -33
@@ -17,39 +17,6 @@#define RX_MPDU_QUEUE 0#define RX_CMD_QUEUE 1 -#define C2H_RX_CMD_HDR_LEN 8 -#define GET_C2H_CMD_CMD_LEN (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 0, 16) -#define GET_C2H_CMD_ELEMENT_ID (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 16, 8) -#define GET_C2H_CMD_CMD_SEQ (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 24, 7) -#define GET_C2H_CMD_CONTINUE (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 31, 1) -#define GET_C2H_CMD_CONTENT (__prxhdr) \ - ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN) - -#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_LEN (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16) -#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_VALID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_TOK (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_QSEL (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4) -#define GET_C2H_CMD_FEEDBACK_CCX_SEQ (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12) -#define GET_RX_STATUS_DESC_BUFF_ADDR (__pdesc) \ - SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32) -#define CHIP_VER_B BIT(4)#define CHIP_BONDING_IDENTIFIER (_value) (((_value) >> 22) & 0x3)#define CHIP_BONDING_92C_1T2R 0x1
drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h +0 -31
@@ -26,37 +26,6 @@#define RX_MPDU_QUEUE 0#define RX_CMD_QUEUE 1 -#define C2H_RX_CMD_HDR_LEN 8 -#define GET_C2H_CMD_CMD_LEN (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 0, 16) -#define GET_C2H_CMD_ELEMENT_ID (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 16, 8) -#define GET_C2H_CMD_CMD_SEQ (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 24, 7) -#define GET_C2H_CMD_CONTINUE (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 31, 1) -#define GET_C2H_CMD_CONTENT (__prxhdr) \ - ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN) - -#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_LEN (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16) -#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_VALID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_TOK (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_QSEL (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4) -#define GET_C2H_CMD_FEEDBACK_CCX_SEQ (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12) -enum version_8192d {VERSION_TEST_CHIP_88C =0x0000 ,VERSION_TEST_CHIP_92C =0x0020 ,
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h +0 -31
@@ -11,37 +11,6 @@#define RX_MPDU_QUEUE 0#define RX_CMD_QUEUE 1 -#define C2H_RX_CMD_HDR_LEN 8 -#define GET_C2H_CMD_CMD_LEN (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 0, 16) -#define GET_C2H_CMD_ELEMENT_ID (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 16, 8) -#define GET_C2H_CMD_CMD_SEQ (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 24, 7) -#define GET_C2H_CMD_CONTINUE (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 31, 1) -#define GET_C2H_CMD_CONTENT (__prxhdr) \ - ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN) - -#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_LEN (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16) -#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_VALID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_TOK (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_QSEL (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4) -#define GET_C2H_CMD_FEEDBACK_CCX_SEQ (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12) -#define CHIP_BONDING_IDENTIFIER (_value) (((_value)>>22)&0x3)#define CHIP_BONDING_92C_1T2R 0x1
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h +0 -31
@@ -107,37 +107,6 @@#define MAX_RX_DMA_BUFFER_SIZE_8812 0x3E80 -#define C2H_RX_CMD_HDR_LEN 8 -#define GET_C2H_CMD_CMD_LEN (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 0, 16) -#define GET_C2H_CMD_ELEMENT_ID (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 16, 8) -#define GET_C2H_CMD_CMD_SEQ (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 24, 7) -#define GET_C2H_CMD_CONTINUE (__prxhdr) \ - LE_BITS_TO_4BYTE((__prxhdr), 31, 1) -#define GET_C2H_CMD_CONTENT (__prxhdr) \ - ((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN) - -#define GET_C2H_CMD_FEEDBACK_ELEMENT_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_LEN (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8) -#define GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16) -#define GET_C2H_CMD_FEEDBACK_CCX_MAC_ID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_VALID (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5) -#define GET_C2H_CMD_FEEDBACK_CCX_TOK (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1) -#define GET_C2H_CMD_FEEDBACK_CCX_QSEL (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4) -#define GET_C2H_CMD_FEEDBACK_CCX_SEQ (__pcmdfbhdr) \ - LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12) -#define CHIP_BONDING_IDENTIFIER (_value) (((_value)>>22)&0x3)#define CHIP_8812 BIT(2)
Signature · 1 line
2.23.0