mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-14 23:06:50 +07:00
rtlwifi: rtl8821ae: Convert driver to use common hardware info routine
The driver for RTL8821AE chips is converted to use the common routine for getting the hardware information. Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
parent
9e9c9c247c
commit
2f7b4b8953
@ -3101,86 +3101,22 @@ static void _rtl8821ae_read_adapter_info(struct ieee80211_hw *hw, bool b_pseudo_
|
||||
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
|
||||
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
|
||||
struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
|
||||
struct device *dev = &rtl_pcipriv(hw)->dev.pdev->dev;
|
||||
u16 i, usvalue;
|
||||
u8 hwinfo[HWSET_MAX_SIZE];
|
||||
u16 eeprom_id;
|
||||
int params[] = {RTL_EEPROM_ID, EEPROM_VID, EEPROM_DID,
|
||||
EEPROM_SVID, EEPROM_SMID, EEPROM_MAC_ADDR,
|
||||
EEPROM_CHANNELPLAN, EEPROM_VERSION, EEPROM_CUSTOMER_ID,
|
||||
COUNTRY_CODE_WORLD_WIDE_13};
|
||||
u8 *hwinfo;
|
||||
|
||||
if (b_pseudo_test) {
|
||||
;/* need add */
|
||||
}
|
||||
|
||||
switch (rtlefuse->epromtype) {
|
||||
case EEPROM_BOOT_EFUSE:
|
||||
rtl_efuse_shadow_map_update(hw);
|
||||
break;
|
||||
|
||||
case EEPROM_93C46:
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
"RTL819X Not boot from eeprom, check it !!\n");
|
||||
hwinfo = kzalloc(HWSET_MAX_SIZE, GFP_KERNEL);
|
||||
if (!hwinfo)
|
||||
return;
|
||||
|
||||
default:
|
||||
dev_warn(dev, "no efuse data\n");
|
||||
}
|
||||
memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0], HWSET_MAX_SIZE);
|
||||
|
||||
RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP\n",
|
||||
hwinfo, HWSET_MAX_SIZE);
|
||||
|
||||
eeprom_id = *((u16 *)&hwinfo[0]);
|
||||
if (eeprom_id != RTL_EEPROM_ID) {
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
|
||||
"EEPROM ID(%#x) is invalid!!\n", eeprom_id);
|
||||
rtlefuse->autoload_failflag = true;
|
||||
} else {
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
|
||||
rtlefuse->autoload_failflag = false;
|
||||
}
|
||||
|
||||
if (rtlefuse->autoload_failflag) {
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
"RTL8812AE autoload_failflag, check it !!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
rtlefuse->eeprom_version = *(u8 *)&hwinfo[EEPROM_VERSION];
|
||||
if (rtlefuse->eeprom_version == 0xff)
|
||||
rtlefuse->eeprom_version = 0;
|
||||
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
|
||||
"EEPROM version: 0x%2x\n", rtlefuse->eeprom_version);
|
||||
|
||||
rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
|
||||
rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
|
||||
rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
|
||||
rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
|
||||
"EEPROMId = 0x%4x\n", eeprom_id);
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
|
||||
"EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
|
||||
"EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
|
||||
"EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
|
||||
"EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
|
||||
|
||||
/*customer ID*/
|
||||
rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
|
||||
if (rtlefuse->eeprom_oemid == 0xFF)
|
||||
rtlefuse->eeprom_oemid = 0;
|
||||
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
|
||||
"EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
|
||||
|
||||
for (i = 0; i < 6; i += 2) {
|
||||
usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
|
||||
*((u16 *)(&rtlefuse->dev_addr[i])) = usvalue;
|
||||
}
|
||||
|
||||
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
|
||||
"dev_addr: %pM\n", rtlefuse->dev_addr);
|
||||
if (rtl_get_hwinfo(hw, rtlpriv, HWSET_MAX_SIZE, hwinfo, params))
|
||||
goto exit;
|
||||
|
||||
_rtl8821ae_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,
|
||||
hwinfo);
|
||||
@ -3280,6 +3216,8 @@ static void _rtl8821ae_read_adapter_info(struct ieee80211_hw *hw, bool b_pseudo_
|
||||
break;
|
||||
}
|
||||
}
|
||||
exit:
|
||||
kfree(hwinfo);
|
||||
}
|
||||
|
||||
/*static void _rtl8821ae_hal_customized_behavior(struct ieee80211_hw *hw)
|
||||
|
Loading…
Reference in New Issue
Block a user