Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a7dfbc authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: Add QoS-NULL and BT-QoS-NULL to reserved page. 



Two additional preset responses are added to the reserved page on the
wifi device.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f70e4df2

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c

+63 −1
Original line number Diff line number Diff line
@@ -468,8 +468,10 @@ void rtl92ee_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus) 
#define PSPOLL_PG		2

#define NULL_PG			3

#define PROBERSP_PG		4 /* ->5 */

#define QOS_NULL_PG		6

#define BT_QOS_NULL_PG	7



#define TOTAL_RESERVED_PKT_LEN	768

#define TOTAL_RESERVED_PKT_LEN	1024



static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {

	/* page 0 beacon */
@@ -570,6 +572,42 @@ static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = { 
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x1A, 0x00, 0x28, 0x8C, 0x00, 0x12, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,



	/* page 6 qos null data */

	0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x1A, 0x00, 0x28, 0x8C, 0x00, 0x12, 0x00, 0x00,

	0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,



	/* page 7 BT-qos null data */

	0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -595,6 +633,8 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) 
	u8 *p_pspoll;

	u8 *nullfunc;

	u8 *p_probersp;

	u8 *qosnull;

	u8 *btqosnull;

	/*---------------------------------------------------------

	 *			(1) beacon

	 *---------------------------------------------------------
@@ -636,6 +676,28 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) 


	SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(u1rsvdpageloc, PROBERSP_PG);



	/*---------------------------------------------------------

	 *			(5) QoS null data

	 *----------------------------------------------------------

	 */

	qosnull = &reserved_page_packet[QOS_NULL_PG * 128];

	SET_80211_HDR_ADDRESS1(qosnull, mac->bssid);

	SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOS_NULL_PG);



	/*---------------------------------------------------------

	 *			(6) BT QoS null data

	 *----------------------------------------------------------

	 */

	btqosnull = &reserved_page_packet[BT_QOS_NULL_PG * 128];

	SET_80211_HDR_ADDRESS1(btqosnull, mac->bssid);

	SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOS_NULL_PG);



	totalpacketlen = TOTAL_RESERVED_PKT_LEN;



	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD ,

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ enum rtl8192e_c2h_evt { 
	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)

#define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)

#define SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd) + 3, 0, 8, __val)

#define SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(__ph2ccmd, __val)	\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd) + 4, 0, 8, __val)



/* _MEDIA_STATUS_RPT_PARM_CMD1 */

#define SET_H2CCMD_MSRRPT_PARM_OPMODE(__cmd, __val)		\

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c

+2 −2
Original line number Diff line number Diff line
@@ -699,9 +699,9 @@ static bool _rtl92ee_llt_table_init(struct ieee80211_hw *hw) 
	u8 txpktbuf_bndy;

	u8 u8tmp, testcnt = 0;



	txpktbuf_bndy = 0xFA;

	txpktbuf_bndy = 0xF7;



	rtl_write_dword(rtlpriv, REG_RQPN, 0x80E90808);

	rtl_write_dword(rtlpriv, REG_RQPN, 0x80E60808);



	rtl_write_byte(rtlpriv, REG_TRXFF_BNDY, txpktbuf_bndy);

	rtl_write_word(rtlpriv, REG_TRXFF_BNDY + 2, 0x3d00 - 1);

drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c

+66 −3
Original line number Diff line number Diff line
@@ -284,8 +284,10 @@ void rtl8723be_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus) 
#define PSPOLL_PG		2

#define NULL_PG			3

#define PROBERSP_PG		4 /* ->5 */

#define QOS_NULL_PG		6

#define BT_QOS_NULL_PG	7



#define TOTAL_RESERVED_PKT_LEN	768

#define TOTAL_RESERVED_PKT_LEN	1024	/* can be up to 1280 (tx_bndy=245) */



static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = {

	/* page 0 beacon */
@@ -390,11 +392,48 @@ static u8 reserved_page_packet[TOTAL_RESERVED_PKT_LEN] = { 
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x1A, 0x00, 0x28, 0x8C, 0x00, 0x12, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,



	/* page 6 qos null data */

	0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x1A, 0x00, 0x28, 0x8C, 0x00, 0x12, 0x00, 0x00,

	0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,



	/* page 7 BT-qos null data */

	0xC8, 0x01, 0x00, 0x00, 0x84, 0xC9, 0xB2, 0xA7,

	0xB3, 0x6E, 0x00, 0xE0, 0x4C, 0x02, 0x51, 0x02,

	0x84, 0xC9, 0xB2, 0xA7, 0xB3, 0x6E, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,



};



void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw,
@@ -413,6 +452,8 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
	u8 *p_pspoll;

	u8 *nullfunc;

	u8 *p_probersp;

	u8 *qosnull;

	u8 *btqosnull;

	/*---------------------------------------------------------

	 *			(1) beacon

	 *---------------------------------------------------------
@@ -454,6 +495,28 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 


	SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(u1rsvdpageloc, PROBERSP_PG);



	/*---------------------------------------------------------

	 *			(5) QoS Null

	 *---------------------------------------------------------

	 */

	qosnull = &reserved_page_packet[QOS_NULL_PG * 128];

	SET_80211_HDR_ADDRESS1(qosnull, mac->bssid);

	SET_80211_HDR_ADDRESS2(qosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(qosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1rsvdpageloc, QOS_NULL_PG);



	/*---------------------------------------------------------

	 *			(5) QoS Null

	 *---------------------------------------------------------

	 */

	btqosnull = &reserved_page_packet[BT_QOS_NULL_PG * 128];

	SET_80211_HDR_ADDRESS1(btqosnull, mac->bssid);

	SET_80211_HDR_ADDRESS2(btqosnull, mac->mac_addr);

	SET_80211_HDR_ADDRESS3(btqosnull, mac->bssid);



	SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1rsvdpageloc, BT_QOS_NULL_PG);



	totalpacketlen = TOTAL_RESERVED_PKT_LEN;



	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
@@ -461,7 +524,7 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
		      &reserved_page_packet[0], totalpacketlen);

	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

		      "rtl8723be_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",

		      u1rsvdpageloc, 3);

		      u1rsvdpageloc, sizeof(u1rsvdpageloc));



	skb = dev_alloc_skb(totalpacketlen);

	memcpy((u8 *)skb_put(skb, totalpacketlen),
@@ -476,7 +539,7 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, 
		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

			 "Set RSVD page location to Fw.\n");

		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG, "H2C_RSVDPAGE:\n",

			      u1rsvdpageloc, 3);

			      u1rsvdpageloc, sizeof(u1rsvdpageloc));

		rtl8723be_fill_h2c_cmd(hw, H2C_8723B_RSVDPAGE,

				       sizeof(u1rsvdpageloc), u1rsvdpageloc);

	} else

drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h

+4 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ enum rtl8723b_c2h_evt { 
	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)

#define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)

#define SET_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(__ph2ccmd, __val)	\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd) + 3, 0, 8, __val)

#define SET_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(__ph2ccmd, __val)	\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd) + 4, 0, 8, __val)





void rtl8723be_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,