Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05678497 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

usb: musb: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Instead of a per-device static timer variable, a spare timer "dev_timer"
is added to the musb structure for devices to use for their per-device
timer.

Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c636364

drivers/usb/musb/am35x.c

+11 −13
Original line number Diff line number Diff line
@@ -133,11 +133,9 @@ static void am35x_musb_set_vbus(struct musb *musb, int is_on) 


#define	POLL_SECONDS	2



static struct timer_list otg_workaround;



static void otg_timer(unsigned long _musb)

static void otg_timer(struct timer_list *t)

{

	struct musb		*musb = (void *)_musb;

	struct musb		*musb = from_timer(musb, t, dev_timer);

	void __iomem		*mregs = musb->mregs;

	u8			devctl;

	unsigned long		flags;
@@ -173,7 +171,7 @@ static void otg_timer(unsigned long _musb) 
	case OTG_STATE_B_IDLE:

		devctl = musb_readb(mregs, MUSB_DEVCTL);

		if (devctl & MUSB_DEVCTL_BDEVICE)

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

		else

			musb->xceiv->otg->state = OTG_STATE_A_IDLE;

		break;
@@ -195,12 +193,12 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout) 
				musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON)) {

		dev_dbg(musb->controller, "%s active, deleting timer\n",

			usb_otg_state_string(musb->xceiv->otg->state));

		del_timer(&otg_workaround);

		del_timer(&musb->dev_timer);

		last_timer = jiffies;

		return;

	}



	if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) {

	if (time_after(last_timer, timeout) && timer_pending(&musb->dev_timer)) {

		dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n");

		return;

	}
@@ -209,7 +207,7 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout) 
	dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n",

		usb_otg_state_string(musb->xceiv->otg->state),

		jiffies_to_msecs(timeout - jiffies));

	mod_timer(&otg_workaround, timeout);

	mod_timer(&musb->dev_timer, timeout);

}



static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
@@ -278,14 +276,14 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci) 
			 */

			musb->int_usb &= ~MUSB_INTR_VBUSERROR;

			musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

			WARNING("VBUS error workaround (delay coming)\n");

		} else if (drvvbus) {

			MUSB_HST_MODE(musb);

			otg->default_a = 1;

			musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;

			portstate(musb->port1_status |= USB_PORT_STAT_POWER);

			del_timer(&otg_workaround);

			del_timer(&musb->dev_timer);

		} else {

			musb->is_active = 0;

			MUSB_DEV_MODE(musb);
@@ -324,7 +322,7 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci) 


	/* Poll for ID change */

	if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)

		mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

		mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);



	spin_unlock_irqrestore(&musb->lock, flags);
@@ -365,7 +363,7 @@ static int am35x_musb_init(struct musb *musb) 
	if (IS_ERR_OR_NULL(musb->xceiv))

		return -EPROBE_DEFER;



	setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);

	timer_setup(&musb->dev_timer, otg_timer, 0);



	/* Reset the musb */

	if (data->reset)
@@ -395,7 +393,7 @@ static int am35x_musb_exit(struct musb *musb) 
	struct musb_hdrc_platform_data *plat = dev_get_platdata(dev);

	struct omap_musb_board_data *data = plat->board_data;



	del_timer_sync(&otg_workaround);

	del_timer_sync(&musb->dev_timer);



	/* Shutdown the on-chip PHY and its PLL. */

	if (data->set_phy_power)

drivers/usb/musb/blackfin.c

+6 −7
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci) 
	if ((musb->xceiv->otg->state == OTG_STATE_B_IDLE

		|| musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON) ||

		(musb->int_usb & MUSB_INTR_DISCONNECT && is_host_active(musb))) {

		mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY);

		mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY);

		musb->a_wait_bcon = TIMER_DELAY;

	}
@@ -232,9 +232,9 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci) 
	return retval;

}



static void musb_conn_timer_handler(unsigned long _musb)

static void musb_conn_timer_handler(struct timer_list *t)

