Commit 014bba73 authored by Bitterblue Smith's avatar Bitterblue Smith Committed by Ping-Ke Shih
Browse files

wifi: rtlwifi: Adjust rtl8192d-common for USB 



A few of the shared functions need small changes for the USB driver:
 - firmware loading
 - efuse reading
 - rate mask updating
 - rf register reading
 - initial gain for scanning

Also, add a few macros to wifi.h and initialise rtlhal.interfaceindex
for USB devices.

Signed-off-by: default avatarBitterblue Smith <rtl8821cerfe2@gmail.com>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/28100330-f421-4b85-b41b-f1045380cef2@gmail.com
parent d75589a0

drivers/net/wireless/realtek/rtlwifi/efuse.c

+1 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ static u8 efuse_calculate_word_cnts(u8 word_en) 
}



int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,

		   int max_size, u8 *hwinfo, int *params)

		   int max_size, u8 *hwinfo, const int *params)

{

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

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);

drivers/net/wireless/realtek/rtlwifi/efuse.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void efuse_force_write_vendor_id(struct ieee80211_hw *hw); 
void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx);

void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate);

int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,

		   int max_size, u8 *hwinfo, int *params);

		   int max_size, u8 *hwinfo, const int *params);

void rtl_fill_dummy(u8 *pfwbuf, u32 *pfwlen);

void rtl_fw_page_write(struct ieee80211_hw *hw, u32 page, u8 *buffer,

		       u32 size);

drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c

+22 −1
Original line number Diff line number Diff line
@@ -98,24 +98,45 @@ int rtl92d_fw_free_to_go(struct ieee80211_hw *hw) 
}

EXPORT_SYMBOL_GPL(rtl92d_fw_free_to_go);



#define RTL_USB_DELAY_FACTOR		60



void rtl92d_firmware_selfreset(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);

	u8 u1b_tmp;

	u8 delay = 100;



	if (rtlhal->interface == INTF_USB) {

		delay *= RTL_USB_DELAY_FACTOR;



		rtl_write_byte(rtlpriv, REG_FSIMR, 0);



		/* We need to disable other HRCV INT to influence 8051 reset. */

		rtl_write_byte(rtlpriv, REG_FWIMR, 0x20);



		/* Close mask to prevent incorrect FW write operation. */

		rtl_write_byte(rtlpriv, REG_FTIMR, 0);

	}



	/* Set (REG_HMETFR + 3) to  0x20 is reset 8051 */

	rtl_write_byte(rtlpriv, REG_HMETFR + 3, 0x20);



	u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);



	while (u1b_tmp & BIT(2)) {

	while (u1b_tmp & (FEN_CPUEN >> 8)) {

		delay--;

		if (delay == 0)

			break;

		udelay(50);

		u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);

	}



	if (rtlhal->interface == INTF_USB) {

		if ((u1b_tmp & (FEN_CPUEN >> 8)) && delay == 0)

			rtl_write_byte(rtlpriv, REG_FWIMR, 0);

	}



	WARN_ONCE((delay <= 0), "rtl8192de: 8051 reset failed!\n");

	rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG,

		"=====> 8051 reset success (%d)\n", delay);

drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.h

+10 −0
Original line number Diff line number Diff line
@@ -25,6 +25,16 @@ 
#define GET_FIRMWARE_HDR_SUB_VER(__fwhdr)		\

	le32_get_bits(*(__le32 *)((__fwhdr) + 4), GENMASK(23, 16))



#define RAID_MASK               GENMASK(31, 28)

#define RATE_MASK_MASK          GENMASK(27, 0)

#define SHORT_GI_MASK           BIT(5)

#define MACID_MASK              GENMASK(4, 0)



struct rtl92d_rate_mask_h2c {

	__le32 rate_mask_and_raid;

	u8 macid_and_short_gi;

} __packed;



bool rtl92d_is_fw_downloaded(struct rtl_priv *rtlpriv);

void rtl92d_enable_fw_download(struct ieee80211_hw *hw, bool enable);

