[PATCH rtw-next] wifi: rtlwifi: rtl8821ae: Fix C2H bit location in RX descriptor

[PATCH rtw-next] wifi: rtlwifi: rtl8821ae: Fix C2H bit location in RX descriptor

[Bitterblue Smith]

Bit 28 of double word 2 in the RX descriptor indicates if the packet is
a normal 802.11 frame, or a message from the wifi firmware to the
driver (Card 2 Host).

Commit f5678bfe1cdc ("rtlwifi: rtl8821ae: Replace local bit manipulation
macros") mistakenly made the driver look for this bit in double word 1,
causing packet loss and Bluetooth coexistence problems.

Fixes: f5678bfe1cdc ("rtlwifi: rtl8821ae: Replace local bit manipulation macros")
Cc: <stable@vger.kernel.org>
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
---
 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h
index 0609039b5322..17d37433e312 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h
@@ -291,7 +291,7 @@ static inline int get_rx_desc_paggr(__le32 *__pdesc)
 
 static inline int get_rx_status_desc_rpt_sel(__le32 *__pdesc)
 {
-	return le32_get_bits(*(__pdesc + 1), BIT(28));
+	return le32_get_bits(*(__pdesc + 2), BIT(28));
 }
 
 static inline int get_rx_desc_rxmcs(__le32 *__pdesc)
-- 
2.53.0

RE: [PATCH rtw-next] wifi: rtlwifi: rtl8821ae: Fix C2H bit location in RX descriptor

[Ping-Ke Shih]

Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote:
> Bit 28 of double word 2 in the RX descriptor indicates if the packet is
> a normal 802.11 frame, or a message from the wifi firmware to the
> driver (Card 2 Host).
> 
> Commit f5678bfe1cdc ("rtlwifi: rtl8821ae: Replace local bit manipulation
> macros") mistakenly made the driver look for this bit in double word 1,
> causing packet loss and Bluetooth coexistence problems.

The mistake in the commit is

#define GET_RX_STATUS_DESC_RPT_SEL(__pdesc)                    \
-       LE_BITS_TO_4BYTE(__pdesc+8, 28, 1)
+       le32_get_bits(*((__le32 *)(__pdesc + 4)), BIT(28))

> 
> Fixes: f5678bfe1cdc ("rtlwifi: rtl8821ae: Replace local bit manipulation macros")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>

Re: [PATCH rtw-next] wifi: rtlwifi: rtl8821ae: Fix C2H bit location in RX descriptor

[Ping-Ke Shih]

Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote:

> Bit 28 of double word 2 in the RX descriptor indicates if the packet is
> a normal 802.11 frame, or a message from the wifi firmware to the
> driver (Card 2 Host).
> 
> Commit f5678bfe1cdc ("rtlwifi: rtl8821ae: Replace local bit manipulation
> macros") mistakenly made the driver look for this bit in double word 1,
> causing packet loss and Bluetooth coexistence problems.
> 
> Fixes: f5678bfe1cdc ("rtlwifi: rtl8821ae: Replace local bit manipulation macros")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>

1 patch(es) applied to rtw-next branch of rtw.git, thanks.

83d38df69291 wifi: rtlwifi: rtl8821ae: Fix C2H bit location in RX descriptor

---
https://github.com/pkshih/rtw.git