{

	struct musb *musb = (void *)_musb;

	struct musb *musb = from_timer(musb, t, dev_timer);

	unsigned long flags;

	u16 val;

	static u8 toggle;
@@ -266,7 +266,7 @@ static void musb_conn_timer_handler(unsigned long _musb) 
			musb_writeb(musb->mregs, MUSB_INTRUSB, val);

			musb->xceiv->otg->state = OTG_STATE_B_IDLE;

		}

		mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY);

		mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY);

		break;

	case OTG_STATE_B_IDLE:

		/*
@@ -310,7 +310,7 @@ static void musb_conn_timer_handler(unsigned long _musb) 
			 * shortening it, if accelerating A-plug detection

			 * is needed in OTG mode.

			 */

			mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY / 4);

			mod_timer(&musb->dev_timer, jiffies + TIMER_DELAY / 4);

		}

		break;

	default:
@@ -445,8 +445,7 @@ static int bfin_musb_init(struct musb *musb) 


	bfin_musb_reg_init(musb);



	setup_timer(&musb_conn_timer, musb_conn_timer_handler,

			(unsigned long) musb);

	timer_setup(&musb->dev_timer, musb_conn_timer_handler, 0);



	musb->xceiv->set_power = bfin_musb_set_power;

drivers/usb/musb/blackfin.h

+0 −2
Original line number Diff line number Diff line
@@ -82,6 +82,4 @@ static void dump_fifo_data(u8 *buf, u16 len) 
/* Almost 1 second */

#define TIMER_DELAY	(1 * HZ)



static struct timer_list musb_conn_timer;



#endif	/* __MUSB_BLACKFIN_H__ */

drivers/usb/musb/da8xx.c

+12 −14
Original line number Diff line number Diff line
@@ -135,11 +135,9 @@ static void da8xx_musb_set_vbus(struct musb *musb, int is_on) 


#define	POLL_SECONDS	2



static struct timer_list otg_workaround;



static void otg_timer(unsigned long _musb)

static void otg_timer(struct timer_list *t)

{

	struct musb		*musb = (void *)_musb;

	struct musb		*musb = from_timer(musb, t, dev_timer);

	void __iomem		*mregs = musb->mregs;

	u8			devctl;

	unsigned long		flags;
@@ -175,7 +173,7 @@ static void otg_timer(unsigned long _musb) 
		 * VBUSERR got reported during enumeration" cases.

		 */

		if (devctl & MUSB_DEVCTL_VBUS) {

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

			break;

		}

		musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
@@ -198,7 +196,7 @@ static void otg_timer(unsigned long _musb) 
		musb_writeb(mregs, MUSB_DEVCTL, devctl | MUSB_DEVCTL_SESSION);

		devctl = musb_readb(mregs, MUSB_DEVCTL);

		if (devctl & MUSB_DEVCTL_BDEVICE)

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

		else

			musb->xceiv->otg->state = OTG_STATE_A_IDLE;

		break;
@@ -220,12 +218,12 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout) 
				musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON)) {

		dev_dbg(musb->controller, "%s active, deleting timer\n",

			usb_otg_state_string(musb->xceiv->otg->state));

		del_timer(&otg_workaround);

		del_timer(&musb->dev_timer);

		last_timer = jiffies;

		return;

	}



	if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) {

	if (time_after(last_timer, timeout) && timer_pending(&musb->dev_timer)) {

		dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n");

		return;

	}
@@ -234,7 +232,7 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout) 
	dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n",

		usb_otg_state_string(musb->xceiv->otg->state),

		jiffies_to_msecs(timeout - jiffies));

	mod_timer(&otg_workaround, timeout);

	mod_timer(&musb->dev_timer, timeout);

}



