hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtlwifi: rtl8821ae: Fix firmware 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: 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:13 -05:00 committed by Kalle Valo
parent 7c24d086ef
commit 253f10abb7
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/wireless/rtlwifi/rtl8821ae/fw.c
View File

@ -210,7 +210,7 @@ int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
{ {
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 rtl8821a_firmware_header *pfwheader; struct rtlwifi_firmware_header *pfwheader;
u8 *pfwdata; u8 *pfwdata;
u32 fwsize; u32 fwsize;
int err; int err;
@ -228,8 +228,8 @@ int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
return 1; return 1;
pfwheader = pfwheader =
(struct rtl8821a_firmware_header *)rtlhal->wowlan_firmware; (struct rtlwifi_firmware_header *)rtlhal->wowlan_firmware;
rtlhal->fw_version = pfwheader->version; rtlhal->fw_version = le16_to_cpu(pfwheader->version);
rtlhal->fw_subversion = pfwheader->subversion; rtlhal->fw_subversion = pfwheader->subversion;
pfwdata = (u8 *)rtlhal->wowlan_firmware; pfwdata = (u8 *)rtlhal->wowlan_firmware;
fwsize = rtlhal->wowlan_fwsize; fwsize = rtlhal->wowlan_fwsize;
@ -238,8 +238,8 @@ int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
return 1; return 1;
pfwheader = pfwheader =
(struct rtl8821a_firmware_header *)rtlhal->pfirmware; (struct rtlwifi_firmware_header *)rtlhal->pfirmware;
rtlhal->fw_version = pfwheader->version; rtlhal->fw_version = le16_to_cpu(pfwheader->version);
rtlhal->fw_subversion = pfwheader->subversion; rtlhal->fw_subversion = pfwheader->subversion;
pfwdata = (u8 *)rtlhal->pfirmware; pfwdata = (u8 *)rtlhal->pfirmware;
fwsize = rtlhal->fwsize; fwsize = rtlhal->fwsize;
@ -255,8 +255,8 @@ int rtl8821ae_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
"Firmware Version(%d), Signature(%#x)\n", "Firmware Version(%d), Signature(%#x)\n",
pfwheader->version, pfwheader->signature); pfwheader->version, pfwheader->signature);
pfwdata = pfwdata + sizeof(struct rtl8821a_firmware_header); pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);
fwsize = fwsize - sizeof(struct rtl8821a_firmware_header); fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);
} }
if (rtlhal->mac_func_enable) { if (rtlhal->mac_func_enable) {

23
drivers/net/wireless/rtlwifi/rtl8821ae/fw.h
View File

@ -34,10 +34,10 @@
#define FW_8821AE_POLLING_TIMEOUT_COUNT 6000 #define FW_8821AE_POLLING_TIMEOUT_COUNT 6000
#define IS_FW_HEADER_EXIST_8812(_pfwhdr) \ #define IS_FW_HEADER_EXIST_8812(_pfwhdr) \
((_pfwhdr->signature&0xFFF0) == 0x9500) ((le16_to_cpu(_pfwhdr->signature) & 0xFFF0) == 0x9500)
#define IS_FW_HEADER_EXIST_8821(_pfwhdr) \ #define IS_FW_HEADER_EXIST_8821(_pfwhdr) \
((_pfwhdr->signature&0xFFF0) == 0x2100) ((le16_to_cpu(_pfwhdr->signature) & 0xFFF0) == 0x2100)
#define USE_OLD_WOWLAN_DEBUG_FW 0 #define USE_OLD_WOWLAN_DEBUG_FW 0
@ -137,25 +137,6 @@
#define FW_PWR_STATE_ACTIVE ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE)) #define FW_PWR_STATE_ACTIVE ((FW_PS_RF_ON) | (FW_PS_REGISTER_ACTIVE))
#define FW_PWR_STATE_RF_OFF 0 #define FW_PWR_STATE_RF_OFF 0
struct rtl8821a_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 rtl8812_c2h_evt { enum rtl8812_c2h_evt {
C2H_8812_DBG = 0, C2H_8812_DBG = 0,
C2H_8812_LB = 1, C2H_8812_LB = 1,