iwlwifi: Add pci .shutdown() hook for iwlwifi driver
RFC PATCH 1/1 iwlwifi: Add pci .shutdown() hook for iwlwifi driver
Previously no .shutdown() hook is implemented for iwlwifi driver, a ETIMEDOUT error will occur during the kexec kernel bootup. As a consequence, wifi is unusable after kexec into the new kernel.
This issue is observed and patch tested on the following wireless cards:
1) Network controller: Intel Corporation Comet Lake PCH-LP CNVi WiFi,
Subsystem: Intel Corporation Wi-Fi 6 AX201 160MHz
2) Network controller: Intel Corporation Wireless-AC 9260,
Subsystem: Intel Corporation Device e014
---
Hi folks,
This is a RFC patch and I'm not sure about the correctness of the code, especially about the pci_clear_master() part. What I want is to stop any ongoing DMA access, in case if the memory overwritting during kexec kernel bootup. But there is already pci_clear_master(pci_dev) in drivers/pci/pci-driver.c:pci_device_shutdown(), so I'm not sure if it is still needed in the driver side. And I only tested the patch against the above 2 wireless cards and worked OK, not sure if it can work for others. Please review the patch, thanks in advance!
Thanks,
Tao Liu
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +13 -0
@@ -1513,6 +1513,18 @@ static void iwl_pci_remove(struct pci_dev *pdev)iwl_trans_pcie_free (trans); } +static void iwl_pci_shutdown (struct pci_dev *pdev) +{ +struct iwl_trans *trans =pci_get_drvdata (pdev); + +if (!trans) +return ; + +iwl_drv_stop (trans->drv); + +pci_clear_master (pdev); +} +#ifdef CONFIG_PM_SLEEP static int iwl_pci_suspend (struct device *device)
@@ -1583,6 +1595,7 @@ static struct pci_driver iwl_pci_driver = { .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, + .shutdown = iwl_pci_shutdown, .driver.pm = IWL_PM_OPS, };
Signature · 1 line
2.40.1
Add kexec to the CC list so kexec people can know this.
Quoted 65 lines · Tao Liu
Previously no .shutdown() hook is implemented for iwlwifi driver, a ETIMEDOUT error will occur during the kexec kernel bootup. As a consequence, wifi is unusable after kexec into the new kernel.
This issue is observed and patch tested on the following wireless cards:
1) Network controller: Intel Corporation Comet Lake PCH-LP CNVi WiFi,
Subsystem: Intel Corporation Wi-Fi 6 AX201 160MHz
2) Network controller: Intel Corporation Wireless-AC 9260,
Subsystem: Intel Corporation Device e014Signed-off-by Tao Liu <[email protected]>---
Hi folks,
This is a RFC patch and I'm not sure about the correctness of the code, especially about the
pci_clear_master()part. What I want is to stop any ongoing DMA access, in case if the memory overwritting during kexec kernel bootup. But there is alreadypci_clear_master(pci_dev)in drivers/pci/pci-driver.c:pci_device_shutdown(), so I'm not sure if it is still needed in the driver side. And I only tested the patch against the above 2 wireless cards and worked OK, not sure if it can work for others. Please review the patch, thanks in advance!Thanks,
Tao Liu--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/net/wireless/intel/iwlwifi/pcie/drv.c +13
-1@@ -1513,6 +1513,18 @@ static void iwl_pci_remove(struct pci_dev *pdev)iwl_trans_pcie_free (trans); } +static void iwl_pci_shutdown (struct pci_dev *pdev) +{ +struct iwl_trans *trans =pci_get_drvdata (pdev); + +if (!trans) +return ; + +iwl_drv_stop (trans->drv); + +pci_clear_master (pdev); +} +#ifdef CONFIG_PM_SLEEP static int iwl_pci_suspend (struct device *device)@@ -1583,6 +1595,7 @@ static struct pci_driver iwl_pci_driver = { .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, + .shutdown = iwl_pci_shutdown, .driver.pm = IWL_PM_OPS, }; --
Quoted 2 lines
2.40.1
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec