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

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

rtlwifi: rtl8192ce: rtl8192cu: Fix endian issue 



Commit e996db69 (rtlwifi: rtl8192c: Add init codes for "fw_version"
and "fw_subversion") added initialization for fw_version, but failed to
note that the variable in the firmware header is little-endian. The
following Sparse warning results:

  CHECK   drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36: warning: incorrect type in assignment (different base types)
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36:    expected unsigned short [unsigned] [usertype] fw_version
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36:    got restricted __le16 [usertype] version

When fixing this problem, I noticed that several of the drivers contain
nearly identical copies of the firmware header struct, and that only the one
used in rtl8192c{e,u} had correct endian notation. The struct has been
moved into a common header, and the other drivers will be fixed in
subsequant patches.

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

drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c

+6 −6
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ int rtl92c_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;
@@ -230,19 +230,19 @@ int rtl92c_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 = (u8 *)rtlhal->pfirmware;

	fwsize = rtlhal->fwsize;

	if (IS_FW_HEADER_EXIST(pfwheader)) {

		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));



		rtlhal->fw_version = pfwheader->version;

		rtlhal->fw_version = le16_to_cpu(pfwheader->version);

		rtlhal->fw_subversion = pfwheader->subversion;

		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);

	}



	_rtl92c_enable_fw_download(hw, true);

drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h

+0 −19
Original line number Diff line number Diff line
@@ -69,25 +69,6 @@ 
	((GET_CVID_CUT_VERSION(version) == \

		CHIP_VENDOR_UMC_B_CUT) ? true : false) : false)



struct rtl92c_firmware_header {

	__le16 signature;

	u8 category;

	u8 function;

	__le16 version;

	u8 subversion;

	u8 rsvd1;

	u8 month;

	u8 date;

	u8 hour;

	u8 minute;

	__le16 ramcodeSize;

	__le16 rsvd2;

	__le32 svnindex;

	__le32 rsvd3;

	__le32 rsvd4;

	__le32 rsvd5;

};



#define pagenum_128(_len)	(u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))



#define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)			\

drivers/net/wireless/rtlwifi/wifi.h

+19 −2
Original line number Diff line number Diff line
@@ -222,6 +222,25 @@ enum rf_tx_num { 
#define	WOL_REASON_REALWOW_V2_WAKEUPPKT	BIT(9)

#define	WOL_REASON_REALWOW_V2_ACKLOST	BIT(10)



struct rtlwifi_firmware_header {

	__le16 signature;

	u8 category;

	u8 function;

	__le16 version;

	u8 subversion;

	u8 rsvd1;

	u8 month;

	u8 date;

	u8 hour;

	u8 minute;

	__le16 ramcodeSize;

	__le16 rsvd2;

	__le32 svnindex;

	__le32 rsvd3;

	__le32 rsvd4;

	__le32 rsvd5;

};



struct txpower_info_2g {

	u8 index_cck_base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];

	u8 index_bw40_base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];
@@ -2064,8 +2083,6 @@ struct rtl_tcb_desc { 
	bool tx_enable_sw_calc_duration;

};



struct rtl92c_firmware_header;



struct rtl_wow_pattern {

	u8 type;

	u16 crc;