static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
@@ -294,14 +292,14 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) 
			 */

			musb->int_usb &= ~MUSB_INTR_VBUSERROR;

			musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

			WARNING("VBUS error workaround (delay coming)\n");

		} else if (drvvbus) {

			MUSB_HST_MODE(musb);

			otg->default_a = 1;

			musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;

			portstate(musb->port1_status |= USB_PORT_STAT_POWER);

			del_timer(&otg_workaround);

			del_timer(&musb->dev_timer);

		} else {

			musb->is_active = 0;

			MUSB_DEV_MODE(musb);
@@ -328,7 +326,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) 


	/* Poll for ID change */

	if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)

		mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

		mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);



	spin_unlock_irqrestore(&musb->lock, flags);
@@ -390,7 +388,7 @@ static int da8xx_musb_init(struct musb *musb) 
		goto fail;

	}



	setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);

	timer_setup(&musb->dev_timer, otg_timer, 0);



	/* Reset the controller */

	musb_writel(reg_base, DA8XX_USB_CTRL_REG, DA8XX_SOFT_RESET_MASK);
@@ -428,7 +426,7 @@ static int da8xx_musb_exit(struct musb *musb) 
{

	struct da8xx_glue *glue = dev_get_drvdata(musb->controller->parent);



	del_timer_sync(&otg_workaround);

	del_timer_sync(&musb->dev_timer);



	phy_power_off(glue->phy);

	phy_exit(glue->phy);

drivers/usb/musb/davinci.c

+9 −11
Original line number Diff line number Diff line
@@ -199,11 +199,9 @@ static void davinci_musb_set_vbus(struct musb *musb, int is_on) 


#define	POLL_SECONDS	2



static struct timer_list otg_workaround;



static void otg_timer(unsigned long _musb)

static void otg_timer(struct timer_list *t)

{

	struct musb		*musb = (void *)_musb;

	struct musb		*musb = from_timer(musb, t, dev_timer);

	void __iomem		*mregs = musb->mregs;

	u8			devctl;

	unsigned long		flags;
@@ -224,7 +222,7 @@ static void otg_timer(unsigned long _musb) 
		 * VBUSERR got reported during enumeration" cases.

		 */

		if (devctl & MUSB_DEVCTL_VBUS) {

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

			break;

		}

		musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
@@ -248,7 +246,7 @@ static void otg_timer(unsigned long _musb) 
				devctl | MUSB_DEVCTL_SESSION);

		devctl = musb_readb(mregs, MUSB_DEVCTL);

		if (devctl & MUSB_DEVCTL_BDEVICE)

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

		else

			musb->xceiv->otg->state = OTG_STATE_A_IDLE;

		break;
@@ -325,14 +323,14 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci) 
			 */

			musb->int_usb &= ~MUSB_INTR_VBUSERROR;

			musb->xceiv->otg->state = OTG_STATE_A_WAIT_VFALL;

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);

			WARNING("VBUS error workaround (delay coming)\n");

		} else if (drvvbus) {

			MUSB_HST_MODE(musb);

			otg->default_a = 1;

			musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;

			portstate(musb->port1_status |= USB_PORT_STAT_POWER);

			del_timer(&otg_workaround);

			del_timer(&musb->dev_timer);

		} else {

			musb->is_active = 0;

			MUSB_DEV_MODE(musb);
@@ -361,7 +359,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci) 


	/* poll for ID change */

	if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)

		mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

		mod_timer(&musb->dev_timer, jiffies + POLL_SECONDS * HZ);



	spin_unlock_irqrestore(&musb->lock, flags);
@@ -393,7 +391,7 @@ static int davinci_musb_init(struct musb *musb) 
	if (revision == 0)

		goto fail;



	setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);

	timer_setup(&musb->dev_timer, otg_timer, 0);



	davinci_musb_source_power(musb, 0, 1);
@@ -443,7 +441,7 @@ static int davinci_musb_init(struct musb *musb) 


static int davinci_musb_exit(struct musb *musb)

{

	del_timer_sync(&otg_workaround);

	del_timer_sync(&musb->dev_timer);



	/* force VBUS off */

	if (cpu_is_davinci_dm355()) {