On Mon, Oct 30, 2017 at 9:29 AM, Bin Liu <b-liu@xxxxxx> wrote: > Now struct musb has the timer (dev_timer) for glue drivers, so let's > remove the duplicated timer defined in dsps glue driver, and use > dev_timer defined in struct musb. > > Signed-off-by: Bin Liu <b-liu@xxxxxx> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> Thanks for this; it wasn't clear to me if both timers needed to exist (i.e. glue operated independently from the musb object), so I didn't make this change myself. Greg, it probably makes sense to just take both patches. Does that work for you? -Kees > --- > > This is the fixup patch for [1]. > > [1] https://marc.info/?l=linux-usb&m=150936947225302&w=2 > > drivers/usb/musb/musb_dsps.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c > index e3d0e626a5d6..4d95fe714f27 100644 > --- a/drivers/usb/musb/musb_dsps.c > +++ b/drivers/usb/musb/musb_dsps.c > @@ -119,7 +119,6 @@ struct dsps_glue { > struct platform_device *musb; /* child musb pdev */ > const struct dsps_musb_wrapper *wrp; /* wrapper register offsets */ > int vbus_irq; /* optional vbus irq */ > - struct timer_list timer; /* otg_workaround timer */ > unsigned long last_timer; /* last timer data for each instance */ > bool sw_babble_enabled; > void __iomem *usbss_base; > @@ -149,6 +148,7 @@ struct dsps_glue { > > static void dsps_mod_timer(struct dsps_glue *glue, int wait_ms) > { > + struct musb *musb = platform_get_drvdata(glue->musb); > int wait; > > if (wait_ms < 0) > @@ -156,7 +156,7 @@ static void dsps_mod_timer(struct dsps_glue *glue, int wait_ms) > else > wait = msecs_to_jiffies(wait_ms); > > - mod_timer(&glue->timer, jiffies + wait); > + mod_timer(&musb->dev_timer, jiffies + wait); > } > > /* > @@ -216,7 +216,7 @@ static void dsps_musb_disable(struct musb *musb) > musb_writel(reg_base, wrp->coreintr_clear, wrp->usb_bitmap); > musb_writel(reg_base, wrp->epintr_clear, > wrp->txep_bitmap | wrp->rxep_bitmap); > - del_timer_sync(&glue->timer); > + del_timer_sync(&musb->dev_timer); > } > > /* Caller must take musb->lock */ > @@ -230,7 +230,7 @@ static int dsps_check_status(struct musb *musb, void *unused) > int skip_session = 0; > > if (glue->vbus_irq) > - del_timer(&glue->timer); > + del_timer(&musb->dev_timer); > > /* > * We poll because DSPS IP's won't expose several OTG-critical > @@ -284,8 +284,7 @@ static int dsps_check_status(struct musb *musb, void *unused) > > static void otg_timer(struct timer_list *t) > { > - struct dsps_glue *glue = from_timer(glue, t, timer); > - struct musb *musb = platform_get_drvdata(glue->musb); > + struct musb *musb = from_timer(musb, t, dev_timer); > struct device *dev = musb->controller; > unsigned long flags; > int err; > @@ -481,7 +480,7 @@ static int dsps_musb_init(struct musb *musb) > } > } > > - timer_setup(&glue->timer, otg_timer, 0); > + timer_setup(&musb->dev_timer, otg_timer, 0); > > /* Reset the musb */ > musb_writel(reg_base, wrp->control, (1 << wrp->reset)); > @@ -516,7 +515,7 @@ static int dsps_musb_exit(struct musb *musb) > struct device *dev = musb->controller; > struct dsps_glue *glue = dev_get_drvdata(dev->parent); > > - del_timer_sync(&glue->timer); > + del_timer_sync(&musb->dev_timer); > usb_phy_shutdown(musb->xceiv); > phy_power_off(musb->phy); > phy_exit(musb->phy); > @@ -1028,7 +1027,7 @@ static int dsps_suspend(struct device *dev) > return ret; > } > > - del_timer_sync(&glue->timer); > + del_timer_sync(&musb->dev_timer); > > mbase = musb->ctrl_base; > glue->context.control = musb_readl(mbase, wrp->control); > -- > 1.9.1 > -- Kees Cook Pixel Security -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
