p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rtlwifi: rtl8723ae: rtl8723be: rtl8723com: Fix firmware header endian issues 

The drivers are 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: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Larry Finger 2015-08-03 15:56:12 -05:00 committed by Kalle Valo
parent e41c513599
commit 7c24d086ef
5 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
View File

@ -205,9 +205,9 @@ bool rtl8723e_get_btc_status(void)
return true; return true;
} }
static bool is_fw_header(struct rtl8723e_firmware_header *hdr) static bool is_fw_header(struct rtlwifi_firmware_header *hdr)
{ {
return (hdr->signature & 0xfff0) == 0x2300; return (le16_to_cpu(hdr->signature) & 0xfff0) == 0x2300;
} }
static struct rtl_hal_ops rtl8723e_hal_ops = { static struct rtl_hal_ops rtl8723e_hal_ops = {

4
drivers/net/wireless/rtlwifi/rtl8723be/sw.c
View File

@ -209,9 +209,9 @@ bool rtl8723be_get_btc_status(void)
return true; return true;
} }
static bool is_fw_header(struct rtl8723e_firmware_header *hdr) static bool is_fw_header(struct rtlwifi_firmware_header *hdr)
{ {
return (hdr->signature & 0xfff0) == 0x5300; return (le16_to_cpu(hdr->signature) & 0xfff0) == 0x5300;
} }
static struct rtl_hal_ops rtl8723be_hal_ops = { static struct rtl_hal_ops rtl8723be_hal_ops = {

10
drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c
View File

@ -253,7 +253,7 @@ int rtl8723_download_fw(struct ieee80211_hw *hw,
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
struct rtl8723e_firmware_header *pfwheader; struct rtlwifi_firmware_header *pfwheader;
u8 *pfwdata; u8 *pfwdata;
u32 fwsize; u32 fwsize;
int err; int err;
@ -263,7 +263,7 @@ int rtl8723_download_fw(struct ieee80211_hw *hw,
if (!rtlhal->pfirmware) if (!rtlhal->pfirmware)
return 1; return 1;
pfwheader = (struct rtl8723e_firmware_header *)rtlhal->pfirmware; pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware;
pfwdata = rtlhal->pfirmware; pfwdata = rtlhal->pfirmware;
fwsize = rtlhal->fwsize; fwsize = rtlhal->fwsize;
@ -275,10 +275,10 @@ int rtl8723_download_fw(struct ieee80211_hw *hw,
RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
"Firmware Version(%d), Signature(%#x), Size(%d)\n", "Firmware Version(%d), Signature(%#x), Size(%d)\n",
pfwheader->version, pfwheader->signature, pfwheader->version, pfwheader->signature,
(int)sizeof(struct rtl8723e_firmware_header)); (int)sizeof(struct rtlwifi_firmware_header));
pfwdata = pfwdata + sizeof(struct rtl8723e_firmware_header); pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);
fwsize = fwsize - sizeof(struct rtl8723e_firmware_header); fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);
} }
if (rtl_read_byte(rtlpriv, REG_MCUFWDL)&BIT(7)) { if (rtl_read_byte(rtlpriv, REG_MCUFWDL)&BIT(7)) {

19
drivers/net/wireless/rtlwifi/rtl8723com/fw_common.h
View File

@ -50,25 +50,6 @@ enum version_8723e {
VERSION_UNKNOWN = 0xFF, VERSION_UNKNOWN = 0xFF,
}; };
struct rtl8723e_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 rtl8723be_cmd { enum rtl8723be_cmd {
H2C_8723BE_RSVDPAGE = 0, H2C_8723BE_RSVDPAGE = 0,
H2C_8723BE_JOINBSSRPT = 1, H2C_8723BE_JOINBSSRPT = 1,

4
drivers/net/wireless/rtlwifi/wifi.h
View File

@ -2089,8 +2089,6 @@ struct rtl_wow_pattern {
u32 mask[4]; u32 mask[4];
}; };
struct rtl8723e_firmware_header;
struct rtl_hal_ops { struct rtl_hal_ops {
int (*init_sw_vars) (struct ieee80211_hw *hw); int (*init_sw_vars) (struct ieee80211_hw *hw);
void (*deinit_sw_vars) (struct ieee80211_hw *hw); void (*deinit_sw_vars) (struct ieee80211_hw *hw);
@ -2194,7 +2192,7 @@ struct rtl_hal_ops {
void (*fill_h2c_cmd) (struct ieee80211_hw *hw, u8 element_id, void (*fill_h2c_cmd) (struct ieee80211_hw *hw, u8 element_id,
u32 cmd_len, u8 *p_cmdbuffer); u32 cmd_len, u8 *p_cmdbuffer);
bool (*get_btc_status) (void); bool (*get_btc_status) (void);
bool (*is_fw_header)(struct rtl8723e_firmware_header *hdr); bool (*is_fw_header)(struct rtlwifi_firmware_header *hdr);
u32 (*rx_command_packet)(struct ieee80211_hw *hw, u32 (*rx_command_packet)(struct ieee80211_hw *hw,
struct rtl_stats status, struct sk_buff *skb); struct rtl_stats status, struct sk_buff *skb);
void (*add_wowlan_pattern)(struct ieee80211_hw *hw, void (*add_wowlan_pattern)(struct ieee80211_hw *hw,