shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

phy: rockchip: inno-usb2: correctly handle otg sm work

Browse Source 
RK3588 has two OTG controllers, OTG0 is configured as
OTG mode, and OTG1 is configured as host mode. The OTG1
doesn't init the otg sm work, so it can only handle the
otg sm work if the func of the work is initialized.

This patch can fix the warning if the logic is power off
during deep sleep on RK3588 EVB2.

WARNING: CPU: 0 PID: 145 at kernel/workqueue.c:3057 __flush_work+0x26c/0x28c
Modules linked in:
CPU: 0 PID: 145 Comm: irq/106-rockchi Not tainted 5.10.66 #720
Hardware name: Rockchip RK3588 EVB2 LP4 V10 Board (DT)
pstate: 60c00009 (nZCv daif +PAN +UAO -TCO BTYPE=--)
pc : __flush_work+0x26c/0x28c
lr : __cancel_work_timer+0x11c/0x1c0
......
Call trace:
 __flush_work+0x26c/0x28c
 __cancel_work_timer+0x11c/0x1c0
 cancel_delayed_work_sync+0x18/0x2c
 rockchip_usb2phy_bvalid_irq+0xf4/0x144
 rockchip_usb2phy_irq+0x368/0x384
 irq_thread_fn+0x34/0x88
 irq_thread+0x1a4/0x248
 kthread+0x13c/0x344
 ret_from_fork+0x10/0x30

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I42b5f6d22df3f7f94d54f05083694fb49e382620
This commit is contained in:
William Wu
2022-02-08 16:08:50 +08:00
committed by Tao Huang
parent 003bfa520d
commit 388805c56b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/phy/rockchip/phy-rockchip-inno-usb2.c
View File

@@ -871,7 +871,7 @@ static int rockchip_usb2phy_exit(struct phy *phy)
if (rport->port_id == USB2PHY_PORT_HOST)
cancel_delayed_work_sync(&rport->sm_work);
else if (rport->port_id == USB2PHY_PORT_OTG &&
rport->bvalid_irq > 0)
rport->otg_sm_work.work.func)
flush_delayed_work(&rport->otg_sm_work);
return 0;
@@ -1617,8 +1617,10 @@ static irqreturn_t rockchip_usb2phy_bvalid_irq(int irq, void *data)
if (rport->bypass_uart_en)
rockchip_usb_bypass_uart(rport, false);
cancel_delayed_work_sync(&rport->otg_sm_work);
rockchip_usb2phy_otg_sm_work(&rport->otg_sm_work.work);
if (rport->otg_sm_work.work.func) {
cancel_delayed_work_sync(&rport->otg_sm_work);
rockchip_usb2phy_otg_sm_work(&rport->otg_sm_work.work);
}
return IRQ_HANDLED;
}