phy: rockchip-inno-usb2: Ignore OTG IRQs in host mode

[ Upstream commit fd7d47484125c7d04578de9294faa7fec6e5df0a ]

When the OTG port is fixed to host mode, the driver does not request its
IRQs, nor does it enable those IRQs in hardware. Similarly, the driver
should ignore the OTG port IRQs when handling the shared interrupt.

Otherwise, it would update the extcon based on an ID pin which may be in
an undefined state, or try to queue a uninitialized work item.

Fixes: 6a98df08ccd5 ("phy: rockchip-inno-usb2: Fix muxed interrupt support")
Reported-by: Frank Wunderlich <frank-w@public-files.de>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Tested-by: Peter Geis <pgwipeout@gmail.com>
Tested-by: Frank Wunderlich <frank-w@public-files.de>
Link: https://lore.kernel.org/r/20220708061434.38115-1-samuel@sholland.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index cba5c32cbaeed0fb4fa74d3f2d8b4df77c9fc530..0c6548ac9d8a9635b13a1d96e5cc67387c2006b8 100644 (file)
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -942,7 +942,9 @@ static irqreturn_t rockchip_usb2phy_irq(int irq, void *data)
 
                switch (rport->port_id) {
                case USB2PHY_PORT_OTG:
-                       ret |= rockchip_usb2phy_otg_mux_irq(irq, rport);
+                       if (rport->mode != USB_DR_MODE_HOST &&
+                           rport->mode != USB_DR_MODE_UNKNOWN)
+                               ret |= rockchip_usb2phy_otg_mux_irq(irq, rport);
                        break;
                case USB2PHY_PORT_HOST:
                        ret |= rockchip_usb2phy_linestate_irq(irq, rport);