mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 13:26:48 +00:00
wifi: mt76: mt792x: stop USB register access after bus hang
Mark the mt792x USB bus hung on the first control timeout and switch
register access to no-op bus ops. Each failed vendor request may spend
up to MT_VEND_REQ_MAX_RETRY * MT_VEND_REQ_TOUT_MS, about 3 seconds, and
teardown/reset paths can keep issuing such requests after the device has
stopped responding.
Also skip the USB WFSYS reset path after bus_hung is set, since it uses
UHW vendor requests as well.
mt7925u 1-2:1.3: vendor request req:63 off:0018 failed:-110
mt7925u 1-2:1.3: vendor request req:63 off:0018 failed:-110
mt7925u 1-2:1.3: vendor request req:63 off:0018 failed:-110
mt7925u 1-2:1.3: vendor request req:63 off:0018 failed:-110
mt7925u 1-2:1.3: vendor request req:63 off:0018 failed:-110
Avoid repeating those register reads after the bus is known to be hung by
switching register access to no-op handlers.
Fixes: 0d2afe09fad5 ("mt76: mt7921: add mt7921u driver")
Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
Signed-off-by: Sean Wang <[email protected]>
Link: https://patch.msgid.link/[email protected]
This commit is contained in:
@@ -30,6 +30,8 @@ int __mt76u_vendor_request(struct mt76_dev *dev, u8 req, u8 req_type,
|
||||
for (i = 0; i < MT_VEND_REQ_MAX_RETRY; i++) {
|
||||
if (test_bit(MT76_REMOVED, &dev->phy.state))
|
||||
return -EIO;
|
||||
if (dev->usb.ctrl_timeout && atomic_read(&dev->bus_hung))
|
||||
return -EIO;
|
||||
|
||||
ret = usb_control_msg(udev, pipe, req, req_type, val,
|
||||
offset, buf, len, MT_VEND_REQ_TOUT_MS);
|
||||
@@ -42,6 +44,15 @@ int __mt76u_vendor_request(struct mt76_dev *dev, u8 req, u8 req_type,
|
||||
|
||||
dev_err(dev->dev, "vendor request req:%02x off:%04x failed:%d\n",
|
||||
req, offset, ret);
|
||||
|
||||
if (dev->usb.ctrl_timeout) {
|
||||
atomic_set(&dev->bus_hung, true);
|
||||
dev_err(dev->dev, "vendor request req:%02x off:%04x timed out, marking bus hung\n",
|
||||
req, offset);
|
||||
dev->usb.ctrl_timeout(dev, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(__mt76u_vendor_request);
|
||||
|
||||
Reference in New Issue
Block a user