]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: musb: da8xx: Remove try_idle implementation from host-only mode
authorBastien Curutchet <bastien.curutchet@bootlin.com>
Tue, 28 May 2024 10:20:25 +0000 (12:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Jun 2024 13:44:11 +0000 (15:44 +0200)
The idle_state is not meant for host-only mode. When the device acts as a
host, it fails to exit the idle state once entered. This prevents new
USB gadgets from being detected once plugged in.

Commit 032ec49f5351 ("usb: musb: drop useless board_mode usage") removed
a is_otg_enabled() check in the try_idle() that prevented from entering
idle_state. This was removed because at that time it was not possible to
select host-only mode with CONFIG_USB_MUSB_HOST so dual role was always
set.

Add #ifndef CONFIG_USB_MUSB_HOST around try_idle() callback to prevent
from entering idle_state when host-only mode has been selected.

Signed-off-by: Bastien Curutchet <bastien.curutchet@bootlin.com>
Link: https://lore.kernel.org/r/20240528102026.40136-4-bastien.curutchet@bootlin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/musb/da8xx.c

index 1681f9fba3dafe1a00ac6617c0ec42bcb5b7c89e..c5cf733673a2e1353fe41974057fa71f8d091c3d 100644 (file)
@@ -191,7 +191,7 @@ static void otg_timer(struct timer_list *t)
        spin_unlock_irqrestore(&musb->lock, flags);
 }
 
-static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout)
+static void __maybe_unused da8xx_musb_try_idle(struct musb *musb, unsigned long timeout)
 {
        static unsigned long last_timer;
 
@@ -476,7 +476,10 @@ static const struct musb_platform_ops da8xx_ops = {
        .disable        = da8xx_musb_disable,
 
        .set_mode       = da8xx_musb_set_mode,
+
+#ifndef CONFIG_USB_MUSB_HOST
        .try_idle       = da8xx_musb_try_idle,
+#endif
 
        .set_vbus       = da8xx_musb_set_vbus,
 };