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

Commit 201b63c7 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl888ee: Fix firmware header endian issues 



This driver is converted to use the common firmware header struct.
Because the old header definition failed to indicate that the multi-byte
entries should be little endian, several problems were thus exposed.
These are fixed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b290b57d

drivers/net/wireless/rtlwifi/rtl8188ee/fw.c

+5 −5
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	struct rtl92c_firmware_header *pfwheader;

	struct rtlwifi_firmware_header *pfwheader;

	u8 *pfwdata;

	u32 fwsize;

	int err;
@@ -209,7 +209,7 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, 
	if (!rtlhal->pfirmware)

		return 1;



	pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;

	pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware;

	pfwdata = rtlhal->pfirmware;

	fwsize = rtlhal->fwsize;

	RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
@@ -219,10 +219,10 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, 
		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,

			 "Firmware Version(%d), Signature(%#x), Size(%d)\n",

			  pfwheader->version, pfwheader->signature,

			  (int)sizeof(struct rtl92c_firmware_header));

			  (int)sizeof(struct rtlwifi_firmware_header));



		pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);

		fwsize = fwsize - sizeof(struct rtl92c_firmware_header);

		pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);

		fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);

	}



	if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) {

drivers/net/wireless/rtlwifi/rtl8188ee/fw.h

+1 −20
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define FW_8192C_POLLING_TIMEOUT_COUNT		3000



#define IS_FW_HEADER_EXIST(_pfwhdr)		\

	((_pfwhdr->signature&0xFFFF) == 0x88E1)

	((le16_to_cpu(_pfwhdr->signature) & 0xFFFF) == 0x88E1)

#define USE_OLD_WOWLAN_DEBUG_FW			0



#define H2C_88E_RSVDPAGE_LOC_LEN		5
@@ -131,25 +131,6 @@ 
#define	FW_PWR_STATE_ACTIVE	((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))

#define	FW_PWR_STATE_RF_OFF		0



struct rtl92c_firmware_header {

	u16 signature;

	u8 category;

	u8 function;

	u16 version;

	u8 subversion;

	u8 rsvd1;

	u8 month;

	u8 date;

	u8 hour;

	u8 minute;

	u16 ramcodesize;

	u16 rsvd2;

	u32 svnindex;

	u32 rsvd3;

	u32 rsvd4;

	u32 rsvd5;

};



enum rtl8188e_h2c_cmd {

	H2C_88E_RSVDPAGE = 0,

	H2C_88E_JOINBSSRPT = 1,