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

Commit b7463c71 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

OHCI: remove uses of hcd->state 



This patch (as1500) removes all uses of the objectionable hcd->state
variable from the ohci-hcd family of drivers.  It is replaced by a
private ohci->rh_state field, just as in uhci-hcd and ehci-hcd.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c6249ff7

drivers/usb/host/ohci-au1xxx.c

+1 −4
Original line number Diff line number Diff line
@@ -173,12 +173,9 @@ static int ohci_hcd_au1xxx_drv_suspend(struct device *dev) 
	 * mark HW unaccessible, bail out if RH has been resumed. Use

	 * the spinlock to properly synchronize with possible pending

	 * RH suspend or resume activity.

	 *

	 * This is still racy as hcd->state is manipulated outside of

	 * any locks =P But that will be a different fix.

	 */

	spin_lock_irqsave(&ohci->lock, flags);

	if (hcd->state != HC_STATE_SUSPENDED) {

	if (ohci->rh_state != OHCI_RH_SUSPENDED) {

		rc = -EINVAL;

		goto bail;

	}

drivers/usb/host/ohci-dbg.c

+16 −2
Original line number Diff line number Diff line
@@ -127,6 +127,19 @@ static char *hcfs2string (int state) 
	return "?";

}



static const char *rh_state_string(struct ohci_hcd *ohci)

{

	switch (ohci->rh_state) {

	case OHCI_RH_HALTED:

		return "halted";

	case OHCI_RH_SUSPENDED:

		return "suspended";

	case OHCI_RH_RUNNING:

		return "running";

	}

	return "?";

}



// dump control and status registers

static void

ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size)
@@ -136,9 +149,10 @@ ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size) 


	temp = ohci_readl (controller, &regs->revision) & 0xff;

	ohci_dbg_sw (controller, next, size,

		"OHCI %d.%d, %s legacy support registers\n",

		"OHCI %d.%d, %s legacy support registers, rh state %s\n",

		0x03 & (temp >> 4), (temp & 0x0f),

		(temp & 0x0100) ? "with" : "NO");

		(temp & 0x0100) ? "with" : "NO",

		rh_state_string(controller));



	temp = ohci_readl (controller, &regs->control);

	ohci_dbg_sw (controller, next, size,

drivers/usb/host/ohci-ep93xx.c

+0 −2
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_ 
	ohci->next_statechange = jiffies;



	ep93xx_stop_hc(&pdev->dev);

	hcd->state = HC_STATE_SUSPENDED;



	return 0;

}

drivers/usb/host/ohci-hcd.c

+13 −13
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int ohci_urb_enqueue ( 
		retval = -ENODEV;

		goto fail;

	}

	if (!HC_IS_RUNNING(hcd->state)) {

	if (ohci->rh_state != OHCI_RH_RUNNING) {

		retval = -ENODEV;

		goto fail;

	}
@@ -274,7 +274,7 @@ static int ohci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) 
	rc = usb_hcd_check_unlink_urb(hcd, urb, status);

	if (rc) {

		;	/* Do nothing */

	} else if (HC_IS_RUNNING(hcd->state)) {

	} else if (ohci->rh_state == OHCI_RH_RUNNING) {

		urb_priv_t  *urb_priv;



		/* Unless an IRQ completed the unlink while it was being
@@ -321,7 +321,7 @@ ohci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep) 
rescan:

	spin_lock_irqsave (&ohci->lock, flags);



	if (!HC_IS_RUNNING (hcd->state)) {

	if (ohci->rh_state != OHCI_RH_RUNNING) {

sanitize:

		ed->state = ED_IDLE;

		if (quirk_zfmicro(ohci) && ed->type == PIPE_INTERRUPT)
@@ -377,6 +377,7 @@ static void ohci_usb_reset (struct ohci_hcd *ohci) 
	ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);

	ohci->hc_control &= OHCI_CTRL_RWC;

	ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);

	ohci->rh_state = OHCI_RH_HALTED;

}



/* ohci_shutdown forcibly disables IRQs and DMA, helping kexec and
@@ -503,7 +504,7 @@ static int ohci_init (struct ohci_hcd *ohci) 
	if (distrust_firmware)

		ohci->flags |= OHCI_QUIRK_HUB_POWER;



	disable (ohci);

	ohci->rh_state = OHCI_RH_HALTED;

	ohci->regs = hcd->regs;



	/* REVISIT this BIOS handshake is now moved into PCI "quirks", and
@@ -578,7 +579,7 @@ static int ohci_run (struct ohci_hcd *ohci) 
	int			first = ohci->fminterval == 0;

	struct usb_hcd		*hcd = ohci_to_hcd(ohci);



	disable (ohci);

	ohci->rh_state = OHCI_RH_HALTED;



	/* boot firmware should have set this up (5.1.1.3.1) */

	if (first) {
@@ -691,7 +692,7 @@ static int ohci_run (struct ohci_hcd *ohci) 
	ohci->hc_control &= OHCI_CTRL_RWC;

	ohci->hc_control |= OHCI_CONTROL_INIT | OHCI_USB_OPER;

	ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);

	hcd->state = HC_STATE_RUNNING;

	ohci->rh_state = OHCI_RH_RUNNING;



	/* wake on ConnectStatusChange, matching external hubs */

	ohci_writel (ohci, RH_HS_DRWE, &ohci->regs->roothub.status);
@@ -728,7 +729,6 @@ static int ohci_run (struct ohci_hcd *ohci) 


	// POTPGT delay is bits 24-31, in 2 ms units.

	mdelay ((val >> 23) & 0x1fe);

	hcd->state = HC_STATE_RUNNING;



	if (quirk_zfmicro(ohci)) {

		/* Create timer to watch for bad queue state on ZF Micro */
@@ -764,7 +764,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) 
	 * of dead, unclocked, or unplugged (CardBus...) devices

	 */

	if (ints == ~(u32)0) {

		disable (ohci);

		ohci->rh_state = OHCI_RH_HALTED;

		ohci_dbg (ohci, "device removed!\n");

		usb_hc_died(hcd);

		return IRQ_HANDLED;
@@ -774,7 +774,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) 
	ints &= ohci_readl(ohci, &regs->intrenable);



	/* interrupt for some other device? */

	if (ints == 0 || unlikely(hcd->state == HC_STATE_HALT))

	if (ints == 0 || unlikely(ohci->rh_state == OHCI_RH_HALTED))

		return IRQ_NOTMINE;



	if (ints & OHCI_INTR_UE) {
@@ -789,8 +789,8 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) 


			schedule_work (&ohci->nec_work);

		} else {

			disable (ohci);

			ohci_err (ohci, "OHCI Unrecoverable Error, disabled\n");

			ohci->rh_state = OHCI_RH_HALTED;

			usb_hc_died(hcd);

		}