void rtl92d_write_fw(struct ieee80211_hw *hw,

drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c

+48 −13
Original line number Diff line number Diff line
@@ -618,9 +618,14 @@ static void _rtl92de_read_macphymode_from_prom(struct ieee80211_hw *hw, 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

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

	u8 macphy_crvalue = content[EEPROM_MAC_FUNCTION];

	bool is_single_mac = true;



	if (macphy_crvalue & BIT(3)) {

	if (rtlhal->interface == INTF_PCI)

		is_single_mac = !!(content[EEPROM_MAC_FUNCTION] & BIT(3));

	else if (rtlhal->interface == INTF_USB)

		is_single_mac = !(content[EEPROM_ENDPOINT_SETTING] & BIT(0));



	if (is_single_mac) {

		rtlhal->macphymode = SINGLEMAC_SINGLEPHY;

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"MacPhyMode SINGLEMAC_SINGLEPHY\n");
@@ -659,6 +664,7 @@ static void _rtl92de_efuse_update_chip_version(struct ieee80211_hw *hw) 
		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "D-CUT!!!\n");

		break;

	case 0xCC33:

	case 0x33CC:

		chipver |= CHIP_92D_E_CUT;

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "E-CUT!!!\n");

		break;
@@ -672,15 +678,27 @@ static void _rtl92de_efuse_update_chip_version(struct ieee80211_hw *hw) 


static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)

{

	static const int params_pci[] = {

		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

	};

	static const int params_usb[] = {

		RTL8190_EEPROM_ID, EEPROM_VID_USB, EEPROM_PID_USB,

		EEPROM_VID_USB, EEPROM_PID_USB, EEPROM_MAC_ADDR_MAC0_92DU,

		EEPROM_CHANNEL_PLAN, EEPROM_VERSION, EEPROM_CUSTOMER_ID,

		COUNTRY_CODE_WORLD_WIDE_13

	};

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

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

	const int *params = params_pci;

	u8 *hwinfo;



	if (rtlhal->interface == INTF_USB)

		params = params_usb;



	hwinfo = kzalloc(HWSET_MAX_SIZE, GFP_KERNEL);

	if (!hwinfo)

		return;
@@ -842,6 +860,7 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_phy *rtlphy = &rtlpriv->phy;

	struct rtl_sta_info *sta_entry = NULL;

	struct rtl92d_rate_mask_h2c rate_mask;

	enum wireless_mode wirelessmode;

	bool shortgi = false;

	u8 curshortgi_40mhz;
@@ -849,7 +868,6 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw, 
	u8 curtxbw_40mhz;

	u32 ratr_bitmap;

	u8 ratr_index;

	u32 value[2];

	u8 macid = 0;

	u8 mimo_ps;
@@ -965,12 +983,28 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw, 
		break;

	}



	value[0] = (ratr_bitmap & 0x0fffffff) | (ratr_index << 28);

	value[1] = macid | (shortgi ? 0x20 : 0x00) | 0x80;

	le32p_replace_bits(&rate_mask.rate_mask_and_raid, ratr_bitmap, RATE_MASK_MASK);

	le32p_replace_bits(&rate_mask.rate_mask_and_raid, ratr_index, RAID_MASK);

	u8p_replace_bits(&rate_mask.macid_and_short_gi, macid, MACID_MASK);

	u8p_replace_bits(&rate_mask.macid_and_short_gi, shortgi, SHORT_GI_MASK);

	u8p_replace_bits(&rate_mask.macid_and_short_gi, 1, BIT(7));



	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,

		"ratr_bitmap :%x value0:%x value1:%x\n",

		ratr_bitmap, value[0], value[1]);

	rtl92d_fill_h2c_cmd(hw, H2C_RA_MASK, 5, (u8 *)value);

		"Rate_index:%x, ratr_val:%x, %5phC\n",

		ratr_index, ratr_bitmap, &rate_mask);



	if (rtlhal->interface == INTF_PCI) {

		rtl92d_fill_h2c_cmd(hw, H2C_RA_MASK, sizeof(rate_mask),

				    (u8 *)&rate_mask);

	} else {

		/* rtl92d_fill_h2c_cmd() does USB I/O and will result in a

		 * "scheduled while atomic" if called directly

		 */

		memcpy(rtlpriv->rate_mask, &rate_mask,

		       sizeof(rtlpriv->rate_mask));

		schedule_work(&rtlpriv->works.fill_h2c_cmd);

	}



	if (macid != 0)

		sta_entry->ratr_index = ratr_index;

}
@@ -1014,7 +1048,8 @@ bool rtl92de_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
	bool actuallyset = false;

	unsigned long flag;



	if (rtlpci->being_init_adapter)

	if (rtlpriv->rtlhal.interface == INTF_PCI &&

	    rtlpci->being_init_adapter)

		return false;

	if (ppsc->swrf_processing)

		return false;