wifi: rtw89: fix wrong pci_get_drvdata type in AER handlers
PATCH 1/1 wifi: rtw89: fix wrong pci_get_drvdata type in AER handlers
rtw89 stores an ieee80211_hw pointer via pci_set_drvdata() at probe time, but io_error_detected() and io_resume() retrieve it as a net_device pointer. This causes netif_device_detach/attach to operate on an ieee80211_hw struct, reading and writing at wrong offsets. The adjacent io_slot_reset() already does it correctly.
Use ieee80211_stop_queues/wake_queues instead, consistent with every other queue stop/start path in the driver.
Tested on RTL8852CE by calling the handlers from a test module before and after the fix.
--- drivers/net/wireless/realtek/rtw89/pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +4 -4
@@ -4624,9 +4624,9 @@ EXPORT_SYMBOL(rtw89_pm_ops);static pci_ers_result_t rtw89_pci_io_error_detected (struct pci_dev *pdev,pci_channel_state_t state) { -struct net_device *netdev =pci_get_drvdata (pdev); +struct ieee80211_hw *hw =pci_get_drvdata (pdev); -netif_device_detach (netdev); +ieee80211_stop_queues (hw);return PCI_ERS_RESULT_NEED_RESET ; }
@@ -4643,12 +4643,12 @@ static pci_ers_result_t rtw89_pci_io_slot_reset(struct pci_dev *pdev)static void rtw89_pci_io_resume (struct pci_dev *pdev) { -struct net_device *netdev =pci_get_drvdata (pdev); +struct ieee80211_hw *hw =pci_get_drvdata (pdev);/* ack any pending wake events, disable PME */ pci_enable_wake (pdev,PCI_D0 ,0 ); -netif_device_attach (netdev); +ieee80211_wake_queues (hw); }const struct pci_error_handlers rtw89_pci_err_handler = {
Signature · 1 line
2.53.0
Quoted 11 lines · Christos Longros
rtw89 stores an
ieee80211_hwpointer viapci_set_drvdata()at probe time, butio_error_detected()andio_resume()retrieve it as anet_devicepointer. This causes netif_device_detach/attach to operate on anieee80211_hwstruct, reading and writing at wrong offsets. The adjacentio_slot_reset()already does it correctly.Use ieee80211_stop_queues/wake_queues instead, consistent with every other queue stop/start path in the driver.
Tested on RTL8852CE by calling the handlers from a test module before and after the fix.
Could you share the "test module" you did? I'd like to know how to test (simulate) the io error.
Quoted 2 lines
Signed-off-by Christos Longros <[email protected]>
Ping-Ke Shih
maintainerQuoted 7 lines · Ping-Ke Shih
Quoted 6 lines · Christos Longros
rtw89 stores an
ieee80211_hwpointer viapci_set_drvdata()at probe time, butio_error_detected()andio_resume()retrieve it as anet_devicepointer. This causes netif_device_detach/attach to operate on anieee80211_hwstruct, reading and writing at wrong offsets. The adjacentio_slot_reset()already does it correctly.
Quoted 10 lines
Quoted 5 lines
Use ieee80211_stop_queues/wake_queues instead, consistent with every other queue stop/start path in the driver.
Tested on RTL8852CE by calling the handlers from a test module before and after the fix.
Could you share the "test module" you did? I'd like to know how to test (simulate) the io error.
Quoted 1 line
I'd add a Fixes tag
Quoted 4 lines
Quoted 1 line
Signed-off-by Christos Longros <[email protected]>Acked-by Ping-Ke Shih <[email protected]>
Ping-Ke Shih
maintainerQuoted 6 lines · Christos Longros
rtw89 stores an
ieee80211_hwpointer viapci_set_drvdata()at probe time, butio_error_detected()andio_resume()retrieve it as anet_devicepointer. This causes netif_device_detach/attach to operate on anieee80211_hwstruct, reading and writing at wrong offsets. The adjacentio_slot_reset()already does it correctly.
Quoted 8 lines
Use ieee80211_stop_queues/wake_queues instead, consistent with every other queue stop/start path in the driver.
Tested on RTL8852CE by calling the handlers from a test module before and after the fix.
Signed-off-by Christos Longros <[email protected]>Acked-by Ping-Ke Shih <[email protected]>
1 patch(es) applied to rtw-next branch of rtw.git, thanks.
7068c379cf9a wifi: rtw89: fix wrong pci_get_drvdata type in AER handlers