@@ -874,11 +874,11 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) 
	if ((ints & OHCI_INTR_SF) != 0

			&& !ohci->ed_rm_list

			&& !ohci->ed_to_check

			&& HC_IS_RUNNING(hcd->state))

			&& ohci->rh_state == OHCI_RH_RUNNING)

		ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);

	spin_unlock (&ohci->lock);



	if (HC_IS_RUNNING(hcd->state)) {

	if (ohci->rh_state == OHCI_RH_RUNNING) {

		ohci_writel (ohci, ints, &regs->intrstatus);

		ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);

		// flush those writes
@@ -932,7 +932,7 @@ static int ohci_restart (struct ohci_hcd *ohci) 
	struct urb_priv *priv;



	spin_lock_irq(&ohci->lock);

	disable (ohci);

	ohci->rh_state = OHCI_RH_HALTED;



	/* Recycle any "live" eds/tds (and urbs). */

	if (!list_empty (&ohci->pending))

drivers/usb/host/ohci-hub.c

+3 −4
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ __acquires(ohci->lock) 
	if (!autostop) {

		ohci->next_statechange = jiffies + msecs_to_jiffies (5);

		ohci->autostop = 0;

		ohci->rh_state = OHCI_RH_SUSPENDED;

	}



done:
@@ -140,7 +141,7 @@ __acquires(ohci->lock) 


	if (ohci->hc_control & (OHCI_CTRL_IR | OHCI_SCHED_ENABLES)) {

		/* this can happen after resuming a swsusp snapshot */

		if (hcd->state == HC_STATE_RESUMING) {

		if (ohci->rh_state != OHCI_RH_RUNNING) {

			ohci_dbg (ohci, "BIOS/SMM active, control %03x\n",

					ohci->hc_control);

			status = -EBUSY;
@@ -274,6 +275,7 @@ __acquires(ohci->lock) 
		(void) ohci_readl (ohci, &ohci->regs->control);

	}



	ohci->rh_state = OHCI_RH_RUNNING;

	return 0;

}
@@ -336,11 +338,8 @@ static void ohci_finish_controller_resume(struct usb_hcd *hcd) 
	/* If needed, reinitialize and suspend the root hub */

	if (need_reinit) {

		spin_lock_irq(&ohci->lock);

		hcd->state = HC_STATE_RESUMING;

		ohci_rh_resume(ohci);

		hcd->state = HC_STATE_QUIESCING;

		ohci_rh_suspend(ohci, 0);

		hcd->state = HC_STATE_SUSPENDED;

		spin_unlock_irq(&ohci->lock);

	}