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

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

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



The driver for RTL8192DE 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 2f7b4b89

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

+15 −62
Original line number Diff line number Diff line
@@ -1744,71 +1744,26 @@ static void _rtl92de_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;

	unsigned long flags;

	int params[] = {RTL8190_EEPROM_ID, EEPROM_VID, EEPROM_DID,

			EEPROM_SVID, EEPROM_SMID, EEPROM_MAC_ADDR_MAC0_92D,

			EEPROM_CHANNEL_PLAN, EEPROM_VERSION, EEPROM_CUSTOMER_ID,

			COUNTRY_CODE_WORLD_WIDE_13};

	int i;

	u16 usvalue;

	u8 *hwinfo;



	switch (rtlefuse->epromtype) {

	case EEPROM_BOOT_EFUSE:

		spin_lock_irqsave(&globalmutex_for_power_and_efuse, flags);

		rtl_efuse_shadow_map_update(hw);

		_rtl92de_efuse_update_chip_version(hw);

		spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags);

		break;

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

	hwinfo = kzalloc(HWSET_MAX_SIZE, GFP_KERNEL);

	if (!hwinfo)

		return;

	}



	memcpy(hwinfo, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0], HWSET_MAX_SIZE);

	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",

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

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

	if (rtl_get_hwinfo(hw, rtlpriv, HWSET_MAX_SIZE, hwinfo, params))

		return;

	}

	rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];

	_rtl92de_read_macphymode_and_bandtype(hw, hwinfo);



	/* VID, DID  SE     0xA-D */

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

	_rtl92de_efuse_update_chip_version(hw);

	_rtl92de_read_macphymode_and_bandtype(hw, hwinfo);



	/* Read Permanent MAC address */

	if (rtlhal->interfaceindex == 0) {

		for (i = 0; i < 6; i += 2) {

			usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR_MAC0_92D + i];

			*((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;

		}

	} else {

	/* Read Permanent MAC address for 2nd interface */

	if (rtlhal->interfaceindex != 0) {

		for (i = 0; i < 6; i += 2) {

			usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR_MAC1_92D + i];

			*((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;
@@ -1834,10 +1789,8 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw) 
		rtlefuse->channel_plan = COUNTRY_CODE_FCC;

		break;

	}

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

	rtlefuse->txpwr_fromeprom = true;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

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

	kfree(hwinfo);

}



void rtl92de_read_eeprom_info(struct ieee80211_hw *hw)