Commit 104372ff authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'rtw-next-2024-12-12' of https://github.com/pkshih/rtw 

rtw-next patches for v6.14

Regular development in this period. Main changes are listed:

rtl8xxxu:

 * add more USB devices IDs

rtlwifi:

 * refine error path

rtw88:

 * add more USB devices IDs

 * enable USB RX aggregation and USB 3 to improve performance

rtw89:

 * implement more stuffs including PS flow for MLO
parents b05d30c2 09489812

drivers/net/wireless/realtek/rtl8xxxu/core.c

+20 −0
Original line number Diff line number Diff line
@@ -8147,6 +8147,8 @@ static const struct usb_device_id dev_table[] = { 
	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x817e, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8186, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x818a, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x317f, 0xff, 0xff, 0xff),
@@ -8157,12 +8159,18 @@ static const struct usb_device_id dev_table[] = { 
	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x050d, 0x1102, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x050d, 0x11f2, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x06f8, 0xe033, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x07b8, 0x8188, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x07b8, 0x8189, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9041, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9043, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x17ba, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x1e1e, 0xff, 0xff, 0xff),
@@ -8179,6 +8187,10 @@ static const struct usb_device_id dev_table[] = { 
	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x13d3, 0x3357, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x13d3, 0x3358, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x13d3, 0x3359, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x330b, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0x4902, 0xff, 0xff, 0xff),
@@ -8193,6 +8205,8 @@ static const struct usb_device_id dev_table[] = { 
	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x4856, 0x0091, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x9846, 0x9041, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0xcdab, 0x8010, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x04f2, 0xaff7, 0xff, 0xff, 0xff),
@@ -8218,6 +8232,8 @@ static const struct usb_device_id dev_table[] = { 
	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0586, 0x341f, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x06f8, 0xe033, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x06f8, 0xe035, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x17ab, 0xff, 0xff, 0xff),
@@ -8226,6 +8242,8 @@ static const struct usb_device_id dev_table[] = { 
	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0df6, 0x0070, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0df6, 0x0077, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x0789, 0x016d, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x07aa, 0x0056, 0xff, 0xff, 0xff),
@@ -8248,6 +8266,8 @@ static const struct usb_device_id dev_table[] = { 
	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x330a, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x330d, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xab2b, 0xff, 0xff, 0xff),

	.driver_info = (unsigned long)&rtl8192cu_fops},

{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x624d, 0xff, 0xff, 0xff),

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

+6 −7
Original line number Diff line number Diff line
@@ -575,9 +575,15 @@ static void rtl_free_entries_from_ack_queue(struct ieee80211_hw *hw, 


void rtl_deinit_core(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	rtl_c2hcmd_launcher(hw, 0);

	rtl_free_entries_from_scan_list(hw);

	rtl_free_entries_from_ack_queue(hw, false);

	if (rtlpriv->works.rtl_wq) {

		destroy_workqueue(rtlpriv->works.rtl_wq);

		rtlpriv->works.rtl_wq = NULL;

	}

}

EXPORT_SYMBOL_GPL(rtl_deinit_core);
@@ -2696,9 +2702,6 @@ MODULE_AUTHOR("Larry Finger <Larry.FInger@lwfinger.net>"); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Realtek 802.11n PCI wireless core");



struct rtl_global_var rtl_global_var = {};

EXPORT_SYMBOL_GPL(rtl_global_var);



static int __init rtl_core_module_init(void)

{

	BUILD_BUG_ON(TX_PWR_BY_RATE_NUM_RATE < TX_PWR_BY_RATE_NUM_SECTION);
@@ -2712,10 +2715,6 @@ static int __init rtl_core_module_init(void) 
	/* add debugfs */

	rtl_debugfs_add_topdir();



	/* init some global vars */

	INIT_LIST_HEAD(&rtl_global_var.glb_priv_list);

	spin_lock_init(&rtl_global_var.glb_list_lock);



	return 0;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ int rtl_send_smps_action(struct ieee80211_hw *hw, 
u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);

void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);

u8 rtl_tid_to_ac(u8 tid);

extern struct rtl_global_var rtl_global_var;

void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);



#endif

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

+9 −52
Original line number Diff line number Diff line
@@ -295,46 +295,6 @@ static bool rtl_pci_get_amd_l1_patch(struct ieee80211_hw *hw) 
	return status;

}



static bool rtl_pci_check_buddy_priv(struct ieee80211_hw *hw,

				     struct rtl_priv **buddy_priv)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	struct rtl_priv *tpriv = NULL, *iter;

	struct rtl_pci_priv *tpcipriv = NULL;



	if (!list_empty(&rtlpriv->glb_var->glb_priv_list)) {

		list_for_each_entry(iter, &rtlpriv->glb_var->glb_priv_list,

				    list) {

			tpcipriv = (struct rtl_pci_priv *)iter->priv;

			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

				"pcipriv->ndis_adapter.funcnumber %x\n",

				pcipriv->ndis_adapter.funcnumber);

			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

				"tpcipriv->ndis_adapter.funcnumber %x\n",

				tpcipriv->ndis_adapter.funcnumber);



			if (pcipriv->ndis_adapter.busnumber ==

			    tpcipriv->ndis_adapter.busnumber &&

			    pcipriv->ndis_adapter.devnumber ==

			    tpcipriv->ndis_adapter.devnumber &&

			    pcipriv->ndis_adapter.funcnumber !=

			    tpcipriv->ndis_adapter.funcnumber) {

				tpriv = iter;

				break;

			}

		}

	}



	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"find_buddy_priv %d\n", tpriv != NULL);



	if (tpriv)

		*buddy_priv = tpriv;



	return tpriv != NULL;

}



