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

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

rtlwifi: rtl8723ae: Convert driver to use common hardware info routine 



The driver for RTL8723AE chips is converted to use the common routine
for getting the hardware information.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 5c392654

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c

+11 −65
Original line number Diff line number Diff line
@@ -1630,67 +1630,22 @@ static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));

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

	struct device *dev = &rtl_pcipriv(hw)->dev.pdev->dev;

	u16 i, usvalue;

	u8 hwinfo[HWSET_MAX_SIZE];

	u16 eeprom_id;

	int params[] = {RTL8190_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 */

		return;

	}

	switch (rtlefuse->epromtype) {

	case EEPROM_BOOT_EFUSE:

		rtl_efuse_shadow_map_update(hw);



	case EEPROM_93C46:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "RTL819X Not boot from eeprom, check it !!\n");

		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 != RTL8190_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)

	hwinfo = kzalloc(HWSET_MAX_SIZE, GFP_KERNEL);

	if (!hwinfo)

		return;



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



	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;



	_rtl8723e_read_txpower_info_from_hwpg(hw, rtlefuse->autoload_failflag,

					      hwinfo);
@@ -1698,17 +1653,6 @@ static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw, 
	rtl8723e_read_bt_coexist_info_from_hwpg(hw,

			rtlefuse->autoload_failflag, hwinfo);



	rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];

	rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];

	rtlefuse->txpwr_fromeprom = true;

	rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);



	/* set channel paln to world wide 13 */

	rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;



	if (rtlhal->oem_id == RT_CID_DEFAULT) {

		switch (rtlefuse->eeprom_oemid) {

		case EEPROM_CID_DEFAULT:
@@ -1836,6 +1780,8 @@ static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw, 


		}

	}

exit:

	kfree(hwinfo);

}



static void _rtl8723e_hal_customized_behavior(struct ieee80211_hw *hw)