iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: dwc2: host: Add missing spinlock in dwc2_hcd_reset_func()

Browse Source 
The dwc2_hcd_reset_func() function is only ever called directly by a
delayed work function.  As such no locks are already held when the
function is called.

Doing a read-modify-write of CPU registers and setting fields in the
main hsotg data structure is a bad idea without locks.  Let's add
locks.

The bug was found by code inspection only.  It turns out that the
dwc2_hcd_reset_func() is only ever called today if the
"host_support_fs_ls_low_power" parameter is enabled and no code in
mainline enables that parameter.  Thus no known issues in mainline are
fixed by this patch, but it's still probably wise to fix the function.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Douglas Anderson 2015-11-20 09:06:27 -08:00 committed by Felipe Balbi
parent 98bfb39466
commit 4a065c7bdb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/dwc2/hcd.c
View File

@ -2358,13 +2358,19 @@ static void dwc2_hcd_reset_func(struct work_struct *work)
{ {
struct dwc2_hsotg *hsotg = container_of(work, struct dwc2_hsotg, struct dwc2_hsotg *hsotg = container_of(work, struct dwc2_hsotg,
reset_work.work); reset_work.work);
unsigned long flags;
u32 hprt0; u32 hprt0;
dev_dbg(hsotg->dev, "USB RESET function called\n"); dev_dbg(hsotg->dev, "USB RESET function called\n");
spin_lock_irqsave(&hsotg->lock, flags);
hprt0 = dwc2_read_hprt0(hsotg); hprt0 = dwc2_read_hprt0(hsotg);
hprt0 &= ~HPRT0_RST; hprt0 &= ~HPRT0_RST;
dwc2_writel(hprt0, hsotg->regs + HPRT0); dwc2_writel(hprt0, hsotg->regs + HPRT0);
hsotg->flags.b.port_reset_change = 1; hsotg->flags.b.port_reset_change = 1;
spin_unlock_irqrestore(&hsotg->lock, flags);
} }
/* /*