static void rtl_pci_parse_configuration(struct pci_dev *pdev,

					struct ieee80211_hw *hw)

{
@@ -1696,8 +1656,6 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw) 
	synchronize_irq(rtlpci->pdev->irq);

	tasklet_kill(&rtlpriv->works.irq_tasklet);

	cancel_work_sync(&rtlpriv->works.lps_change_work);



	destroy_workqueue(rtlpriv->works.rtl_wq);

}



static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev)
@@ -2011,7 +1969,6 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, 
		pcipriv->ndis_adapter.amd_l1_patch);



	rtl_pci_parse_configuration(pdev, hw);

	list_add_tail(&rtlpriv->list, &rtlpriv->glb_var->glb_priv_list);



	return true;

}
@@ -2158,7 +2115,6 @@ int rtl_pci_probe(struct pci_dev *pdev, 
	rtlpriv->rtlhal.interface = INTF_PCI;

	rtlpriv->cfg = (struct rtl_hal_cfg *)(id->driver_data);

	rtlpriv->intf_ops = &rtl_pci_ops;

	rtlpriv->glb_var = &rtl_global_var;

	rtl_efuse_ops_init(hw);



	/* MEM map */
@@ -2209,7 +2165,7 @@ int rtl_pci_probe(struct pci_dev *pdev, 
	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		pr_err("Can't init_sw_vars\n");

		err = -ENODEV;

		goto fail3;

		goto fail2;

	}

	rtl_init_sw_leds(hw);
@@ -2227,14 +2183,14 @@ int rtl_pci_probe(struct pci_dev *pdev, 
	err = rtl_pci_init(hw, pdev);

	if (err) {

		pr_err("Failed to init PCI\n");

		goto fail3;

		goto fail4;

	}



	err = ieee80211_register_hw(hw);

	if (err) {

		pr_err("Can't register mac80211 hw.\n");

		err = -ENODEV;

		goto fail3;

		goto fail5;

	}

	rtlpriv->mac80211.mac80211_registered = 1;
@@ -2257,16 +2213,19 @@ int rtl_pci_probe(struct pci_dev *pdev, 
	set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);

	return 0;



fail3:

	pci_set_drvdata(pdev, NULL);

fail5:

	rtl_pci_deinit(hw);

fail4:

	rtl_deinit_core(hw);

fail3:

	wait_for_completion(&rtlpriv->firmware_loading_complete);

	rtlpriv->cfg->ops->deinit_sw_vars(hw);



fail2:

	if (rtlpriv->io.pci_mem_start != 0)

		pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);



	pci_release_regions(pdev);

	complete(&rtlpriv->firmware_loading_complete);



fail1:

	if (hw)
@@ -2317,7 +2276,6 @@ void rtl_pci_disconnect(struct pci_dev *pdev) 
	if (rtlpci->using_msi)

		pci_disable_msi(rtlpci->pdev);



	list_del(&rtlpriv->list);

	if (rtlpriv->io.pci_mem_start != 0) {

		pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);

		pci_release_regions(pdev);
@@ -2376,7 +2334,6 @@ EXPORT_SYMBOL(rtl_pci_resume); 
const struct rtl_intf_ops rtl_pci_ops = {

	.adapter_start = rtl_pci_start,

	.adapter_stop = rtl_pci_stop,

	.check_buddy_priv = rtl_pci_check_buddy_priv,

	.adapter_tx = rtl_pci_tx,

	.flush = rtl_pci_flush,

	.reset_trx_ring = rtl_pci_reset_trx_ring,

drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c

+4 −3
Original line number Diff line number Diff line
@@ -64,22 +64,23 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context) 


	rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD,

		"Firmware callback routine entered!\n");

	complete(&rtlpriv->firmware_loading_complete);

	if (!firmware) {

		pr_err("Firmware %s not available\n", fw_name);

		rtlpriv->max_fw_size = 0;

		return;

		goto exit;

	}

	if (firmware->size > rtlpriv->max_fw_size) {

		pr_err("Firmware is too big!\n");

		rtlpriv->max_fw_size = 0;

		release_firmware(firmware);

		return;

		goto exit;

	}

	pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware;

	memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);

	pfirmware->sz_fw_tmpbufferlen = firmware->size;

	release_firmware(firmware);

exit:

	complete(&rtlpriv->firmware_loading_complete);

}



static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)