lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 447/575] usb: dwc2: drd: fix dwc2_force_mode call in dwc2_ovr_init
    Date
    From: Amelie Delaunay <amelie.delaunay@foss.st.com>

    [ Upstream commit b2cab2a24fb5d13ce1d384ecfb6de827fa08a048 ]

    Instead of forcing the role to Device, check the dr_mode configuration.
    If the core is Host only, force the mode to Host, this to avoid the
    dwc2_force_mode warning:
    WARNING: CPU: 1 PID: 21 at drivers/usb/dwc2/core.c:615 dwc2_drd_init+0x104/0x17c

    When forcing mode to Host, dwc2_force_mode may sleep the time the host
    role is applied. To avoid sleeping while atomic context, move the call
    to dwc2_force_mode after spin_unlock_irqrestore. It is safe, as
    interrupts are not yet unmasked here.

    Fixes: 17f934024e84 ("usb: dwc2: override PHY input signals with usb role switch support")
    Acked-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
    Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
    Link: https://lore.kernel.org/r/20211005095305.66397-2-amelie.delaunay@foss.st.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/dwc2/drd.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/dwc2/drd.c b/drivers/usb/dwc2/drd.c
    index 2d4176f5788eb..80eae88d76dda 100644
    --- a/drivers/usb/dwc2/drd.c
    +++ b/drivers/usb/dwc2/drd.c
    @@ -25,9 +25,9 @@ static void dwc2_ovr_init(struct dwc2_hsotg *hsotg)
    gotgctl &= ~(GOTGCTL_BVALOVAL | GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL);
    dwc2_writel(hsotg, gotgctl, GOTGCTL);

    - dwc2_force_mode(hsotg, false);
    -
    spin_unlock_irqrestore(&hsotg->lock, flags);
    +
    + dwc2_force_mode(hsotg, (hsotg->dr_mode == USB_DR_MODE_HOST));
    }

    static int dwc2_ovr_avalid(struct dwc2_hsotg *hsotg, bool valid)
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-15 21:38    [W:2.959 / U:26.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site